90 files changed, 5166 insertions, 3350 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 395cf7a2c5e..0982f2782d7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,425 @@
+2005-10-28  Juri Linkov  <juri@jurta.org>
+
+        * international/quail.el (quail-get-current-str): Translate last
+        raw character for deterministic input methods.
+
+2005-10-27  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-ext.el: Add functions to autoloads.
+        (math-identity-matrix-p, math-ident-row-p): New functions.
+
+        * calc/calc-arith.el (calc-mul-symb-fancy): Add checks for
+        multiplication by an identity matrix; don't turn multiplication by
+        an inverse matrix into division.
+        (math-div-symbol-fancy):  Replace division by matrices with
+        multiplication by inverse.
+
+        * calc/calc-misc.el (calcFunc-inv): Check for symbolic matrices.
+
+        * calc/calc-alg.el (calcFunc-writeoutpower, math-write-out-power)
+        (calc-writeoutpower): New functions.
+
+2005-10-27  Romain Francoise  <romain@orebokech.com>
+
+        * replace.el (occur-engine): Include colon in mouse-face highlight.
+
+        * dired-x.el: Change Maintainer field.
+
+2005-10-26  Chong Yidong  <cyd@stupidchicken.com>
+
+        * longlines.el (longlines-mode): Bind after-change-functions to
+        nil during initial decoding and final encoding.
+
+2005-10-26  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * term.el (term-emulate-terminal, term-handle-colors-array)
+        (term-handle-ansi-escape): Specify the terminfo capabilities
+        implemented.
+
+2005-10-26  Richard M. Stallman  <rms@gnu.org>
+
+        * info.el (Info-fontify-node): Fix detection of sentence-break
+        before *Note.
+
+2005-10-26  Romain Francoise  <romain@orebokech.com>
+
+        * smerge-mode.el: Add `tools' to file keywords.
+
+2005-10-26  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gud.el (gud-menu-map): Only display gud-until icon
+        when the fringe is not available.
+
+        * progmodes/gdb-ui.el (def-gdb-auto-updated-buffer)
+        (def-gdb-auto-update-trigger): Simplify construction.
+        (gdb-locals-buffer): Use def-gdb-auto-update-trigger instead of
+        def-gdb-auto-updated-buffer as gdb-info-locals-handler is
+        defined explicitly.
+        (gdb-assembler-buffer): Use def-gdb-auto-update-handler instead of
+        def-gdb-auto-updated-buffer as gdb-invalidate-assembler is
+        defined explicitly.
+        (gdb-info-locals-custom): Remove as it's a no-op.
+
+2005-10-25  Chong Yidong  <cyd@stupidchicken.com>
+
+        * longlines.el (longlines-mode): Remove narrowing before
+        performing the initial decoding or final encoding.
+
+2005-10-25  Romain Francoise  <romain@orebokech.com>
+
+        * emacs-lisp/find-func.el (find-library-name): Also strip
+        extension if library name ends in .el, to take advantage of
+        `find-library-suffixes'.
+
+2005-10-25  Richard M. Stallman  <rms@gnu.org>
+
+        * menu-bar.el (menu-bar-help-menu): Say which kind of therapist.
+
+2005-10-25  Juri Linkov  <juri@jurta.org>
+
+        * textmodes/texinfo.el (texinfo-mode): Change charset of one
+        quotation mark from [mule-unicode-0100-24ff] to [japanese-jisx0208].
+
+2005-10-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * play/blackbox.el (blackbox-mode-map): Move init into declaration.
+        (blackbox-redefine-key): Add argument `map'.
+
+        * jit-lock.el (jit-lock-fontify-now): Be careful not to skip multiline
+        regions when moving the jit-lock-context-unfontify-pos boundary.
+
+2005-10-25  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * net/browse-url.el (browse-url-of-buffer): Add ".html" to
+        filename.
+
+2005-10-25  Masatake YAMATO  <jet@gyve.org>
+
+        * dired-x.el (dired-virtual): Don't use `dired-insert-headerline'.
+
+2005-10-25  Michael Cadilhac  <michael.cadilhac-@t-lrde.epita.fr>  (tiny change)
+
+        * play/blackbox.el (blackbox-redefine-key): New function.
+        (blackbox-mode-map): Use it to remap existing bindings for cursor
+        motion instead of binding literal keys.
+
+2005-10-25  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/diary-lib.el (diary-list-entries): Prevent infloop when
+        diary does not end in a newline.  Do not assume a blank line at
+        the start of the diary file.
+
+2005-10-25  Kenichi Handa  <handa@m17n.org>
+
+        * international/quail.el (quail-translate-key): If the input
+        method is deterministic and failed to handle the last key, restart
+        the key handling loop from an appropriate key.
+
+2005-10-25  Michael Albinus  <michael.albinus@gmx.de>
+
+        * vc.el (vc-dired-mode): Extend comment for binding of
+        `directory-listing-before-filename-regexp'.
+
+2005-10-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/texinfo.el (texinfo-mode):
+        * textmodes/paragraphs.el (sentence-end-base): Use real chars, so as
+        not to unnecessarily expose emacs-mule's internal char codes.
+
+2005-10-25  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-put-breakpoint-icon): Correct help-echo.
+        Display hand pointer and help-echo on disabled icon too.
+        (gdb-mouse-until): New function.
+        (gdb-ann3): Bind it to mouse-2 and drag-mouse-1 in left fringe.
+
+2005-10-24  Chong Yidong  <cyd@stupidchicken.com>
+
+        * menu-bar.el (menu-bar-help-menu): Rename "psychiatrist", in line
+        with 2005-10-23 change to doctor.el.
+
+        * finder.el (finder-mode-map): Add follow-link binding.
+
+2005-10-25  Kim F. Storm  <storm@cua.dk>
+
+        * progmodes/gdb-ui.el (gdb-ann3): Bind mouse-3 in left fringe
+        to gdb-mouse-toggle-breakpoint-fringe.
+        (gdb-mouse-toggle-breakpoint-margin): Rename from
+        gdb-mouse-toggle-breakpoint. Fix doc.
+        (gdb-mouse-toggle-breakpoint-fringe): New defun.
+        (gdb-put-string): Add optional SPROPS arg.  Add props to string.
+        (gdb-put-breakpoint-icon): Add gdb-bptno and gdb-enabled
+        string properties also for fringe breakpoint bitmaps.
+
+2005-10-24  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-start-icalendar-file): Fix format form.
+
+2005-10-25  Masatake YAMATO  <jet@gyve.org>
+
+        * simple.el (completion-common-substring):
+        Use `completion-common-substring' prior to `completion-base-size'.
+
+2005-10-24  Hrvoje Niksic  <hniksic@xemacs.org>
+
+        * savehist.el: Require CL while compiling.
+        (savehist-history-variables): Remove.
+        (savehist-save-minibuffer-history, savehist-additional-variables)
+        (savehist-minibuffer-history-variables): New vars.
+        (savehist-save): Use them.
+        (savehist-uninstall, savehist-minibuffer-hook): New funs.
+        (savehist-install): New fun, extracted from savehist-load.
+        (savehist-load): Use them.
+
+2005-10-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/lisp-mode.el (easy-mmode-define-global-mode): Don't add
+        a dummy doc-string-elt property.
+        (defalias, defvaralias, define-category): Add a docstring property.
+
+        * image.el (defimage):
+        * widget.el (define-widget):
+        * custom.el (defface, defcustom): Add `doc-string' declaration.
+
+        * emacs-lisp/advice.el (ad-make-advised-definition): Fix arg-order.
+        (defadvice): Add `doc-string' declaration.
+
+        * emacs-lisp/byte-run.el (macro-declaration-function):
+        Handle `doc-string' declarations.
+        (define-obsolete-function-alias, define-obsolete-variable-alias):
+        Add `doc-string' declaration.
+
+2005-10-24  Kenichi Handa  <handa@m17n.org>
+
+        * international/utf-7.el (utf-7): Add autoload cookie.
+
+        * term/x-win.el: Register more Cyrillic characters in x-keysym-table.
+
+2005-10-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (autoloads): Use "." instead of $(lisp) in the
+        list of directories passed to batch-update-autoloads.  Add "." to
+        the list of the echoed directories.
+
+        * pgg-def.el:
+        * pgg-gpg.el:
+        * pgg-parse.el:
+        * pgg-pgp.el:
+        * pgg-pgp5.el:
+        * pgg.el: Moved here from the gnus subdirectory.
+
+2005-10-24  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gud.el (gud-filter): Bind inhibit-read-only to t
+        in case comint-prompt-read-only is set to t.
+
+        * progmodes/gdb-ui.el (gdb-send): Bind inhibit-read-only to t
+        in case comint-prompt-read-only is set to t.
+
+2005-10-24  Ulf Jasper  <ulf.jasper@web.de>
+
+        * calendar/icalendar.el (icalendar-version): Increase to 0.13.
+        Now a string.
+        (icalendar-import-format): Handle CLASS, STATUS, URL.
+        Rename `subject' to `summary'.
+        (icalendar-import-format-summary): Rename from
+        `icalendar-import-format-subject'.
+        (icalendar-import-format-url, icalendar-import-format-status)
+        (icalendar-import-format-class): New variables.
+        (icalendar--rris): Take variable argument list.
+        (icalendar--datestring-to-isodate): Remove unnecessary
+        calendar-style check when converting dates with explicit month names.
+        (icalendar-export-region): Change return type of conversion
+        subroutines.  Bury current buffer unless error occurred.
+        (icalendar--convert-to-ical)
+        (icalendar--parse-summary-and-rest): New functions.
+        (icalendar--convert-ordinary-to-ical)
+        (icalendar--convert-weekly-to-ical)
+        (icalendar--convert-yearly-to-ical)
+        (icalendar--convert-block-to-ical)
+        (icalendar--convert-cyclic-to-ical)
+        (icalendar--convert-anniversary-to-ical): Change return type.
+        Strip trailing blanks from subject.
+        (icalendar--convert-sexp-to-ical): Change return type.
+        Strip trailing blanks from subject.  Handle simple sexp
+        entries as generated by icalendar.el.
+        (icalendar--convert-float-to-ical)
+        (icalendar--convert-date-to-ical): Strip trailing blanks from subject.
+        (icalendar-import-file): Doc fix.
+        (icalendar--format-ical-event): Handle CLASS, STATUS, URL.
+        Correct call to icalendar--rris.
+        (icalendar--convert-ical-to-diary): Doc fix.  Rename `subject' to
+        `summary'.
+        (icalendar--add-diary-entry): Rename `subject' to `summary'.
+
+2005-10-24  Romain Francoise  <romain@orebokech.com>
+
+        * server.el (server-sentinel): Set query-on-exit flag to nil on
+        new client processes (it isn't inherited from the server process).
+
+        * replace.el (occur-engine): Rearrange text properties.
+
+2005-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/debug.el (debugger-make-xrefs): Don't assume
+        case-fold-search is nil.
+        (debug-help-follow): Use help-xref-interned directly.
+
+2005-10-23  Chong Yidong  <cyd@stupidchicken.com>
+
+        * thumbs.el (thumbs-image-type): Add .pbm.
+
+2005-10-23  Richard M. Stallman  <rms@gnu.org>
+
+        * faces.el (inhibit-face-set-after-frame-default): New variable.
+        (set-face-attribute): Bind it.
+        (face-set-after-frame-default): Test it.
+
+        * help-fns.el (describe-simplify-lib-file-name): New function.
+        (describe-function-1, describe-variable): Use it.
+
+        * faces.el (describe-face): Use describe-simplify-lib-file-name.
+
+        * tooltip.el (tooltip-x-offset, tooltip-y-offset): Change defaults.
+        Eliminate nil as possible value.
+        (tooltip-hide-delay): Reduce internal-border-width.
+
+        * menu-bar.el (menu-bar-file-menu) <dired>: Change help-echo string.
+        (menu-bar-file-menu) <new-file>: Likewise.
+
+        * simple.el (line-move-finish): Ignore fields computing LINE-END.
+
+        * international/mule.el (load-with-code-conversion):
+        Pass full file name to `eval-buffer' unless preloading.
+
+        * textmodes/flyspell.el (flyspell-large-region):
+        Call ispell-check-version.
+
+        * textmodes/ispell.el (ispell-local-dictionary-overridden):
+        Fix the make-variable-buffer-local call that was supposed
+        to be for this variable.
+        (ispell-aspell-supports-utf8): Doc fix.
+        (ispell-find-aspell-dictionaries): Preserve elements of
+        ispell-dictionary-alist for dictionaries that aspell doesn't report.
+        (ispell-aspell-find-dictionary): Return nil on error.
+
+        * play/doctor.el (doctor-doc): Don't say "psychiatrist".
+        (doctor-symptoms): Likewise.
+
+        * add-log.el (add-log-current-defun): Clean up handling of DEFUNs.
+
+2005-10-23  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cus-edit.el (custom-button, custom-button-pressed): New vars.
+        (custom-raised-buttons): Add :set spec.
+        (custom-button-unraised, custom-button-pressed-unraised):
+        New faces, so that custom-raised-buttons actually does something.
+        (custom-mode): Use custom-button and custom-button-pressed.
+
+        * wid-edit.el (widget-specify-button): Don't ignore
+        widget-mouse-face on graphic terminals.
+        (widget-move-and-invoke): Cleanup.
+
+2005-10-23  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * whitespace.el (whitespace-cleanup): Doc fix.
+
+2005-10-23  Romain Francoise  <romain@orebokech.com>
+
+        * emulation/viper.el (viper-set-hooks): Quote forms passed to
+        `eval-after-load' to avoid evaluating their result.
+
+2005-10-23  Michael Albinus  <michael.albinus@gmx.de>
+
+        * files.el (directory-listing-before-filename-regexp):
+        New defvar.  Replaces `dired-move-to-filename-regexp' from dired.el.
+
+        * dired.el (dired-move-to-filename-regexp): Remove.
+        All occurences replaced by `directory-listing-before-filename-regexp'.
+
+        * dired-x.el, locate.el, vc.el:
+        Replace `dired-move-to-filename-regexp' by
+        `directory-listing-before-filename-regexp'.  In vc.el it is
+        overwritten locally; maybe this can be handled in files.el too.
+
+        * net/ange-ftp.el (ange-ftp-date-regexp): Remove.  All occurences
+        replaced by `directory-listing-before-filename-regexp'.
+
+2005-10-23  Andreas Schwab  <schwab@suse.de>
+
+        * font-lock.el (lisp-font-lock-keywords-2): Add eval-at-startup
+        and eval-next-after-load.
+
+2005-10-23  MIYOSHI Masanori  <miyoshi@meadowy.org>  (tiny change)
+
+        * mouse.el (mouse-drag-region): If the *Messages* buffer doesn't
+        exist, create it.
+
+2005-10-23  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el: Remove autoloads for mailcrypt and crypt++.
+        Require pgg, pgg-gpg during compilation.
+        (allout-version): Increment version number to 2.1, and use a literal
+        rather than RCS Id.
+        (allout-default-encryption-scheme): Remove.
+        (allout-passphrase-verifier-handling)
+        (allout-passphrase-verifier-string)
+        (allout-file-passphrase-verifier-string)
+        (allout-passphrase-hint-string): Rename -key- to -passphrase-.
+        (allout-passphrase-hint-handling): Rename and simplify.
+        (allout-init): Use `find-file-hook' if available, otherwise
+        `find-file-hooks'.
+        (allout-mode): Use `write-file-functions' if available, otherwise
+        `local-write-file-hooks' and, instead of making auto-save-hook
+        buffer local, make the write-file-hook activity contingent to
+        allout-mode.
+        (allout-mode): Use key-binding substitution in the docstring.
+        (allout-kill-line): Spell-out kill ring data structure mutation
+        instead of using byte-compiler-complaint-provoking `pop'.
+        (allout-insert-listified): Use `insert' rather than `insert-string'
+        (allout-toggle-current-subtree-encryption): Update docstring, adjust
+        to new gpp-based encryption, use new `allout-encrypted-topic-p'.
+        (allout-encrypt-string): Totally revamped vis new underlying
+        encryption facilities.
+        (allout-mc-activate-passwd): Remove.
+        (allout-obtain-passphrase): New, more or less replaces
+        allout-mc-activate-passwd.
+        (allout-encrypted-key-info): More or less replaces
+        allout-encrypted-text-type.
+        (outlineify-sticky, outlinify-sticky): Add autoload cookie.
+        (my-mark-marker): Use `(featurep 'xemacs)'.
+
+2005-10-23  Lars Hansen <larsh@soem.dk>
+
+        * emacs-lisp/bytecomp.el (byte-compile-lambda): New arg add-lambda.
+        (byte-compile-file-form-defmumble, byte-compile-defun)
+        (byte-compile-defmacro): Use it.
+        (byte-compile-form): Don't call byte-compile-set-symbol-position
+        when a byte-compile handler is called.
+
+2005-10-22  Romain Francoise  <romain@orebokech.com>
+
+        * savehist.el (savehist-history-variables): Add `grep-find-history'.
+
+        * subr.el (eval-after-load): Convert library name to an absolute
+        file name using locate-library, since load-history no longer has
+        library names in it.
+
+2005-10-22  Richard M. Stallman  <rms@gnu.org>
+
+        * files.el (make-temp-file): Move from subr.el.
+        * subr.el (make-temp-file): Move to files.el.
+
+        * window.el (get-buffer-window-list): Move from subr.el.
+        * subr.el (get-buffer-window-list): Move to window.el.
+
+        * image.el (image-load-path): Use eval-at-startup to initialize.
+
+        * subr.el (eval-at-startup): New macro.
+
+        * subr.el: Much rearrangement of functions and division
+        into pages.  No code changes.
+
 2005-10-22  Kenichi Handa  <handa@m17n.org>
 
         * tar-mode.el (tar-extract): Be sure to call
@@ -14,8 +436,8 @@
         (image-type-from-file-header): Use it instead of image-type-from-data.
         Use image-search-load-path instead of only looking in data-directory.
         (image-type-from-file-name): New defun.
-        (image-search-load-path): Make PATH arg optional, default to image-load-path.
-        Change `pathname' to `filename'.
+        (image-search-load-path): Change `pathname' to `filename'.
+        Make PATH arg optional, default to image-load-path.
 
 2005-10-21  Richard M. Stallman  <rms@gnu.org>
 
diff --git a/lisp/add-log.el b/lisp/add-log.el
index 8ea934084f6..024262a6bee 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -826,31 +826,28 @@ Has a preference of looking backwards."
                  ;; If the desired position is within the defun we found,
                  ;; find the function name.
                  (when (< location (point))
+                   ;; Move back over function body.
                    (backward-sexp 1)
-                   (let (beg tem)
-
+                   (let (beg)
+                     ;; Skip back over typedefs and arglist.
+                     ;; Stop at the function definition itself
+                     ;; or at the line that follows end of function doc string.
                      (forward-line -1)
-                     ;; Skip back over typedefs of arglist.
                      (while (and (not (bobp))
-                                 (looking-at "[ \t\n]"))
+                                 (looking-at "[ \t\n]")
+                                 (not (looking-back "[*]/)\n" (- (point) 4))))
                        (forward-line -1))
-                     ;; See if this is using the DEFUN macro used in Emacs,
-                     ;; or the DEFUN macro used by the C library:
-                     (if (condition-case nil
-                             (and (save-excursion
-                                    (end-of-line)
-                                    (while (= (preceding-char) ?\\)
-                                      (end-of-line 2))
-                                    (backward-sexp 1)
-                                    (beginning-of-line)
-                                    (setq tem (point))
-                                    (looking-at "DEFUN\\b"))
-                                  (>= location tem))
-                           (error nil))
+                     ;; If we found a doc string, this must be the DEFUN macro
+                     ;; used in Emacs.  Move back to the DEFUN line.
+                     (when (looking-back "[*]/)\n" (- (point) 4))
+                       (backward-sexp 1)
+                       (beginning-of-line))
+                     ;; Is this a DEFUN construct?  And is LOCATION in it?
+                     (if (and (looking-at "DEFUN\\b")
+                              (>= location (point)))
                          ;; DEFUN ("file-name-directory", Ffile_name_directory, Sfile_name_directory, ...) ==> Ffile_name_directory
                          ;; DEFUN(POSIX::STREAM-LOCK, stream lockp &key BLOCK SHARED START LENGTH) ==> POSIX::STREAM-LOCK
                          (progn
-                           (goto-char tem)
                            (down-list 1)
                            (when (= (char-after (point)) ?\")
                              (forward-sexp 1)
@@ -863,6 +860,7 @@ Has a preference of looking backwards."
                                    (skip-syntax-backward " ")
                                    (point))))
                        (if (looking-at "^[+-]")
+                           ;; C++.
                            (change-log-get-method-definition)
                          ;; Ordinary C function syntax.
                          (setq beg (point))
diff --git a/lisp/allout.el b/lisp/allout.el
index 5dc16ee3546..805b3cc288c 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -6,6 +6,7 @@
 ;; Author: Ken Manheimer <ken dot manheimer at gmail dot com>
 ;; Maintainer: Ken Manheimer <ken dot manheimer at gmail dot com>
 ;; Created: Dec 1991 - first release to usenet
+;; Version: 2.1
 ;; Keywords: outlines wp languages
 
 ;; This file is part of GNU Emacs.
@@ -45,9 +46,10 @@
 ;;    formatted as an outline - do ESC-x eval-current-buffer in allout.el
 ;;    to try it out.)
 ;;  - configurable per-file initial exposure settings
-;;  - symmetric-key and key-pair topic encryption, plus reliable key
-;;    verification and user-supplied hint maintenance.  (see
-;;    allout-toggle-current-subtree-encryption docstring.)
+;;  - symmetric-key and key-pair topic encryption, plus symmetric passphrase
+;;    mnemonic support, with verification against an established passphrase
+;;    (using a stashed encrypted dummy string) and user-supplied hint
+;;    maintenance.  (see allout-toggle-current-subtree-encryption docstring.)
 ;;  - automatic topic-number maintenance
 ;;  - "hot-spot" operation, for single-keystroke maneuvering and
 ;;    exposure control (see the allout-mode docstring)
@@ -79,17 +81,10 @@
 
 ;;;_* Dependency autoloads
 (eval-when-compile 'cl)                 ; otherwise, flet compilation fouls
-(autoload 'crypt-encrypt-buffer "crypt++")
-(setq-default crypt-encryption-type 'gpg)
-
-(autoload 'mc-encrypt "mailcrypt"
-  "*Encrypt the current buffer")
-(autoload 'mc-activate-passwd "mailcrypt"
-  "Activate the passphrase matching ID, using PROMPT for a prompt.
-Return the passphrase.  If PROMPT is nil, only return value if cached.")
-(autoload 'mc-gpg-process-region "mc-gpg")
-(autoload 'mc-dectivate-passwd "mailcrypt"
-  "*Deactivate the passphrase cache.")
+(eval-when-compile (progn (require 'pgg)
+                          (require 'pgg-gpg)))
+(autoload 'pgg-gpg-symmetric-key-p "pgg-gpg"
+  "True if decoded armor MESSAGE-KEYS has symmetric encryption indicator.")
 
 ;;;_* USER CUSTOMIZATION VARIABLES:
 (defgroup allout nil
@@ -428,55 +423,30 @@ formatted copy."
   "*Bullet signifying encryption of the entry's body."
   :type '(choice (const nil) string)
   :group 'allout)
-;;;_  = allout-default-encryption-scheme
-(defcustom allout-default-encryption-scheme 'mc-scheme-gpg
-  "*Default allout outline topic encryption mode.
-
-See mailcrypt variable `mc-schemes' and mailcrypt docs for encryption schemes."
-  :type 'symbol
-  :group 'allout)
-;;;_  = allout-key-verifier-handling
-(defcustom allout-key-verifier-handling 'situate
-  "*Dictate outline encryption key verifier handling.
-
-The key verifier is string associated with a file that is encrypted with
-the file's current symmetric encryption key.  It is used, if present, to
-confirm that the key entered by the user is the same as the established
-one, or explicitly presenting the user with the choice to go with a
-new key when a difference is encountered.
-
-The range of values are:
-
- situate - include key verifier string as text in the file's local-vars
-           section
- transient - establish the value as a variable in the file's buffer, but
-             don't preserve it as a file variable.
- disabled - don't establish or do verification.
+;;;_  = allout-passphrase-verifier-handling
+(defcustom allout-passphrase-verifier-handling t
+  "*Enable use of symmetric encryption passphrase verifier if non-nil.
 
 See the docstring for the `allout-enable-file-variable-adjustment'
 variable for details about allout ajustment of file variables."
-  :type '(choice (const situate)
-                 (const transient)
-                 (const disabled))
+  :type 'boolean
   :group 'allout)
-(make-variable-buffer-local 'allout-key-verifier-handling)
-;;;_  = allout-key-hint-handling
-(defcustom allout-key-hint-handling 'always
-  "*Dictate outline encryption key reminder handling:
+(make-variable-buffer-local 'allout-passphrase-verifier-handling)
+;;;_  = allout-passphrase-hint-handling
+(defcustom allout-passphrase-hint-handling 'always
+  "*Dictate outline encryption passphrase reminder handling:
 
  always - always show reminder when prompting
- needed - show reminder on key entry failure
- manage - never present reminder, but still manage a file-var entry for it
- disabled - don't even manage the file variable entry
+ needed - show reminder on passphrase entry failure
+ disabled - never present or adjust reminder
 
 See the docstring for the `allout-enable-file-variable-adjustment'
 variable for details about allout ajustment of file variables."
   :type '(choice (const always)
                  (const needed)
-                 (const manage)
                  (const disabled))
   :group 'allout)
-(make-variable-buffer-local 'allout-key-hint-handling)
+(make-variable-buffer-local 'allout-passphrase-hint-handling)
 ;;;_  = allout-encrypt-unencrypted-on-saves
 (defcustom allout-encrypt-unencrypted-on-saves 'except-current
   "*When saving, should topics pending encryption be encrypted?
@@ -494,14 +464,14 @@ mostly covers both deliberate file writes and auto-saves.
  - All except current topic: skip the topic currently being edited, even if
        it's pending encryption.  This may expose the current topic on the
        file sytem, but avoids the nuisance of prompts for the encryption
-       key in the middle of editing for, eg, autosaves.
+       passphrase in the middle of editing for, eg, autosaves.
        This mode is used for auto-saves for both this option and \"Yes\".
  - No: leave it to the user to encrypt any unencrypted topics.
 
 For practical reasons, auto-saves always use the 'except-current policy
-when auto-encryption is enabled.  \(Otherwise, spurious key prompts and
-unavoidable timing collisions are too disruptive.)  If security for a file
-requires that even the current topic is never auto-saved in the clear,
+when auto-encryption is enabled.  \(Otherwise, spurious passphrase prompts
+and unavoidable timing collisions are too disruptive.)  If security for a
+file requires that even the current topic is never auto-saved in the clear,
 disable auto-saves for that file."
 
   :type '(choice (const :tag "Yes" t)
@@ -606,7 +576,7 @@ those that do not have the variable `comment-start' set.  A value of
 
 ;;;_  = allout-enable-file-variable-adjustment
 (defcustom allout-enable-file-variable-adjustment t
-  "*If non-nil, some allout outline actions can edit Emacs file variables text.
+  "*If non-nil, some allout outline actions edit Emacs local file var text.
 
 This can range from changes to existing entries, addition of new ones,
 and creation of a new local variables section when necessary.
@@ -626,14 +596,8 @@ details."
 ;;;_ #1 Internal Outline Formatting and Configuration
 ;;;_  : Version
 ;;;_   = allout-version
-(defvar allout-version
-  (let ((rcs-rev "$Revision$"))
-    (condition-case err
-        (save-match-data
-          (string-match "Revision: \\([0-9]+\\.[0-9]+\\)" rcs-rev)
-          (substring rcs-rev (match-beginning 1) (match-end 1)))
-      ('error rcs-rev)))
-  "Revision number of currently loaded outline package.  \(allout.el)")
+(defvar allout-version "2.1"
+  "Version of currently loaded outline package.  \(allout.el)")
 ;;;_   > allout-version
 (defun allout-version (&optional here)
   "Return string describing the loaded outline version."
@@ -1027,45 +991,38 @@ the way that `before-change-functions' and undo interact.")
   "Horrible hack used to prevent invalid multiple triggering of outline
 mode from prop-line file-var activation.  Used by `allout-mode' function
 to track repeats.")
-;;;_   = allout-file-key-verifier-string
-(defvar allout-file-key-verifier-string nil
-  "Name for use as a file variable for verifying encryption key across
-sessions.")
-(make-variable-buffer-local 'allout-file-key-verifier-string)
-;;;_   = allout-encryption-scheme
-(defvar allout-encryption-scheme nil
-  "*Allout outline topic encryption scheme pending for the current buffer.
-
-Intended as a file-specific (buffer local) setting, it defaults to the
-value of allout-default-encryption-scheme if nil.")
-(make-variable-buffer-local 'allout-encryption-scheme)
-;;;_   = allout-key-verifier-string
-(defvar allout-key-verifier-string nil
-  "Setting used to test solicited encryption keys against that already
-associated with a file.
-
-It consists of an encrypted random string useful only to verify that a key
-entered by the user is effective for decryption.  The key itself is \*not*
-recorded in the file anywhere, and the encrypted contents are random binary
-characters to avoid exposing greater susceptibility to search attacks.
+;;;_   = allout-file-passphrase-verifier-string
+(defvar allout-file-passphrase-verifier-string nil
+  "Name for use as a file variable for verifying encryption passphrase
+across sessions.")
+(make-variable-buffer-local 'allout-file-passphrase-verifier-string)
+;;;_   = allout-passphrase-verifier-string
+(defvar allout-passphrase-verifier-string nil
+  "Setting used to test solicited encryption passphrases against the one
+already associated with a file.
+
+It consists of an encrypted random string useful only to verify that a
+passphrase entered by the user is effective for decryption.  The passphrase
+itself is \*not* recorded in the file anywhere, and the encrypted contents
+are random binary characters to avoid exposing greater susceptibility to
+search attacks.
 
 The verifier string is retained as an Emacs file variable, as well as in
 the emacs buffer state, if file variable adjustments are enabled.  See
 `allout-enable-file-variable-adjustment' for details about that.")
-(make-variable-buffer-local 'allout-key-verifier-string)
-(setq-default allout-key-verifier-string nil)
-;;;_   = allout-key-hint-string
-(defvar allout-key-hint-string ""
-  "Variable used to retain a reminder string for a file's encryption key.
+(make-variable-buffer-local 'allout-passphrase-verifier-string)
+;;;_   = allout-passphrase-hint-string
+(defvar allout-passphrase-hint-string ""
+  "Variable used to retain reminder string for file's encryption passphrase.
 
-See the description of `allout-key-hint-handling' for details about how
+See the description of `allout-passphrase-hint-handling' for details about how
 the reminder is deployed.
 
 The hint is retained as an Emacs file variable, as well as in the emacs buffer
 state, if file variable adjustments are enabled.  See
 `allout-enable-file-variable-adjustment' for details about that.")
-(make-variable-buffer-local 'allout-key-hint-string)
-(setq-default allout-key-hint-string "")
+(make-variable-buffer-local 'allout-passphrase-hint-string)
+(setq-default allout-passphrase-hint-string "")
 ;;;_   = allout-after-save-decrypt
 (defvar allout-after-save-decrypt nil
   "Internal variable, is nil or has the value of two points:
@@ -1080,7 +1037,8 @@ was encrypted automatically as part of a file write or autosave.")
 (defun allout-write-file-hook-handler ()
   "Implement `allout-encrypt-unencrypted-on-saves' policy for file writes."
 
-  (if (or (not (boundp 'allout-encrypt-unencrypted-on-saves))
+  (if (or (not (allout-mode-p))
+          (not (boundp 'allout-encrypt-unencrypted-on-saves))
           (not allout-encrypt-unencrypted-on-saves))
       nil
     (let ((except-mark (and (equal allout-encrypt-unencrypted-on-saves
@@ -1105,7 +1063,7 @@ was encrypted automatically as part of a file write or autosave.")
 (defun allout-auto-save-hook-handler ()
   "Implement `allout-encrypt-unencrypted-on-saves' policy for auto saves."
 
-  (if  allout-encrypt-unencrypted-on-saves
+  (if (and (allout-mode-p) allout-encrypt-unencrypted-on-saves)
       ;; Always implement 'except-current policy when enabled.
       (let ((allout-encrypt-unencrypted-on-saves 'except-current))
         (allout-write-file-hook-handler))))
@@ -1190,18 +1148,22 @@ the following two lines in your Emacs init file:
   (let
       ;; convenience aliases, for consistent ref to respective vars:
       ((hook 'allout-find-file-hook)
+       (find-file-hook-var-name (if (boundp 'find-file-hook)
+                                    'find-file-hook
+                                  'find-file-hooks))
        (curr-mode 'allout-auto-activation))
 
     (cond ((not mode)
-           (setq find-file-hooks (delq hook find-file-hooks))
+           (set find-file-hook-var-name
+                (delq hook (symbol-value find-file-hook-var-name)))
            (if (interactive-p)
                (message "Allout outline mode auto-activation inhibited.")))
           ((eq mode 'report)
-           (if (not (memq hook find-file-hooks))
+           (if (not (memq hook (symbol-value find-file-hook-var-name)))
                (allout-init nil)
              ;; Just punt and use the reports from each of the modes:
              (allout-init (symbol-value curr-mode))))
-          (t (add-hook 'find-file-hooks hook)
+          (t (add-hook find-file-hook-var-name hook)
              (set curr-mode             ; `set', not `setq'!
                   (cond ((eq mode 'activate)
                          (message
@@ -1233,6 +1195,7 @@ the following two lines in your Emacs init file:
       (easy-menu-add cur))))
 ;;;_  > allout-mode (&optional toggle)
 ;;;_   : Defun:
+;;;###autoload
 (defun allout-mode (&optional toggle)
 ;;;_    . Doc string:
   "Toggle minor mode for controlling exposure and editing of text outlines.
@@ -1271,53 +1234,53 @@ The bindings are dictated by the `allout-keybindings-list' and
 
         Navigation:                                Exposure Control:
         ----------                                 ----------------
-C-c C-n allout-next-visible-heading     | C-c C-h allout-hide-current-subtree
-C-c C-p allout-previous-visible-heading | C-c C-i allout-show-children
-C-c C-u allout-up-current-level         | C-c C-s allout-show-current-subtree
-C-c C-f allout-forward-current-level    | C-c C-o allout-show-current-entry
-C-c C-b allout-backward-current-level   | ^U C-c C-s allout-show-all
-C-c C-e allout-end-of-entry             |          allout-hide-current-leaves
-C-c C-a allout-beginning-of-current-entry, alternately, goes to hot-spot
+\\[allout-next-visible-heading] allout-next-visible-heading     | \\[allout-hide-current-subtree] allout-hide-current-subtree
+\\[allout-previous-visible-heading] allout-previous-visible-heading | \\[allout-show-children] allout-show-children
+\\[allout-up-current-level] allout-up-current-level         | \\[allout-show-current-subtree] allout-show-current-subtree
+\\[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
 
         Topic Header Production:
         -----------------------
-C-c<SP> allout-open-sibtopic    Create a new sibling after current topic.
-C-c .   allout-open-subtopic    ... an offspring of current topic.
-C-c ,   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:
         ---------------------------------
-C-c >   allout-shift-in Shift current topic and all offspring deeper.
-C-c <   allout-shift-out        ... less deep.
-C-c<CR> allout-rebullet-topic   Reconcile bullets of topic and its offspring
+\\[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.
-C-c b   allout-rebullet-current-heading Prompt for alternate bullet for
-                                         current topic.
-C-c #   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:
         ----------------------------------
-C-c C-k allout-kill-topic       Kill current topic, including offspring.
-C-k     allout-kill-line        Like kill-line, but reconciles numbering, etc.
-C-y     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).
-M-y     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
 
         Misc commands:
         -------------
 M-x outlineify-sticky           Activate outline mode for current buffer,
                                 and establish a default file-var setting
                                 for `allout-layout'.
-C-c C-SPC allout-mark-topic
-C-c = c allout-copy-exposed-to-buffer
+\\[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*\".
-C-c = p 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.
@@ -1327,12 +1290,12 @@ ESC ESC (allout-init t)	Setup Emacs session for outline mode
                   Encrypted Entries
 
 Outline mode supports easily togglable gpg encryption of topics, with
-niceities like support for symmetric and key-pair modes, key timeout, key
-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 key, forgetting which key was used,
-and other practical pitfalls.
+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.
 
 See the `allout-toggle-current-subtree-encryption' function and
 `allout-encrypt-unencrypted-on-saves' customization variable for details.
@@ -1450,6 +1413,9 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
          ;; allout-mode already called once during this complex command?
          (same-complex-command (eq allout-v18/19-file-var-hack
                                   (car command-history)))
+         (write-file-hook-var-name (if (boundp 'write-file-functions)
+                                       'write-file-functions
+                                     'local-write-file-hooks))
          do-layout
          )
 
@@ -1500,9 +1466,9 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
       (allout-resumptions 'selective-display)
       (if (and (boundp 'before-change-functions) before-change-functions)
           (allout-resumptions 'before-change-functions))
-      (setq local-write-file-hooks
+      (set write-file-hook-var-name
            (delq 'allout-write-file-hook-handler
-                 local-write-file-hooks))
+                 (symbol-value write-file-hook-var-name)))
       (setq auto-save-hook
            (delq 'allout-auto-save-hook-handler
                  auto-save-hook))
@@ -1563,8 +1529,7 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
       (allout-resumptions 'selective-display '(t))
       (add-hook 'pre-command-hook 'allout-pre-command-business)
       (add-hook 'post-command-hook 'allout-post-command-business)
-      (add-hook 'local-write-file-hooks 'allout-write-file-hook-handler)
-      (make-variable-buffer-local 'auto-save-hook)
+      (add-hook write-file-hook-var-name 'allout-write-file-hook-handler)
       (add-hook 'auto-save-hook 'allout-auto-save-hook-handler)
                                        ; Custom auto-fill func, to support
                                        ; respect for topic headline,
@@ -2501,8 +2466,9 @@ return to regular interpretation of self-insert characters."
                                last-command-char)
                               ;; Only xemacs has characterp.
                               ((and (fboundp 'characterp)
-                                    (characterp last-command-char))
-                               (char-to-int last-command-char))
+                                    (apply 'characterp
+                                           (list last-command-char)))
+                               (apply 'char-to-int (list last-command-char)))
                               (t 0)))
                mapped-binding)
           (if (zerop this-key-num)
@@ -3506,7 +3472,9 @@ depth, however."
        ;; ensure prior kill-ring leader is properly restored:
        (if (eq leading-kill-ring-entry (cadr kill-ring))
            ;; Aborted kill got pushed on front - ditch it:
-           (pop kill-ring)
+           (let ((got (car kill-ring)))
+             (setq kill-ring (cdr kill-ring))
+             got)
          ;; Aborted kill got appended to prior - resurrect prior:
          (setcar kill-ring leading-kill-ring-entry))
        ;; make last-command skip this failed command, so kill-appending
@@ -4608,7 +4576,7 @@ If `bullet-plus' is specified, it is inserted just after the entire prefix."
     (while text
       (insert (car text))
       (if (setq text (cdr text))
-          (insert-string "\n")))
+          (insert "\n")))
     (insert "\n")))
 ;;;_   > allout-copy-exposed-to-buffer (&optional arg tobuf format)
 (defun allout-copy-exposed-to-buffer (&optional arg tobuf format)
@@ -4881,11 +4849,15 @@ With repeat count, copy the exposed portions of entire buffer."
     (goto-char start-pt)))
 
 ;;;_ #8 Encryption
-;;;_  > allout-toggle-current-subtree-encryption (&optional fetch-key)
-(defun allout-toggle-current-subtree-encryption (&optional fetch-key)
-  "Encrypt clear text or decrypt encoded contents of a topic.
+;;;_  > allout-toggle-current-subtree-encryption (&optional fetch-pass)
+(defun allout-toggle-current-subtree-encryption (&optional fetch-pass)
+  "Encrypt clear text or decrypt encoded topic contents \(body and subtopics.)
 
-Contents includes body and subtopics.
+Optional FETCH-PASS universal argument provokes key-pair encryption with
+single universal argument.  With doubled universal argument \(value = 16),
+it forces prompting for the passphrase regardless of availability from the
+passphrase cache.  With no universal argument, the appropriate passphrase
+for the is obtained from the cache, if available, else from the user.
 
 Currently only GnuPG encryption is supported.
 
@@ -4897,67 +4869,52 @@ the default, use a single \(x4) universal argument for keypair mode.
 
 Encrypted topic's bullet is set to a `~' to signal that the contents of the
 topic \(body and subtopics, but not heading) is pending encryption or
-encrypted.  An `*' asterisk immediately after the bullet signals that the
-body is encrypted, its absence means it's meant to be encrypted but is not
-- it's \"disclosed\".  When a file with disclosed topics is saved, the user
-prompted for an ok to \(symmetric-key) encrypt the disclosed topics.  NOTE
-WELL that you must explicitly \(re)encrypt key-pair encrypted topics if you
-want them to continue to be in key-pair mode.
+encrypted.  `*' asterisk immediately after the bullet signals that the body
+is encrypted, its' absence means the topic is meant to be encrypted but is
+not.  When a file with topics pending encryption is saved, topics pending
+encryption are encrypted.  See allout-encrypt-unencrypted-on-saves for
+auto-encryption specifics.
+
+\**NOTE WELL** that automatic encryption that happens during saves will
+default to symmetric encryption - you must manually \(re)encrypt key-pair
+encrypted topics if you want them to continue to use the key-pair cipher.
 
 Level-1 topics, with prefix consisting solely of an `*' asterisk, cannot be
 encrypted.  If you want to encrypt the contents of a top-level topic, use
 \\[allout-shift-in] to increase its depth.
 
-Failed transformation does not change the an entry being encrypted -
-instead, the key is re-solicited and the transformation is retried.
-\\[keyboard-quit] to abort.
-
-Decryption does symmetric or key-pair key mode depending on how the text
-was encrypted.  The encryption key is solicited if not currently available
-from the key cache from a recent prior encryption action.
-
-Optional FETCH-KEY universal argument is used for two purposes - to provoke
-key-pair instead of symmetric encryption, or to provoke clearing of the key
-cache so keys are freshly fetched.
-
- - Without any universal arguments, then the appropriate key for the is
-   obtained from the cache, if available, else from the user.
-
- - If FETCH-KEY is the result of one universal argument - ie, equal to 4 -
-   then key-pair encryption is used.
-
- - With repeated universal argument - equal to 16 - then the key cache is
-   cleared before any encryption transformations, to force prompting of the
-   user for the key.
-
-The solicited key is retained for reuse in a buffer-specific cache for some
-set period of time \(default, 60 seconds), after which the string is
-nulled.  `mailcrypt' provides the key caching functionality.  You can
-adjust the key cache timeout by ajdusting the setting of the elisp variable
-`mc-passwd-timeout'.
-
-If the file previously had no associated key, or had a different key than
-specified, the user is prompted to repeat the new one for corroboration.  A
-random string encrypted by the new key is set on the buffer-specific
-variable `allout-key-verifier-string', for confirmation of the key when
-next obtained, before encrypting or decrypting anything with it.  This
-helps avoid mistakenly shifting between keys.
-
-If allout customization var `allout-key-verifier-handling' is non-nil, an
-entry for `allout-key-verifier-string' and its value is added to an Emacs
-'local variables' section at the end of the file, which is created if
-necessary.  That setting is for retention of the key verifier across emacs
-sessions.
-
-Similarly, `allout-key-hint-string' stores a user-provided reminder about
-their key, and `allout-key-hint-handling' specifies when the hint is
-presented, or if key hints are disabled.  If enabled \(see the
-`allout-key-hint-handling' docstring for details), the hint string is
-stored in the local-variables section of the file, and solicited whenever
-the key is changed."
-
-;;; This routine handles allout-specific business, dispatching
-;;; encryption-specific business to allout-encrypt-string.
+  Passphrase Caching
+
+The encryption passphrase is solicited if not currently available in the
+passphrase cache from a recent encryption action.
+
+The solicited passphrase is retained for reuse in a buffer-specific cache
+for some set period of time \(default, 60 seconds), after which the string
+is nulled.  The passphrase cache timeout is customized by setting
+`pgg-passphrase-cache-expiry'.
+
+  Symmetric Passphrase Hinting and Verification
+
+If the file previously had no associated passphrase, or had a different
+passphrase than specified, the user is prompted to repeat the new one for
+corroboration.  A random string encrypted by the new passphrase is set on
+the buffer-specific variable `allout-passphrase-verifier-string', for
+confirmation of the passphrase when next obtained, before encrypting or
+decrypting anything with it.  This helps avoid mistakenly shifting between
+keys.
+
+If allout customization var `allout-passphrase-verifier-handling' is
+non-nil, an entry for `allout-passphrase-verifier-string' and its value is
+added to an Emacs 'local variables' section at the end of the file, which
+is created if necessary.  That setting is for retention of the passphrase
+verifier across emacs sessions.
+
+Similarly, `allout-passphrase-hint-string' stores a user-provided reminder
+about their passphrase, and `allout-passphrase-hint-handling' specifies
+when the hint is presented, or if passphrase hints are disabled.  If
+enabled \(see the `allout-passphrase-hint-handling' docstring for details),
+the hint string is stored in the local-variables section of the file, and
+solicited whenever the passphrase is changed."
 
   (interactive "P")
   (save-excursion
@@ -4967,17 +4924,13 @@ the key is changed."
         (error (concat "Cannot encrypt or decrypt level 1 topics -"
                        " shift it in to make it encryptable")))
 
-    (if (and fetch-key
-             (not (equal fetch-key '(4))))
-        (mc-deactivate-passwd))
-
     (let* ((allout-buffer (current-buffer))
            ;; Asses location:
            (after-bullet-pos (point))
            (was-encrypted
             (progn (if (= (point-max) after-bullet-pos)
                        (error "no body to encrypt"))
-                   (looking-at "\\*")))
+                   (allout-encrypted-topic-p)))
            (was-collapsed (if (not (re-search-forward "[\n\r]" nil t))
                               nil
                             (backward-char 1)
@@ -4993,20 +4946,22 @@ the key is changed."
                              (error "No topic contents to %scrypt"
                                     (if was-encrypted "de" "en"))))
            ;; Assess key parameters:
-           (key-type (or
+           (key-info (or
                       ;; detect the type by which it is already encrypted
                       (and was-encrypted
-                           (allout-encrypted-text-type subject-text))
-                      (and (member fetch-key '(4 (4)))
-                           (yes-or-no-p "Use key-pair encryption instead? ")
-                           'keypair)
-                      'symmetric))
-           (fetch-key (and fetch-key (not (member fetch-key '(16 (16))))))
+                           (allout-encrypted-key-info subject-text))
+                      (and (member fetch-pass '(4 (4)))
+                           '(keypair nil))
+                      '(symmetric nil)))
+           (for-key-type (car key-info))
+           (for-key-identity (cadr key-info))
+           (fetch-pass (and fetch-pass (member fetch-pass '(16 (16)))))
            result-text)
 
       (setq result-text
             (allout-encrypt-string subject-text was-encrypted
-                                    (current-buffer) key-type fetch-key))
+                                    (current-buffer)
+                                    for-key-type for-key-identity fetch-pass))
 
        ;; Replace the subtree with the processed product.
       (allout-unprotected
@@ -5040,251 +4995,285 @@ the key is changed."
       )
     )
   )
-;;;_  > allout-encrypt-string (text decrypt allout-buffer key-type rekey
-;;;                                  &optional retried verifying)
-(defun allout-encrypt-string (text decrypt allout-buffer key-type rekey
-                                    &optional retried verifying)
-  "Encrypt or decrypt a string TEXT using KEY.
+;;;_  > allout-encrypt-string (text decrypt allout-buffer key-type for-key
+;;;                                  fetch-pass &optional retried verifying
+;;;                                  passphrase)
+(defun allout-encrypt-string (text decrypt allout-buffer key-type for-key
+                                       fetch-pass &optional retried verifying
+                                       passphrase)
+  "Encrypt or decrypt message TEXT.
 
-If optional DECRYPT is true (default false), then decrypt instead of
-encrypt.
+If DECRYPT is true (default false), then decrypt instead of encrypt.
 
-Optional REKEY (default false) provokes clearing of the key cache to force
-fresh prompting for the key.
+FETCH-PASS (default false) forces fresh prompting for the passphrase.
 
-Optional RETRIED is for internal use - conveys the number of failed keys have
-been solicited in sequence leading to this current call.
+KEY-TYPE indicates whether to use a 'symmetric or 'keypair cipher.
 
-Optional VERIFYING is for internal use, signifying processing of text
-solely for verification of the cached key.
+FOR-KEY is human readable identification of the first of the user's
+eligible secret keys a keypair decryption targets, or else nil.
 
-Returns the resulting string, or nil if the transformation fails."
+Optional RETRIED is for internal use - conveys the number of failed keys
+that have been solicited in sequence leading to this current call.
+
+Optional PASSPHRASE enables explicit delivery of the decryption passphrase,
+for verification purposes.
 
-  ;; Ensure that we have an alternate handle on the real mc-activate-passwd:
-  (if (not (fboundp 'real-mc-activate-passwd))
-      ;; Force loads of the primary mailcrypt packages, so flet below holds.
-      (progn (require 'mailcrypt)
-             (load "mc-toplev")
-             (fset 'real-mc-activate-passwd
-                   (symbol-function 'mc-activate-passwd))))
+Returns the resulting string, or nil if the transformation fails."
 
-  (if (and rekey (not verifying)) (mc-deactivate-passwd))
+  (require 'pgg)
+
+  (let* ((scheme (upcase
+                  (format "%s" (or pgg-scheme pgg-default-scheme "GPG"))))
+         (for-key (and (equal key-type 'keypair)
+                       (or for-key
+                           (split-string (read-string
+                                          (format "%s message recipients: "
+                                                  scheme))
+                                         "[ \t,]+"))))
+         (target-prompt-id (if (equal key-type 'keypair)
+                               (if (= (length for-key) 1)
+                                   (car for-key) for-key)
+                             (buffer-name allout-buffer)))
+         (target-cache-id (format "%s-%s"
+                                  key-type
+                                  (if (equal key-type 'keypair)
+                                      target-prompt-id
+                                    (or (buffer-file-name allout-buffer)
+                                        target-prompt-id))))
+         (comment "Processed by allout driving pgg")
+         work-buffer result result-text status)
+
+    (if (and fetch-pass (not passphrase))
+        ;; Force later fetch by evicting passphrase from the cache.
+        (pgg-remove-passphrase-from-cache target-cache-id t))
+
+    (catch 'encryption-failed
+
+        ;; Obtain the passphrase if we don't already have one and we're not
+        ;; doing a keypair encryption:
+        (if (not (or passphrase
+                     (and (equal key-type 'keypair)
+                          (not decrypt))))
+
+            (setq passphrase (allout-obtain-passphrase for-key
+                                                       target-cache-id
+                                                       target-prompt-id
+                                                       key-type
+                                                       allout-buffer
+                                                       retried fetch-pass)))
+        (with-temp-buffer
+
+          (insert (subst-char-in-string ?\r ?\n text))
 
-  (catch 'encryption-failed
-    (save-excursion
+          (cond
 
-      (let* ((mc-default-scheme (or allout-encryption-scheme
-                                    allout-default-encryption-scheme))
-             (id (format "%s-%s" key-type
-                         (or (buffer-file-name allout-buffer)
-                             (buffer-name allout-buffer))))
-             (cached (real-mc-activate-passwd id nil))
-             (comment "Processed by allout driving mailcrypt")
-             key work-buffer result result-text encryption-process-status)
-
-        (unwind-protect
-
-            ;; Interject our mc-activate-passwd wrapper:
-            (flet ((mc-activate-passwd (id &optional prompt)
-                                       (allout-mc-activate-passwd id prompt)))
-
-              (setq work-buffer
-                    (set-buffer (allout-encryption-produce-work-buffer text)))
-
-              (cond
-
-               ;; symmetric:
-               ((equal key-type 'symmetric)
-                (setq key (if verifying
-                              (real-mc-activate-passwd id nil)
-                            (allout-mc-activate-passwd id)))
-                (setq encryption-process-status
-                      (crypt-encrypt-buffer key decrypt))
-                (if (zerop encryption-process-status)
-                    t
-                  (if verifying
-                      (throw 'encryption-failed nil)
-                    (mc-deactivate-passwd)
-                    (error "Symmetric-key encryption failed (%s) - wrong key?"
-                           encryption-process-status))))
-
-               ;; encrypt 'keypair:
-               ((not decrypt)
-                (condition-case result
-                    (mailcrypt-encrypt 1)
-                  (error (mc-deactivate-passwd)
-                         (error "encryption failed: %s"
-                                (cadr result)))))
-
-               ;; decrypt 'keypair:
-               (t (condition-case result
-                      (mc-decrypt)
-                    (error (mc-deactivate-passwd)
-                           (error "decryption failed: %s"
-                                  (cadr result))))))
-
-              (setq result-text (if (or (equal key-type 'keypair)
-                                        (not decrypt))
-                                    (buffer-substring 1 (1- (point-max)))
-                                  (buffer-string)))
-              ;; validate result - non-empty
-              (cond ((not result-text)
-                     (if verifying
-                         nil
-                       ;; Transformation was fruitless - retry with new key.
-                       (mc-deactivate-passwd)
-                       (allout-encrypt-string text allout-buffer decrypt nil
-                                               (if retried (1+ retried) 1)
-                                               verifying)))
-
-                    ;; Barf if encryption yields extraordinary control chars:
-                    ((and (not decrypt)
-                          (string-match "[\C-a\C-k\C-o-\C-z\C-@]" result-text))
-                     (error (concat "encryption produced unusable"
-                                    " non-armored text - reconfigure!")))
-
-                    ;; valid result and just verifying or non-symmetric:
-                    ((or verifying (not (equal key-type 'symmetric)))
-                     result-text)
-
-                    ;; valid result and regular symmetric - situate validator:
-                    (t
-                     ;; valid result and verifier needs to be situated in
-                     ;; allout-buffer:
-                     (set-buffer allout-buffer)
-                     (if (and (or rekey (not cached))
-                              (not (allout-verify-key key allout-buffer)))
-                         (allout-situate-encryption-key-verifier key id))
-                     result-text)
-                    )
-              )
-
-          ;; unwind-protect emergence:
-          (if work-buffer
-              (kill-buffer work-buffer))
+           ;; symmetric:
+           ((equal key-type 'symmetric)
+            (setq status
+                  (if decrypt
+
+                      (pgg-decrypt (point-min) (point-max) passphrase)
+
+                    (pgg-encrypt-symmetric (point-min) (point-max)
+                                           passphrase)))
+
+            (if status
+                (pgg-situate-output (point-min) (point-max))
+              ;; failed - handle passphrase caching
+              (if verifying
+                  (throw 'encryption-failed nil)
+                (pgg-remove-passphrase-from-cache target-cache-id t)
+                (error "Symmetric-cipher encryption failed - %s"
+                       "try again with different passphrase."))))
+
+           ;; encrypt 'keypair:
+           ((not decrypt)
+
+            (setq status
+
+                  (pgg-encrypt for-key
+                               nil (point-min) (point-max) passphrase))
+
+            (if status
+                (pgg-situate-output (point-min) (point-max))
+              (error (pgg-remove-passphrase-from-cache target-cache-id t)
+                     (error "encryption failed"))))
+
+           ;; decrypt 'keypair:
+           (t
+
+            (setq status
+                  (pgg-decrypt (point-min) (point-max) passphrase))
+
+            (if status
+                (pgg-situate-output (point-min) (point-max))
+              (error (pgg-remove-passphrase-from-cache target-cache-id t)
+                     (error "decryption failed"))))
+           )
+
+          (setq result-text
+                (buffer-substring 1 (- (point-max) (if decrypt 0 1))))
+
+          ;; validate result - non-empty
+          (cond ((not result-text)
+                 (if verifying
+                     nil
+                   ;; transform was fruitless, retry w/new passphrase.
+                   (pgg-remove-passphrase-from-cache target-cache-id t)
+                   (allout-encrypt-string text allout-buffer decrypt nil
+                                          (if retried (1+ retried) 1)
+                                          passphrase)))
+
+                ;; Barf if encryption yields extraordinary control chars:
+                ((and (not decrypt)
+                      (string-match "[\C-a\C-k\C-o-\C-z\C-@]"
+                                    result-text))
+                 (error (concat "encryption produced unusable"
+                                " non-armored text - reconfigure!")))
+
+                ;; valid result and just verifying or non-symmetric:
+                ((or verifying (not (equal key-type 'symmetric)))
+                 (if (or verifying decrypt)
+                     (pgg-add-passphrase-to-cache target-cache-id
+                                                  passphrase t))
+                 result-text)
+
+                ;; valid result and regular symmetric - "register"
+                ;; passphrase with mnemonic aids/cache.
+                (t
+                 (set-buffer allout-buffer)
+                 (if passphrase
+                     (pgg-add-passphrase-to-cache target-cache-id
+                                                  passphrase t))
+                 (allout-update-passphrase-mnemonic-aids for-key passphrase
+                                                         allout-buffer)
+                 result-text)
+                )
           )
         )
-      )
     )
   )
-;;;_  > allout-mc-activate-passwd (id &optional prompt)
-(defun allout-mc-activate-passwd (id &optional prompt)
-  "Substituted for mc-activate-passwd during allout outline encryption.
-
-We add key-verification to vanilla mc-activate-passwd.
-
-We depend in some cases on values of the following allout-encrypt-string
-internal or prevailing variables:
-  - key-type - 'symmetric or 'keypair
-  - id - id associated with current key in key cache
-  - allout-buffer - where subject text resides
-  - retried - number of current attempts to obtain this key
-  - rekey - user asked to present a new key - needs to be confirmed"
-
-;;  - if we're doing non-symmetric key, just do normal mc-activate-passwd
-;;  - otherwise, if we are have a cached version of the key, then assume
-;;    it's verified and return it
-;;  - otherwise, prompt for a key, and:
-;;    - if we have a key verifier \(a string value which should decrypt
-;;      against a symmetric key), validate against the verifier
-;;      - if successful, return the verified key
-;;      - if unsuccessful:
-;;        - offer to use the new key
-;;          - if accepted, do confirm process
-;;          - if refused, try again until we get a correctly spelled one or the
-;;            user quits
-;;    - if no key verifier, resolicit the key to get corroboration and return
-;;      the corroborated key if spelled identically, or error if not.
+;;;_  > allout-obtain-passphrase (for-key cache-id prompt-id key-type
+;;;                                       allout-buffer retried fetch-pass)
+(defun allout-obtain-passphrase (for-key cache-id prompt-id key-type 
+                                         allout-buffer retried fetch-pass)
+  "Obtain passphrase for a key from the cache or else from the user.
+
+When obtaining from the user, symmetric-cipher passphrases are verified
+against either, if available and enabled, a random string that was
+encrypted against the passphrase, or else against repeated entry by the
+user for corroboration.
+
+FOR-KEY is the key for which the passphrase is being obtained.
+
+CACHE-ID is the cache id of the key for the passphrase.
+
+PROMPT-ID is the id for use when prompting the user.
+
+KEY-TYPE is either 'symmetric or 'keypair.
+
+ALLOUT-BUFFER is the buffer containing the entry being en/decrypted.
+
+RETRIED is the number of this attempt to obtain this passphrase.
+
+FETCH-PASS causes the passphrase to be solicited from the user, regardless
+of the availability of a cached copy."
 
   (if (not (equal key-type 'symmetric))
-      ;; do regular mc-activate-passwd on non-symmetric key
-      (real-mc-activate-passwd id prompt)
+      ;; do regular passphrase read on non-symmetric passphrase:
+      (pgg-read-passphrase (format "%s passphrase%s: "
+                                   (upcase (format "%s" (or pgg-scheme
+                                                            pgg-default-scheme
+                                                            "GPG")))
+                                     (if prompt-id
+                                         (format " for %s" prompt-id)
+                                       ""))
+                           cache-id t)
 
     ;; Symmetric hereon:
 
     (save-excursion
       (set-buffer allout-buffer)
-      (let* ((hint (if (and (not (string= allout-key-hint-string ""))
-                            (or (equal allout-key-hint-handling 'always)
-                                (and (equal allout-key-hint-handling 'needed)
+      (let* ((hint (if (and (not (string= allout-passphrase-hint-string ""))
+                            (or (equal allout-passphrase-hint-handling 'always)
+                                (and (equal allout-passphrase-hint-handling
+                                            'needed)
                                      retried)))
-                       (format " [%s]" allout-key-hint-string)
+                       (format " [%s]" allout-passphrase-hint-string)
                      ""))
              (retry-message (if retried (format " (%s retry)" retried) ""))
-             (prompt-sans-hint (format "'%s' symmetric key%s: "
-                                       (buffer-name allout-buffer)
-                                       retry-message))
-             (full-prompt (format "'%s' symmetric key%s%s: "
-                                  (buffer-name allout-buffer)
-                                  hint retry-message))
+             (prompt-sans-hint (format "'%s' symmetric passphrase%s: "
+                                       prompt-id retry-message))
+             (full-prompt (format "'%s' symmetric passphrase%s%s: "
+                                  prompt-id hint retry-message))
              (prompt full-prompt)
-             (verifier-string (allout-get-encryption-key-verifier))
-             ;; force retention of cached passwords for five minutes while
-             ;; we're in this particular routine:
-             (mc-passwd-timeout 300)
-             (cached (real-mc-activate-passwd id nil))
-             (got (or cached (real-mc-activate-passwd id full-prompt)))
+             (verifier-string (allout-get-encryption-passphrase-verifier))
+
+             (cached (and (not fetch-pass)
+                          (pgg-read-passphrase-from-cache cache-id t)))
+             (got-pass (or cached
+                           (pgg-read-passphrase full-prompt cache-id t)))
+
              confirmation)
 
-        (if (not got)
+        (if (not got-pass)
             nil
 
-          ;; Duplicate our handle on the key so it's not clobbered by
+          ;; Duplicate our handle on the passphrase so it's not clobbered by
           ;; deactivate-passwd memory clearing:
-          (setq got (format "%s" got))
+          (setq got-pass (format "%s" got-pass))
 
           (cond (verifier-string
-                 (if (and (not (allout-encrypt-string
-                                verifier-string 'decrypt allout-buffer
-                                'symmetric nil 0 'verifying))
+                 (save-window-excursion
+                   (if (allout-encrypt-string verifier-string 'decrypt
+                                              allout-buffer 'symmetric
+                                              for-key nil 0 'verifying
+                                              got-pass)
+                       (setq confirmation (format "%s" got-pass))))
+
+                 (if (and (not confirmation)
                           (if (yes-or-no-p
-                               (concat "Key differs from established"
+                               (concat "Passphrase differs from established"
                                        " - use new one instead? "))
                               ;; deactivate password for subsequent
                               ;; confirmation:
-                              (progn (mc-deactivate-passwd)
-                                     (setq prompt prompt-sans-hint)
-                                     nil)
+                              (progn
+                                (pgg-remove-passphrase-from-cache cache-id t)
+                                (setq prompt prompt-sans-hint)
+                                nil)
                             t))
-                     (progn (mc-deactivate-passwd)
-                            (error "Wrong key."))))
-                ;; Force confirmation by repetition for new key:
-                ((or rekey (not cached)) (mc-deactivate-passwd))))
-        ;; we have a key and it's either verified and cached.
-        ;; confirmation vs new input - doing mc-activate-passwd will do the
+                     (progn (pgg-remove-passphrase-from-cache cache-id t)
+                            (error "Wrong passphrase."))))
+                ;; No verifier string - force confirmation by repetition of
+                ;; (new) passphrase:
+                ((or fetch-pass (not cached))
+                 (pgg-remove-passphrase-from-cache cache-id t))))
+        ;; confirmation vs new input - doing pgg-read-passphrase will do the
         ;; right thing, in either case:
-        (setq confirmation
-              (real-mc-activate-passwd id (concat prompt
-                                                  " ... confirm spelling: ")))
+        (if (not confirmation)
+            (setq confirmation
+                  (pgg-read-passphrase (concat prompt
+                                               " ... confirm spelling: ")
+                                       cache-id t)))
         (prog1
-            (if (equal got confirmation)
+            (if (equal got-pass confirmation)
                 confirmation
               (if (yes-or-no-p (concat "spelling of original and"
                                        " confirmation differ - retry? "))
                   (progn (setq retried (if retried (1+ retried) 1))
-                         (mc-deactivate-passwd)
+                         (pgg-remove-passphrase-from-cache cache-id t)
                          ;; recurse to this routine:
-                         (mc-activate-passwd id prompt-sans-hint))
-                (mc-deactivate-passwd)
+                         (pgg-read-passphrase prompt-sans-hint cache-id t))
+                (pgg-remove-passphrase-from-cache cache-id t)
                 (error "Confirmation failed.")))
           ;; reduce opportunity for memory cherry-picking by zeroing duplicate:
-          (dotimes (i (length got))
-            (aset got i 0))
+          (dotimes (i (length got-pass))
+            (aset got-pass i 0))
           )
         )
       )
     )
   )
-;;;_  > allout-encryption-produce-work-buffer (text)
-(defun allout-encryption-produce-work-buffer (text)
-  "Establish a new buffer filled with TEXT, for outline encrypion processing.
-
-TEXT is massaged so outline collapsing, if any, is removed."
-  (let ((work-buffer (generate-new-buffer " *allout encryption*")))
-    (save-excursion
-      (set-buffer work-buffer)
-      (insert (subst-char-in-string ?\r ?\n text)))
-    work-buffer))
 ;;;_  > allout-encrypted-topic-p ()
 (defun allout-encrypted-topic-p ()
   "True if the current topic is encryptable and encrypted."
@@ -5295,96 +5284,128 @@ TEXT is massaged so outline collapsing, if any, is removed."
          (looking-at "\\*"))
     )
   )
-;;;_  > allout-encrypted-text-type (text)
-;;; XXX gpg-specific, not generic!
-(defun allout-encrypted-text-type (text)
-  "For gpg encrypted text, return 'symmetric or 'keypair."
+;;;_  > allout-encrypted-key-info (text)
+;; XXX gpg-specific, alas
+(defun allout-encrypted-key-info (text)
+  "Return a pair of the key type and identity of a recipient's secret key.
+
+The key type is one of 'symmetric or 'keypair.
 
-  ;; Ensure mc-gpg-path has a value:
-  (if (not (boundp 'mc-gpg-path))
-      (load-library "mc-gpg"))
+if 'keypair, and some of the user's secret keys are among those for which
+the message was encoded, return the identity of the first.  otherwise,
+return nil for the second item of the pair.
 
+An error is raised if the text is not encrypted."
+  (require 'pgg-parse)
   (save-excursion
-    (let* ((work-buffer (set-buffer
-                         (allout-encryption-produce-work-buffer text)))
-           (result (mc-gpg-process-region (point-min) (point-max)
-                                          nil mc-gpg-path
-                                          '("--batch" "--decrypt")
-                                          'mc-gpg-decrypt-parser
-                                          work-buffer nil)))
-      (cond ((equal (nth 0 result) 'symmetric)
-             'symmetric)
-            ((equal (nth 0 result) t)
-             'keypair)
-            (t (error "Unrecognized/unsupported encryption type %S"
-                      (nth 0 result))))
+    (with-temp-buffer
+      (insert (subst-char-in-string ?\r ?\n text))
+      (let* ((parsed-armor (pgg-parse-armor-region (point-min) (point-max)))
+             (type (if (pgg-gpg-symmetric-key-p parsed-armor)
+                       'symmetric
+                     'keypair))
+             secret-keys first-secret-key for-key-owner)
+        (if (equal type 'keypair)
+            (setq secret-keys (pgg-gpg-lookup-all-secret-keys)
+                  first-secret-key (pgg-gpg-select-matching-key parsed-armor
+                                                                secret-keys)
+                  for-key-owner (and first-secret-key
+                                     (pgg-gpg-lookup-key-owner
+                                      first-secret-key))))
+        (list type (pgg-gpg-key-id-from-key-owner for-key-owner))
+        )
       )
     )
   )
-;;;_  > allout-create-encryption-key-verifier (key id)
-(defun allout-create-encryption-key-verifier (key id)
-  "Encrypt a random message for later validation of symmetric key."
+;;;_  > allout-create-encryption-passphrase-verifier (passphrase)
+(defun allout-create-encryption-passphrase-verifier (passphrase)
+  "Encrypt random message for later validation of symmetric key's passphrase."
   ;; use 20 random ascii characters, across the entire ascii range.
   (random t)
   (let ((spew (make-string 20 ?\0)))
     (dotimes (i (length spew))
       (aset spew i (1+ (random 254))))
-    (allout-encrypt-string spew nil nil 'symmetric nil nil t))
+    (allout-encrypt-string spew nil (current-buffer) 'symmetric
+                           nil nil 0 passphrase))
   )
-;;;_  > allout-situate-encryption-key-verifier (key id)
-(defun allout-situate-encryption-key-verifier (key id)
-  "Establish key verifier string on file variable.
-
-We also prompt for and situate a new reminder, if reminders are enabled.
-
-We massage the string to simplify programmatic adjustment.  File variable
-is `allout-file-key-verifier-string'."
-  (let ((verifier-string
-         ;; Collapse to a single line and enclose in string quotes:
-         (subst-char-in-string ?\n ?\C-a
-                               (allout-create-encryption-key-verifier
-                                key id)))
-        (reminder (if (not (equal allout-key-hint-handling 'disabled))
-                      (read-from-minibuffer
-                       "Key hint to jog your memory next time: "
-                       allout-key-hint-string))))
-    (setq allout-key-verifier-string verifier-string)
-    (allout-adjust-file-variable "allout-key-verifier-string"
-                                  verifier-string)
-    (cond ((equal allout-key-hint-handling 'disabled)
-           nil)
-          ((not (string= reminder allout-key-hint-string))
-           (setq allout-key-hint-string reminder)
-           (allout-adjust-file-variable "allout-key-hint-string"
-                                         reminder)))
+;;;_  > allout-update-passphrase-mnemonic-aids (for-key passphrase
+;;;                                                     outline-buffer) 
+(defun allout-update-passphrase-mnemonic-aids (for-key passphrase
+                                                       outline-buffer)
+  "Update passphrase verifier and hint strings if necessary.
+
+See `allout-passphrase-verifier-string' and `allout-passphrase-hint-string'
+settings.
+
+PASSPHRASE is the passphrase being mnemonicized
+
+OUTLINE-BUFFER is the buffer of the outline being adjusted.
+
+These are used to help the user keep track of the passphrase they use for
+symmetric encryption in the file.
+
+Behavior is governed by `allout-passphrase-verifier-handling',
+`allout-passphrase-hint-handling', and also, controlling whether the values
+are preserved on Emacs local file variables,
+`allout-enable-file-variable-adjustment'."
+
+  ;; If passphrase doesn't agree with current verifier:
+  ;;   - adjust the verifier
+  ;;   - if passphrase hint handling is enabled, adjust the passphrase hint
+  ;;   - if file var settings are enabled, adjust the file vars
+
+  (let* ((new-verifier-needed (not (allout-verify-passphrase
+                                    for-key passphrase outline-buffer)))
+         (new-verifier-string
+          (if new-verifier-needed
+              ;; Collapse to a single line and enclose in string quotes:
+              (subst-char-in-string
+               ?\n ?\C-a (allout-create-encryption-passphrase-verifier
+                          passphrase))))
+         new-hint)
+    (when new-verifier-string
+      ;; do the passphrase hint first, since it's interactive
+      (when (and allout-passphrase-hint-handling
+                 (not (equal allout-passphrase-hint-handling 'disabled)))
+        (setq new-hint
+              (read-from-minibuffer "Passphrase hint to jog your memory: "
+                                    allout-passphrase-hint-string))
+        (when (not (string= new-hint allout-passphrase-hint-string))
+          (setq allout-passphrase-hint-string new-hint)
+          (allout-adjust-file-variable "allout-passphrase-hint-string"
+                                       allout-passphrase-hint-string)))
+      (when allout-passphrase-verifier-handling
+        (setq allout-passphrase-verifier-string new-verifier-string)
+        (allout-adjust-file-variable "allout-passphrase-verifier-string"
+                                     allout-passphrase-verifier-string))
+      )
     )
   )
-;;;_  > allout-get-encryption-key-verifier ()
-(defun allout-get-encryption-key-verifier ()
-  "Return the text of the encrypt key verifier, unmassaged, or nil if none.
+;;;_  > allout-get-encryption-passphrase-verifier ()
+(defun allout-get-encryption-passphrase-verifier ()
+  "Return text of the encrypt passphrase verifier, unmassaged, or nil if none.
 
-Derived from value of `allout-file-key-verifier-string'."
+Derived from value of `allout-file-passphrase-verifier-string'."
 
-  (let ((verifier-string (and (boundp 'allout-key-verifier-string)
-                              allout-key-verifier-string)))
+  (let ((verifier-string (and (boundp 'allout-passphrase-verifier-string)
+                              allout-passphrase-verifier-string)))
     (if verifier-string
         ;; Return it uncollapsed
-        (subst-char-in-string ?\C-a ?\n verifier-string)
-      nil)
+        (subst-char-in-string ?\C-a ?\n verifier-string))
    )
   )
-;;;_  > allout-verify-key (key)
-(defun allout-verify-key (key allout-buffer)
-  "True if key successfully decrypts key verifier, nil otherwise.
+;;;_  > allout-verify-passphrase (key passphrase allout-buffer)
+(defun allout-verify-passphrase (key passphrase allout-buffer)
+  "True if passphrase successfully decrypts verifier, nil otherwise.
 
-\"Otherwise\" includes absence of key verifier."
+\"Otherwise\" includes absence of passphrase verifier."
   (save-excursion
     (set-buffer allout-buffer)
-    (and (boundp 'allout-key-verifier-string)
-         allout-key-verifier-string
-         (allout-encrypt-string (allout-get-encryption-key-verifier)
+    (and (boundp 'allout-passphrase-verifier-string)
+         allout-passphrase-verifier-string
+         (allout-encrypt-string (allout-get-encryption-passphrase-verifier)
                                  'decrypt allout-buffer 'symmetric
-                                 nil nil 'verifying)
+                                 key nil 0 'verifying passphrase)
          t)))
 ;;;_  > allout-next-topic-pending-encryption (&optional except-mark)
 (defun allout-next-topic-pending-encryption (&optional except-mark)
@@ -5500,7 +5521,9 @@ save.  See `allout-encrypt-unencrypted-on-saves' for more info."
   (exchange-point-and-mark))
 ;;;_  > outlineify-sticky ()
 ;; outlinify-sticky is correct spelling; provide this alias for sticklers:
+;;;###autoload
 (defalias 'outlinify-sticky 'outlineify-sticky)
+;;;###autoload
 (defun outlineify-sticky (&optional arg)
   "Activate outline mode and establish file var so it is started subsequently.
 
@@ -5699,15 +5722,14 @@ Unless optional argument INPLACE is non-nil, return a new string."
           (if (eq (aref newstr i) fromchar)
               (aset newstr i tochar)))
         newstr)))
-
 ;;;_  : my-mark-marker to accommodate divergent emacsen:
 (defun my-mark-marker (&optional force buffer)
   "Accommodate the different signature for `mark-marker' across Emacsen.
 
 XEmacs takes two optional args, while mainline GNU Emacs does not,
 so pass them along when appropriate."
-  (if (string-match " XEmacs " emacs-version)
-      (mark-marker force buffer)
+  (if (featurep 'xemacs)
+      (apply 'mark-marker force buffer)
     (mark-marker)))
 
 ;;;_ #10 Under development
diff --git a/lisp/calc/calc-alg.el b/lisp/calc/calc-alg.el
index ada18830988..11d550bb5d2 100644
--- a/lisp/calc/calc-alg.el
+++ b/lisp/calc/calc-alg.el
@@ -91,6 +91,32 @@
                                     (calc-top-n 1))
                               (and n (list (prefix-numeric-value n)))))))
 
+;;; Write out powers (a*b*...)^n as a*b*...*a*b*...
+(defun calcFunc-writeoutpower (expr)
+  (math-normalize (math-map-tree 'math-write-out-power expr)))
+
+(defun math-write-out-power (expr)
+  (if (eq (car-safe expr) '^)
+      (let ((a (nth 1 expr))
+            (n (nth 2 expr))
+            (prod (nth 1 expr))
+            (i 1))
+        (if (and (integerp n)
+                 (> n 0))
+            (progn
+              (while (< i n)
+                (setq prod (math-mul prod a))
+                (setq i (1+ i)))
+              prod)
+          expr))
+    expr))
+
+(defun calc-writeoutpower ()
+  (interactive)
+  (calc-slow-wrapper
+   (calc-enter-result 1 "expp"
+                      (calcFunc-writeoutpower (calc-top-n 1)))))
+
 (defun calc-collect (&optional var)
   (interactive "sCollect terms involving: ")
   (calc-slow-wrapper
diff --git a/lisp/calc/calc-arith.el b/lisp/calc/calc-arith.el
index feb3c9d25a8..f8057c5f1b9 100644
--- a/lisp/calc/calc-arith.el
+++ b/lisp/calc/calc-arith.el
@@ -1386,6 +1386,7 @@
       (and (eq (car-safe b) '^)
            (Math-looks-negp (nth 2 b))
            (not (and (eq (car-safe a) '^) (Math-looks-negp (nth 2 a))))
+           (not (math-known-matrixp (nth 1 b)))
            (math-div a (math-normalize
                         (list '^ (nth 1 b) (math-neg (nth 2 b))))))
       (and (eq (car-safe a) '/)
@@ -1427,6 +1428,30 @@
                     (list 'calcFunc-idn (math-mul a (nth 1 b))))
                (and (math-known-matrixp a)
                     (math-mul a (nth 1 b)))))
+      (and (math-identity-matrix-p a t)
+           (or (and (eq (car-safe b) 'calcFunc-idn)
+                    (= (length b) 2)
+                    (list 'calcFunc-idn (math-mul 
+                                         (nth 1 (nth 1 a))
+                                         (nth 1 b))
+                          (1- (length a))))
+               (and (math-known-scalarp b)
+                    (list 'calcFunc-idn (math-mul 
+                                         (nth 1 (nth 1 a)) b)
+                          (1- (length a))))
+               (and (math-known-matrixp b)
+                    (math-mul (nth 1 (nth 1 a)) b))))
+      (and (math-identity-matrix-p b t)
+           (or (and (eq (car-safe a) 'calcFunc-idn)
+                    (= (length a) 2)
+                    (list 'calcFunc-idn (math-mul (nth 1 a) 
+                                                  (nth 1 (nth 1 b)))
+                          (1- (length b))))
+               (and (math-known-scalarp a)
+                    (list 'calcFunc-idn (math-mul a (nth 1 (nth 1 b))) 
+                          (1- (length b))))
+               (and (math-known-matrixp a)
+                    (math-mul a (nth 1 (nth 1 b))))))
       (and (math-looks-negp b)
            (math-mul (math-neg a) (math-neg b)))
       (and (eq (car-safe b) '-)
@@ -1706,7 +1731,9 @@
       (math-div-new-non-trig term))))
 
 (defun math-div-symb-fancy (a b)
-  (or (and math-simplify-only
+  (or (and (math-known-matrixp b)
+           (math-mul a (math-pow b -1)))
+      (and math-simplify-only
            (not (equal a math-simplify-only))
            (list '/ a b))
       (and (Math-equal-int b 1) a)
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index db370f766d9..563bcd9b023 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -659,7 +659,7 @@
  ("calc-alg" calc-has-rules math-defsimplify
 calc-modify-simplify-mode calcFunc-collect calcFunc-esimplify
 calcFunc-islin calcFunc-islinnt calcFunc-lin calcFunc-linnt
-calcFunc-simplify calcFunc-subst math-beforep
+calcFunc-simplify calcFunc-subst calcFunc-writeoutpower math-beforep
 math-build-polynomial-expr math-expand-formula math-expr-contains
 math-expr-contains-count math-expr-depends math-expr-height
 math-expr-subst math-expr-weight math-integer-plus math-is-linear
@@ -923,7 +923,7 @@ calc-force-refresh calc-locate-cursor-element calc-show-edit-buffer)
  ("calc-alg" calc-alg-evaluate calc-apart calc-collect calc-expand
 calc-expand-formula calc-factor calc-normalize-rat calc-poly-div
 calc-poly-div-rem calc-poly-gcd calc-poly-rem calc-simplify
-calc-simplify-extended calc-substitute)
+calc-simplify-extended calc-substitute calc-writeoutpower)
 
  ("calcalg2" calc-alt-summation calc-derivative
 calc-dump-integral-cache calc-integral calc-num-integral
@@ -2107,6 +2107,35 @@ calc-kill calc-kill-region calc-yank))))
     (and (cdr dims)
          (= (car dims) (nth 1 dims)))))
 
+;;; True if MAT is an identity matrix.
+(defun math-identity-matrix-p (mat &optional mul)
+  (if (math-square-matrixp mat)
+      (let ((a (if mul
+                   (nth 1 (nth 1 mat))
+                 1))
+            (n (1- (length mat)))
+            (i 1))
+        (while (and (<= i n)
+                    (math-ident-row-p (nth i mat) i a))
+          (setq i (1+ i)))
+        (if (> i n)
+            a
+          nil))))
+
+(defun math-ident-row-p (row n &optional a)
+  (unless a
+    (setq a 1))
+  (and
+   (not (memq nil (mapcar 
+                   (lambda (x) (eq x 0))
+                   (nthcdr (1+ n) row))))
+   (not (memq nil (mapcar 
+                   (lambda (x) (eq x 0))
+                   (butlast 
+                    (cdr row)
+                    (- (length row) n)))))
+   (eq (elt row n) a)))
+
 ;;; True if A is any scalar data object.  [P x]
 (defun math-objectp (a)    ;  [Public]
   (or (integerp a)
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index e8c0ea4b658..ba80f455b4f 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -646,8 +646,11 @@ loaded and the keystroke automatically re-typed."
             (or (math-with-extra-prec 2 (math-matrix-inv-raw m))
                 (math-reject-arg m "*Singular matrix"))
           (math-reject-arg m 'square-matrixp)))
-    (math-div 1 m)))
-
+    (if (and
+         (require 'calc-arith)
+         (math-known-matrixp m))
+        (math-pow m -1)
+      (math-div 1 m))))
 
 (defun math-do-working (msg arg)
   (or executing-kbd-macro
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index ae42fa98661..896f0755ad8 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -439,10 +439,20 @@ If LIST-ONLY is non-nil don't modify or display the buffer, only return a list."
                                  date-start temp)
                              (re-search-backward "\^M\\|\n\\|\\`")
                              (setq date-start (point))
-                             (re-search-forward "\^M\\|\n" nil t 2)
+                             ;; When selective display (rather than
+                             ;; overlays) was used, diary file used to
+                             ;; start in a blank line and end in a
+                             ;; newline. Now that neither of these
+                             ;; need be true, 'move handles the latter
+                             ;; and 1/2 kludge the former.
+                             (re-search-forward
+                              "\^M\\|\n" nil 'move
+                              (if (and (bobp) (not (looking-at "\^M\\|\n")))
+                                  1
+                                2))
                              (while (looking-at " \\|\^I")
-                               (re-search-forward "\^M\\|\n" nil t))
-                             (backward-char 1)
+                               (re-search-forward "\^M\\|\n" nil 'move))
+                             (unless (eobp) (backward-char 1))
                              (unless list-only
                                (remove-overlays date-start (point)
                                                 'invisible 'diary))
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 0e0400bd686..33f89474504 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -97,7 +97,7 @@
 
 ;;; Code:
 
-(defconst icalendar-version 0.12
+(defconst icalendar-version "0.13"
   "Version number of icalendar.el.")
 
 ;; ======================================================================
@@ -113,18 +113,21 @@
   "Format string for importing events from iCalendar into Emacs diary.
 This string defines how iCalendar events are inserted into diary
 file.  Meaning of the specifiers:
+%c Class, see `icalendar-import-format-class'
 %d Description, see `icalendar-import-format-description'
 %l Location, see `icalendar-import-format-location'
 %o Organizer, see `icalendar-import-format-organizer'
-%s Subject, see `icalendar-import-format-subject'"
+%s Summary, see `icalendar-import-format-summary'
+%t Status, see `icalendar-import-format-status'
+%u URL, see `icalendar-import-format-url'"
   :type 'string
   :group 'icalendar)
 
-(defcustom icalendar-import-format-subject
+(defcustom icalendar-import-format-summary
   "%s"
-  "Format string defining how the subject element is formatted.
-This applies only if the subject is not empty! `%s' is replaced
-by the subject."
+  "Format string defining how the summary element is formatted.
+This applies only if the summary is not empty! `%s' is replaced
+by the summary."
   :type 'string
   :group 'icalendar)
 
@@ -152,6 +155,30 @@ replaced by the organizer."
   :type 'string
   :group 'icalendar)
 
+(defcustom icalendar-import-format-url
+  "\n URL: %s"
+  "Format string defining how the URL element is formatted.
+This applies only if the URL is not empty! `%s' is replaced by
+the URL."
+  :type 'string
+  :group 'icalendar)
+
+(defcustom icalendar-import-format-status
+  "\n Status: %s"
+  "Format string defining how the status element is formatted.
+This applies only if the status is not empty! `%s' is replaced by
+the status."
+  :type 'string
+  :group 'icalendar)
+
+(defcustom icalendar-import-format-class
+  "\n Class: %s"
+  "Format string defining how the class element is formatted.
+This applies only if the class is not empty! `%s' is replaced by
+the class."
+  :type 'string
+  :group 'icalendar)
+
 (defvar icalendar-debug nil
   "Enable icalendar debug messages.")
 
@@ -195,15 +222,16 @@ buffer."
         (replace-match "" nil nil)))
     unfolded-buffer))
 
-(defsubst icalendar--rris (re rp st)
-  "Replace regexp RE with RP in string ST and return the new string.
-This is here for compatibility with XEmacs."
+(defsubst icalendar--rris (&rest args)
+  "Replace regular expression in string.
+Pass ARGS to `replace-regexp-in-string' (Emacs) or to
+`replace-in-string' (XEmacs)."
   ;; XEmacs:
   (if (fboundp 'replace-in-string)
       (save-match-data ;; apparently XEmacs needs save-match-data
-        (replace-in-string st re rp))
+        (apply 'replace-in-string args))
     ;; Emacs:
-    (replace-regexp-in-string re rp st)))
+    (apply 'replace-regexp-in-string args)))
 
 (defun icalendar--read-element (invalue inparams)
   "Recursively read the next iCalendar element in the current buffer.
@@ -609,12 +637,11 @@ takes care of european-style."
                  (setq month day)
                  (setq day x))))
             ( ;; date contains month names -- european-style
-             (and european-calendar-style
-                  (string-match (concat "\\s-*"
-                                        "0?\\([123]?[0-9]\\)[ \t/]\\s-*"
-                                        "\\([A-Za-z][^ ]+\\)[ \t/]\\s-*"
-                                        "\\([0-9]\\{4\\}\\)")
-                                datestring))
+             (string-match (concat "\\s-*"
+                                   "0?\\([123]?[0-9]\\)[ \t/]\\s-*"
+                                   "\\([A-Za-z][^ ]+\\)[ \t/]\\s-*"
+                                   "\\([0-9]\\{4\\}\\)")
+                           datestring)
              (setq day (read (substring datestring (match-beginning 1)
                                         (match-end 1))))
              (setq month (icalendar--get-month-number
@@ -623,12 +650,11 @@ takes care of european-style."
              (setq year (read (substring datestring (match-beginning 3)
                                          (match-end 3)))))
             ( ;; date contains month names -- non-european-style
-             (and (not european-calendar-style)
-                  (string-match (concat "\\s-*"
-                                        "\\([A-Za-z][^ ]+\\)[ \t/]\\s-*"
-                                        "0?\\([123]?[0-9]\\),?[ \t/]\\s-*"
-                                        "\\([0-9]\\{4\\}\\)")
-                                datestring))
+             (string-match (concat "\\s-*"
+                                   "\\([A-Za-z][^ ]+\\)[ \t/]\\s-*"
+                                   "0?\\([123]?[0-9]\\),?[ \t/]\\s-*"
+                                   "\\([0-9]\\{4\\}\\)")
+                           datestring)
              (setq day (read (substring datestring (match-beginning 2)
                                         (match-end 2))))
              (setq month (icalendar--get-month-number
@@ -704,10 +730,12 @@ FExport diary data into iCalendar file: ")
         (entry-main "")
         (entry-rest "")
         (header "")
+        (contents-n-summary)
         (contents)
         (found-error nil)
         (nonmarker (concat "^" (regexp-quote diary-nonmarking-symbol)
-                           "?")))
+                           "?"))
+        (other-elements nil))
     ;; prepare buffer with error messages
     (save-current-buffer
       (set-buffer (get-buffer-create "*icalendar-errors*"))
@@ -728,36 +756,33 @@ FExport diary data into iCalendar file: ")
                              (car (cddr (current-time)))))
         (condition-case error-val
             (progn
-              (setq contents
-                    (or
-                     ;; anniversaries -- %%(diary-anniversary ...)
-                     (icalendar--convert-anniversary-to-ical nonmarker
-                                                             entry-main)
-                     ;; cyclic events -- %%(diary-cyclic ...)
-                     (icalendar--convert-cyclic-to-ical nonmarker entry-main)
-                     ;; diary-date -- %%(diary-date ...)
-                     (icalendar--convert-date-to-ical nonmarker entry-main)
-                     ;; float events -- %%(diary-float ...)
-                     (icalendar--convert-float-to-ical nonmarker entry-main)
-                     ;; block events -- %%(diary-block ...)
-                     (icalendar--convert-block-to-ical nonmarker entry-main)
-                     ;; other sexp diary entries
-                     (icalendar--convert-sexp-to-ical nonmarker entry-main)
-                     ;; weekly by day -- Monday 8:30 Team meeting
-                     (icalendar--convert-weekly-to-ical nonmarker entry-main)
-                     ;; yearly by day -- 1 May Tag der Arbeit
-                     (icalendar--convert-yearly-to-ical nonmarker entry-main)
-                     ;; "ordinary" events, start and end time given
-                     ;; 1 Feb 2003 blah
-                     (icalendar--convert-ordinary-to-ical nonmarker entry-main)
-                     ;; everything else
-                     ;; Oops! what's that?
-                     (error "Could not parse entry")))
-              (unless (string= entry-rest "")
-                (setq contents
-                      (concat contents "\nDESCRIPTION:"
-                              (icalendar--convert-string-for-export
-                               entry-rest))))
+              (setq contents-n-summary
+                    (icalendar--convert-to-ical nonmarker entry-main))
+              (setq other-elements (icalendar--parse-summary-and-rest
+                                    (concat entry-main entry-rest)))
+              (setq contents (concat (car contents-n-summary)
+                                     "\nSUMMARY:" (cadr contents-n-summary)))
+              (let ((cla (cdr (assoc 'cla other-elements)))
+                    (des (cdr (assoc 'des other-elements)))
+                    (loc (cdr (assoc 'loc other-elements)))
+                    (org (cdr (assoc 'org other-elements)))
+                    (sta (cdr (assoc 'sta other-elements)))
+                    (sum (cdr (assoc 'sum other-elements)))
+                    (url (cdr (assoc 'url other-elements))))
+                (if cla
+                    (setq contents (concat contents "\nCLASS:" cla)))
+                (if des
+                    (setq contents (concat contents "\nDESCRIPTION:" des)))
+                (if loc
+                    (setq contents (concat contents "\nLOCATION:" loc)))
+                (if org
+                    (setq contents (concat contents "\nORGANIZER:" org)))
+                (if sta
+                    (setq contents (concat contents "\nSTATUS:" sta)))
+                ;;(if sum
+                ;;    (setq contents (concat contents "\nSUMMARY:" sum)))
+                (if url
+                    (setq contents (concat contents "\nURL:" url))))
               (setq result (concat result header contents "\nEND:VEVENT")))
           ;; handle errors
           (error
@@ -780,13 +805,127 @@ FExport diary data into iCalendar file: ")
           (insert result)
           (insert "\nEND:VCALENDAR\n")
           ;; save the diary file
-          (save-buffer))))
+          (save-buffer)
+          (unless found-error
+            (bury-buffer)))))
     found-error))
 
-;; subroutines
+(defun icalendar--convert-to-ical (nonmarker entry-main)
+  "Convert a diary entry to icalendar format.
+NONMARKER is a regular expression matching the start of non-marking
+entries.  ENTRY-MAIN is the first line of the diary entry."
+  (or
+   ;; anniversaries -- %%(diary-anniversary ...)
+   (icalendar--convert-anniversary-to-ical nonmarker entry-main)
+   ;; cyclic events -- %%(diary-cyclic ...)
+   (icalendar--convert-cyclic-to-ical nonmarker entry-main)
+   ;; diary-date -- %%(diary-date ...)
+   (icalendar--convert-date-to-ical nonmarker entry-main)
+   ;; float events -- %%(diary-float ...)
+   (icalendar--convert-float-to-ical nonmarker entry-main)
+   ;; block events -- %%(diary-block ...)
+   (icalendar--convert-block-to-ical nonmarker entry-main)
+   ;; other sexp diary entries
+   (icalendar--convert-sexp-to-ical nonmarker entry-main)
+   ;; weekly by day -- Monday 8:30 Team meeting
+   (icalendar--convert-weekly-to-ical nonmarker entry-main)
+   ;; yearly by day -- 1 May Tag der Arbeit
+   (icalendar--convert-yearly-to-ical nonmarker entry-main)
+   ;; "ordinary" events, start and end time given
+   ;; 1 Feb 2003 blah
+   (icalendar--convert-ordinary-to-ical nonmarker entry-main)
+   ;; everything else
+   ;; Oops! what's that?
+   (error "Could not parse entry")))
+
+(defun icalendar--parse-summary-and-rest (summary-and-rest)
+  "Parse SUMMARY-AND-REST from a diary to fill iCalendar properties."
+  (save-match-data
+    (let* ((s icalendar-import-format)
+           (p-cla (or (string-match "%c" icalendar-import-format) -1))
+           (p-des (or (string-match "%d" icalendar-import-format) -1))
+           (p-loc (or (string-match "%l" icalendar-import-format) -1))
+           (p-org (or (string-match "%o" icalendar-import-format) -1))
+           (p-sum (or (string-match "%s" icalendar-import-format) -1))
+           (p-sta (or (string-match "%t" icalendar-import-format) -1))
+           (p-url (or (string-match "%u" icalendar-import-format) -1))
+           (p-list (sort (list p-cla p-des p-loc p-org p-sta p-sum p-url) '<))
+           pos-cla pos-des pos-loc pos-org pos-sta pos-sum pos-url)
+      (dotimes (i (length p-list))
+        (cond ((and (>= p-cla 0) (= (nth i p-list) p-cla))
+               (setq pos-cla (+ 2 (* 2 i))))
+              ((and (>= p-des 0) (= (nth i p-list) p-des))
+               (setq pos-des (+ 2 (* 2 i))))
+              ((and (>= p-loc 0) (= (nth i p-list) p-loc))
+               (setq pos-loc (+ 2 (* 2 i))))
+              ((and (>= p-org 0) (= (nth i p-list) p-org))
+               (setq pos-org (+ 2 (* 2 i))))
+              ((and (>= p-sta 0) (= (nth i p-list) p-sta))
+               (setq pos-sta (+ 2 (* 2 i))))
+              ((and (>= p-sum 0) (= (nth i p-list) p-sum))
+               (setq pos-sum (+ 2 (* 2 i))))
+              ((and (>= p-url 0) (= (nth i p-list) p-url))
+               (setq pos-url (+ 2 (* 2 i))))))
+      (mapc (lambda (ij)
+              (setq s (icalendar--rris (car ij) (cadr ij) s t t)))
+            (list
+             ;; summary must be first! because of %s
+             (list "%s"
+                   (concat "\\(" icalendar-import-format-summary "\\)?"))
+             (list "%c"
+                   (concat "\\(" icalendar-import-format-class "\\)?"))
+             (list "%d"
+                   (concat "\\(" icalendar-import-format-description "\\)?"))
+             (list "%l"
+                   (concat "\\(" icalendar-import-format-location "\\)?"))
+             (list "%o"
+                   (concat "\\(" icalendar-import-format-organizer "\\)?"))
+             (list "%t"
+                   (concat "\\(" icalendar-import-format-status "\\)?"))
+             (list "%u"
+                   (concat "\\(" icalendar-import-format-url "\\)?"))))
+      (setq s (concat (icalendar--rris "%s" "\\(.*\\)" s nil t) " "))
+      (if (string-match s summary-and-rest)
+          (let (cla des loc org sta sum url)
+            (if (and pos-sum (match-beginning pos-sum))
+                (setq sum (substring summary-and-rest
+                                     (match-beginning pos-sum)
+                                     (match-end pos-sum))))
+            (if (and pos-cla (match-beginning pos-cla))
+                (setq cla (substring summary-and-rest
+                                     (match-beginning pos-cla)
+                                     (match-end pos-cla))))
+            (if (and pos-des (match-beginning pos-des))
+                (setq des (substring summary-and-rest
+                                     (match-beginning pos-des)
+                                     (match-end pos-des))))
+            (if (and pos-loc (match-beginning pos-loc))
+                (setq loc (substring summary-and-rest
+                                     (match-beginning pos-loc)
+                                     (match-end pos-loc))))
+            (if (and pos-org (match-beginning pos-org))
+                (setq org (substring summary-and-rest
+                                     (match-beginning pos-org)
+                                     (match-end pos-org))))
+            (if (and pos-sta (match-beginning pos-sta))
+                (setq sta (substring summary-and-rest
+                                     (match-beginning pos-sta)
+                                     (match-end pos-sta))))
+            (if (and pos-url (match-beginning pos-url))
+                (setq url (substring summary-and-rest
+                                     (match-beginning pos-url)
+                                     (match-end pos-url))))
+            (list (if cla (cons 'cla cla) nil)
+                  (if des (cons 'des des) nil)
+                  (if loc (cons 'loc loc) nil)
+                  (if org (cons 'org org) nil)
+                  (if sta (cons 'sta sta) nil)
+                  ;;(if sum (cons 'sum sum) nil)
+                  (if url (cons 'url url) nil)))))))
+
+;; subroutines for icalendar-export-region
 (defun icalendar--convert-ordinary-to-ical (nonmarker entry-main)
   "Convert \"ordinary\" diary entry to icalendar format.
-
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match (concat nonmarker
@@ -795,7 +934,7 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
                             "\\("
                             "-0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?\\)?"
                             "\\)?"
-                            "\\s-*\\(.*\\)")
+                            "\\s-*\\(.*?\\) ?$")
                     entry-main)
       (let* ((datetime (substring entry-main (match-beginning 1)
                                   (match-end 1)))
@@ -839,26 +978,24 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
                                           starttimestring))))
               (setq endtimestring (format "T%06d"
                                           (+ 10000 time))))))
-        (concat "\nDTSTART;"
-                (if starttimestring "VALUE=DATE-TIME:"
-                  "VALUE=DATE:")
-                startisostring
-                (or starttimestring "")
-                "\nDTEND;"
-                (if endtimestring "VALUE=DATE-TIME:"
-                  "VALUE=DATE:")
-                (if starttimestring
-                    startisostring
-                  endisostring)
-                (or endtimestring "")
-                "\nSUMMARY:"
-                summary))
+        (list (concat "\nDTSTART;"
+                      (if starttimestring "VALUE=DATE-TIME:"
+                        "VALUE=DATE:")
+                      startisostring
+                      (or starttimestring "")
+                      "\nDTEND;"
+                      (if endtimestring "VALUE=DATE-TIME:"
+                        "VALUE=DATE:")
+                      (if starttimestring
+                          startisostring
+                        endisostring)
+                      (or endtimestring ""))
+              summary))
     ;; no match
     nil))
 
 (defun icalendar--convert-weekly-to-ical (nonmarker entry-main)
   "Convert weekly diary entry to icalendar format.
-
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (and (string-match (concat nonmarker
@@ -869,7 +1006,7 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
                                  "\\([1-9][0-9]?:[0-9][0-9]\\)"
                                  "\\([ap]m\\)?\\)?"
                                  "\\)?"
-                                 "\\s-*\\(.*\\)$")
+                                 "\\s-*\\(.*?\\) ?$")
                          entry-main)
            (icalendar--get-weekday-abbrev
             (substring entry-main (match-beginning 1)
@@ -911,35 +1048,34 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
                                           starttimestring))))
               (setq endtimestring (format "T%06d"
                                           (+ 10000 time))))))
-        (concat "\nDTSTART;"
-                (if starttimestring
-                    "VALUE=DATE-TIME:"
-                  "VALUE=DATE:")
-                ;; find the correct week day,
-                ;; 1st january 2000 was a saturday
-                (format
-                 "200001%02d"
-                 (+ (icalendar--get-weekday-number day) 2))
-                (or starttimestring "")
-                "\nDTEND;"
-                (if endtimestring
-                    "VALUE=DATE-TIME:"
-                  "VALUE=DATE:")
-                (format
-                 "200001%02d"
-                 ;; end is non-inclusive!
-                 (+ (icalendar--get-weekday-number day)
-                    (if endtimestring 2 3)))
-                (or endtimestring "")
-                "\nSUMMARY:" summary
-                "\nRRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY="
-                day))
+        (list (concat "\nDTSTART;"
+                      (if starttimestring
+                          "VALUE=DATE-TIME:"
+                        "VALUE=DATE:")
+                      ;; find the correct week day,
+                      ;; 1st january 2000 was a saturday
+                      (format
+                       "200001%02d"
+                       (+ (icalendar--get-weekday-number day) 2))
+                      (or starttimestring "")
+                      "\nDTEND;"
+                      (if endtimestring
+                          "VALUE=DATE-TIME:"
+                        "VALUE=DATE:")
+                      (format
+                       "200001%02d"
+                       ;; end is non-inclusive!
+                       (+ (icalendar--get-weekday-number day)
+                          (if endtimestring 2 3)))
+                      (or endtimestring "")
+                      "\nRRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY="
+                      day)
+              summary))
     ;; no match
     nil))
 
 (defun icalendar--convert-yearly-to-ical (nonmarker entry-main)
   "Convert yearly diary entry to icalendar format.
-
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match (concat nonmarker
@@ -951,7 +1087,7 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
                             "\\("
                             "-0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?\\)?"
                             "\\)?"
-                            "\\s-*\\([^0-9]+.*\\)$" ; must not match years
+                            "\\s-*\\([^0-9]+.*?\\) ?$" ; must not match years
                             )
                     entry-main)
       (let* ((daypos (if european-calendar-style 1 2))
@@ -997,25 +1133,24 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
                                           starttimestring))))
               (setq endtimestring (format "T%06d"
                                           (+ 10000 time))))))
-        (concat "\nDTSTART;"
-                (if starttimestring "VALUE=DATE-TIME:"
-                  "VALUE=DATE:")
-                (format "1900%02d%02d" month day)
-                (or starttimestring "")
-                "\nDTEND;"
-                (if endtimestring "VALUE=DATE-TIME:"
-                  "VALUE=DATE:")
-                ;; end is not included! shift by one day
-                (icalendar--date-to-isodate
-                 (list month day 1900)
-                 (if endtimestring 0 1))
-                (or endtimestring "")
-                "\nSUMMARY:"
-                summary
-                "\nRRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH="
-                (format "%2d" month)
-                ";BYMONTHDAY="
-                (format "%2d" day)))
+        (list (concat "\nDTSTART;"
+                      (if starttimestring "VALUE=DATE-TIME:"
+                        "VALUE=DATE:")
+                      (format "1900%02d%02d" month day)
+                      (or starttimestring "")
+                      "\nDTEND;"
+                      (if endtimestring "VALUE=DATE-TIME:"
+                        "VALUE=DATE:")
+                      ;; end is not included! shift by one day
+                      (icalendar--date-to-isodate
+                       (list month day 1900)
+                       (if endtimestring 0 1))
+                      (or endtimestring "")
+                      "\nRRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH="
+                      (format "%2d" month)
+                      ";BYMONTHDAY="
+                      (format "%2d" day))
+              summary))
     ;; no match
     nil))
 
@@ -1026,18 +1161,28 @@ FIXME!
 
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
-  (if (string-match (concat nonmarker
-                            "%%(\\([^)]+\\))\\s-*\\(.*\\)")
-                    entry-main)
-      (progn
-        (icalendar--dmsg "diary-sexp %s" entry-main)
-        (error "Sexp-entries are not supported yet"))
-    ;; no match
-    nil))
+  (cond ((string-match (concat nonmarker
+                               "%%(and \\(([^)]+)\\))\\(\\s-*.*?\\) ?$")
+                       entry-main)
+         ;; simple sexp entry as generated by icalendar.el: strip off the
+         ;; unnecessary (and)
+         (icalendar--dmsg "diary-sexp from icalendar.el %s" entry-main)
+         (icalendar--convert-to-ical
+          nonmarker
+          (concat "%%"
+                  (substring entry-main (match-beginning 1) (match-end 1))
+                  (substring entry-main (match-beginning 2) (match-end 2)))))
+        ((string-match (concat nonmarker
+                               "%%([^)]+)\\s-*.*")
+                       entry-main)
+         (icalendar--dmsg "diary-sexp %s" entry-main)
+         (error "Sexp-entries are not supported yet"))
+        (t
+         ;; no match
+         nil)))
 
 (defun icalendar--convert-block-to-ical (nonmarker entry-main)
   "Convert block diary entry to icalendar format.
-
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match (concat nonmarker
@@ -1047,7 +1192,7 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
                             "\\("
                             "-0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?\\)?"
                             "\\)?"
-                            "\\s-*\\(.*\\)")
+                            "\\s-*\\(.*?\\) ?$")
                     entry-main)
       (let* ((startstring (substring entry-main
                                      (match-beginning 1)
@@ -1096,20 +1241,19 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
                                           (+ 10000 time))))))
         (if starttimestring
             ;; with time -> write rrule
-            (concat "\nDTSTART;VALUE=DATE-TIME:"
-                    startisostring
-                    starttimestring
-                    "\nDTEND;VALUE=DATE-TIME:"
-                    startisostring
-                    endtimestring
-                    "\nSUMMARY:"
-                    summary
-                    "\nRRULE:FREQ=DAILY;INTERVAL=1;UNTIL="
-                    endisostring)
+            (list (concat "\nDTSTART;VALUE=DATE-TIME:"
+                          startisostring
+                          starttimestring
+                          "\nDTEND;VALUE=DATE-TIME:"
+                          startisostring
+                          endtimestring
+                          "\nRRULE:FREQ=DAILY;INTERVAL=1;UNTIL="
+                          endisostring)
+                  summary)
           ;; no time -> write long event
-          (concat "\nDTSTART;VALUE=DATE:" startisostring
-                  "\nDTEND;VALUE=DATE:" endisostring+1
-                  "\nSUMMARY:" summary)))
+          (list (concat "\nDTSTART;VALUE=DATE:" startisostring
+                        "\nDTEND;VALUE=DATE:" endisostring+1)
+                summary)))
     ;; no match
     nil))
 
@@ -1121,7 +1265,7 @@ FIXME!
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match (concat nonmarker
-                            "%%(diary-float \\([^)]+\\))\\s-*\\(.*\\)")
+                            "%%(diary-float \\([^)]+\\))\\s-*\\(.*?\\) ?$")
                     entry-main)
       (progn
         (icalendar--dmsg "diary-float %s" entry-main)
@@ -1137,7 +1281,7 @@ FIXME!
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match (concat nonmarker
-                            "%%(diary-date \\([^)]+\\))\\s-*\\(.*\\)")
+                            "%%(diary-date \\([^)]+\\))\\s-*\\(.*?\\) ?$")
                     entry-main)
       (progn
         (icalendar--dmsg "diary-date %s" entry-main)
@@ -1147,7 +1291,6 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
 
 (defun icalendar--convert-cyclic-to-ical (nonmarker entry-main)
   "Convert `diary-cyclic' diary entry to icalendar format.
-
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match (concat nonmarker
@@ -1157,7 +1300,7 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
                             "\\("
                             "-0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?\\)?"
                             "\\)?"
-                            "\\s-*\\(.*\\)")
+                            "\\s-*\\(.*?\\) ?$")
                     entry-main)
       (let* ((frequency (substring entry-main (match-beginning 1)
                                    (match-end 1)))
@@ -1202,27 +1345,26 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
                                           starttimestring))))
               (setq endtimestring (format "T%06d"
                                           (+ 10000 time))))))
-        (concat "\nDTSTART;"
-                (if starttimestring "VALUE=DATE-TIME:"
-                  "VALUE=DATE:")
-                startisostring
-                (or starttimestring "")
-                "\nDTEND;"
-                (if endtimestring "VALUE=DATE-TIME:"
-                  "VALUE=DATE:")
-                (if endtimestring endisostring endisostring+1)
-                (or endtimestring "")
-                "\nSUMMARY:" summary
-                "\nRRULE:FREQ=DAILY;INTERVAL=" frequency
-                ;; strange: korganizer does not expect
-                ;; BYSOMETHING here...
-                ))
+        (list (concat "\nDTSTART;"
+                      (if starttimestring "VALUE=DATE-TIME:"
+                        "VALUE=DATE:")
+                      startisostring
+                      (or starttimestring "")
+                      "\nDTEND;"
+                      (if endtimestring "VALUE=DATE-TIME:"
+                        "VALUE=DATE:")
+                      (if endtimestring endisostring endisostring+1)
+                      (or endtimestring "")
+                      "\nRRULE:FREQ=DAILY;INTERVAL=" frequency
+                      ;; strange: korganizer does not expect
+                      ;; BYSOMETHING here...
+                      )
+              summary))
     ;; no match
     nil))
 
 (defun icalendar--convert-anniversary-to-ical (nonmarker entry-main)
   "Convert `diary-anniversary' diary entry to icalendar format.
-
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match (concat nonmarker
@@ -1231,7 +1373,7 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
                             "\\("
                             "-0?\\([1-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?\\)?"
                             "\\)?"
-                            "\\s-*\\(.*\\)")
+                            "\\s-*\\(.*?\\) ?$")
                     entry-main)
       (let* ((datetime (substring entry-main (match-beginning 1)
                                   (match-end 1)))
@@ -1272,26 +1414,26 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
                                           starttimestring))))
               (setq endtimestring (format "T%06d"
                                           (+ 10000 time))))))
-        (concat "\nDTSTART;"
-                (if starttimestring "VALUE=DATE-TIME:"
-                  "VALUE=DATE:")
-                startisostring
-                (or starttimestring "")
-                "\nDTEND;"
-                (if endtimestring "VALUE=DATE-TIME:"
-                  "VALUE=DATE:")
-                endisostring
-                (or endtimestring "")
-                "\nSUMMARY:" summary
-                "\nRRULE:FREQ=YEARLY;INTERVAL=1"
-                ;; the following is redundant,
-                ;; but korganizer seems to expect this... ;(
-                ;; and evolution doesn't understand it... :(
-                ;; so... who is wrong?!
-                ";BYMONTH="
-                (substring startisostring 4 6)
-                ";BYMONTHDAY="
-                (substring startisostring 6 8)))
+        (list (concat "\nDTSTART;"
+                      (if starttimestring "VALUE=DATE-TIME:"
+                        "VALUE=DATE:")
+                      startisostring
+                      (or starttimestring "")
+                      "\nDTEND;"
+                      (if endtimestring "VALUE=DATE-TIME:"
+                        "VALUE=DATE:")
+                      endisostring
+                      (or endtimestring "")
+                      "\nRRULE:FREQ=YEARLY;INTERVAL=1"
+                      ;; the following is redundant,
+                      ;; but korganizer seems to expect this... ;(
+                      ;; and evolution doesn't understand it... :(
+                      ;; so... who is wrong?!
+                      ";BYMONTH="
+                      (substring startisostring 4 6)
+                      ";BYMONTHDAY="
+                      (substring startisostring 6 8))
+              summary))
     ;; no match
     nil))
 
@@ -1302,7 +1444,7 @@ entries.  ENTRY-MAIN is the first line of the diary entry."
 ;;;###autoload
 (defun icalendar-import-file (ical-filename diary-filename
                                             &optional non-marking)
-  "Import a iCalendar file and append to a diary file.
+  "Import an iCalendar file and append to a diary file.
 Argument ICAL-FILENAME output iCalendar file.
 Argument DIARY-FILENAME input `diary-file'.
 Optional argument NON-MARKING determines whether events are created as
@@ -1376,10 +1518,13 @@ buffer `*icalendar-errors*'."
   "Create a string representation of an iCalendar EVENT."
   (let ((string icalendar-import-format)
         (conversion-list
-         '(("%d" DESCRIPTION icalendar-import-format-description)
-           ("%s" SUMMARY     icalendar-import-format-subject)
+         '(("%c" CLASS       icalendar-import-format-class)
+           ("%d" DESCRIPTION icalendar-import-format-description)
            ("%l" LOCATION    icalendar-import-format-location)
-           ("%o" ORGANIZER   icalendar-import-format-organizer))))
+           ("%o" ORGANIZER   icalendar-import-format-organizer)
+           ("%s" SUMMARY     icalendar-import-format-summary)
+           ("%t" STATUS      icalendar-import-format-status)
+           ("%u" URL         icalendar-import-format-url))))
     ;; convert the specifiers in the format string
     (mapcar (lambda (i)
               (let* ((spec (car i))
@@ -1392,17 +1537,19 @@ buffer `*icalendar-errors*'."
                         (icalendar--rris "%s"
                                          (icalendar--convert-string-for-import
                                           contents)
-                                         (symbol-value format))))
+                                         (symbol-value format)
+                                         t t)))
                 (setq string (icalendar--rris spec
                                               formatted-contents
-                                              string))))
+                                              string
+                                              t t))))
             conversion-list)
     string))
 
 (defun icalendar--convert-ical-to-diary (ical-list diary-file
                                                    &optional do-not-ask
                                                    non-marking)
-  "Convert an iCalendar file to an Emacs diary file.
+  "Convert Calendar data to an Emacs diary file.
 Import VEVENTS from the iCalendar object ICAL-LIST and saves them to a
 DIARY-FILE.  If DO-NOT-ASK is nil the user is asked for each event
 whether to actually import it.  NON-MARKING determines whether diary
@@ -1432,13 +1579,13 @@ written into the buffer `*icalendar-errors*'."
                  end-d
                  end-1-d
                  end-t
-                 (subject (icalendar--convert-string-for-import
+                 (summary (icalendar--convert-string-for-import
                            (or (icalendar--get-event-property e 'SUMMARY)
-                               "No Subject")))
+                               "No summary")))
                  (rrule (icalendar--get-event-property e 'RRULE))
                  (rdate (icalendar--get-event-property e 'RDATE))
                  (duration (icalendar--get-event-property e 'DURATION)))
-            (icalendar--dmsg "%s: `%s'" start-d subject)
+            (icalendar--dmsg "%s: `%s'" start-d summary)
             ;; check whether start-time is missing
             (if  (and dtstart
                       (string=
@@ -1456,7 +1603,7 @@ written into the buffer `*icalendar-errors*'."
                                                                    t))))
                 (if (and dtend-dec (not (eq dtend-dec dtend-dec-d)))
                     (message "Inconsistent endtime and duration for %s"
-                             subject))
+                             summary))
                 (setq dtend-dec dtend-dec-d)
                 (setq dtend-1-dec dtend-1-dec-d)))
             (setq end-d (if dtend-dec
@@ -1517,9 +1664,9 @@ written into the buffer `*icalendar-errors*'."
                   (setq diary-string
                         (concat diary-string " "
                                 (icalendar--format-ical-event e)))
-                  (if do-not-ask (setq subject nil))
+                  (if do-not-ask (setq summary nil))
                   (icalendar--add-diary-entry diary-string diary-file
-                                              non-marking subject))
+                                              non-marking summary))
               ;; event was not ok
               (setq found-error t)
               (setq error-string
@@ -1570,7 +1717,7 @@ END-T is the event's end time in diary format."
         (let ((until-1 0))
           (cond ((string-equal frequency "DAILY")
                  (setq until (icalendar--add-decoded-times
-                              dtstart-dec 
+                              dtstart-dec
                               (list 0 0 0 (* (read count) interval) 0 0)))
                  (setq until-1 (icalendar--add-decoded-times
                                 dtstart-dec
@@ -1767,23 +1914,24 @@ END-T is the event's end time in diary format."
                  start-t))))
 
 (defun icalendar--add-diary-entry (string diary-file non-marking
-                                          &optional subject)
+                                          &optional summary)
   "Add STRING to the diary file DIARY-FILE.
 STRING must be a properly formatted valid diary entry.  NON-MARKING
 determines whether diary events are created as non-marking.  If
-SUBJECT is not nil it must be a string that gives the subject of the
+SUMMARY is not nil it must be a string that gives the summary of the
 entry.  In this case the user will be asked whether he wants to insert
 the entry."
-  (when (or (not subject)
+  (when (or (not summary)
             (y-or-n-p (format "Add appointment for `%s' to diary? "
-                              subject)))
-    (when subject
+                              summary)))
+    (when summary
       (setq non-marking
             (y-or-n-p (format "Make appointment non-marking? "))))
     (save-window-excursion
       (unless diary-file
         (setq diary-file
               (read-file-name "Add appointment to this diary file: ")))
+      ;; Note: make-diary-entry will add a trailing blank char.... :(
       (make-diary-entry string non-marking diary-file))))
 
 (provide 'icalendar)
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 696fd66543a..40e26834c83 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1377,13 +1377,27 @@ This button will have a menu with all three reset operations."
   (interactive)
   (quit-window custom-buffer-done-kill))
 
+(defvar custom-button nil
+  "Face used for buttons in customization buffers.")
+
+(defvar custom-button-pressed nil
+  "Face used for pressed buttons in customization buffers.")
+
 (defcustom custom-raised-buttons (not (equal (face-valid-attribute-values :box)
                                              '(("unspecified" . unspecified))))
   "If non-nil, indicate active buttons in a `raised-button' style.
 Otherwise use brackets."
   :type 'boolean
   :version "21.1"
-  :group 'custom-buffer)
+  :group 'custom-buffer
+  :set (lambda (variable value)
+         (custom-set-default variable value)
+         (setq custom-button
+               (if value 'custom-button 'custom-button-unraised))
+         (setq custom-button-pressed
+               (if value
+                   'custom-button-pressed
+                 'custom-button-pressed-unraised))))
 
 (defun custom-buffer-create-internal (options &optional description)
   (custom-mode)
@@ -1896,24 +1910,52 @@ and `face'."
            :background "lightgrey" :foreground "black"))
     (t
      nil))
-  "Face used for buttons in customization buffers."
+  "Face for custom buffer buttons if `custom-raised-buttons' is non-nil."
   :version "21.1"
   :group 'custom-faces)
 ;; backward-compatibility alias
 (put 'custom-button-face 'face-alias 'custom-button)
 
+(defface custom-button-unraised
+  '((((min-colors 88)
+      (class color) (background light)) :foreground "blue1" :underline t)
+    (((class color) (background light)) :foreground "blue" :underline t)
+    (((min-colors 88)
+      (class color) (background dark)) :foreground "cyan1" :underline t)
+    (((class color) (background dark)) :foreground "cyan" :underline t)
+    (t :underline t))
+  "Face for custom buffer buttons if `custom-raised-buttons' is nil."
+  :version "22.1"
+  :group 'custom-faces)
+
+(setq custom-button
+      (if custom-raised-buttons 'custom-button 'custom-button-unraised))
+
 (defface custom-button-pressed
   '((((type x w32 mac) (class color))
      (:box (:line-width 2 :style pressed-button)
            :background "lightgrey" :foreground "black"))
     (t
      (:inverse-video t)))
-  "Face used for buttons in customization buffers."
+  "Face for pressed custom buttons if `custom-raised-buttons' is non-nil."
   :version "21.1"
   :group 'custom-faces)
 ;; backward-compatibility alias
 (put 'custom-button-pressed-face 'face-alias 'custom-button-pressed)
 
+(defface custom-button-pressed-unraised
+  '((default :inherit custom-button-unraised)
+    (((class color) (background light)) :foreground "magenta4")
+    (((class color) (background dark)) :foreground "violet"))
+  "Face for pressed custom buttons if `custom-raised-buttons' is nil."
+  :version "22.1"
+  :group 'custom-faces)
+
+(setq custom-button-pressed
+  (if custom-raised-buttons
+      'custom-button-pressed
+    'custom-button-pressed-unraised))
+
 (defface custom-documentation nil
   "Face used for documentation strings in customization buffers."
   :group 'custom-faces)
@@ -4311,10 +4353,11 @@ if that value is non-nil."
   (make-local-variable 'widget-documentation-face)
   (setq widget-documentation-face 'custom-documentation)
   (make-local-variable 'widget-button-face)
-  (setq widget-button-face 'custom-button)
-  (set (make-local-variable 'widget-button-pressed-face) 'custom-button-pressed)
-  (set (make-local-variable 'widget-mouse-face)
-       'custom-button-pressed)          ; buttons `depress' when moused
+  (setq widget-button-face custom-button)
+  (set (make-local-variable 'widget-button-pressed-face) custom-button-pressed)
+  (if custom-raised-buttons
+      (set (make-local-variable 'widget-mouse-face) custom-button))
+
   ;; When possible, use relief for buttons, not bracketing.  This test
   ;; may not be optimal.
   (when custom-raised-buttons
diff --git a/lisp/custom.el b/lisp/custom.el
index cf6ef88456e..9d74335a007 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -272,6 +272,7 @@ _outside_ any bindings for these variables.  \(`defvar' and
 
 Read the section about customization in the Emacs Lisp manual for more
 information."
+  (declare (doc-string 3))
   ;; It is better not to use backquote in this file,
   ;; because that makes a bootstrapping problem
   ;; if you need to recompile all the Lisp files using interpreted code.
@@ -353,6 +354,7 @@ corresponding ITEMs.  These are the defined REQ values:
 
 Read the section about customization in the Emacs Lisp manual for more
 information."
+  (declare (doc-string 3))
   ;; It is better not to use backquote in this file,
   ;; because that makes a bootstrapping problem
   ;; if you need to recompile all the Lisp files using interpreted code.
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 8ce5e5d48d0..955f3b1b076 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -2,7 +2,7 @@
 
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
 ;;      Lawrence R. Dodd <dodd@roebling.poly.edu>
-;; Maintainer: nobody (want to volunteer?)
+;; Maintainer: Romain Francoise <rfrancoise@gnu.org>
 ;; Version: 2.37+
 ;; Date: 1994/08/18 19:27:42
 ;; Keywords: dired extensions files
@@ -678,7 +678,9 @@ you can relist single subdirs using \\[dired-do-redisplay]."
   ;; decent subdir headerline:
   (goto-char (point-min))
   (or (looking-at dired-subdir-regexp)
-      (dired-insert-headerline default-directory))
+      (insert "  " 
+              (directory-file-name (file-name-directory default-directory))
+              ":\n"))
   (dired-mode dirname (or switches dired-listing-switches))
   (setq mode-name "Virtual Dired"
         revert-buffer-function 'dired-virtual-revert)
@@ -1517,7 +1519,7 @@ to mark all zero length files."
               ;; Karsten Wenger <kw@cis.uni-muenchen.de> fixed uid.
               (setq uid (buffer-substring (+ (point) 1)
                                           (progn (forward-word 1) (point))))
-              (re-search-forward dired-move-to-filename-regexp)
+              (re-search-forward directory-listing-before-filename-regexp)
               (goto-char (match-beginning 1))
               (forward-char -1)
               (setq size (string-to-number (buffer-substring (save-excursion
@@ -1716,5 +1718,5 @@ variables `dired-x-variable-list' in the message."
 ;; As Barry Warsaw would say: "This might be useful..."
 (provide 'dired-x)
 
-;;; arch-tag: 71a43ba2-7a00-4793-a028-0613dd7765ae
+;; arch-tag: 71a43ba2-7a00-4793-a028-0613dd7765ae
 ;;; dired-x.el ends here
diff --git a/lisp/dired.el b/lisp/dired.el
index 3934fe4e433..3cc83b29fdd 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -842,16 +842,17 @@ BEG..END is the line where the file info is located."
   ;; line, the alignment if this line w.r.t the rest is messed up because
   ;; the fields of that one line will generally be smaller.
   ;;
-  ;; To work around this problem, we here add spaces to try and re-align the
-  ;; fields as needed.  Since this is purely aesthetic, it is of utmost
-  ;; importance that it doesn't mess up anything like
-  ;; `dired-move-to-filename'.  To this end, we limit ourselves to adding
-  ;; spaces only, and to only add them at places where there was already at
-  ;; least one space.  This way, as long as `dired-move-to-filename-regexp'
-  ;; always matches spaces with "*" or "+", we know we haven't made anything
-  ;; worse.  There is one spot where the exact number of spaces is
-  ;; important, which is just before the actual filename, so we refrain from
-  ;; adding spaces there (and within the filename as well, of course).
+  ;; To work around this problem, we here add spaces to try and
+  ;; re-align the fields as needed.  Since this is purely aesthetic,
+  ;; it is of utmost importance that it doesn't mess up anything like
+  ;; `dired-move-to-filename'.  To this end, we limit ourselves to
+  ;; adding spaces only, and to only add them at places where there
+  ;; was already at least one space.  This way, as long as
+  ;; `directory-listing-before-filename-regexp' always matches spaces
+  ;; with "*" or "+", we know we haven't made anything worse.  There
+  ;; is one spot where the exact number of spaces is important, which
+  ;; is just before the actual filename, so we refrain from adding
+  ;; spaces there (and within the filename as well, of course).
   (save-excursion
     (let (file file-col other other-col)
       ;; Check the there is indeed a file, and that there is anoter adjacent
@@ -953,7 +954,7 @@ If HDR is non-nil, insert a header line with the directory name."
         (setq switches (concat "--dired " switches)))
     ;; We used to specify the C locale here, to force English month names;
     ;; but this should not be necessary any more,
-    ;; with the new value of dired-move-to-filename-regexp.
+    ;; with the new value of `directory-listing-before-filename-regexp'.
     (if file-list
         (dolist (f file-list)
           (let ((beg (point)))
@@ -1837,50 +1838,6 @@ DIR must be a directory name, not a file name."
 
 ;;; Functions for finding the file name in a dired buffer line.
 
-(defvar dired-move-to-filename-regexp
-  (let* ((l "\\([A-Za-z]\\|[^\0-\177]\\)")
-         (l-or-quote "\\([A-Za-z']\\|[^\0-\177]\\)")
-         ;; In some locales, month abbreviations are as short as 2 letters,
-         ;; and they can be followed by ".".
-         ;; In Breton, a month name  can include a quote character.
-         (month (concat l-or-quote l-or-quote "+\\.?"))
-         (s " ")
-         (yyyy "[0-9][0-9][0-9][0-9]")
-         (dd "[ 0-3][0-9]")
-         (HH:MM "[ 0-2][0-9][:.][0-5][0-9]")
-         (seconds "[0-6][0-9]\\([.,][0-9]+\\)?")
-         (zone "[-+][0-2][0-9][0-5][0-9]")
-         (iso-mm-dd "[01][0-9]-[0-3][0-9]")
-         (iso-time (concat HH:MM "\\(:" seconds "\\( ?" zone "\\)?\\)?"))
-         (iso (concat "\\(\\(" yyyy "-\\)?" iso-mm-dd "[ T]" iso-time
-                      "\\|" yyyy "-" iso-mm-dd "\\)"))
-         (western (concat "\\(" month s "+" dd "\\|" dd "\\.?" s month "\\)"
-                          s "+"
-                          "\\(" HH:MM "\\|" yyyy "\\)"))
-         (western-comma (concat month s "+" dd "," s "+" yyyy))
-         ;; Japanese MS-Windows ls-lisp has one-digit months, and
-         ;; omits the Kanji characters after month and day-of-month.
-         ;; On Mac OS X 10.3, the date format in East Asian locales is
-         ;; day-of-month digits followed by month digits.
-         (mm "[ 0-1]?[0-9]")
-         (east-asian
-          (concat "\\(" mm l "?" s dd l "?" s "+"
-                  "\\|" dd s mm s "+" "\\)"
-                  "\\(" HH:MM "\\|" yyyy l "?" "\\)")))
-         ;; The "[0-9]" below requires the previous column to end in a digit.
-         ;; This avoids recognizing `1 may 1997' as a date in the line:
-         ;; -r--r--r--   1 may      1997        1168 Oct 19 16:49 README
-         ;; The "[BkKMGTPEZY]?" below supports "ls -alh" output.
-         ;; The ".*" below finds the last match if there are multiple matches.
-         ;; This avoids recognizing `jservice  10  1024' as a date in the line:
-         ;; drwxr-xr-x  3 jservice  10  1024 Jul  2  1997 esg-host
-    (concat ".*[0-9][BkKMGTPEZY]?" s
-            "\\(" western "\\|" western-comma "\\|" east-asian "\\|" iso "\\)"
-            s "+"))
-  "Regular expression to match up to the file name in a directory listing.
-The default value is designed to recognize dates and times
-regardless of the language.")
-
 (defvar dired-permission-flags-regexp
   "\\([^ ]\\)[-r][-w]\\([^ ]\\)[-r][-w]\\([^ ]\\)[-r][-w]\\([^ ]\\)"
   "Regular expression to match the permission flags in `ls -l'.")
@@ -1898,12 +1855,12 @@ Return the position of the beginning of the filename, or nil if none found."
     (cond
      ((and change (< change eol))
       (goto-char change))
-     ((re-search-forward dired-move-to-filename-regexp eol t)
+     ((re-search-forward directory-listing-before-filename-regexp eol t)
       (goto-char (match-end 0)))
      ((re-search-forward dired-permission-flags-regexp eol t)
       ;; Ha!  There *is* a file.  Our regexp-from-hell just failed to find it.
       (if raise-error
-          (error "Unrecognized line!  Check dired-move-to-filename-regexp"))
+          (error "Unrecognized line!  Check directory-listing-before-filename-regexp"))
       (beginning-of-line)
       nil)
      (raise-error
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index ce727c30d14..dc285a717af 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -3109,8 +3109,8 @@ in any of these classes."
                      ;; in order to do proper prompting:
                      `(if (called-interactively-p)
                           (call-interactively ',origname)
-                        ,(ad-make-mapped-call orig-arglist
-                                              advised-arglist
+                        ,(ad-make-mapped-call advised-arglist
+                                              orig-arglist
                                               origname)))
                     ;; And now for normal functions and non-interactive subrs
                     ;; (or subrs whose interactive behavior was advised):
@@ -3812,6 +3812,7 @@ documentation of the advised function can be dumped onto the `DOC' file
 during preloading.
 
 See Info node `(elisp)Advising Functions' for comprehensive documentation."
+  (declare (doc-string 3))
   (if (not (ad-name-p function))
       (error "defadvice: Invalid function name: %s" function))
   (let* ((class (car args))
@@ -3986,5 +3987,5 @@ Use only in REAL emergencies."
 
 (provide 'advice)
 
-;;; arch-tag: 29f8c9a1-8c88-471f-95d7-e28541c6b7c0
+;; arch-tag: 29f8c9a1-8c88-471f-95d7-e28541c6b7c0
 ;;; advice.el ends here
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index c31036f02ed..1ebc8f765fa 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -50,6 +50,8 @@ The return value of this function is not used."
              (put macro 'lisp-indent-function (car (cdr d))))
             ((and (consp d) (eq (car d) 'debug))
              (put macro 'edebug-form-spec (car (cdr d))))
+            ((and (consp d) (eq (car d) 'doc-string))
+             (put macro 'doc-string-elt (car (cdr d))))
             (t
              (message "Unknown declaration %s" d))))))
 
@@ -126,6 +128,7 @@ is equivalent to the following two lines of code:
 \(make-obsolete 'old-fun 'new-fun \"22.1\")
 
 See the docstrings of `defalias' and `make-obsolete' for more details."
+  (declare (doc-string 4))
   `(progn
      (defalias ,obsolete-name ,current-name ,docstring)
      (make-obsolete ,obsolete-name ,current-name ,when)))
@@ -158,9 +161,10 @@ is equivalent to the following two lines of code:
 
 See the docstrings of `defvaralias' and `make-obsolete-variable' or
 Info node `(elisp)Variable Aliases' for more details."
+  (declare (doc-string 4))
   `(progn
      (defvaralias ,obsolete-name ,current-name ,docstring)
-      (make-obsolete-variable ,obsolete-name ,current-name ,when)))
+     (make-obsolete-variable ,obsolete-name ,current-name ,when)))
 
 (defmacro dont-compile (&rest body)
   "Like `progn', but the body always runs interpreted (not compiled).
@@ -169,10 +173,10 @@ If you think you need this, you're probably making a mistake somewhere."
   (list 'eval (list 'quote (if (cdr body) (cons 'progn body) (car body)))))
 
 
-;;; interface to evaluating things at compile time and/or load time
-;;; these macro must come after any uses of them in this file, as their
-;;; definition in the file overrides the magic definitions on the
-;;; byte-compile-macro-environment.
+;; interface to evaluating things at compile time and/or load time
+;; these macro must come after any uses of them in this file, as their
+;; definition in the file overrides the magic definitions on the
+;; byte-compile-macro-environment.
 
 (defmacro eval-when-compile (&rest body)
   "Like `progn', but evaluates the body at compile time if you're compiling.
@@ -196,12 +200,12 @@ In interpreted code, this is entirely equivalent to `progn'."
   (car (last body)))
 
 
-;;; I nuked this because it's not a good idea for users to think of using it.
-;;; These options are a matter of installation preference, and have nothing to
-;;; with particular source files; it's a mistake to suggest to users
-;;; they should associate these with particular source files.
-;;; There is hardly any reason to change these parameters, anyway.
-;;; --rms.
+;; I nuked this because it's not a good idea for users to think of using it.
+;; These options are a matter of installation preference, and have nothing to
+;; with particular source files; it's a mistake to suggest to users
+;; they should associate these with particular source files.
+;; There is hardly any reason to change these parameters, anyway.
+;; --rms.
 
 ;; (put 'byte-compiler-options 'lisp-indent-function 0)
 ;; (defmacro byte-compiler-options (&rest args)
@@ -227,5 +231,5 @@ In interpreted code, this is entirely equivalent to `progn'."
 ;;       (file-format emacs19))"
 ;;   nil)
 
-;;; arch-tag: 76f8328a-1f66-4df2-9b6d-5c3666dc05e9
+;; arch-tag: 76f8328a-1f66-4df2-9b6d-5c3666dc05e9
 ;;; byte-run.el ends here
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 559d2bd86c6..47bcbbcae6c 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -908,6 +908,13 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'."
 ;; list.  If our current position is after the symbol's position, we
 ;; assume we've already passed that point, and look for the next
 ;; occurrence of the symbol.
+;;
+;; This function should not be called twice for the same occurrence of
+;; a symbol, and it should not be called for symbols generated by the
+;; byte compiler itself; because rather than just fail looking up the
+;; symbol, we may find an occurrence of the symbol further ahead, and
+;; then `byte-compile-last-position' as advanced too far.
+;;
 ;; So your're probably asking yourself: Isn't this function a
 ;; gross hack?  And the answer, of course, would be yes.
 (defun byte-compile-set-symbol-position (sym &optional allow-previous)
@@ -2304,7 +2311,7 @@ list that represents a doc string reference.
                                  ',name ',declaration))
                    outbuffer)))))
 
-    (let* ((new-one (byte-compile-lambda (cons 'lambda (nthcdr 2 form))))
+    (let* ((new-one (byte-compile-lambda (nthcdr 2 form) t))
            (code (byte-compile-byte-code-maker new-one)))
       (if this-one
           (setcdr this-one new-one)
@@ -2500,10 +2507,16 @@ If FORM is a lambda or a macro, byte-compile it as a function."
 ;; Byte-compile a lambda-expression and return a valid function.
 ;; The value is usually a compiled function but may be the original
 ;; lambda-expression.
-(defun byte-compile-lambda (fun)
-  (unless (eq 'lambda (car-safe fun))
-    (error "Not a lambda list: %S" fun))
-  (byte-compile-set-symbol-position 'lambda)
+;; When ADD-LAMBDA is non-nil, the symbol `lambda' is added as head
+;; of the list FUN and `byte-compile-set-symbol-position' is not called.
+;; Use this feature to avoid calling `byte-compile-set-symbol-position'
+;; for symbols generated by the byte compiler itself.
+(defun byte-compile-lambda (fun &optional add-lambda)
+  (if add-lambda
+      (setq fun (cons 'lambda fun))
+    (unless (eq 'lambda (car-safe fun))
+      (error "Not a lambda list: %S" fun))
+    (byte-compile-set-symbol-position 'lambda))
   (byte-compile-check-lambda-list (nth 1 fun))
   (let* ((arglist (nth 1 fun))
          (byte-compile-bound-variables
@@ -2755,9 +2768,7 @@ That command is designed for interactive use only" fn))
                     (or (not (byte-compile-version-cond
                               byte-compile-compatibility))
                         (not (get (get fn 'byte-opcode) 'emacs19-opcode))))
-               (progn
-                 (byte-compile-set-symbol-position fn)
-                 (funcall handler form))
+               (funcall handler form)
              (when (memq 'callargs byte-compile-warnings)
                (if (memq fn '(custom-declare-group custom-declare-variable custom-declare-face))
                    (byte-compile-nogroup-warn form))
@@ -3671,7 +3682,7 @@ that suppresses all warnings during execution of BODY."
          (list 'fset
                (list 'quote (nth 1 form))
                (byte-compile-byte-code-maker
-                (byte-compile-lambda (cons 'lambda (cdr (cdr form)))))))
+                (byte-compile-lambda (cdr (cdr form)) t))))
         (byte-compile-discard))
     ;; We prefer to generate a defalias form so it will record the function
     ;; definition just like interpreting a defun.
@@ -3679,7 +3690,7 @@ that suppresses all warnings during execution of BODY."
      (list 'defalias
            (list 'quote (nth 1 form))
            (byte-compile-byte-code-maker
-            (byte-compile-lambda (cons 'lambda (cdr (cdr form))))))
+            (byte-compile-lambda (cdr (cdr form)) t)))
      t))
   (byte-compile-constant (nth 1 form)))
 
@@ -3688,8 +3699,7 @@ that suppresses all warnings during execution of BODY."
   (byte-compile-body-do-effect
    (list (list 'fset (list 'quote (nth 1 form))
                (let ((code (byte-compile-byte-code-maker
-                            (byte-compile-lambda
-                             (cons 'lambda (cdr (cdr form)))))))
+                            (byte-compile-lambda (cdr (cdr form)) t))))
                  (if (eq (car-safe code) 'make-byte-code)
                      (list 'cons ''macro code)
                    (list 'quote (cons 'macro (eval code))))))
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 2b47b139759..612abaf7091 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -353,9 +353,10 @@ That buffer should be current already."
                   (forward-line -1)
                   (setq new-start (point)))
                 (if (not (zerop
-                          (compare-buffer-substrings
-                           (current-buffer) old-start old-end
-                           buffer new-start new-end)))
+                          (let ((case-fold-search nil))
+                            (compare-buffer-substrings
+                             (current-buffer) old-start old-end
+                             buffer new-start new-end))))
                     (setq all-match nil))))
             ;; Now new-end is the position of the start of the
             ;; unchanged part in the current buffer, and old-end is
@@ -659,6 +660,9 @@ Complete list of commands:
 For the cross-reference format, see `help-make-xrefs'."
   (interactive "d")
   (require 'help-mode)
+  ;; Ideally we'd just do (call-interactively 'help-follow) except that this
+  ;; assumes we're already in a *Help* buffer and reuses it, so it ends up
+  ;; incorrectly "reusing" the *Backtrace* buffer to show the help info.
   (unless pos
     (setq pos (point)))
   (unless (push-button pos)
@@ -671,8 +675,7 @@ For the cross-reference format, see `help-make-xrefs'."
                                 (progn (skip-syntax-forward "w_")
                                        (point)))))))
       (when (or (boundp sym) (fboundp sym) (facep sym))
-        (switch-to-buffer-other-window (generate-new-buffer "*Help*"))
-        (help-do-xref pos #'help-xref-interned (list sym))))))
+        (help-xref-interned sym)))))
 
 ;; When you change this, you may also need to change the number of
 ;; frames that the debugger skips.
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 0cebeeb6f7f..2f394c2c470 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -142,9 +142,9 @@ See the functions `find-function' and `find-variable'."
 
 (defun find-library-name (library)
   "Return the absolute file name of the Lisp source of LIBRARY."
-  ;; If the library is byte-compiled, try to find a source library by
-  ;; the same name.
-  (if (string-match "\\.el\\(c\\(\\..*\\)?\\)\\'" library)
+  ;; Strip off the extension to take advantage of library suffixes in
+  ;; the call to `locate-file'.
+  (if (string-match "\\.el\\(c\\(\\..*\\)?\\)?\\'" library)
       (setq library (replace-match "" t t library)))
   (or (locate-file library
                    (or find-function-source-path load-path)
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index c93eb0e62c4..b9a73218322 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -142,12 +142,13 @@
 (put 'easy-mmode-define-minor-mode 'doc-string-elt 2)
 (put 'define-minor-mode 'doc-string-elt 2)
 (put 'define-generic-mode 'doc-string-elt 7)
-;; define-global-mode has no explicit docstring.
-(put 'easy-mmode-define-global-mode 'doc-string-elt 0)
 (put 'define-ibuffer-filter 'doc-string-elt 2)
 (put 'define-ibuffer-op 'doc-string-elt 3)
 (put 'define-ibuffer-sorter 'doc-string-elt 2)
 (put 'lambda 'doc-string-elt 2)
+(put 'defalias 'doc-string-elt 3)
+(put 'defvaralias 'doc-string-elt 3)
+(put 'define-category 'doc-string-elt 2)
 
 (defvar lisp-doc-string-elt-property 'doc-string-elt
   "The symbol property that holds the docstring position info.")
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index a361469382e..71b9347b8b0 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -942,55 +942,55 @@ It also can't undo some Viper settings."
   ;; the advice.
   (eval-after-load
    "iso-acc"
-   (defadvice iso-accents-mode (around viper-iso-accents-advice activate)
-     "Set viper-automatic-iso-accents to iso-accents-mode."
-     (let ((arg (ad-get-arg 0)))
-       ad-do-it
-       (setq viper-automatic-iso-accents
-             (if (eq viper-current-state 'vi-state)
-                 (if arg
-                     ;; if iso-accents-mode was called with positive arg, turn
-                     ;; accents on
-                     (> (prefix-numeric-value arg) 0)
-                   ;; else: toggle viper-automatic-iso-accents
-                   (not viper-automatic-iso-accents))
-               ;; other states: accept what iso-accents-mode has done
-               iso-accents-mode))
-       ;; turn off ISO accents in vi-state
-       (if (eq viper-current-state 'vi-state)
-           (viper-set-iso-accents-mode nil))
-       (if (memq viper-current-state '(vi-state insert-state replace-state))
-           (message "Viper ISO accents mode: %s"
-                    (if viper-automatic-iso-accents "on" "off")))
-       )))
+   '(defadvice iso-accents-mode (around viper-iso-accents-advice activate)
+      "Set viper-automatic-iso-accents to iso-accents-mode."
+      (let ((arg (ad-get-arg 0)))
+        ad-do-it
+        (setq viper-automatic-iso-accents
+              (if (eq viper-current-state 'vi-state)
+                  (if arg
+                      ;; if iso-accents-mode was called with positive arg, turn
+                      ;; accents on
+                      (> (prefix-numeric-value arg) 0)
+                    ;; else: toggle viper-automatic-iso-accents
+                    (not viper-automatic-iso-accents))
+                ;; other states: accept what iso-accents-mode has done
+                iso-accents-mode))
+        ;; turn off ISO accents in vi-state
+        (if (eq viper-current-state 'vi-state)
+            (viper-set-iso-accents-mode nil))
+        (if (memq viper-current-state '(vi-state insert-state replace-state))
+            (message "Viper ISO accents mode: %s"
+                     (if viper-automatic-iso-accents "on" "off")))
+        )))
 
   ;; International input methods
   (if viper-emacs-p
       (eval-after-load "mule-cmds"
-        (progn
-          (defadvice inactivate-input-method (after viper-mule-advice activate)
-            "Set viper-special-input-method to disable intl. input methods."
-            (viper-inactivate-input-method-action))
-          (defadvice activate-input-method (after viper-mule-advice activate)
-            "Set viper-special-input-method to enable intl. input methods."
-            (viper-activate-input-method-action))
-          ))
+        '(progn
+           (defadvice inactivate-input-method (after viper-mule-advice activate)
+             "Set viper-special-input-method to disable intl. input methods."
+             (viper-inactivate-input-method-action))
+           (defadvice activate-input-method (after viper-mule-advice activate)
+             "Set viper-special-input-method to enable intl. input methods."
+             (viper-activate-input-method-action))
+           ))
     ;; XEmacs Although these hooks exist in Emacs, they don't seem to be always
     ;; called on input-method activation/deactivation, so we the above advise
     ;; functions instead.
     (eval-after-load "mule-cmds"
-      (progn
-        (add-hook 'input-method-activate-hook
-                  'viper-activate-input-method-action t)
-        (add-hook 'input-method-inactivate-hook
-                  'viper-inactivate-input-method-action t)))
+      '(progn
+         (add-hook 'input-method-activate-hook
+                   'viper-activate-input-method-action t)
+         (add-hook 'input-method-inactivate-hook
+                   'viper-inactivate-input-method-action t)))
     )
   (eval-after-load "mule-cmds"
-    (defadvice toggle-input-method (around viper-mule-advice activate)
-      "Adjust input-method toggling in vi-state."
-      (if (and viper-special-input-method (eq viper-current-state 'vi-state))
-          (viper-inactivate-input-method)
-        ad-do-it)))
+    '(defadvice toggle-input-method (around viper-mule-advice activate)
+       "Adjust input-method toggling in vi-state."
+       (if (and viper-special-input-method (eq viper-current-state 'vi-state))
+           (viper-inactivate-input-method)
+         ad-do-it)))
 
   ) ; viper-set-hooks
 
diff --git a/lisp/faces.el b/lisp/faces.el
index 21686d9f6ed..4cf96fc391d 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -33,7 +33,6 @@
   (autoload 'xw-defined-colors "x-win"))
 
 (defvar help-xref-stack-item)
-
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Font selection.
@@ -547,6 +546,9 @@ If FACE is a face-alias, get the documentation for the target face."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
+(defvar inhibit-face-set-after-frame-default nil
+  "If non-nil, that tells `face-set-after-frame-default' to do nothing.")
+
 (defun set-face-attribute (face frame &rest args)
   "Set attributes of FACE on FRAME from ARGS.
 
@@ -677,9 +679,12 @@ like an underlying face would be, with higher priority than underlying faces."
     (if (memq where '(0 t))
         (put (or (get face 'face-alias) face) 'face-modified t))
     (while args
-      (internal-set-lisp-face-attribute face (car args)
-                                        (purecopy (cadr args))
-                                        where)
+      ;; Don't recursively set the attributes from the frame's font param
+      ;; when we update the frame's font param fro the attributes.
+      (let ((inhibit-face-set-after-frame-default t))
+        (internal-set-lisp-face-attribute face (car args)
+                                          (purecopy (cadr args))
+                                          where))
       (setq args (cdr (cdr args))))))
 
 
@@ -1297,6 +1302,7 @@ If FRAME is omitted or nil, use the selected frame."
               ;; The next 4 sexps are copied from describe-function-1
               ;; and simplified.
               (setq file-name (symbol-file f 'defface))
+              (setq file-name (describe-simplify-lib-file-name file-name))
               (when file-name
                 (princ "Defined in `")
                 (princ file-name)
@@ -1738,23 +1744,23 @@ Value is the new frame created."
         (delete-frame frame)))
     frame))
 
-
 (defun face-set-after-frame-default (frame)
   "Set frame-local faces of FRAME from face specs and resources.
 Initialize colors of certain faces from frame parameters."
-  (if (face-attribute 'default :font t)
-      (set-face-attribute 'default frame :font
-                          (face-attribute 'default :font t))
-    (set-face-attribute 'default frame :family
-                        (face-attribute 'default :family t))
-    (set-face-attribute 'default frame :height
-                        (face-attribute 'default :height t))
-    (set-face-attribute 'default frame :slant
-                        (face-attribute 'default :slant t))
-    (set-face-attribute 'default frame :weight
-                        (face-attribute 'default :weight t))
-    (set-face-attribute 'default frame :width
-                        (face-attribute 'default :width t)))
+  (unless inhibit-face-set-after-frame-default
+    (if (face-attribute 'default :font t)
+        (set-face-attribute 'default frame :font
+                            (face-attribute 'default :font t))
+      (set-face-attribute 'default frame :family
+                          (face-attribute 'default :family t))
+      (set-face-attribute 'default frame :height
+                          (face-attribute 'default :height t))
+      (set-face-attribute 'default frame :slant
+                          (face-attribute 'default :slant t))
+      (set-face-attribute 'default frame :weight
+                          (face-attribute 'default :weight t))
+      (set-face-attribute 'default frame :width
+                          (face-attribute 'default :width t))))
   (dolist (face (face-list))
     ;; Don't let frame creation fail because of an invalid face spec.
     (condition-case ()
diff --git a/lisp/files.el b/lisp/files.el
index 0065e45aecf..80f849e6ca2 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -861,6 +861,43 @@ it means chase no more than that many links and then stop."
         (setq count (1+ count))))
     newname))
 
+(defun make-temp-file (prefix &optional dir-flag suffix)
+  "Create a temporary file.
+The returned file name (created by appending some random characters at the end
+of PREFIX, and expanding against `temporary-file-directory' if necessary),
+is guaranteed to point to a newly created empty file.
+You can then use `write-region' to write new data into the file.
+
+If DIR-FLAG is non-nil, create a new empty directory instead of a file.
+
+If SUFFIX is non-nil, add that at the end of the file name."
+  (let ((umask (default-file-modes))
+        file)
+    (unwind-protect
+        (progn
+          ;; Create temp files with strict access rights.  It's easy to
+          ;; loosen them later, whereas it's impossible to close the
+          ;; time-window of loose permissions otherwise.
+          (set-default-file-modes ?\700)
+          (while (condition-case ()
+                     (progn
+                       (setq file
+                             (make-temp-name
+                              (expand-file-name prefix temporary-file-directory)))
+                       (if suffix
+                           (setq file (concat file suffix)))
+                       (if dir-flag
+                           (make-directory file)
+                         (write-region "" nil file nil 'silent nil 'excl))
+                       nil)
+                   (file-already-exists t))
+            ;; the file was somehow created by someone else between
+            ;; `make-temp-name' and `write-region', let's try again.
+            nil)
+          file)
+      ;; Reset the umask.
+      (set-default-file-modes umask))))
+
 (defun recode-file-name (file coding new-coding &optional ok-if-already-exists)
   "Change the encoding of FILE's name from CODING to NEW-CODING.
 The value is a new name of FILE.
@@ -4438,6 +4475,57 @@ program specified by `directory-free-space-program' if that is non-nil."
                   (forward-word -1)
                   (buffer-substring (point) end)))))))))
 
+;; The following expression replaces `dired-move-to-filename-regexp'.
+(defvar directory-listing-before-filename-regexp
+  (let* ((l "\\([A-Za-z]\\|[^\0-\177]\\)")
+         (l-or-quote "\\([A-Za-z']\\|[^\0-\177]\\)")
+         ;; In some locales, month abbreviations are as short as 2 letters,
+         ;; and they can be followed by ".".
+         ;; In Breton, a month name  can include a quote character.
+         (month (concat l-or-quote l-or-quote "+\\.?"))
+         (s " ")
+         (yyyy "[0-9][0-9][0-9][0-9]")
+         (dd "[ 0-3][0-9]")
+         (HH:MM "[ 0-2][0-9][:.][0-5][0-9]")
+         (seconds "[0-6][0-9]\\([.,][0-9]+\\)?")
+         (zone "[-+][0-2][0-9][0-5][0-9]")
+         (iso-mm-dd "[01][0-9]-[0-3][0-9]")
+         (iso-time (concat HH:MM "\\(:" seconds "\\( ?" zone "\\)?\\)?"))
+         (iso (concat "\\(\\(" yyyy "-\\)?" iso-mm-dd "[ T]" iso-time
+                      "\\|" yyyy "-" iso-mm-dd "\\)"))
+         (western (concat "\\(" month s "+" dd "\\|" dd "\\.?" s month "\\)"
+                          s "+"
+                          "\\(" HH:MM "\\|" yyyy "\\)"))
+         (western-comma (concat month s "+" dd "," s "+" yyyy))
+         ;; Japanese MS-Windows ls-lisp has one-digit months, and
+         ;; omits the Kanji characters after month and day-of-month.
+         ;; On Mac OS X 10.3, the date format in East Asian locales is
+         ;; day-of-month digits followed by month digits.
+         (mm "[ 0-1]?[0-9]")
+         (east-asian
+          (concat "\\(" mm l "?" s dd l "?" s "+"
+                  "\\|" dd s mm s "+" "\\)"
+                  "\\(" HH:MM "\\|" yyyy l "?" "\\)")))
+         ;; The "[0-9]" below requires the previous column to end in a digit.
+         ;; This avoids recognizing `1 may 1997' as a date in the line:
+         ;; -r--r--r--   1 may      1997        1168 Oct 19 16:49 README
+
+         ;; The "[BkKMGTPEZY]?" below supports "ls -alh" output.
+         ;; The ".*" below finds the last match if there are multiple matches.
+         ;; This avoids recognizing `jservice  10  1024' as a date in the line:
+         ;; drwxr-xr-x  3 jservice  10  1024 Jul  2  1997 esg-host
+
+         ;; vc dired listings provide the state or blanks between file
+         ;; permissions and date.  The state is always surrounded by
+         ;; parantheses:
+         ;; -rw-r--r-- (modified) 2005-10-22 21:25 files.el
+         ;; This is not supported yet.
+    (concat ".*[0-9][BkKMGTPEZY]?" s
+            "\\(" western "\\|" western-comma "\\|" east-asian "\\|" iso "\\)"
+            s "+"))
+  "Regular expression to match up to the file name in a directory listing.
+The default value is designed to recognize dates and times
+regardless of the language.")
 
 (defvar insert-directory-ls-version 'unknown)
 
diff --git a/lisp/finder.el b/lisp/finder.el
index 737bb676a1a..dfbd6851129 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -100,6 +100,7 @@
   (let ((map (make-sparse-keymap)))
     (define-key map " " 'finder-select)
     (define-key map "f" 'finder-select)
+    (define-key map [follow-link] 'mouse-face)
     (define-key map [mouse-2]   'finder-mouse-select)
     (define-key map "\C-m"      'finder-select)
     (define-key map "?" 'finder-summary)
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index c0e9e9ab16b..e9fb87e0050 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2035,7 +2035,7 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
                  "save-match-data" "save-current-buffer" "unwind-protect"
                  "condition-case" "track-mouse"
                  "eval-after-load" "eval-and-compile" "eval-when-compile"
-                 "eval-when"
+                 "eval-when" "eval-at-startup" "eval-next-after-load"
                  "with-category-table"
                  "with-current-buffer" "with-electric-help"
                  "with-local-quit" "with-no-warnings"
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 04213b9fa45..d6d4d99a853 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,67 @@
+2005-10-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * pgg-def.el:
+        * pgg-gpg.el:
+        * pgg-parse.el:
+        * pgg-pgp.el:
+        * pgg-pgp5.el:
+        * pgg.el: Move to the parent lisp directory.
+
+2005-10-23  Chong Yidong  <cyd@stupidchicken.com>
+
+        * gnus-sum.el (gnus-ignored-from-addresses): Handle case where
+        user-mail-name is an empty string.
+
+2005-10-25  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-score.el (gnus-default-adaptive-score-alist): Set defaults
+        depending on gnus-score-decay-constant.
+
+2005-10-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * nnslashdot.el (nnslashdot-request-article)
+        (nnslashdot-retrieve-headers-1): Update to new HTML.
+
+2005-10-23  Simon Josefsson  <jas@extundo.com>
+
+        * imap.el (imap-gssapi-program): Align command line parameters
+        with latest GNU SASL.
+        (imap-gssapi-open): Ignore 'Trying ...' messages from GNU SASL.
+
+2005-10-20  Hiroshi Fujishima  <hiroshi.fujishima@gmail.com>  (tiny change)
+
+        * mail-source.el (mail-source-fetch-pop): Require pop3.
+        (mail-source-check-pop): Ditto.
+
+2005-10-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * rfc2047.el (rfc2047-decode-encoded-words): Fix the handling of
+        errors.
+
+2005-10-19  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-art.el (gnus-treat-strip-trailing-blank-lines)
+        (gnus-treat-strip-leading-blank-lines): Improve doc string.
+
+        * message.el (message-tool-bar-local-item-from-menu): Fix comment.
+
+2005-10-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * rfc2047.el (rfc2047-allow-incomplete-encoded-text): New variable.
+        (rfc2047-charset-to-coding-system): New function.
+        (rfc2047-decode-encoded-words): New function.
+        (rfc2047-decode-region): Use them.
+        (rfc2047-decode-cte): Remove.
+        (rfc2047-parse-and-decode): Remove.
+        (rfc2047-decode): Remove.
+
+2005-10-15  Kenichi Handa  <handa@m17n.org>
+
+        * rfc2047.el (rfc2047-decode-cte): New function.
+        (rfc2047-decode-region): Change the way to decode successive
+        encoded-words: decode B- or Q-encoding in each encoded-word,
+        concatenate them, and decode it as charset.
+
 2005-10-17  Chong Yidong  <cyd@stupidchicken.com>
 
         * gnus-cus.el (gnus-custom-map): New variable.  Bind mouse-1 to
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 249325a06f0..98e699cd80c 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1181,7 +1181,10 @@ See Info node `(gnus)Customizing Articles' for details."
 (defcustom gnus-treat-strip-trailing-blank-lines nil
   "Strip trailing blank lines.
 Valid values are nil, t, `head', `last', an integer or a predicate.
-See Info node `(gnus)Customizing Articles' for details."
+See Info node `(gnus)Customizing Articles' for details.
+
+When set to t, it also strips trailing blanks in all MIME parts.
+Consider to use `last' instead."
   :group 'gnus-article-treat
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-custom)
@@ -1189,7 +1192,9 @@ See Info node `(gnus)Customizing Articles' for details."
 (defcustom gnus-treat-strip-leading-blank-lines nil
   "Strip leading blank lines.
 Valid values are nil, t, `head', `last', an integer or a predicate.
-See Info node `(gnus)Customizing Articles' for details."
+See Info node `(gnus)Customizing Articles' for details.
+
+When set to t, it also strips trailing blanks in all MIME parts."
   :group 'gnus-article-treat
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-custom)
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index 22a579c3d69..2858ecb8343 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -221,13 +221,22 @@ This variable allows the same syntax as `gnus-home-score-file'."
                  (function :value fun)))
 
 (defcustom gnus-default-adaptive-score-alist
-  '((gnus-kill-file-mark)
+  `((gnus-kill-file-mark)
     (gnus-unread-mark)
-    (gnus-read-mark (from 3) (subject 30))
-    (gnus-catchup-mark (subject -10))
-    (gnus-killed-mark (from -1) (subject -20))
-    (gnus-del-mark (from -2) (subject -15)))
-  "*Alist of marks and scores."
+    (gnus-read-mark
+     (from , (+ 2 gnus-score-decay-constant))
+     (subject , (+ 27 gnus-score-decay-constant)))
+    (gnus-catchup-mark
+     (subject , (+ -7 (* -1 gnus-score-decay-constant))))
+    (gnus-killed-mark
+     (from , (- -1 gnus-score-decay-constant))
+     (subject , (+ -17 (* -1 gnus-score-decay-constant))))
+    (gnus-del-mark
+     (from , (- -1 gnus-score-decay-constant))
+     (subject , (+ -12 (* -1 gnus-score-decay-constant)))))
+  "Alist of marks and scores.
+If you use score decays, you might want to set values higher than
+`gnus-score-decay-constant'."
   :group 'gnus-score-adapt
   :type '(repeat (cons (symbol :tag "Mark")
                        (repeat (list (choice :tag "Header"
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index c9e93d19f42..51f03061d4f 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1000,7 +1000,9 @@ which it may alter in any way."
   :type '(repeat symbol))
 
 (defcustom gnus-ignored-from-addresses
-  (and user-mail-address (regexp-quote user-mail-address))
+  (and user-mail-address  
+       (not (string= user-mail-address ""))
+       (regexp-quote user-mail-address))
   "*Regexp of From headers that may be suppressed in favor of To headers."
   :version "21.1"
   :group 'gnus-summary
diff --git a/lisp/gnus/imap.el b/lisp/gnus/imap.el
index 062f1be4c94..b66d9eded8a 100644
--- a/lisp/gnus/imap.el
+++ b/lisp/gnus/imap.el
@@ -182,8 +182,7 @@ the list is tried until a successful connection is made."
   :type '(repeat string))
 
 (defcustom imap-gssapi-program (list
-                                (concat "gsasl --client --connect %s:%p "
-                                        "--imap --application-data "
+                                (concat "gsasl %s %p "
                                         "--mechanism GSSAPI "
                                         "--authentication-id %l")
                                 "imtest -m gssapi -u %l -p %p %s")
@@ -600,6 +599,10 @@ sure of changing the value of `foo'."
                         (or (not (looking-at "S: "))
                             (forward-char 3)
                             t)
+                        ;; GNU SASL may print 'Trying ...' first.
+                        (or (not (looking-at "Trying "))
+                            (forward-line)
+                            t)
                         (not (and (imap-parse-greeting)
                                   ;; success in imtest 1.6:
                                   (re-search-forward
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index 3f3ecc7919f..c31fa6825f4 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -740,6 +740,7 @@ Pass INFO on to CALLBACK."
               (funcall function mail-source-crash-box))
              ;; The default is to use pop3.el.
              (t
+              (require 'pop3)
               (let ((pop3-password password)
                     (pop3-maildrop user)
                     (pop3-mailhost server)
@@ -801,6 +802,7 @@ Pass INFO on to CALLBACK."
              (function)
              ;; The default is to use pop3.el.
              (t
+              (require 'pop3)
               (let ((pop3-password password)
                     (pop3-maildrop user)
                     (pop3-mailhost server)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 8ac3bb8cf18..06039347acc 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6565,9 +6565,8 @@ which specify the range to operate on."
 
 (defun message-tool-bar-local-item-from-menu (command icon in-map &optional from-map &rest props)
   ;; We need to make tool bar entries in local keymaps with
-  ;; `tool-bar-local-item-from-menu' in Emacs > 21.3
+  ;; `tool-bar-local-item-from-menu' in Emacs >= 22
   (if (fboundp 'tool-bar-local-item-from-menu)
-      ;; This is for Emacs 21.3
       (tool-bar-local-item-from-menu command icon in-map from-map props)
     (tool-bar-add-item-from-menu command icon from-map props)))
 
diff --git a/lisp/gnus/nnslashdot.el b/lisp/gnus/nnslashdot.el
index 9350a284e3d..522f94acabc 100644
--- a/lisp/gnus/nnslashdot.el
+++ b/lisp/gnus/nnslashdot.el
@@ -87,7 +87,7 @@
   (nnslashdot-possibly-change-server group server)
   (condition-case why
       (unless gnus-nov-is-evil
-        (nnslashdot-retrieve-headers-1 articles group))
+        (nnslashdot-retrieve-headers-1 articles group))
     (search-failed (nnslashdot-lose why))))
 
 (deffoo nnslashdot-retrieve-headers-1 (articles group)
@@ -142,41 +142,30 @@
           (setq article (if (and article (< start article)) article start))
           (goto-char point)
           (while (re-search-forward
-                  "<a name=\"\\([0-9]+\\)\"><\\(b\\|H4\\)>\\([^<]+\\)</\\(b\\|H4\\)>.*score:\\([^)]+\\))"
+                  "<a name=\"\\([0-9]+\\)\">\\([^<]+\\)</a>.*\n.*score:\\([^)]+\\))"
                   nil t)
             (setq cid (match-string 1)
-                  subject (match-string 3)
-                  score (match-string 5))
+                  subject (match-string 2)
+                  score (match-string 3))
             (unless (assq article (nth 4 entry))
               (setcar (nthcdr 4 entry) (cons (cons article cid) (nth 4 entry)))
               (setq changed t))
             (when (string-match "^Re: *" subject)
               (setq subject (concat "Re: " (substring subject (match-end 0)))))
-            (setq subject (mm-url-decode-entities-string subject))
-            (search-forward "<BR>")
-            (cond 
-             ((looking-at
-               "by[ \t\n]+<a[^>]+>\\([^<]+\\)</a>[ \t\n]*(\\(<[^>]+>\\)*\\([^<>)]+\\))")
-              (goto-char (- (match-end 0) 5))
-              (setq from (concat
-                          (mm-url-decode-entities-string (match-string 1))
-                          " <" (match-string 3) ">")))
-             ((looking-at "by[ \t\n]+<a[^>]+>\\([^<(]+\\) (\\([0-9]+\\))</a>")
-              (goto-char (- (match-end 0) 5))
-              (setq from (concat 
-                          (mm-url-decode-entities-string (match-string 1))
-                          " <" (match-string 2) ">")))
-             ((looking-at "by \\([^<>]*\\)[\t\n\r ]+on ")
-              (goto-char (- (match-end 0) 5))
-              (setq from (mm-url-decode-entities-string (match-string 1))))
-             (t
-              (setq from "")))
+            (setq subject (mm-url-decode-entities-string subject)
+                  from "")
+            (when (re-search-forward "by[ \t\n]+<[^>]+>\\([^<(]+\\)" nil t)
+              (setq from
+                    (concat
+                     (mm-url-decode-entities-string (match-string 1))
+                     " <nobody@slashdot.org>")))
             (search-forward "on ")
             (setq date
                   (nnslashdot-date-to-date
-                   (buffer-substring (point) (progn (skip-chars-forward "^()<>\n\r") (point)))))
-            (setq lines (/ (abs (- (search-forward "<td")
-                                   (search-forward "</td>")))
+                   (buffer-substring
+                    (point) (progn (skip-chars-forward "^()<>\n\r") (point)))))
+            (setq lines (/ (abs (- (search-forward "<div")
+                                   (search-forward "</div>")))
                            70))
             (if (not
                  (re-search-forward ".*cid=\\([0-9]+\\)\">Parent</A>" nil t))
@@ -255,23 +244,21 @@
             (when (numberp article)
               (if (= article 1)
                   (progn
-                    (re-search-forward
-                     "Posted by")
-                    (search-forward "<BR>")
+                    (search-forward "Posted by")
+                    (search-forward "<div class=\"intro\">")
                     (setq contents
                           (buffer-substring
                            (point)
                            (progn
-                             (re-search-forward
-                              "<IFRAME\\|<SCRIPT LANGUAGE=\"JAVASCRIPT\">\\|<!-- no ad 6 -->\\|&lt;&nbsp;[ \t\r\n]*<A HREF=\"\\(\\(http:\\)?//slashdot\\.org\\)?/article")
+                             (search-forward "commentwrap")
                              (match-beginning 0)))))
                 (setq cid (cdr (assq article
                                      (nth 4 (assoc group nnslashdot-groups)))))
                 (search-forward (format "<a name=\"%s\">" cid))
                 (setq contents
                       (buffer-substring
-                       (re-search-forward "<td[^>]*>")
-                       (search-forward "</td>")))))))
+                       (search-forward "<div class=\"commentBody\">")
+                       (search-forward "</div>")))))))
       (search-failed (nnslashdot-lose why)))
 
     (when contents
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el
index 84c46e936a3..d03a25c4564 100644
--- a/lisp/gnus/rfc2047.el
+++ b/lisp/gnus/rfc2047.el
@@ -812,6 +812,85 @@ it, put the following line in your ~/.gnus.el file:
 (defvar rfc2047-quote-decoded-words-containing-tspecials nil
   "If non-nil, quote decoded words containing special characters.")
 
+(defvar rfc2047-allow-incomplete-encoded-text t
+  "*Non-nil means allow incomplete encoded-text in successive encoded-words.
+Dividing of encoded-text in the place other than character boundaries
+violates RFC2047 section 5, while we have a capability to decode it.
+If it is non-nil, the decoder will decode B- or Q-encoding in each
+encoded-word, concatenate them, and decode it by charset.  Otherwise,
+the decoder will fully decode each encoded-word before concatenating
+them.")
+
+(defun rfc2047-charset-to-coding-system (charset)
+  "Return coding-system corresponding to MIME CHARSET.
+If your Emacs implementation can't decode CHARSET, return nil."
+  (when (stringp charset)
+    (setq charset (intern (downcase charset))))
+  (when (or (not charset)
+            (eq 'gnus-all mail-parse-ignored-charsets)
+            (memq 'gnus-all mail-parse-ignored-charsets)
+            (memq charset mail-parse-ignored-charsets))
+    (setq charset mail-parse-charset))
+  (let ((cs (mm-coding-system-p (mm-charset-to-coding-system charset))))
+    (cond ((eq cs 'ascii)
+           (setq cs (or (mm-charset-to-coding-system mail-parse-charset)
+                        'raw-text)))
+          (cs)
+          ((and charset
+                (listp mail-parse-ignored-charsets)
+                (memq 'gnus-unknown mail-parse-ignored-charsets))
+           (setq cs (mm-charset-to-coding-system mail-parse-charset))))
+    (if (eq cs 'ascii)
+        'raw-text
+      cs)))
+
+(defun rfc2047-decode-encoded-words (words)
+  "Decode successive encoded-words in WORDS and return a decoded string.
+Each element of WORDS looks like (CHARSET ENCODING ENCODED-TEXT
+ENCODED-WORD)."
+  (let (word charset cs encoding text rest)
+    (while words
+      (setq word (pop words))
+      (if (and (or (setq cs (rfc2047-charset-to-coding-system
+                             (setq charset (car word))))
+                   (progn
+                     (message "Unknown charset: %s" charset)
+                     nil))
+               (condition-case code
+                   (cond ((char-equal ?B (nth 1 word))
+                          (setq text (base64-decode-string
+                                      (rfc2047-pad-base64 (nth 2 word)))))
+                         ((char-equal ?Q (nth 1 word))
+                          (setq text (quoted-printable-decode-string
+                                      (mm-subst-char-in-string
+                                       ?_ ?  (nth 2 word) t)))))
+                 (error
+                  (message "%s" (error-message-string code))
+                  nil)))
+          (if (and rfc2047-allow-incomplete-encoded-text
+                   (eq cs (caar rest)))
+              ;; Concatenate text of which the charset is the same.
+              (setcdr (car rest) (concat (cdar rest) text))
+            (push (cons cs text) rest))
+        ;; Don't decode encoded-word.
+        (push (cons nil (nth 3 word)) rest)))
+    (while rest
+      (setq words (concat
+                   (or (and (setq cs (caar rest))
+                            (condition-case code
+                                (mm-decode-coding-string (cdar rest) cs)
+                              (error
+                               (message "%s" (error-message-string code))
+                               nil)))
+                       (concat (when (cdr rest) " ")
+                               (cdar rest)
+                               (when (and words
+                                          (not (eq (string-to-char words) ? )))
+                                 " ")))
+                   words)
+            rest (cdr rest)))
+    words))
+
 ;; Fixme: This should decode in place, not cons intermediate strings.
 ;; Also check whether it needs to worry about delimiting fields like
 ;; encoding.
@@ -826,32 +905,32 @@ it, put the following line in your ~/.gnus.el file:
   "Decode MIME-encoded words in region between START and END."
   (interactive "r")
   (let ((case-fold-search t)
-        b e)
+        (eword-regexp (eval-when-compile
+                        ;; Ignore whitespace between encoded-words.
+                        (concat "[\n\t ]*\\(" rfc2047-encoded-word-regexp
+                                "\\)")))
+        b e match words)
     (save-excursion
       (save-restriction
         (narrow-to-region start end)
-        (goto-char (point-min))
-        ;; Remove whitespace between encoded words.
-        (while (re-search-forward
-                (eval-when-compile
-                  (concat "\\(" rfc2047-encoded-word-regexp "\\)"
-                          "\\(\n?[ \t]\\)+"
-                          "\\(" rfc2047-encoded-word-regexp "\\)"))
-                nil t)
-          (delete-region (goto-char (match-end 1)) (match-beginning 7)))
-        ;; Decode the encoded words.
-        (setq b (goto-char (point-min)))
-        (while (re-search-forward rfc2047-encoded-word-regexp nil t)
-          (setq e (match-beginning 0))
-          (insert (rfc2047-parse-and-decode
-                   (prog1
-                       (match-string 0)
-                     (delete-region e (match-end 0)))))
-          (while (looking-at rfc2047-encoded-word-regexp)
-            (insert (rfc2047-parse-and-decode
-                     (prog1
-                         (match-string 0)
-                       (delete-region (point) (match-end 0))))))
+        (goto-char (setq b start))
+        ;; Look for the encoded-words.
+        (while (setq match (re-search-forward eword-regexp nil t))
+          (setq e (match-beginning 1)
+                end (match-end 0)
+                words nil)
+          (while match
+            (push (list (match-string 2) ;; charset
+                        (char-after (match-beginning 4)) ;; encoding
+                        (match-string 5) ;; encoded-text
+                        (match-string 1)) ;; encoded-word
+                  words)
+            ;; Look for the subsequent encoded-words.
+            (when (setq match (looking-at eword-regexp))
+              (goto-char (setq end (match-end 0)))))
+          ;; Replace the encoded-words with the decoded one.
+          (delete-region e end)
+          (insert (rfc2047-decode-encoded-words (nreverse words)))
           (save-restriction
             (narrow-to-region e (point))
             (goto-char e)
@@ -957,21 +1036,6 @@ it, put the following line in your ~/.gnus.el file:
             (mm-decode-coding-string string mail-parse-charset))
         (mm-string-as-multibyte string)))))
 
-(defun rfc2047-parse-and-decode (word)
-  "Decode WORD and return it if it is an encoded word.
-Return WORD if it is not not an encoded word or if the charset isn't
-decodable."
-  (if (not (string-match rfc2047-encoded-word-regexp word))
-      word
-    (or
-     (condition-case nil
-         (rfc2047-decode
-          (match-string 1 word)
-          (string-to-char (match-string 3 word))
-          (match-string 4 word))
-       (error word))
-     word)))                            ; un-decodable
-
 (defun rfc2047-pad-base64 (string)
   "Pad STRING to quartets."
   ;; Be more liberal to accept buggy base64 strings. If
@@ -987,36 +1051,6 @@ decodable."
       (2 (concat string "=="))
       (3 (concat string "=")))))
 
-(defun rfc2047-decode (charset encoding string)
-  "Decode STRING from the given MIME CHARSET in the given ENCODING.
-Valid ENCODINGs are the characters \"B\" and \"Q\".
-If your Emacs implementation can't decode CHARSET, return nil."
-  (if (stringp charset)
-      (setq charset (intern (downcase charset))))
-  (if (or (not charset)
-          (eq 'gnus-all mail-parse-ignored-charsets)
-          (memq 'gnus-all mail-parse-ignored-charsets)
-          (memq charset mail-parse-ignored-charsets))
-      (setq charset mail-parse-charset))
-  (let ((cs (mm-charset-to-coding-system charset)))
-    (if (and (not cs) charset
-             (listp mail-parse-ignored-charsets)
-             (memq 'gnus-unknown mail-parse-ignored-charsets))
-        (setq cs (mm-charset-to-coding-system mail-parse-charset)))
-    (when cs
-      (when (eq cs 'ascii)
-        (setq cs (or mail-parse-charset 'raw-text)))
-      (mm-decode-coding-string
-       (cond
-        ((char-equal ?B encoding)
-         (base64-decode-string
-          (rfc2047-pad-base64 string)))
-        ((char-equal ?Q encoding)
-         (quoted-printable-decode-string
-          (mm-subst-char-in-string ?_ ? string t)))
-        (t (error "Invalid encoding: %c" encoding)))
-       cs))))
-
 (provide 'rfc2047)
 
 ;;; arch-tag: a07fe3d4-22b5-4c4a-bd89-b1f82d5d36f6
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 979ff06a307..41602f1c7a2 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -311,6 +311,19 @@ face (according to `face-differs-from-default-p')."
   ;; Return value is like the one from help-split-fundoc, but highlighted
   (cons usage doc))
 
+(defun describe-simplify-lib-file-name (file)
+  "Simplify a library name FILE to a relative name, and make it a source file."
+  (if file
+      ;; Try converting the absolute file name to a library name.
+      (let ((libname (file-name-nondirectory file)))
+        ;; Now convert that back to a file name and see if we get
+        ;; the original one.  If so, they are equivalent.
+        (if (equal file (locate-file libname load-path '("")))
+            (if (string-match "[.]elc?\\'" libname)
+                (substring libname 0 -1)
+              libname)
+          file))))
+
 ;;;###autoload
 (defun describe-function-1 (function)
   (let* ((def (if (symbolp function)
@@ -363,6 +376,7 @@ face (according to `face-differs-from-default-p')."
               (help-xref-button 1 'help-function def)))))
     (or file-name
         (setq file-name (symbol-file function 'defun)))
+    (setq file-name (describe-simplify-lib-file-name file-name))
     (when (equal file-name "loaddefs.el")
       ;; Find the real def site of the preloaded function.
       ;; This is necessary only for defaliases.
@@ -537,6 +551,7 @@ it is displayed along with the global value."
             ;; change the format of the buffer's initial line in case
             ;; anything expects the current format.)
             (let ((file-name (symbol-file variable 'defvar)))
+              (setq file-name (describe-simplify-lib-file-name file-name))
               (when (equal file-name "loaddefs.el")
                 ;; Find the real def site of the preloaded variable.
                 (let ((location
diff --git a/lisp/image.el b/lisp/image.el
index 72e6ee8e633..87102dd34e4 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -64,9 +64,7 @@ When the name of an image file match REGEXP, it is assumed to
 be of image type IMAGE-TYPE.")
 
 
-(defvar image-load-path
-  (list (file-name-as-directory (expand-file-name "images" data-directory))
-        'data-directory 'load-path)
+(defvar image-load-path nil
   "List of locations in which to search for image files.
 If an element is a string, it defines a directory to search.
 If an element is a variable symbol whose value is a string, that
@@ -74,6 +72,11 @@ value defines a directory to search.
 If an element is a variable symbol whose value is a list, the
 value is used as a list of directories to search.")
 
+(eval-at-startup
+ (setq image-load-path
+       (list (file-name-as-directory (expand-file-name "images" data-directory))
+             'data-directory 'load-path)))
+
 (defun image-jpeg-p (data)
   "Value is non-nil if DATA, a string, consists of JFIF image data.
 We accept the tag Exif because that is the same format."
@@ -427,10 +430,11 @@ Example:
 
    (defimage test-image ((:type xpm :file \"~/test1.xpm\")
                          (:type xbm :file \"~/test1.xbm\")))"
+  (declare (doc-string 3))
   `(defvar ,symbol (find-image ',specs) ,doc))
 
 
 (provide 'image)
 
-;;; arch-tag: 8e76a07b-eb48-4f3e-a7a0-1a7ba9f096b3
+;; arch-tag: 8e76a07b-eb48-4f3e-a7a0-1a7ba9f096b3
 ;;; image.el ends here
diff --git a/lisp/info.el b/lisp/info.el
index c94e4121dc8..ec74160188a 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3736,20 +3736,18 @@ the variable `Info-file-list-for-emacs'."
                   ;; *Note is often used where *note should have been
                   (goto-char start)
                   (skip-syntax-backward " ")
+                  (when (memq (char-before) '(?\( ?\[ ?\{))
+                    ;; Check whether the paren is preceded by
+                    ;; an end of sentence
+                    (skip-syntax-backward " ("))
                   (setq other-tag
                         (cond ((memq (char-before) '(nil ?\. ?! ??))
                                "See ")
-                              ((memq (char-before) '(?\, ?\; ?\: ?-))
-                               "see ")
-                              ((memq (char-before) '(?\( ?\[ ?\{))
-                               ;; Check whether the paren is preceded by
-                               ;; an end of sentence
-                               (skip-syntax-backward " (")
-                               (if (memq (char-before) '(nil ?\. ?! ??))
-                                   "See "
-                                 "see "))
-                              ((save-match-data (looking-at "\n\n"))
-                               "See "))))
+                              ((save-match-data
+                                 (save-excursion
+                                   (search-forward "\n\n" start t)))
+                               "See ")
+                              (t "see "))))
                 (goto-char next)
                 (add-text-properties
                  (match-beginning 1)
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index d51d871abe8..20bf5696f2e 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -85,7 +85,9 @@ Return t if file exists."
               ;; Make `kill-buffer' quiet.
               (set-buffer-modified-p nil))
             ;; Have the original buffer current while we eval.
-            (eval-buffer buffer nil file
+            (eval-buffer buffer nil
+                         ;; This is compatible with what `load' does.
+                         (if purify-flag file fullname)
                          ;; If this Emacs is running with --unibyte,
                          ;; convert multibyte strings to unibyte
                          ;; after reading them.
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 0f9cc8f231d..3998764957e 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -1598,13 +1598,21 @@ Quail map for the sequence."
   (or (and (consp def) (aref (cdr def) (car (car def))))
       def
       (and (> len 1)
-           (let ((str (quail-get-current-str
-                       (1- len)
-                       (quail-map-definition (quail-lookup-key
-                                              quail-current-key (1- len))))))
+           (let* ((str (quail-get-current-str
+                        (1- len)
+                        (quail-map-definition (quail-lookup-key
+                                               quail-current-key (1- len)))))
+                  (substr1 (substring quail-current-key (1- len) len))
+                  (str1 (and (quail-deterministic)
+                             (quail-get-current-str
+                              1
+                              (quail-map-definition (quail-lookup-key
+                                                     substr1 1))))))
              (if str
                  (concat (if (stringp str) str (char-to-string str))
-                         (substring quail-current-key (1- len) len)))))))
+                         (if str1
+                             (if (stringp str1) str1 (char-to-string str1))
+                           substr1)))))))
 
 (defvar quail-guidance-translations-starting-column 20)
 
@@ -1720,6 +1728,20 @@ sequence counting from the head."
              ;; And, we can terminate the current translation.
              t)
 
+            ((quail-deterministic)
+             ;; No way to handle the last character in this context.
+             ;; Commit the longest successfully translated characters, and
+             ;; handle the remaining characters in a new loop.
+             (setq def nil)
+             (while (and (not def) (> len 1))
+               (setq len (1- len))
+               (setq def (quail-map-definition
+                          (quail-lookup-key quail-current-key len))))
+             (if def (setq quail-current-str
+                           (quail-get-current-str len def))
+               (setq quail-current-str (aref quail-current-key 0)))
+             len)
+
             (t
              ;; No way to handle the last character in this context.
              (setq def (quail-map-definition
diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el
index 6340dafc12a..68d77123cde 100644
--- a/lisp/international/utf-7.el
+++ b/lisp/international/utf-7.el
@@ -36,6 +36,7 @@
 
 ;;; Code:
 
+;;;###autoload(autoload-coding-system 'utf-7 '(require 'utf-7))
 (make-coding-system
  'utf-7 0 ?U
  "UTF-7 encoding of Unicode (RFC 2152)"
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index b76c675cba4..9e6121c17a1 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -353,7 +353,12 @@ Defaults to the whole buffer.  END can be out of bounds."
            ;; what's already been refontified.
            (when (and jit-lock-context-unfontify-pos
                       (< jit-lock-context-unfontify-pos next)
-                      (>= jit-lock-context-unfontify-pos start))
+                      (>= jit-lock-context-unfontify-pos start)
+                      ;; Don't move boundary forward if we have to
+                      ;; refontify previous text.  Otherwise, we risk moving
+                      ;; it past the end of the multiline property and thus
+                      ;; forget about this multiline region altogether.
+                      (not (get-text-property start 'jit-lock-defer-multiline)))
              (setq jit-lock-context-unfontify-pos next))
 
            ;; Fontify the chunk, and mark it as fontified.
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index ef54a899c64..b0e7b9691fa 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" (17178 22152))
+;;;;;;  "play/5x5.el" (17187 59902))
 ;;; Generated autoloads from play/5x5.el
 
 (autoload (quote 5x5) "5x5" "\
@@ -64,7 +64,7 @@ should return a grid vector array that is the new solution.
 ;;;***
 
 ;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el"
-;;;;;;  (17178 22152))
+;;;;;;  (17226 24577))
 ;;; Generated autoloads from progmodes/ada-mode.el
 
 (autoload (quote ada-add-extensions) "ada-mode" "\
@@ -125,7 +125,7 @@ If you use ada-xref.el:
 ;;;***
 
 ;;;### (autoloads (ada-header) "ada-stmt" "progmodes/ada-stmt.el"
-;;;;;;  (17178 22152))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from progmodes/ada-stmt.el
 
 (autoload (quote ada-header) "ada-stmt" "\
@@ -136,7 +136,7 @@ Insert a descriptive header at the top of the file.
 ;;;***
 
 ;;;### (autoloads (ada-find-file) "ada-xref" "progmodes/ada-xref.el"
-;;;;;;  (17178 22152))
+;;;;;;  (17226 24577))
 ;;; Generated autoloads from progmodes/ada-xref.el
 
 (autoload (quote ada-find-file) "ada-xref" "\
@@ -151,7 +151,7 @@ Completion is available.
 ;;;;;;  change-log-mode add-change-log-entry-other-window add-change-log-entry
 ;;;;;;  find-change-log prompt-for-change-log-name add-log-mailing-address
 ;;;;;;  add-log-full-name add-log-current-defun-function) "add-log"
-;;;;;;  "add-log.el" (17178 22141))
+;;;;;;  "add-log.el" (17254 63790))
 ;;; Generated autoloads from add-log.el
 
 (defvar add-log-current-defun-function nil "\
@@ -288,8 +288,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" (17178
-;;;;;;  22143))
+;;;;;;  ad-redefinition-action) "advice" "emacs-lisp/advice.el" (17226
+;;;;;;  24574))
 ;;; Generated autoloads from emacs-lisp/advice.el
 
 (defvar ad-redefinition-action (quote warn) "\
@@ -388,7 +388,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" (17178 22141))
+;;;;;;  align) "align" "align.el" (17187 59901))
 ;;; Generated autoloads from align.el
 
 (autoload (quote align) "align" "\
@@ -477,43 +477,224 @@ A replacement function for `newline-and-indent', aligning as it goes.
 
 ;;;***
 
-;;;### (autoloads (allout-init) "allout" "allout.el" (17178 22141))
+;;;### (autoloads (outlineify-sticky allout-mode) "allout" "allout.el"
+;;;;;;  (17254 63790))
 ;;; Generated autoloads from allout.el
 
-(autoload (quote allout-init) "allout" "\
-Prime `allout-mode' to enable/disable auto-activation, wrt `allout-layout'.
+(autoload (quote allout-mode) "allout" "\
+Toggle minor mode for controlling exposure and editing of text outlines.
+
+Optional arg forces mode to re-initialize iff arg is positive num or
+symbol.  Allout outline mode always runs as a minor mode.
+
+Allout outline mode provides extensive outline oriented formatting and
+manipulation.  It enables structural editing of outlines, as well as
+navigation and exposure.  It also is specifically aimed at
+accommodating syntax-sensitive text like programming languages.  (For
+an example, see the allout code itself, which is organized as an allout
+outline.)
+
+In addition to outline navigation and exposure, allout includes:
+
+ - topic-oriented repositioning, promotion/demotion, cut, and paste
+ - integral outline exposure-layout
+ - incremental search with dynamic exposure and reconcealment of hidden text
+ - automatic topic-number maintenance
+ - easy topic encryption and decryption
+ - \"Hot-spot\" operation, for single-keystroke maneuvering and
+    exposure control.  (See the allout-mode docstring.)
+
+and many other features.
+
+Below is a description of the bindings, and then explanation of
+special `allout-mode' features and terminology.  See also the outline
+menubar additions for quick reference to many of the features, and see
+the docstring of the function `allout-init' for instructions on
+priming your emacs session for automatic activation of `allout-mode'.
+
+
+The bindings are dictated by the `allout-keybindings-list' and
+`allout-command-prefix' variables.
+
+        Navigation:                                Exposure Control:
+        ----------                                 ----------------
+\\[allout-next-visible-heading] allout-next-visible-heading     | \\[allout-hide-current-subtree] allout-hide-current-subtree
+\\[allout-previous-visible-heading] allout-previous-visible-heading | \\[allout-show-children] allout-show-children
+\\[allout-up-current-level] allout-up-current-level         | \\[allout-show-current-subtree] allout-show-current-subtree
+\\[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
+
+        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.
+
+        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
+                                         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
+                                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
+                                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
+
+        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-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
+                                Like above 'copy-exposed', but convert topic
+                                prefixes to section.subsection... numeric
+                                format.
+ESC ESC (allout-init t) Setup Emacs session for outline mode
+                                auto-activation.
+
+                  Encrypted Entries
+
+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.
+
+See the `allout-toggle-current-subtree-encryption' function and
+`allout-encrypt-unencrypted-on-saves' customization variable for details.
+
+                 HOT-SPOT Operation
+
+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\"
+\(\\[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.
+
+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]
+twice in a row to get to the hot-spot.
+
+                            Terminology
+
+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,
+CURRENT topic:
+        The visible topic most immediately containing the cursor.
+DEPTH:  The degree of nesting of a topic; it increases with
+        containment.  Also called the:
+LEVEL:  The same as DEPTH.
+
+ANCESTORS:
+        The topics that contain a topic.
+PARENT: A topic's immediate ancestor.  It has a depth one less than
+        the topic.
+OFFSPRING:
+        The topics contained by a topic;
+SUBTOPIC:
+        An immediate offspring of a topic;
+CHILDREN:
+        The immediate offspring of a topic.
+SIBLINGS:
+        Topics having the same parent and depth.
+
+Topic text constituents:
+
+HEADER: The first line of a topic, include the topic PREFIX and header
+        text.
+PREFIX: The leading text of a topic which distinguishes it from normal
+        text.  It has a strict form, which consists of a prefix-lead
+        string, padding, and a bullet.  The bullet may be followed by a
+        number, indicating the ordinal number of the topic among its
+        siblings, a space, and then the header text.
+
+        The relative length of the PREFIX determines the nesting depth
+        of the topic.
+PREFIX-LEAD:
+        The string at the beginning of a topic prefix, normally a `.'.
+        It can be customized by changing the setting of
+        `allout-header-prefix' and then reinitializing `allout-mode'.
+
+        By setting the prefix-lead to the comment-string of a
+        programming language, you can embed outline structuring in
+        program code without interfering with the language processing
+        of that code.  See `allout-use-mode-specific-leader'
+        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: 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.
+ENTRY:  The text contained in a topic before any offspring.
+BODY:   Same as ENTRY.
+
+
+EXPOSURE:
+        The state of a topic which determines the on-screen visibility
+        of its offspring and contained text.
+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.
+OPEN:   A topic that is not closed, though its offspring or body may be.
+
+\(fn &optional TOGGLE)" t nil)
+
+(defalias (quote outlinify-sticky) (quote outlineify-sticky))
+
+(autoload (quote outlineify-sticky) "allout" "\
+Activate outline mode and establish file var so it is started subsequently.
+
+See doc-string for `allout-layout' and `allout-init' for details on
+setup for auto-startup.
 
-MODE is one of the following symbols:
-
- - nil (or no argument) deactivate auto-activation/layout;
- - `activate', enable auto-activation only;
- - `ask', enable auto-activation, and enable auto-layout but with
-   confirmation for layout operation solicited from user each time;
- - `report', just report and return the current auto-activation state;
- - anything else (eg, t) for auto-activation and auto-layout, without
-   any confirmation check.
-
-Use this function to setup your Emacs session for automatic activation
-of allout outline mode, contingent to the buffer-specific setting of
-the `allout-layout' variable.  (See `allout-layout' and
-`allout-expose-topic' docstrings for more details on auto layout).
-
-`allout-init' works by setting up (or removing)
-`allout-find-file-hook' in `find-file-hook', and giving
-`allout-auto-activation' a suitable setting.
-
-To prime your Emacs session for full auto-outline operation, include
-the following two lines in your Emacs init file:
-
-\(require 'allout)
-\(allout-init t)
-
-\(fn &optional MODE)" t nil)
+\(fn &optional ARG)" t nil)
 
 ;;;***
 
 ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp"
-;;;;;;  "net/ange-ftp.el" (17178 22151))
+;;;;;;  "net/ange-ftp.el" (17254 63791))
 ;;; Generated autoloads from net/ange-ftp.el
 
 (defalias (quote ange-ftp-re-read-dir) (quote ange-ftp-reread-dir))
@@ -535,7 +716,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (animate-birthday-present animate-sequence animate-string)
-;;;;;;  "animate" "play/animate.el" (17178 22152))
+;;;;;;  "animate" "play/animate.el" (17226 24576))
 ;;; Generated autoloads from play/animate.el
 
 (autoload (quote animate-string) "animate" "\
@@ -563,7 +744,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" (17178 22141))
+;;;;;;  "ansi-color" "ansi-color.el" (17187 59901))
 ;;; Generated autoloads from ansi-color.el
 
 (autoload (quote ansi-color-for-comint-mode-on) "ansi-color" "\
@@ -589,7 +770,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" (17178 22152))
+;;;;;;  "antlr-mode" "progmodes/antlr-mode.el" (17187 59902))
 ;;; Generated autoloads from progmodes/antlr-mode.el
 
 (autoload (quote antlr-show-makefile-rules) "antlr-mode" "\
@@ -628,7 +809,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" (17178 20480))
+;;;;;;  appt-issue-message) "appt" "calendar/appt.el" (17229 28052))
 ;;; Generated autoloads from calendar/appt.el
 
 (defvar appt-issue-message t "\
@@ -716,7 +897,7 @@ ARG is positive, otherwise off.
 
 ;;;### (autoloads (apropos-documentation apropos-value apropos apropos-documentation-property
 ;;;;;;  apropos-command apropos-variable) "apropos" "apropos.el"
-;;;;;;  (17178 22141))
+;;;;;;  (17226 24570))
 ;;; Generated autoloads from apropos.el
 
 (autoload (quote apropos-variable) "apropos" "\
@@ -770,8 +951,8 @@ Returns list of symbols and documentation found.
 
 ;;;***
 
-;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17178
-;;;;;;  22141))
+;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17238
+;;;;;;  21257))
 ;;; Generated autoloads from arc-mode.el
 
 (autoload (quote archive-mode) "arc-mode" "\
@@ -791,7 +972,7 @@ archive.
 
 ;;;***
 
-;;;### (autoloads (array-mode) "array" "array.el" (17178 22141))
+;;;### (autoloads (array-mode) "array" "array.el" (17187 59901))
 ;;; Generated autoloads from array.el
 
 (autoload (quote array-mode) "array" "\
@@ -862,8 +1043,8 @@ Entering array mode calls the function `array-mode-hook'.
 
 ;;;***
 
-;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (17178
-;;;;;;  22154))
+;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (17229
+;;;;;;  28057))
 ;;; Generated autoloads from textmodes/artist.el
 
 (autoload (quote artist-mode) "artist" "\
@@ -1068,8 +1249,8 @@ Keymap summary
 
 ;;;***
 
-;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (17178
-;;;;;;  22152))
+;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from progmodes/asm-mode.el
 
 (autoload (quote asm-mode) "asm-mode" "\
@@ -1097,7 +1278,7 @@ Special commands:
 ;;;***
 
 ;;;### (autoloads (auto-show-mode auto-show-mode) "auto-show" "obsolete/auto-show.el"
-;;;;;;  (17178 20481))
+;;;;;;  (17187 59881))
 ;;; Generated autoloads from obsolete/auto-show.el
 
 (defvar auto-show-mode nil "\
@@ -1113,7 +1294,7 @@ This command is obsolete.
 ;;;***
 
 ;;;### (autoloads (autoarg-kp-mode autoarg-mode) "autoarg" "autoarg.el"
-;;;;;;  (17178 22141))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from autoarg.el
 
 (defvar autoarg-mode nil "\
@@ -1170,7 +1351,7 @@ This is similar to \\[autoarg-mode] but rebinds the keypad keys `kp-1'
 ;;;***
 
 ;;;### (autoloads (autoconf-mode) "autoconf" "progmodes/autoconf.el"
-;;;;;;  (17178 22152))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from progmodes/autoconf.el
 
 (autoload (quote autoconf-mode) "autoconf" "\
@@ -1181,7 +1362,7 @@ Major mode for editing Autoconf configure.in files.
 ;;;***
 
 ;;;### (autoloads (auto-insert-mode define-auto-insert auto-insert)
-;;;;;;  "autoinsert" "autoinsert.el" (17178 22141))
+;;;;;;  "autoinsert" "autoinsert.el" (17187 59901))
 ;;; Generated autoloads from autoinsert.el
 
 (autoload (quote auto-insert) "autoinsert" "\
@@ -1221,7 +1402,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"
-;;;;;;  (17178 22143))
+;;;;;;  (17229 28053))
 ;;; Generated autoloads from emacs-lisp/autoload.el
 
 (autoload (quote update-file-autoloads) "autoload" "\
@@ -1236,7 +1417,7 @@ Return FILE if there was no autoload cookie in it, else nil.
 
 (autoload (quote update-directory-autoloads) "autoload" "\
 Update loaddefs.el with all the current autoloads from DIRS, and no old ones.
-This uses `update-file-autoloads' (which see) do its work.
+This uses `update-file-autoloads' (which see) to do its work.
 In an interactive call, you must give one argument, the name
 of a single directory.  In a call from Lisp, you can supply multiple
 directories as separate arguments, but this usage is discouraged.
@@ -1256,7 +1437,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" (17178 22141))
+;;;;;;  "autorevert" "autorevert.el" (17187 59901))
 ;;; Generated autoloads from autorevert.el
 
 (autoload (quote auto-revert-mode) "autorevert" "\
@@ -1326,7 +1507,7 @@ Use `auto-revert-mode' to revert a particular buffer.
 ;;;***
 
 ;;;### (autoloads (mouse-avoidance-mode mouse-avoidance-mode) "avoid"
-;;;;;;  "avoid.el" (17178 22141))
+;;;;;;  "avoid.el" (17187 59901))
 ;;; Generated autoloads from avoid.el
 
 (defvar mouse-avoidance-mode nil "\
@@ -1367,7 +1548,7 @@ definition of \"random distance\".)
 ;;;***
 
 ;;;### (autoloads (backquote) "backquote" "emacs-lisp/backquote.el"
-;;;;;;  (17178 22143))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from emacs-lisp/backquote.el
 
 (autoload (quote backquote) "backquote" "\
@@ -1392,7 +1573,7 @@ Vectors work just like lists.  Nested backquotes are permitted.
 ;;;***
 
 ;;;### (autoloads (display-battery-mode battery) "battery" "battery.el"
-;;;;;;  (17178 22141))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from battery.el
  (put 'battery-mode-line-string 'risky-local-variable t)
 
@@ -1425,7 +1606,7 @@ seconds.
 ;;;***
 
 ;;;### (autoloads (benchmark benchmark-run-compiled benchmark-run)
-;;;;;;  "benchmark" "emacs-lisp/benchmark.el" (17178 22143))
+;;;;;;  "benchmark" "emacs-lisp/benchmark.el" (17187 59901))
 ;;; Generated autoloads from emacs-lisp/benchmark.el
 
 (autoload (quote benchmark-run) "benchmark" "\
@@ -1457,8 +1638,8 @@ non-interactive use see also `benchmark-run' and
 
 ;;;***
 
-;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17178
-;;;;;;  22154))
+;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17238
+;;;;;;  21257))
 ;;; Generated autoloads from textmodes/bibtex.el
 
 (autoload (quote bibtex-mode) "bibtex" "\
@@ -1520,7 +1701,7 @@ if that value is non-nil.
 
 ;;;### (autoloads (binhex-decode-region binhex-decode-region-external
 ;;;;;;  binhex-decode-region-internal) "binhex" "gnus/binhex.el"
-;;;;;;  (17178 22145))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/binhex.el
 
 (defconst binhex-begin-line "^:...............................................................$")
@@ -1543,8 +1724,8 @@ Binhex decode region between START and END.
 
 ;;;***
 
-;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (17178
-;;;;;;  22152))
+;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from play/blackbox.el
 
 (autoload (quote blackbox) "blackbox" "\
@@ -1666,7 +1847,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" (17178 22141))
+;;;;;;  bookmark-set) "bookmark" "bookmark.el" (17244 4913))
 ;;; Generated autoloads from bookmark.el
  (define-key ctl-x-map "rb" 'bookmark-jump)
  (define-key ctl-x-map "rm" 'bookmark-set)
@@ -1856,7 +2037,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" (17178 22151))
+;;;;;;  "browse-url" "net/browse-url.el" (17187 59902))
 ;;; 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))) "\
@@ -2187,8 +2368,8 @@ Default to the URL around or before point.
 
 ;;;***
 
-;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (17178
-;;;;;;  22152))
+;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from play/bruce.el
 
 (autoload (quote bruce) "bruce" "\
@@ -2204,7 +2385,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" (17178 22141))
+;;;;;;  "bs" "bs.el" (17187 59901))
 ;;; Generated autoloads from bs.el
 
 (autoload (quote bs-cycle-next) "bs" "\
@@ -2245,8 +2426,8 @@ name of buffer configuration.
 ;;;***
 
 ;;;### (autoloads (insert-text-button make-text-button insert-button
-;;;;;;  make-button define-button-type) "button" "button.el" (17178
-;;;;;;  22141))
+;;;;;;  make-button define-button-type) "button" "button.el" (17187
+;;;;;;  59901))
 ;;; 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) "\
@@ -2334,7 +2515,7 @@ Also see `make-text-button'.
 ;;;;;;  batch-byte-compile-if-not-done display-call-tree byte-compile
 ;;;;;;  compile-defun byte-compile-file byte-recompile-directory
 ;;;;;;  byte-force-recompile) "bytecomp" "emacs-lisp/bytecomp.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17254 63790))
 ;;; Generated autoloads from emacs-lisp/bytecomp.el
 
 (autoload (quote byte-force-recompile) "bytecomp" "\
@@ -2426,7 +2607,7 @@ For example, invoke `emacs -batch -f batch-byte-recompile-directory .'.
 
 ;;;***
 
-;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17178 20480))
+;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17187 59880))
 ;;; Generated autoloads from calendar/cal-dst.el
 
 (put (quote calendar-daylight-savings-starts) (quote risky-local-variable) t)
@@ -2436,7 +2617,7 @@ For example, invoke `emacs -batch -f batch-byte-recompile-directory .'.
 ;;;***
 
 ;;;### (autoloads (list-yahrzeit-dates) "cal-hebrew" "calendar/cal-hebrew.el"
-;;;;;;  (17178 22142))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from calendar/cal-hebrew.el
 
 (autoload (quote list-yahrzeit-dates) "cal-hebrew" "\
@@ -2451,7 +2632,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"
-;;;;;;  (17178 22142))
+;;;;;;  (17229 28052))
 ;;; Generated autoloads from calc/calc.el
 
 (defvar calc-settings-file (convert-standard-filename "~/.calc.el") "\
@@ -2529,8 +2710,8 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (calculator) "calculator" "calculator.el" (17178
-;;;;;;  22142))
+;;;### (autoloads (calculator) "calculator" "calculator.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from calculator.el
 
 (autoload (quote calculator) "calculator" "\
@@ -2557,8 +2738,8 @@ See the documentation for `calculator-mode' for more information.
 ;;;;;;  all-christian-calendar-holidays all-hebrew-calendar-holidays
 ;;;;;;  mark-holidays-in-calendar view-calendar-holidays-initially
 ;;;;;;  calendar-remove-frame-by-deleting mark-diary-entries-in-calendar
-;;;;;;  number-of-diary-entries view-diary-entries-initially calendar-offset)
-;;;;;;  "calendar" "calendar/calendar.el" (17178 22143))
+;;;;;;  view-diary-entries-initially calendar-offset) "calendar"
+;;;;;;  "calendar/calendar.el" (17229 28052))
 ;;; Generated autoloads from calendar/calendar.el
 
 (defvar calendar-offset 0 "\
@@ -2578,26 +2759,6 @@ be overridden by the value of `calendar-setup'.")
 
 (custom-autoload (quote view-diary-entries-initially) "calendar")
 
-(defvar number-of-diary-entries 1 "\
-*Specifies how many days of diary entries are to be displayed initially.
-This variable affects the diary display when the command \\[diary] is used,
-or if the value of the variable `view-diary-entries-initially' is t.  For
-example, if the default value 1 is used, then only the current day's diary
-entries will be displayed.  If the value 2 is used, then both the current
-day's and the next day's entries will be displayed.
-
-The value can also be a vector such as [0 2 2 2 2 4 1]; this value
-says to display no diary entries on Sunday, the display the entries
-for the current date and the day after on Monday through Thursday,
-display Friday through Monday's entries on Friday, and display only
-Saturday's entries on Saturday.
-
-This variable does not affect the diary display with the `d' command
-from the calendar; in that case, the prefix argument controls the
-number of days of diary entries displayed.")
-
-(custom-autoload (quote number-of-diary-entries) "calendar")
-
 (defvar mark-diary-entries-in-calendar nil "\
 *Non-nil means mark dates with diary entries, in the calendar window.
 The marking symbol is specified by the variable `diary-entry-marker'.")
@@ -2709,7 +2870,7 @@ functions that move by days and weeks.")
 
 For example,
 
-  (add-hook 'calendar-move-hook (lambda () (view-diary-entries 1)))
+  (add-hook 'calendar-move-hook (lambda () (diary-view-entries 1)))
 
 redisplays the diary for whatever date the cursor is moved to.")
 
@@ -3149,7 +3310,7 @@ movement commands will not work correctly.")
 ;;;***
 
 ;;;### (autoloads (canlock-verify canlock-insert-header) "canlock"
-;;;;;;  "gnus/canlock.el" (17178 22145))
+;;;;;;  "gnus/canlock.el" (17187 59901))
 ;;; Generated autoloads from gnus/canlock.el
 
 (autoload (quote canlock-insert-header) "canlock" "\
@@ -3167,7 +3328,7 @@ it fails.
 ;;;***
 
 ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el"
-;;;;;;  (17178 22152))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from progmodes/cc-engine.el
 
 (autoload (quote c-guess-basic-syntax) "cc-engine" "\
@@ -3180,7 +3341,7 @@ This function does not do any hidden buffer changes.
 
 ;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode
 ;;;;;;  c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el"
-;;;;;;  (17178 22152))
+;;;;;;  (17226 24577))
 ;;; Generated autoloads from progmodes/cc-mode.el
 
 (autoload (quote c-initialize-cc-mode) "cc-mode" "\
@@ -3338,7 +3499,7 @@ Key bindings:
 ;;;***
 
 ;;;### (autoloads (c-set-offset c-add-style c-set-style) "cc-styles"
-;;;;;;  "progmodes/cc-styles.el" (17178 22152))
+;;;;;;  "progmodes/cc-styles.el" (17226 24577))
 ;;; Generated autoloads from progmodes/cc-styles.el
 
 (autoload (quote c-set-style) "cc-styles" "\
@@ -3395,7 +3556,7 @@ and exists only for compatibility reasons.
 
 ;;;### (autoloads (ccl-execute-with-args check-ccl-program define-ccl-program
 ;;;;;;  declare-ccl-program ccl-dump ccl-compile) "ccl" "international/ccl.el"
-;;;;;;  (17178 20480))
+;;;;;;  (17187 59880))
 ;;; Generated autoloads from international/ccl.el
 
 (autoload (quote ccl-compile) "ccl" "\
@@ -3654,7 +3815,7 @@ See the documentation of `define-ccl-program' for the detail of CCL program.
 ;;;***
 
 ;;;### (autoloads (cfengine-mode) "cfengine" "progmodes/cfengine.el"
-;;;;;;  (17178 22152))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from progmodes/cfengine.el
 
 (autoload (quote cfengine-mode) "cfengine" "\
@@ -3676,7 +3837,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"
-;;;;;;  (17178 22144))
+;;;;;;  (17226 24574))
 ;;; Generated autoloads from emacs-lisp/checkdoc.el
 
 (autoload (quote checkdoc) "checkdoc" "\
@@ -3859,8 +4020,8 @@ checking of documentation strings.
 ;;;***
 
 ;;;### (autoloads (encode-hz-buffer encode-hz-region decode-hz-buffer
-;;;;;;  decode-hz-region) "china-util" "language/china-util.el" (17178
-;;;;;;  20481))
+;;;;;;  decode-hz-region) "china-util" "language/china-util.el" (17187
+;;;;;;  59881))
 ;;; Generated autoloads from language/china-util.el
 
 (autoload (quote decode-hz-region) "china-util" "\
@@ -3888,7 +4049,7 @@ Encode the text in the current buffer to HZ.
 ;;;***
 
 ;;;### (autoloads (command-history list-command-history repeat-matching-complex-command)
-;;;;;;  "chistory" "chistory.el" (17178 22143))
+;;;;;;  "chistory" "chistory.el" (17187 59901))
 ;;; Generated autoloads from chistory.el
 
 (autoload (quote repeat-matching-complex-command) "chistory" "\
@@ -3927,7 +4088,7 @@ and runs the normal hook `command-history-hook'.
 
 ;;;***
 
-;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (17178 22144))
+;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (17187 59901))
 ;;; Generated autoloads from emacs-lisp/cl.el
 
 (defvar custom-print-functions nil "\
@@ -3943,7 +4104,7 @@ a future Emacs interpreter will be able to use it.")
 ;;;***
 
 ;;;### (autoloads (common-lisp-indent-function) "cl-indent" "emacs-lisp/cl-indent.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from emacs-lisp/cl-indent.el
 
 (autoload (quote common-lisp-indent-function) "cl-indent" "\
@@ -3954,7 +4115,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (c-macro-expand) "cmacexp" "progmodes/cmacexp.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17226 24577))
 ;;; Generated autoloads from progmodes/cmacexp.el
 
 (autoload (quote c-macro-expand) "cmacexp" "\
@@ -3974,8 +4135,8 @@ For use inside Lisp programs, see also `c-macro-expansion'.
 
 ;;;***
 
-;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (17178
-;;;;;;  22143))
+;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from cmuscheme.el
 
 (autoload (quote run-scheme) "cmuscheme" "\
@@ -3996,7 +4157,7 @@ is run).
 ;;;***
 
 ;;;### (autoloads (cp-make-coding-system) "code-pages" "international/code-pages.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17226 24576))
 ;;; Generated autoloads from international/code-pages.el
 
 (autoload (quote cp-make-coding-system) "code-pages" "\
@@ -4049,7 +4210,7 @@ Return an updated `non-iso-charset-alist'.
 
 ;;;### (autoloads (codepage-setup cp-supported-codepages cp-offset-for-codepage
 ;;;;;;  cp-language-for-codepage cp-charset-for-codepage cp-make-coding-systems-for-codepage)
-;;;;;;  "codepage" "international/codepage.el" (17178 20480))
+;;;;;;  "codepage" "international/codepage.el" (17226 24576))
 ;;; Generated autoloads from international/codepage.el
 
 (autoload (quote cp-make-coding-systems-for-codepage) "codepage" "\
@@ -4108,7 +4269,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"
-;;;;;;  (17178 22143))
+;;;;;;  (17226 24571))
 ;;; Generated autoloads from comint.el
 
 (defvar comint-output-filter-functions (quote (comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt)) "\
@@ -4198,8 +4359,8 @@ REGEXP-GROUP is the regular expression group in REGEXP to use.
 
 ;;;***
 
-;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17178
-;;;;;;  22143))
+;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from compare-w.el
 
 (autoload (quote compare-windows) "compare-w" "\
@@ -4234,9 +4395,9 @@ on third call it again advances points to the next difference and so on.
 
 ;;;### (autoloads (compilation-next-error-function compilation-minor-mode
 ;;;;;;  compilation-shell-minor-mode compilation-mode compilation-start
-;;;;;;  compile compilation-search-path compilation-ask-about-save
-;;;;;;  compilation-window-height compilation-mode-hook) "compile"
-;;;;;;  "progmodes/compile.el" (17178 22153))
+;;;;;;  compile compilation-disable-input compile-command compilation-search-path
+;;;;;;  compilation-ask-about-save compilation-window-height compilation-mode-hook)
+;;;;;;  "compile" "progmodes/compile.el" (17238 21257))
 ;;; Generated autoloads from progmodes/compile.el
 
 (defvar compilation-mode-hook nil "\
@@ -4286,6 +4447,29 @@ nil as an element means to try the default directory.")
 
 (custom-autoload (quote compilation-search-path) "compile")
 
+(defvar compile-command "make -k " "\
+*Last shell command used to do a compilation; default for next compilation.
+
+Sometimes it is useful for files to supply local values for this variable.
+You might also use mode hooks to specify it in certain modes, like this:
+
+    (add-hook 'c-mode-hook
+       (lambda ()
+         (unless (or (file-exists-p \"makefile\")
+                     (file-exists-p \"Makefile\"))
+           (set (make-local-variable 'compile-command)
+                (concat \"make -k \"
+                        (file-name-sans-extension buffer-file-name))))))")
+
+(custom-autoload (quote compile-command) "compile")
+
+(defvar compilation-disable-input nil "\
+*If non-nil, send end-of-file as compilation process input.
+This only affects platforms that support asynchronous processes (see
+`start-process'); synchronous compilation processes never accept input.")
+
+(custom-autoload (quote compilation-disable-input) "compile")
+
 (autoload (quote compile) "compile" "\
 Compile the program including the current buffer.  Default: run `make'.
 Runs COMMAND, a shell command, in a separate process asynchronously
@@ -4374,7 +4558,7 @@ This is the value of `next-error-function' in Compilation buffers.
 ;;;***
 
 ;;;### (autoloads (partial-completion-mode) "complete" "complete.el"
-;;;;;;  (17178 22143))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from complete.el
 
 (defvar partial-completion-mode nil "\
@@ -4411,7 +4595,7 @@ See also the variable `PC-include-file-path'.
 ;;;***
 
 ;;;### (autoloads (dynamic-completion-mode) "completion" "completion.el"
-;;;;;;  (17178 22143))
+;;;;;;  (17226 24571))
 ;;; Generated autoloads from completion.el
 
 (autoload (quote dynamic-completion-mode) "completion" "\
@@ -4424,7 +4608,7 @@ Enable dynamic word-completion.
 ;;;### (autoloads (decompose-composite-char compose-last-chars compose-chars-after
 ;;;;;;  find-composition compose-chars decompose-string compose-string
 ;;;;;;  decompose-region compose-region encode-composition-rule)
-;;;;;;  "composite" "composite.el" (17178 22143))
+;;;;;;  "composite" "composite.el" (17187 59901))
 ;;; Generated autoloads from composite.el
 
 (defconst reference-point-alist (quote ((tl . 0) (tc . 1) (tr . 2) (Bl . 3) (Bc . 4) (Br . 5) (bl . 6) (bc . 7) (br . 8) (cl . 9) (cc . 10) (cr . 11) (top-left . 0) (top-center . 1) (top-right . 2) (base-left . 3) (base-center . 4) (base-right . 5) (bottom-left . 6) (bottom-center . 7) (bottom-right . 8) (center-left . 9) (center-center . 10) (center-right . 11) (ml . 3) (mc . 10) (mr . 5) (mid-left . 3) (mid-center . 10) (mid-right . 5))) "\
@@ -4645,7 +4829,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" (17178 22154))
+;;;;;;  conf-mode) "conf-mode" "textmodes/conf-mode.el" (17238 21257))
 ;;; Generated autoloads from textmodes/conf-mode.el
 
 (autoload (quote conf-mode) "conf-mode" "\
@@ -4686,7 +4870,7 @@ Conf Mode starter for Unix style Conf files.
 Comments start with `#'.
 For details see `conf-mode'.  Example:
 
-# Conf mode font-locks this right on Unix and with C-c C-u
+# Conf mode font-locks this right on Unix and with \\[conf-unix-mode]
 
 \[Desktop Entry]
          Encoding=UTF-8
@@ -4701,7 +4885,7 @@ Conf Mode starter for Windows style Conf files.
 Comments start with `;'.
 For details see `conf-mode'.  Example:
 
-; Conf mode font-locks this right on Windows and with C-c C-w
+; Conf mode font-locks this right on Windows and with \\[conf-windows-mode]
 
 \[ExtShellFolderViews]
 Default={5984FFE0-28D4-11CF-AE66-08002B2E1262}
@@ -4718,7 +4902,7 @@ Comments start with `#' but are also recognized with `//' or
 between `/*' and `*/'.
 For details see `conf-mode'.  Example:
 
-# Conf mode font-locks this right with C-c C-j (Java properties)
+# Conf mode font-locks this right with \\[conf-javaprop-mode] (Java properties)
 // another kind of comment
 /* yet another */
 
@@ -4742,7 +4926,7 @@ KEYWORDS, or any non-nil non-string for no keywords.
 
 For details see `conf-mode'.  Example:
 
-# Conf mode font-locks this right with C-c C-s (space separated)
+# Conf mode font-locks this right with \\[conf-space-mode] (space separated)
 
 image/jpeg                      jpeg jpg jpe
 image/png                       png
@@ -4761,7 +4945,7 @@ Conf Mode starter for Colon files.
 \"Assignments\" are with `:'.
 For details see `conf-mode'.  Example:
 
-# Conf mode font-locks this right with C-c C-c (colon)
+# Conf mode font-locks this right with \\[conf-colon-mode] (colon)
 
 <Multi_key> <exclam> <exclam>           : \"\\241\"     exclamdown
 <Multi_key> <c> <slash>                 : \"\\242\"     cent
@@ -4773,7 +4957,7 @@ Conf Mode starter for Adobe/CUPS PPD files.
 Comments start with `*%' and \"assignments\" are with `:'.
 For details see `conf-mode'.  Example:
 
-*% Conf mode font-locks this right with C-c C-p (PPD)
+*% Conf mode font-locks this right with \\[conf-ppd-mode] (PPD)
 
 *DefaultTransfer: Null
 *Transfer Null.Inverse: \"{ 1 exch sub }\"
@@ -4785,7 +4969,7 @@ Conf Mode starter for Xdefaults files.
 Comments start with `!' and \"assignments\" are with `:'.
 For details see `conf-mode'.  Example:
 
-! Conf mode font-locks this right with C-c C-x (.Xdefaults)
+! Conf mode font-locks this right with \\[conf-xdefaults-mode] (.Xdefaults)
 
 *background:                    gray99
 *foreground:                    black
@@ -4795,7 +4979,7 @@ For details see `conf-mode'.  Example:
 ;;;***
 
 ;;;### (autoloads (shuffle-vector cookie-snarf cookie-insert cookie)
-;;;;;;  "cookie1" "play/cookie1.el" (17178 22152))
+;;;;;;  "cookie1" "play/cookie1.el" (17187 59902))
 ;;; Generated autoloads from play/cookie1.el
 
 (autoload (quote cookie) "cookie1" "\
@@ -4827,7 +5011,7 @@ Randomly permute the elements of VECTOR (all permutations equally likely).
 ;;;***
 
 ;;;### (autoloads (copyright copyright-fix-years copyright-update)
-;;;;;;  "copyright" "emacs-lisp/copyright.el" (17178 22144))
+;;;;;;  "copyright" "emacs-lisp/copyright.el" (17187 59901))
 ;;; Generated autoloads from emacs-lisp/copyright.el
 
 (autoload (quote copyright-update) "copyright" "\
@@ -4855,7 +5039,7 @@ Insert a copyright by $ORGANIZATION notice at cursor.
 ;;;***
 
 ;;;### (autoloads (cperl-mode) "cperl-mode" "progmodes/cperl-mode.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from progmodes/cperl-mode.el
 
 (autoload (quote cperl-mode) "cperl-mode" "\
@@ -5028,7 +5212,7 @@ or as help on variables `cperl-tips', `cperl-problems',
 ;;;***
 
 ;;;### (autoloads (cpp-parse-edit cpp-highlight-buffer) "cpp" "progmodes/cpp.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from progmodes/cpp.el
 
 (autoload (quote cpp-highlight-buffer) "cpp" "\
@@ -5047,7 +5231,7 @@ Edit display information for cpp conditionals.
 ;;;***
 
 ;;;### (autoloads (crisp-mode crisp-mode) "crisp" "emulation/crisp.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from emulation/crisp.el
 
 (defvar crisp-mode nil "\
@@ -5071,7 +5255,7 @@ With ARG, turn CRiSP mode on if ARG is positive, off otherwise.
 ;;;***
 
 ;;;### (autoloads (completing-read-multiple) "crm" "emacs-lisp/crm.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from emacs-lisp/crm.el
 
 (autoload (quote completing-read-multiple) "crm" "\
@@ -5107,7 +5291,7 @@ INHERIT-INPUT-METHOD.
 ;;;***
 
 ;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el"
-;;;;;;  (17178 24780))
+;;;;;;  (17251 25141))
 ;;; Generated autoloads from emulation/cua-base.el
 
 (defvar cua-mode nil "\
@@ -5169,7 +5353,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" (17178 22143))
+;;;;;;  customize-set-value) "cus-edit" "cus-edit.el" (17254 63790))
 ;;; Generated autoloads from cus-edit.el
  (add-hook 'same-window-regexps "\\`\\*Customiz.*\\*\\'")
 
@@ -5424,7 +5608,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" (17178 22143))
+;;;;;;  custom-declare-face) "cus-face" "cus-face.el" (17244 4913))
 ;;; Generated autoloads from cus-face.el
 
 (autoload (quote custom-declare-face) "cus-face" "\
@@ -5494,7 +5678,7 @@ This means reset FACE to its value in FROM-THEME.
 ;;;***
 
 ;;;### (autoloads (customize-create-theme) "cus-theme" "cus-theme.el"
-;;;;;;  (17178 22143))
+;;;;;;  (17187 59914))
 ;;; Generated autoloads from cus-theme.el
 
 (autoload (quote customize-create-theme) "cus-theme" "\
@@ -5505,7 +5689,7 @@ Create a custom theme.
 ;;;***
 
 ;;;### (autoloads (cvs-status-mode) "cvs-status" "cvs-status.el"
-;;;;;;  (17178 22143))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from cvs-status.el
 
 (autoload (quote cvs-status-mode) "cvs-status" "\
@@ -5516,7 +5700,7 @@ Mode used for cvs status output.
 ;;;***
 
 ;;;### (autoloads (global-cwarn-mode turn-on-cwarn-mode cwarn-mode)
-;;;;;;  "cwarn" "progmodes/cwarn.el" (17178 22153))
+;;;;;;  "cwarn" "progmodes/cwarn.el" (17187 59902))
 ;;; Generated autoloads from progmodes/cwarn.el
 
 (autoload (quote cwarn-mode) "cwarn" "\
@@ -5560,7 +5744,7 @@ in which `turn-on-cwarn-mode-if-enabled' turns it on.
 
 ;;;### (autoloads (standard-display-cyrillic-translit cyrillic-encode-alternativnyj-char
 ;;;;;;  cyrillic-encode-koi8-r-char) "cyril-util" "language/cyril-util.el"
-;;;;;;  (17178 20481))
+;;;;;;  (17187 59881))
 ;;; Generated autoloads from language/cyril-util.el
 
 (autoload (quote cyrillic-encode-koi8-r-char) "cyril-util" "\
@@ -5589,7 +5773,7 @@ If the argument is nil, we return the display table to its standard state.
 ;;;***
 
 ;;;### (autoloads (dabbrev-expand dabbrev-completion) "dabbrev" "dabbrev.el"
-;;;;;;  (17178 22143))
+;;;;;;  (17238 21257))
 ;;; Generated autoloads from dabbrev.el
  (define-key esc-map "/" 'dabbrev-expand)
  (define-key esc-map [?\C-/] 'dabbrev-completion)
@@ -5636,8 +5820,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion].
 
 ;;;***
 
-;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (17178
-;;;;;;  22153))
+;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from progmodes/dcl-mode.el
 
 (autoload (quote dcl-mode) "dcl-mode" "\
@@ -5764,7 +5948,7 @@ There is some minimal font-lock support (see vars
 ;;;***
 
 ;;;### (autoloads (cancel-debug-on-entry debug-on-entry debug) "debug"
-;;;;;;  "emacs-lisp/debug.el" (17178 22144))
+;;;;;;  "emacs-lisp/debug.el" (17254 63790))
 ;;; Generated autoloads from emacs-lisp/debug.el
 
 (setq debugger (quote debug))
@@ -5808,7 +5992,7 @@ To specify a nil argument interactively, exit with an empty minibuffer.
 ;;;***
 
 ;;;### (autoloads (decipher-mode decipher) "decipher" "play/decipher.el"
-;;;;;;  (17178 22152))
+;;;;;;  (17226 24576))
 ;;; Generated autoloads from play/decipher.el
 
 (autoload (quote decipher) "decipher" "\
@@ -5837,8 +6021,8 @@ The most useful commands are:
 ;;;***
 
 ;;;### (autoloads (delimit-columns-rectangle delimit-columns-region
-;;;;;;  delimit-columns-customize) "delim-col" "delim-col.el" (17178
-;;;;;;  22143))
+;;;;;;  delimit-columns-customize) "delim-col" "delim-col.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from delim-col.el
 
 (autoload (quote delimit-columns-customize) "delim-col" "\
@@ -5862,8 +6046,8 @@ START and END delimits the corners of text rectangle.
 
 ;;;***
 
-;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (17178
-;;;;;;  22153))
+;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (17187
+;;;;;;  59914))
 ;;; Generated autoloads from progmodes/delphi.el
 
 (autoload (quote delphi-mode) "delphi" "\
@@ -5913,8 +6097,8 @@ no args, if that value is non-nil.
 
 ;;;***
 
-;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (17178
-;;;;;;  22143))
+;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from delsel.el
 
 (defalias (quote pending-delete-mode) (quote delete-selection-mode))
@@ -5944,7 +6128,7 @@ any selection.
 ;;;***
 
 ;;;### (autoloads (derived-mode-init-mode-variables define-derived-mode)
-;;;;;;  "derived" "emacs-lisp/derived.el" (17178 22144))
+;;;;;;  "derived" "emacs-lisp/derived.el" (17187 59901))
 ;;; Generated autoloads from emacs-lisp/derived.el
 
 (autoload (quote define-derived-mode) "derived" "\
@@ -6009,7 +6193,7 @@ the first time the mode is used.
 ;;;***
 
 ;;;### (autoloads (describe-char describe-text-properties) "descr-text"
-;;;;;;  "descr-text.el" (17178 22143))
+;;;;;;  "descr-text.el" (17187 59914))
 ;;; Generated autoloads from descr-text.el
 
 (autoload (quote describe-text-properties) "descr-text" "\
@@ -6034,7 +6218,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" (17178 22143))
+;;;;;;  desktop-save-mode) "desktop" "desktop.el" (17244 4913))
 ;;; Generated autoloads from desktop.el
 
 (defvar desktop-save-mode nil "\
@@ -6199,7 +6383,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"
-;;;;;;  (17178 20480))
+;;;;;;  (17187 59879))
 ;;; Generated autoloads from gnus/deuglify.el
 
 (defvar gnus-outlook-deuglify-unwrap-min 45 "\
@@ -6248,7 +6432,7 @@ Deuglify broken Outlook (Express) articles and redisplay.
 ;;;***
 
 ;;;### (autoloads (devanagari-post-read-conversion devanagari-compose-region)
-;;;;;;  "devan-util" "language/devan-util.el" (17178 20481))
+;;;;;;  "devan-util" "language/devan-util.el" (17187 59881))
 ;;; Generated autoloads from language/devan-util.el
 
 (defconst devanagari-consonant "[\x51ad5-\x51af9\x51b38-\x51b3f]")
@@ -6266,7 +6450,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib"
-;;;;;;  "calendar/diary-lib.el" (17178 22143))
+;;;;;;  "calendar/diary-lib.el" (17229 28052))
 ;;; Generated autoloads from calendar/diary-lib.el
 
 (autoload (quote diary) "diary-lib" "\
@@ -6312,7 +6496,7 @@ Major mode for editing the diary file.
 ;;;***
 
 ;;;### (autoloads (diff-backup diff diff-command diff-switches) "diff"
-;;;;;;  "diff.el" (17178 22143))
+;;;;;;  "diff.el" (17226 24572))
 ;;; Generated autoloads from diff.el
 
 (defvar diff-switches "-c" "\
@@ -6346,7 +6530,7 @@ With prefix arg, prompt for diff switches.
 ;;;***
 
 ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "diff-mode.el"
-;;;;;;  (17178 22143))
+;;;;;;  (17238 21257))
 ;;; Generated autoloads from diff-mode.el
 
 (autoload (quote diff-mode) "diff-mode" "\
@@ -6358,7 +6542,7 @@ If you edit the buffer manually, diff-mode will try to update the hunk
 headers for you on-the-fly.
 
 You can also switch between context diff and unified diff with \\[diff-context->unified],
-or vice versa with \\[diff-unified->context] and you can also revert the direction of
+or vice versa with \\[diff-unified->context] and you can also reverse the direction of
 a diff with \\[diff-reverse-direction].
 
 \(fn)" t nil)
@@ -6375,7 +6559,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" (17178 22143))
+;;;;;;  "dired" "dired.el" (17254 63790))
 ;;; Generated autoloads from dired.el
 
 (defvar dired-listing-switches "-al" "\
@@ -6580,7 +6764,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" (17178 22143))
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" (17226 24572))
 ;;; Generated autoloads from dired-aux.el
 
 (autoload (quote dired-diff) "dired-aux" "\
@@ -6988,7 +7172,7 @@ true then the type of the file linked to by FILE is printed instead.
 
 ;;;***
 
-;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (17178 22143))
+;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (17254 63790))
 ;;; Generated autoloads from dired-x.el
 
 (autoload (quote dired-jump) "dired-x" "\
@@ -7002,7 +7186,7 @@ buffer and try again.
 
 ;;;***
 
-;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (17178 22143))
+;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (17187 59901))
 ;;; Generated autoloads from dirtrack.el
 
 (autoload (quote dirtrack) "dirtrack" "\
@@ -7021,8 +7205,8 @@ You can enable directory tracking by adding this function to
 
 ;;;***
 
-;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (17178
-;;;;;;  22144))
+;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from emacs-lisp/disass.el
 
 (autoload (quote disassemble) "disass" "\
@@ -7040,7 +7224,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" (17178 22143))
+;;;;;;  make-display-table) "disp-table" "disp-table.el" (17244 4913))
 ;;; Generated autoloads from disp-table.el
 
 (autoload (quote make-display-table) "disp-table" "\
@@ -7141,7 +7325,7 @@ for users who call this function in `.emacs'.
 ;;;***
 
 ;;;### (autoloads (dissociated-press) "dissociate" "play/dissociate.el"
-;;;;;;  (17178 22152))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from play/dissociate.el
 
 (autoload (quote dissociated-press) "dissociate" "\
@@ -7157,7 +7341,7 @@ Default is 2.
 
 ;;;***
 
-;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (17178 22143))
+;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (17226 24572))
 ;;; Generated autoloads from dnd.el
 
 (defvar dnd-protocol-alist (quote (("^file:///" . dnd-open-local-file) ("^file://" . dnd-open-file) ("^file:" . dnd-open-local-file))) "\
@@ -7178,7 +7362,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" (17178 22154))
+;;;;;;  "textmodes/dns-mode.el" (17187 59902))
 ;;; Generated autoloads from textmodes/dns-mode.el
 
 (autoload (quote dns-mode) "dns-mode" "\
@@ -7201,7 +7385,7 @@ Locate SOA record and increment the serial field.
 
 ;;;***
 
-;;;### (autoloads (doctor) "doctor" "play/doctor.el" (17178 22152))
+;;;### (autoloads (doctor) "doctor" "play/doctor.el" (17254 63791))
 ;;; Generated autoloads from play/doctor.el
 
 (autoload (quote doctor) "doctor" "\
@@ -7212,7 +7396,7 @@ Switch to *doctor* buffer and start giving psychotherapy.
 ;;;***
 
 ;;;### (autoloads (double-mode double-mode) "double" "double.el"
-;;;;;;  (17178 22143))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from double.el
 
 (defvar double-mode nil "\
@@ -7233,7 +7417,7 @@ when pressed twice.  See variable `double-map' for details.
 
 ;;;***
 
-;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (17178 22152))
+;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (17187 59902))
 ;;; Generated autoloads from play/dunnet.el
 
 (autoload (quote dunnet) "dunnet" "\
@@ -7244,7 +7428,7 @@ Switch to *dungeon* buffer and start game.
 ;;;***
 
 ;;;### (autoloads (gnus-earcon-display) "earcon" "gnus/earcon.el"
-;;;;;;  (17178 22145))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/earcon.el
 
 (autoload (quote gnus-earcon-display) "earcon" "\
@@ -7256,7 +7440,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" (17178 22144))
+;;;;;;  "emacs-lisp/easy-mmode.el" (17187 59901))
 ;;; Generated autoloads from emacs-lisp/easy-mmode.el
 
 (defalias (quote easy-mmode-define-minor-mode) (quote define-minor-mode))
@@ -7342,8 +7526,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" (17178
-;;;;;;  22144))
+;;;;;;  easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from emacs-lisp/easymenu.el
 
 (put (quote easy-menu-define) (quote lisp-indent-function) (quote defun))
@@ -7488,7 +7672,7 @@ to implement dynamic menus.
 ;;;;;;  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" (17178 20481))
+;;;;;;  "progmodes/ebnf2ps.el" (17226 24577))
 ;;; Generated autoloads from progmodes/ebnf2ps.el
 
 (autoload (quote ebnf-customize) "ebnf2ps" "\
@@ -7747,8 +7931,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" (17178
-;;;;;;  22153))
+;;;;;;  ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (17226
+;;;;;;  24577))
 ;;; Generated autoloads from progmodes/ebrowse.el
 
 (autoload (quote ebrowse-tree-mode) "ebrowse" "\
@@ -7899,7 +8083,7 @@ Display statistics for a class tree.
 ;;;***
 
 ;;;### (autoloads (electric-buffer-list) "ebuff-menu" "ebuff-menu.el"
-;;;;;;  (17178 22143))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from ebuff-menu.el
 
 (autoload (quote electric-buffer-list) "ebuff-menu" "\
@@ -7924,7 +8108,7 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry.
 ;;;***
 
 ;;;### (autoloads (Electric-command-history-redo-expression) "echistory"
-;;;;;;  "echistory.el" (17178 22143))
+;;;;;;  "echistory.el" (17226 24572))
 ;;; Generated autoloads from echistory.el
 
 (autoload (quote Electric-command-history-redo-expression) "echistory" "\
@@ -7936,7 +8120,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing.
 ;;;***
 
 ;;;### (autoloads (edebug-eval-top-level-form def-edebug-spec edebug-all-forms
-;;;;;;  edebug-all-defs) "edebug" "emacs-lisp/edebug.el" (17178 22144))
+;;;;;;  edebug-all-defs) "edebug" "emacs-lisp/edebug.el" (17187 59901))
 ;;; Generated autoloads from emacs-lisp/edebug.el
 
 (defvar edebug-all-defs nil "\
@@ -7999,7 +8183,7 @@ already is one.)
 ;;;;;;  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" (17178 22143))
+;;;;;;  ediff-files3 ediff-files) "ediff" "ediff.el" (17229 28053))
 ;;; Generated autoloads from ediff.el
 
 (autoload (quote ediff-files) "ediff" "\
@@ -8237,7 +8421,7 @@ With optional NODE, goes to that node.
 ;;;***
 
 ;;;### (autoloads (ediff-customize) "ediff-help" "ediff-help.el"
-;;;;;;  (17178 22143))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from ediff-help.el
 
 (autoload (quote ediff-customize) "ediff-help" "\
@@ -8247,7 +8431,7 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads nil "ediff-hook" "ediff-hook.el" (17178 22143))
+;;;### (autoloads nil "ediff-hook" "ediff-hook.el" (17187 59901))
 ;;; Generated autoloads from ediff-hook.el
 
 (defvar ediff-window-setup-function)
@@ -8260,7 +8444,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (ediff-show-registry) "ediff-mult" "ediff-mult.el"
-;;;;;;  (17178 22143))
+;;;;;;  (17229 28052))
 ;;; Generated autoloads from ediff-mult.el
 
 (autoload (quote ediff-show-registry) "ediff-mult" "\
@@ -8273,7 +8457,7 @@ Display Ediff's registry.
 ;;;***
 
 ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe)
-;;;;;;  "ediff-util" "ediff-util.el" (17178 22143))
+;;;;;;  "ediff-util" "ediff-util.el" (17229 28052))
 ;;; Generated autoloads from ediff-util.el
 
 (autoload (quote ediff-toggle-multiframe) "ediff-util" "\
@@ -8294,7 +8478,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"
-;;;;;;  (17178 22143))
+;;;;;;  (17251 25141))
 ;;; Generated autoloads from edmacro.el
 
 (defvar edmacro-eight-bits nil "\
@@ -8347,7 +8531,7 @@ or nil, use a compact 80-column format.
 ;;;***
 
 ;;;### (autoloads (edt-emulation-on edt-set-scroll-margins) "edt"
-;;;;;;  "emulation/edt.el" (17178 22144))
+;;;;;;  "emulation/edt.el" (17187 59901))
 ;;; Generated autoloads from emulation/edt.el
 
 (autoload (quote edt-set-scroll-margins) "edt" "\
@@ -8365,7 +8549,7 @@ Turn on EDT Emulation.
 ;;;***
 
 ;;;### (autoloads (electric-helpify with-electric-help) "ehelp" "ehelp.el"
-;;;;;;  (17178 22143))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from ehelp.el
 
 (autoload (quote with-electric-help) "ehelp" "\
@@ -8403,7 +8587,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (turn-on-eldoc-mode eldoc-mode eldoc-minor-mode-string)
-;;;;;;  "eldoc" "emacs-lisp/eldoc.el" (17178 22144))
+;;;;;;  "eldoc" "emacs-lisp/eldoc.el" (17226 24574))
 ;;; Generated autoloads from emacs-lisp/eldoc.el
 
 (defvar eldoc-minor-mode-string " ElDoc" "\
@@ -8441,8 +8625,8 @@ Emacs Lisp mode) that support Eldoc.")
 
 ;;;***
 
-;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (17178
-;;;;;;  22143))
+;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from elide-head.el
 
 (autoload (quote elide-head) "elide-head" "\
@@ -8458,7 +8642,7 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks.
 ;;;***
 
 ;;;### (autoloads (elint-initialize) "elint" "emacs-lisp/elint.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from emacs-lisp/elint.el
 
 (autoload (quote elint-initialize) "elint" "\
@@ -8469,8 +8653,8 @@ Initialize elint.
 ;;;***
 
 ;;;### (autoloads (elp-results elp-instrument-package elp-instrument-list
-;;;;;;  elp-instrument-function) "elp" "emacs-lisp/elp.el" (17178
-;;;;;;  22144))
+;;;;;;  elp-instrument-function) "elp" "emacs-lisp/elp.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from emacs-lisp/elp.el
 
 (autoload (quote elp-instrument-function) "elp" "\
@@ -8504,7 +8688,7 @@ displayed.
 ;;;***
 
 ;;;### (autoloads (report-emacs-bug) "emacsbug" "mail/emacsbug.el"
-;;;;;;  (17178 22150))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from mail/emacsbug.el
 
 (autoload (quote report-emacs-bug) "emacsbug" "\
@@ -8519,7 +8703,7 @@ Prompts for bug subject.  Leaves you in a mail buffer.
 ;;;;;;  emerge-revisions emerge-files-with-ancestor-remote emerge-files-remote
 ;;;;;;  emerge-files-with-ancestor-command emerge-files-command emerge-buffers-with-ancestor
 ;;;;;;  emerge-buffers emerge-files-with-ancestor emerge-files) "emerge"
-;;;;;;  "emerge.el" (17178 22144))
+;;;;;;  "emerge.el" (17187 59901))
 ;;; Generated autoloads from emerge.el
 
 (defvar menu-bar-emerge-menu (make-sparse-keymap "Emerge"))
@@ -8597,7 +8781,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (encoded-kbd-setup-display) "encoded-kb" "international/encoded-kb.el"
-;;;;;;  (17178 21353))
+;;;;;;  (17251 25141))
 ;;; Generated autoloads from international/encoded-kb.el
 
 (autoload (quote encoded-kbd-setup-display) "encoded-kb" "\
@@ -8610,7 +8794,7 @@ DISPLAY may be a display id, a frame, or nil for the selected frame's display.
 ;;;***
 
 ;;;### (autoloads (enriched-decode enriched-encode enriched-mode)
-;;;;;;  "enriched" "textmodes/enriched.el" (17178 22154))
+;;;;;;  "enriched" "textmodes/enriched.el" (17187 59902))
 ;;; Generated autoloads from textmodes/enriched.el
 
 (autoload (quote enriched-mode) "enriched" "\
@@ -8640,8 +8824,8 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (17178
-;;;;;;  22144))
+;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from eshell/esh-mode.el
 
 (autoload (quote eshell-mode) "esh-mode" "\
@@ -8653,8 +8837,8 @@ Emacs shell interactive mode.
 
 ;;;***
 
-;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (17178
-;;;;;;  22144))
+;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from eshell/esh-test.el
 
 (autoload (quote eshell-test) "esh-test" "\
@@ -8665,7 +8849,7 @@ Test Eshell to verify that it works as expected.
 ;;;***
 
 ;;;### (autoloads (eshell-report-bug eshell-command-result eshell-command
-;;;;;;  eshell) "eshell" "eshell/eshell.el" (17178 22144))
+;;;;;;  eshell) "eshell" "eshell/eshell.el" (17187 59901))
 ;;; Generated autoloads from eshell/eshell.el
 
 (autoload (quote eshell) "eshell" "\
@@ -8708,10 +8892,10 @@ Please include any configuration details that might be involved.
 ;;;;;;  tags-query-replace tags-search tags-loop-continue next-file
 ;;;;;;  pop-tag-mark find-tag-regexp find-tag-other-frame find-tag-other-window
 ;;;;;;  find-tag find-tag-noselect tags-table-files visit-tags-table-buffer
-;;;;;;  visit-tags-table find-tag-default-function find-tag-hook
-;;;;;;  tags-add-tables tags-compression-info-list tags-table-list
-;;;;;;  tags-case-fold-search) "etags" "progmodes/etags.el" (17178
-;;;;;;  22153))
+;;;;;;  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"
+;;;;;;  (17244 4914))
 ;;; Generated autoloads from progmodes/etags.el
 
 (defvar tags-file-name nil "\
@@ -8769,6 +8953,11 @@ Otherwise, `find-tag-default' is used.")
 
 (custom-autoload (quote find-tag-default-function) "etags")
 
+(autoload (quote tags-table-mode) "etags" "\
+Major mode for tags table file buffers.
+
+\(fn)" t nil)
+
 (autoload (quote visit-tags-table) "etags" "\
 Tell tags commands to use tags table file FILE.
 FILE should be the name of a file created with the `etags' program.
@@ -9008,7 +9197,7 @@ for \\[find-tag] (which see).
 ;;;;;;  ethio-fidel-to-sera-buffer ethio-fidel-to-sera-region ethio-sera-to-fidel-marker
 ;;;;;;  ethio-sera-to-fidel-mail ethio-sera-to-fidel-mail-or-marker
 ;;;;;;  ethio-sera-to-fidel-buffer ethio-sera-to-fidel-region setup-ethiopic-environment-internal)
-;;;;;;  "ethio-util" "language/ethio-util.el" (17178 22147))
+;;;;;;  "ethio-util" "language/ethio-util.el" (17187 59901))
 ;;; Generated autoloads from language/ethio-util.el
 
 (autoload (quote setup-ethiopic-environment-internal) "ethio-util" "\
@@ -9203,7 +9392,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"
-;;;;;;  (17178 22151))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from net/eudc.el
 
 (autoload (quote eudc-set-server) "eudc" "\
@@ -9259,7 +9448,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" (17178 22151))
+;;;;;;  "eudc-bob" "net/eudc-bob.el" (17187 59902))
 ;;; Generated autoloads from net/eudc-bob.el
 
 (autoload (quote eudc-display-generic-binary) "eudc-bob" "\
@@ -9295,7 +9484,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" (17178 22151))
+;;;;;;  "eudc-export" "net/eudc-export.el" (17187 59902))
 ;;; Generated autoloads from net/eudc-export.el
 
 (autoload (quote eudc-insert-record-at-point-into-bbdb) "eudc-export" "\
@@ -9312,7 +9501,7 @@ Call `eudc-insert-record-at-point-into-bbdb' if on a record.
 ;;;***
 
 ;;;### (autoloads (eudc-edit-hotlist) "eudc-hotlist" "net/eudc-hotlist.el"
-;;;;;;  (17178 22151))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from net/eudc-hotlist.el
 
 (autoload (quote eudc-edit-hotlist) "eudc-hotlist" "\
@@ -9325,7 +9514,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"
-;;;;;;  (17178 22153))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from progmodes/executable.el
 
 (autoload (quote executable-command-find-posix-p) "executable" "\
@@ -9367,7 +9556,7 @@ file modes.
 ;;;***
 
 ;;;### (autoloads (expand-jump-to-next-slot expand-jump-to-previous-slot
-;;;;;;  expand-add-abbrevs) "expand" "expand.el" (17178 22144))
+;;;;;;  expand-add-abbrevs) "expand" "expand.el" (17187 59901))
 ;;; Generated autoloads from expand.el
 
 (autoload (quote expand-add-abbrevs) "expand" "\
@@ -9410,7 +9599,7 @@ This is used only in conjunction with `expand-add-abbrevs'.
 
 ;;;***
 
-;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17178 22153))
+;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17229 28054))
 ;;; Generated autoloads from progmodes/f90.el
 
 (autoload (quote f90-mode) "f90" "\
@@ -9465,8 +9654,6 @@ Variables controlling indentation style and extra features:
   The possibilities are 'downcase-word, 'upcase-word, 'capitalize-word.
 `f90-leave-line-no'
   Do not left-justify line numbers (default nil).
-`f90-keywords-re'
-  List of keywords used for highlighting/upcase-keywords etc.
 
 Turning on F90 mode calls the value of the variable `f90-mode-hook'
 with no args, if that value is non-nil.
@@ -9479,7 +9666,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" (17178 22144))
+;;;;;;  "facemenu" "facemenu.el" (17187 59901))
 ;;; Generated autoloads from facemenu.el
  (define-key global-map "\M-o" 'facemenu-keymap)
  (autoload 'facemenu-keymap "facemenu" "Keymap for face-changing commands." t 'keymap)
@@ -9642,7 +9829,7 @@ argument BUFFER-NAME is nil, it defaults to *Colors*.
 ;;;***
 
 ;;;### (autoloads (turn-on-fast-lock fast-lock-mode) "fast-lock"
-;;;;;;  "obsolete/fast-lock.el" (17178 22151))
+;;;;;;  "obsolete/fast-lock.el" (17226 24576))
 ;;; Generated autoloads from obsolete/fast-lock.el
 
 (autoload (quote fast-lock-mode) "fast-lock" "\
@@ -9683,7 +9870,7 @@ Unconditionally turn on Fast Lock mode.
 
 ;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue
 ;;;;;;  feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts
-;;;;;;  feedmail-send-it) "feedmail" "mail/feedmail.el" (17178 20480))
+;;;;;;  feedmail-send-it) "feedmail" "mail/feedmail.el" (17226 24576))
 ;;; Generated autoloads from mail/feedmail.el
 
 (autoload (quote feedmail-send-it) "feedmail" "\
@@ -9737,7 +9924,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" (17178 22144))
+;;;;;;  find-file-at-point ffap-next) "ffap" "ffap.el" (17238 21257))
 ;;; Generated autoloads from ffap.el
 
 (autoload (quote ffap-next) "ffap" "\
@@ -9758,8 +9945,6 @@ If `ffap-require-prefix' is set, the prefix meaning is reversed.
 See also the variables `ffap-dired-wildcards', `ffap-newfile-prompt',
 and the functions `ffap-file-at-point' and `ffap-url-at-point'.
 
-See <ftp://ftp.mathcs.emory.edu/pub/mic/emacs/> for latest version.
-
 \(fn &optional FILENAME)" t nil)
 
 (defalias (quote ffap) (quote find-file-at-point))
@@ -9796,7 +9981,7 @@ Evaluate the forms in variable `ffap-bindings'.
 ;;;***
 
 ;;;### (autoloads (file-cache-minibuffer-complete) "filecache" "filecache.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17238 21257))
 ;;; Generated autoloads from filecache.el
 
 (autoload (quote file-cache-minibuffer-complete) "filecache" "\
@@ -9814,8 +9999,8 @@ the name is considered already unique; only the second substitution
 
 ;;;***
 
-;;;### (autoloads (filesets-init) "filesets" "filesets.el" (17178
-;;;;;;  22144))
+;;;### (autoloads (filesets-init) "filesets" "filesets.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from filesets.el
 
 (autoload (quote filesets-init) "filesets" "\
@@ -9828,7 +10013,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"
-;;;;;;  (17178 22144))
+;;;;;;  (17187 59901))
 ;;; 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"))) "\
@@ -9889,7 +10074,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"
-;;;;;;  (17178 22144))
+;;;;;;  (17187 59901))
 ;;; 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)))))) "\
@@ -9981,7 +10166,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" (17178 22144))
+;;;;;;  "emacs-lisp/find-func.el" (17244 4913))
 ;;; Generated autoloads from emacs-lisp/find-func.el
 
 (autoload (quote find-library) "find-func" "\
@@ -10130,7 +10315,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" (17178 22144))
+;;;;;;  find-lisp-find-dired) "find-lisp" "find-lisp.el" (17187 59901))
 ;;; Generated autoloads from find-lisp.el
 
 (autoload (quote find-lisp-find-dired) "find-lisp" "\
@@ -10151,7 +10336,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" (17178 22144))
+;;;;;;  "finder" "finder.el" (17187 59901))
 ;;; Generated autoloads from finder.el
 
 (autoload (quote finder-list-keywords) "finder" "\
@@ -10173,7 +10358,7 @@ Find packages matching a given keyword.
 ;;;***
 
 ;;;### (autoloads (enable-flow-control-on enable-flow-control) "flow-ctrl"
-;;;;;;  "flow-ctrl.el" (17178 22144))
+;;;;;;  "flow-ctrl.el" (17187 59901))
 ;;; Generated autoloads from flow-ctrl.el
 
 (autoload (quote enable-flow-control) "flow-ctrl" "\
@@ -10195,7 +10380,7 @@ to get the effect of a C-q.
 ;;;***
 
 ;;;### (autoloads (fill-flowed fill-flowed-encode) "flow-fill" "gnus/flow-fill.el"
-;;;;;;  (17178 22145))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/flow-fill.el
 
 (autoload (quote fill-flowed-encode) "flow-fill" "\
@@ -10211,7 +10396,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (flymake-mode-off flymake-mode-on flymake-mode)
-;;;;;;  "flymake" "progmodes/flymake.el" (17178 22153))
+;;;;;;  "flymake" "progmodes/flymake.el" (17226 24577))
 ;;; Generated autoloads from progmodes/flymake.el
 
 (autoload (quote flymake-mode) "flymake" "\
@@ -10235,7 +10420,7 @@ Turn flymake mode off.
 
 ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off
 ;;;;;;  flyspell-mode flyspell-prog-mode) "flyspell" "textmodes/flyspell.el"
-;;;;;;  (17178 22154))
+;;;;;;  (17254 63791))
 ;;; Generated autoloads from textmodes/flyspell.el
 
 (autoload (quote flyspell-prog-mode) "flyspell" "\
@@ -10294,7 +10479,7 @@ Flyspell whole buffer.
 
 ;;;### (autoloads (follow-delete-other-windows-and-split follow-mode
 ;;;;;;  turn-off-follow-mode turn-on-follow-mode) "follow" "follow.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17196 27217))
 ;;; Generated autoloads from follow.el
 
 (autoload (quote turn-on-follow-mode) "follow" "\
@@ -10370,9 +10555,129 @@ in your `~/.emacs' file, replacing [f7] by your favourite key:
 
 ;;;### (autoloads (font-lock-fontify-buffer font-lock-remove-keywords
 ;;;;;;  font-lock-add-keywords font-lock-mode-internal) "font-lock"
-;;;;;;  "font-lock.el" (17178 22144))
+;;;;;;  "font-lock.el" (17254 63790))
 ;;; Generated autoloads from font-lock.el
 
+(defvar font-lock-keywords nil "\
+A list of the keywords to highlight.
+There are two kinds of values: user-level, and compiled.
+
+A user-level keywords list is what a major mode or the user would
+set up.  Normally the list would come from `font-lock-defaults'.
+through selection of a fontification level and evaluation of any
+contained expressions.  You can also alter it by calling
+`font-lock-add-keywords' or `font-lock-remove-keywords' with MODE = nil.
+
+Each element in a user-level keywords list should have one of these forms:
+
+ MATCHER
+ (MATCHER . SUBEXP)
+ (MATCHER . FACENAME)
+ (MATCHER . HIGHLIGHT)
+ (MATCHER HIGHLIGHT ...)
+ (eval . FORM)
+
+where MATCHER can be either the regexp to search for, or the function name to
+call to make the search (called with one argument, the limit of the search;
+it should return non-nil, move point, and set `match-data' appropriately iff
+it succeeds; like `re-search-forward' would).
+MATCHER regexps can be generated via the function `regexp-opt'.
+
+FORM is an expression, whose value should be a keyword element, evaluated when
+the keyword is (first) used in a buffer.  This feature can be used to provide a
+keyword that can only be generated when Font Lock mode is actually turned on.
+
+HIGHLIGHT should be either MATCH-HIGHLIGHT or MATCH-ANCHORED.
+
+For highlighting single items, for example each instance of the word \"foo\",
+typically only MATCH-HIGHLIGHT is required.
+However, if an item or (typically) items are to be highlighted following the
+instance of another item (the anchor), for example each instance of the
+word \"bar\" following the word \"anchor\" then MATCH-ANCHORED may be required.
+
+MATCH-HIGHLIGHT should be of the form:
+
+ (SUBEXP FACENAME [OVERRIDE [LAXMATCH]])
+
+SUBEXP is the number of the subexpression of MATCHER to be highlighted.
+
+FACENAME is an expression whose value is the face name to use.
+Instead of a face, FACENAME can evaluate to a property list
+of the form (face FACE PROP1 VAL1 PROP2 VAL2 ...)
+in which case all the listed text-properties will be set rather than
+just FACE.  In such a case, you will most likely want to put those
+properties in `font-lock-extra-managed-props' or to override
+`font-lock-unfontify-region-function'.
+
+OVERRIDE and LAXMATCH are flags.  If OVERRIDE is t, existing fontification can
+be overwritten.  If `keep', only parts not already fontified are highlighted.
+If `prepend' or `append', existing fontification is merged with the new, in
+which the new or existing fontification, respectively, takes precedence.
+If LAXMATCH is non-nil, that means don't signal an error if there is
+no match for SUBEXP in MATCHER.
+
+For example, an element of the form highlights (if not already highlighted):
+
+ \"\\\\\\=<foo\\\\\\=>\"                discrete occurrences of \"foo\" in the value of the
+                        variable `font-lock-keyword-face'.
+ (\"fu\\\\(bar\\\\)\" . 1)      substring \"bar\" within all occurrences of \"fubar\" in
+                        the value of `font-lock-keyword-face'.
+ (\"fubar\" . fubar-face)       Occurrences of \"fubar\" in the value of `fubar-face'.
+ (\"foo\\\\|bar\" 0 foo-bar-face t)
+                        occurrences of either \"foo\" or \"bar\" in the value
+                        of `foo-bar-face', even if already highlighted.
+ (fubar-match 1 fubar-face)
+                        the first subexpression within all occurrences of
+                        whatever the function `fubar-match' finds and matches
+                        in the value of `fubar-face'.
+
+MATCH-ANCHORED should be of the form:
+
+ (MATCHER PRE-MATCH-FORM POST-MATCH-FORM MATCH-HIGHLIGHT ...)
+
+where MATCHER is a regexp to search for or the function name to call to make
+the search, as for MATCH-HIGHLIGHT above, but with one exception; see below.
+PRE-MATCH-FORM and POST-MATCH-FORM are evaluated before the first, and after
+the last, instance MATCH-ANCHORED's MATCHER is used.  Therefore they can be
+used to initialize before, and cleanup after, MATCHER is used.  Typically,
+PRE-MATCH-FORM is used to move to some position relative to the original
+MATCHER, before starting with MATCH-ANCHORED's MATCHER.  POST-MATCH-FORM might
+be used to move back, before resuming with MATCH-ANCHORED's parent's MATCHER.
+
+For example, an element of the form highlights (if not already highlighted):
+
+ (\"\\\\\\=<anchor\\\\\\=>\" (0 anchor-face) (\"\\\\\\=<item\\\\\\=>\" nil nil (0 item-face)))
+
+ discrete occurrences of \"anchor\" in the value of `anchor-face', and subsequent
+ discrete occurrences of \"item\" (on the same line) in the value of `item-face'.
+ (Here PRE-MATCH-FORM and POST-MATCH-FORM are nil.  Therefore \"item\" is
+ initially searched for starting from the end of the match of \"anchor\", and
+ searching for subsequent instances of \"anchor\" resumes from where searching
+ for \"item\" concluded.)
+
+The above-mentioned exception is as follows.  The limit of the MATCHER search
+defaults to the end of the line after PRE-MATCH-FORM is evaluated.
+However, if PRE-MATCH-FORM returns a position greater than the position after
+PRE-MATCH-FORM is evaluated, that position is used as the limit of the search.
+It is generally a bad idea to return a position greater than the end of the
+line, i.e., cause the MATCHER search to span lines.
+
+These regular expressions can match text which spans lines, although
+it is better to avoid it if possible since updating them while editing
+text is slower, and it is not guaranteed to be always correct when using
+support modes like jit-lock or lazy-lock.
+
+This variable is set by major modes via the variable `font-lock-defaults'.
+Be careful when composing regexps for this list; a poorly written pattern can
+dramatically slow things down!
+
+A compiled keywords list starts with t.  It is produced internal
+by `font-lock-compile-keywords' from a user-level keywords list.
+Its second element is the user-level keywords list that was
+compiled.  The remaining elements have the same form as
+user-level keywords, but normally their values have been
+optimized.")
+
 (autoload (quote font-lock-mode-internal) "font-lock" "\
 Not documented
 
@@ -10442,8 +10747,8 @@ Fontify the current buffer the way the function `font-lock-mode' would.
 
 ;;;***
 
-;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (17178
-;;;;;;  22150))
+;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from mail/footnote.el
 
 (autoload (quote footnote-mode) "footnote" "\
@@ -10464,7 +10769,7 @@ key		binding
 ;;;***
 
 ;;;### (autoloads (forms-find-file-other-window forms-find-file forms-mode)
-;;;;;;  "forms" "forms.el" (17178 22144))
+;;;;;;  "forms" "forms.el" (17226 24575))
 ;;; Generated autoloads from forms.el
 
 (autoload (quote forms-mode) "forms" "\
@@ -10501,7 +10806,7 @@ Visit a file in Forms mode in other window.
 ;;;***
 
 ;;;### (autoloads (fortran-mode fortran-tab-mode-default) "fortran"
-;;;;;;  "progmodes/fortran.el" (17178 22153))
+;;;;;;  "progmodes/fortran.el" (17229 28054))
 ;;; Generated autoloads from progmodes/fortran.el
 
 (defvar fortran-tab-mode-default nil "\
@@ -10587,7 +10892,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" (17178 22152))
+;;;;;;  fortune-add-fortune) "fortune" "play/fortune.el" (17187 59902))
 ;;; Generated autoloads from play/fortune.el
 
 (autoload (quote fortune-add-fortune) "fortune" "\
@@ -10637,7 +10942,7 @@ and choose the directory as the fortune-file.
 ;;;***
 
 ;;;### (autoloads (set-fringe-style fringe-mode fringe-mode) "fringe"
-;;;;;;  "fringe.el" (17178 22144))
+;;;;;;  "fringe.el" (17187 59901))
 ;;; Generated autoloads from fringe.el
 
 (defvar fringe-mode nil "\
@@ -10708,7 +11013,7 @@ default appearance of fringes on all frames, see the command
 ;;;***
 
 ;;;### (autoloads (gdb-enable-debug-log gdba) "gdb-ui" "progmodes/gdb-ui.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17254 64068))
 ;;; Generated autoloads from progmodes/gdb-ui.el
 
 (autoload (quote gdba) "gdb-ui" "\
@@ -10738,28 +11043,28 @@ 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                    | Input/Output (of inferior) buffer
-                                  | (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 inferior)     |
+|                               | (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)
 
@@ -10771,8 +11076,8 @@ Non-nil means record the process input and output in `gdb-debug-log'.")
 ;;;***
 
 ;;;### (autoloads (generic-make-keywords-list generic-mode generic-mode-internal
-;;;;;;  define-generic-mode) "generic" "emacs-lisp/generic.el" (17178
-;;;;;;  22144))
+;;;;;;  define-generic-mode) "generic" "emacs-lisp/generic.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from emacs-lisp/generic.el
 
 (defvar generic-mode-list nil "\
@@ -10847,7 +11152,7 @@ regular expression that can be used as an element of
 ;;;***
 
 ;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el"
-;;;;;;  (17178 20481))
+;;;;;;  (17226 24577))
 ;;; Generated autoloads from progmodes/glasses.el
 
 (autoload (quote glasses-mode) "glasses" "\
@@ -10860,7 +11165,7 @@ at places they belong to.
 ;;;***
 
 ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server
-;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (17178 22145))
+;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (17226 24575))
 ;;; Generated autoloads from gnus/gnus.el
 
 (autoload (quote gnus-slave-no-server) "gnus" "\
@@ -10911,7 +11216,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" (17178 22145))
+;;;;;;  "gnus/gnus-agent.el" (17226 24575))
 ;;; Generated autoloads from gnus/gnus-agent.el
 
 (autoload (quote gnus-unplugged) "gnus-agent" "\
@@ -10998,7 +11303,7 @@ If CLEAN, obsolete (ignore).
 ;;;***
 
 ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el"
-;;;;;;  (17178 22145))
+;;;;;;  (17254 63788))
 ;;; Generated autoloads from gnus/gnus-art.el
 
 (autoload (quote gnus-article-prepare-display) "gnus-art" "\
@@ -11009,7 +11314,7 @@ Make the current buffer look like a nice article.
 ;;;***
 
 ;;;### (autoloads (gnus-audio-play) "gnus-audio" "gnus/gnus-audio.el"
-;;;;;;  (17178 22145))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/gnus-audio.el
 
 (autoload (quote gnus-audio-play) "gnus-audio" "\
@@ -11021,8 +11326,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" (17178
-;;;;;;  22145))
+;;;;;;  gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from gnus/gnus-cache.el
 
 (autoload (quote gnus-jog-cache) "gnus-cache" "\
@@ -11060,7 +11365,7 @@ next enabled. Depends upon the caller to determine whether group deletion is sup
 ;;;***
 
 ;;;### (autoloads (gnus-delay-initialize gnus-delay-send-queue gnus-delay-article)
-;;;;;;  "gnus-delay" "gnus/gnus-delay.el" (17178 22145))
+;;;;;;  "gnus-delay" "gnus/gnus-delay.el" (17187 59901))
 ;;; Generated autoloads from gnus/gnus-delay.el
 
 (defgroup gnus-delay nil "Arrange for sending postings later." :version "22.1" :group (quote gnus))
@@ -11098,7 +11403,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"
-;;;;;;  (17178 22145))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/gnus-dired.el
 
 (autoload (quote turn-on-gnus-dired-mode) "gnus-dired" "\
@@ -11109,7 +11414,7 @@ Convenience method to turn on gnus-dired-mode.
 ;;;***
 
 ;;;### (autoloads (gnus-draft-reminder) "gnus-draft" "gnus/gnus-draft.el"
-;;;;;;  (17178 22145))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/gnus-draft.el
 
 (autoload (quote gnus-draft-reminder) "gnus-draft" "\
@@ -11121,8 +11426,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" (17178
-;;;;;;  22145))
+;;;;;;  gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (17187
+;;;;;;  59914))
 ;;; Generated autoloads from gnus/gnus-fun.el
 
 (autoload (quote gnus-random-x-face) "gnus-fun" "\
@@ -11141,7 +11446,7 @@ Insert an X-Face header based on an image file.
 \(fn FILE)" t nil)
 
 (autoload (quote gnus-face-from-file) "gnus-fun" "\
-Return an Face header based on an image file.
+Return a Face header based on an image file.
 
 \(fn FILE)" t nil)
 
@@ -11161,7 +11466,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" (17178 22145))
+;;;;;;  "gnus-group" "gnus/gnus-group.el" (17187 59901))
 ;;; Generated autoloads from gnus/gnus-group.el
 
 (autoload (quote gnus-fetch-group) "gnus-group" "\
@@ -11178,7 +11483,7 @@ Pop up a frame and enter GROUP.
 ;;;***
 
 ;;;### (autoloads (gnus-batch-score) "gnus-kill" "gnus/gnus-kill.el"
-;;;;;;  (17178 22145))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/gnus-kill.el
 
 (defalias (quote gnus-batch-kill) (quote gnus-batch-score))
@@ -11193,7 +11498,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"
-;;;;;;  (17178 22145))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/gnus-ml.el
 
 (autoload (quote turn-on-gnus-mailing-list-mode) "gnus-ml" "\
@@ -11218,7 +11523,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"
-;;;;;;  (17178 22145))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/gnus-mlspl.el
 
 (autoload (quote gnus-group-split-setup) "gnus-mlspl" "\
@@ -11319,7 +11624,7 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns:
 ;;;***
 
 ;;;### (autoloads (gnus-change-server) "gnus-move" "gnus/gnus-move.el"
-;;;;;;  (17178 22145))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/gnus-move.el
 
 (autoload (quote gnus-change-server) "gnus-move" "\
@@ -11331,7 +11636,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" (17178 22145))
+;;;;;;  "gnus-msg" "gnus/gnus-msg.el" (17187 59914))
 ;;; Generated autoloads from gnus/gnus-msg.el
 
 (autoload (quote gnus-msg-mail) "gnus-msg" "\
@@ -11357,7 +11662,7 @@ Like `message-reply'.
 
 ;;;### (autoloads (gnus-treat-newsgroups-picon gnus-treat-mail-picon
 ;;;;;;  gnus-treat-from-picon) "gnus-picon" "gnus/gnus-picon.el"
-;;;;;;  (17178 22145))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/gnus-picon.el
 
 (autoload (quote gnus-treat-from-picon) "gnus-picon" "\
@@ -11384,7 +11689,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" (17178 22145))
+;;;;;;  "gnus/gnus-range.el" (17187 59901))
 ;;; Generated autoloads from gnus/gnus-range.el
 
 (autoload (quote gnus-sorted-difference) "gnus-range" "\
@@ -11452,7 +11757,7 @@ Add NUM into sorted LIST by side effect.
 ;;;***
 
 ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize)
-;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (17178 22145))
+;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (17187 59901))
 ;;; Generated autoloads from gnus/gnus-registry.el
 
 (autoload (quote gnus-registry-initialize) "gnus-registry" "\
@@ -11468,8 +11773,8 @@ Install the registry hooks.
 ;;;***
 
 ;;;### (autoloads (gnus-sieve-article-add-rule gnus-sieve-generate
-;;;;;;  gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (17178
-;;;;;;  22145))
+;;;;;;  gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from gnus/gnus-sieve.el
 
 (autoload (quote gnus-sieve-update) "gnus-sieve" "\
@@ -11497,7 +11802,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (gnus-batch-brew-soup) "gnus-soup" "gnus/gnus-soup.el"
-;;;;;;  (17178 22145))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/gnus-soup.el
 
 (autoload (quote gnus-batch-brew-soup) "gnus-soup" "\
@@ -11517,7 +11822,7 @@ Note -- this function hasn't been implemented yet.
 ;;;***
 
 ;;;### (autoloads (gnus-update-format) "gnus-spec" "gnus/gnus-spec.el"
-;;;;;;  (17178 22145))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/gnus-spec.el
 
 (autoload (quote gnus-update-format) "gnus-spec" "\
@@ -11528,8 +11833,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" (17178
-;;;;;;  22145))
+;;;;;;  gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (17226
+;;;;;;  24575))
 ;;; Generated autoloads from gnus/gnus-start.el
 
 (autoload (quote gnus-declare-backend) "gnus-start" "\
@@ -11545,7 +11850,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (gnus-add-configuration) "gnus-win" "gnus/gnus-win.el"
-;;;;;;  (17178 22145))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/gnus-win.el
 
 (autoload (quote gnus-add-configuration) "gnus-win" "\
@@ -11555,7 +11860,7 @@ Add the window configuration CONF to `gnus-buffer-configuration'.
 
 ;;;***
 
-;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (17178 22152))
+;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (17226 24576))
 ;;; Generated autoloads from play/gomoku.el
 
 (autoload (quote gomoku) "gomoku" "\
@@ -11582,7 +11887,7 @@ Use \\[describe-mode] for more info.
 ;;;***
 
 ;;;### (autoloads (goto-address goto-address-at-point) "goto-addr"
-;;;;;;  "net/goto-addr.el" (17178 22151))
+;;;;;;  "net/goto-addr.el" (17187 59902))
 ;;; Generated autoloads from net/goto-addr.el
 
 (define-obsolete-function-alias (quote goto-address-at-mouse) (quote goto-address-at-point) "22.1")
@@ -11610,7 +11915,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" (17178 22153))
+;;;;;;  grep-window-height) "grep" "progmodes/grep.el" (17187 59902))
 ;;; Generated autoloads from progmodes/grep.el
 
 (defvar grep-window-height nil "\
@@ -11734,7 +12039,7 @@ those sub directories of DIR.
 
 ;;;***
 
-;;;### (autoloads (gs-load-image) "gs" "gs.el" (17178 22146))
+;;;### (autoloads (gs-load-image) "gs" "gs.el" (17187 59901))
 ;;; Generated autoloads from gs.el
 
 (autoload (quote gs-load-image) "gs" "\
@@ -11748,7 +12053,7 @@ 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" (17178 22153))
+;;;;;;  perldb xdb dbx sdb gdb) "gud" "progmodes/gud.el" (17254 64068))
 ;;; Generated autoloads from progmodes/gud.el
 
 (autoload (quote gdb) "gud" "\
@@ -11844,8 +12149,8 @@ Toggle the display of GUD tooltips.
 
 ;;;***
 
-;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (17178
-;;;;;;  22152))
+;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from play/handwrite.el
 
 (autoload (quote handwrite) "handwrite" "\
@@ -11863,7 +12168,7 @@ Variables: handwrite-linespace     (default 12)
 ;;;***
 
 ;;;### (autoloads (hanoi-unix-64 hanoi-unix hanoi) "hanoi" "play/hanoi.el"
-;;;;;;  (17178 20480))
+;;;;;;  (17187 59879))
 ;;; Generated autoloads from play/hanoi.el
 
 (autoload (quote hanoi) "hanoi" "\
@@ -11893,7 +12198,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" (17178 22146))
+;;;;;;  help-at-pt-string) "help-at-pt" "help-at-pt.el" (17187 59901))
 ;;; Generated autoloads from help-at-pt.el
 
 (autoload (quote help-at-pt-string) "help-at-pt" "\
@@ -12023,7 +12328,7 @@ different regions.  With numeric argument ARG, behaves like
 ;;;### (autoloads (describe-categories describe-syntax describe-variable
 ;;;;;;  variable-at-point describe-function-1 help-C-file-name describe-function
 ;;;;;;  locate-library help-with-tutorial) "help-fns" "help-fns.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17254 63790))
 ;;; Generated autoloads from help-fns.el
 
 (autoload (quote help-with-tutorial) "help-fns" "\
@@ -12103,7 +12408,7 @@ BUFFER should be a buffer or a buffer name.
 ;;;***
 
 ;;;### (autoloads (three-step-help) "help-macro" "help-macro.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from help-macro.el
 
 (defvar three-step-help nil "\
@@ -12119,7 +12424,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" (17178 22146))
+;;;;;;  help-mode) "help-mode" "help-mode.el" (17187 59901))
 ;;; Generated autoloads from help-mode.el
 
 (autoload (quote help-mode) "help-mode" "\
@@ -12202,7 +12507,7 @@ Add xrefs for symbols in `pp's output between FROM and TO.
 ;;;***
 
 ;;;### (autoloads (Helper-help Helper-describe-bindings) "helper"
-;;;;;;  "emacs-lisp/helper.el" (17178 22144))
+;;;;;;  "emacs-lisp/helper.el" (17187 59901))
 ;;; Generated autoloads from emacs-lisp/helper.el
 
 (autoload (quote Helper-describe-bindings) "helper" "\
@@ -12218,7 +12523,7 @@ Provide help for current mode.
 ;;;***
 
 ;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl"
-;;;;;;  "hexl.el" (17178 22146))
+;;;;;;  "hexl.el" (17187 59901))
 ;;; Generated autoloads from hexl.el
 
 (autoload (quote hexl-mode) "hexl" "\
@@ -12313,8 +12618,8 @@ 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
-;;;;;;  hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el" (17178
-;;;;;;  22146))
+;;;;;;  hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el" (17226
+;;;;;;  24576))
 ;;; Generated autoloads from hi-lock.el
 
 (defvar hi-lock-mode nil "\
@@ -12425,7 +12730,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" (17178 22153))
+;;;;;;  hide-ifdef-mode) "hideif" "progmodes/hideif.el" (17187 59902))
 ;;; Generated autoloads from progmodes/hideif.el
 
 (autoload (quote hide-ifdef-mode) "hideif" "\
@@ -12479,15 +12784,10 @@ how the hiding is done:
 
 ;;;***
 
-;;;### (autoloads (hs-minor-mode hs-hide-comments-when-hiding-all)
-;;;;;;  "hideshow" "progmodes/hideshow.el" (17178 22153))
+;;;### (autoloads (hs-minor-mode) "hideshow" "progmodes/hideshow.el"
+;;;;;;  (17196 27217))
 ;;; Generated autoloads from progmodes/hideshow.el
 
-(defvar hs-hide-comments-when-hiding-all t "\
-*Hide the comments too when you do an `hs-hide-all'.")
-
-(custom-autoload (quote hs-hide-comments-when-hiding-all) "hideshow")
-
 (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))) "\
 *Alist for initializing the hideshow variables for different modes.
 Each element has the form
@@ -12543,7 +12843,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" (17178 22146))
+;;;;;;  "hilit-chg" "hilit-chg.el" (17187 59901))
 ;;; Generated autoloads from hilit-chg.el
 
 (autoload (quote highlight-changes-remove-highlight) "hilit-chg" "\
@@ -12673,7 +12973,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" (17178 22146))
+;;;;;;  "hippie-exp.el" (17187 59901))
 ;;; 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)) "\
@@ -12746,7 +13046,7 @@ argument VERBOSE non-nil makes the function verbose.
 ;;;***
 
 ;;;### (autoloads (global-hl-line-mode hl-line-mode) "hl-line" "hl-line.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from hl-line.el
 
 (autoload (quote hl-line-mode) "hl-line" "\
@@ -12788,7 +13088,7 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and
 ;;;***
 
 ;;;### (autoloads (list-holidays holidays) "holidays" "calendar/holidays.el"
-;;;;;;  (17178 20480))
+;;;;;;  (17229 28052))
 ;;; Generated autoloads from calendar/holidays.el
 
 (autoload (quote holidays) "holidays" "\
@@ -12812,7 +13112,7 @@ The optional LABEL is used to label the buffer created.
 ;;;***
 
 ;;;### (autoloads (hscroll-global-mode hscroll-mode turn-on-hscroll)
-;;;;;;  "hscroll" "obsolete/hscroll.el" (17178 22152))
+;;;;;;  "hscroll" "obsolete/hscroll.el" (17187 59902))
 ;;; Generated autoloads from obsolete/hscroll.el
 
 (autoload (quote turn-on-hscroll) "hscroll" "\
@@ -12838,8 +13138,8 @@ Also see `automatic-hscrolling'.
 
 ;;;***
 
-;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (17178
-;;;;;;  22145))
+;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from gnus/html2text.el
 
 (autoload (quote html2text) "html2text" "\
@@ -12870,7 +13170,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" (17178 22146))
+;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" (17229 28053))
 ;;; Generated autoloads from ibuf-ext.el
 
 (autoload (quote ibuffer-auto-mode) "ibuf-ext" "\
@@ -12908,17 +13208,17 @@ Move point forwards by COUNT filtering groups.
 Move point backwards by COUNT filtering groups.
 
 \(fn &optional COUNT)" t nil)
- (autoload 'ibuffer-do-shell-command-pipe "ibuf-ext.el")
- (autoload 'ibuffer-do-shell-command-pipe-replace "ibuf-ext.el")
- (autoload 'ibuffer-do-shell-command-file "ibuf-ext.el")
- (autoload 'ibuffer-do-eval "ibuf-ext.el")
- (autoload 'ibuffer-do-view-and-eval "ibuf-ext.el")
- (autoload 'ibuffer-do-rename-uniquely "ibuf-ext.el")
- (autoload 'ibuffer-do-revert "ibuf-ext.el")
- (autoload 'ibuffer-do-replace-regexp "ibuf-ext.el")
- (autoload 'ibuffer-do-query-replace "ibuf-ext.el")
- (autoload 'ibuffer-do-query-replace-regexp "ibuf-ext.el")
- (autoload 'ibuffer-do-print "ibuf-ext.el")
+ (autoload 'ibuffer-do-shell-command-pipe "ibuf-ext")
+ (autoload 'ibuffer-do-shell-command-pipe-replace "ibuf-ext")
+ (autoload 'ibuffer-do-shell-command-file "ibuf-ext")
+ (autoload 'ibuffer-do-eval "ibuf-ext")
+ (autoload 'ibuffer-do-view-and-eval "ibuf-ext")
+ (autoload 'ibuffer-do-rename-uniquely "ibuf-ext")
+ (autoload 'ibuffer-do-revert "ibuf-ext")
+ (autoload 'ibuffer-do-replace-regexp "ibuf-ext")
+ (autoload 'ibuffer-do-query-replace "ibuf-ext")
+ (autoload 'ibuffer-do-query-replace-regexp "ibuf-ext")
+ (autoload 'ibuffer-do-print "ibuf-ext")
 
 (autoload (quote ibuffer-included-in-filters-p) "ibuf-ext" "\
 Not documented
@@ -13056,14 +13356,14 @@ If prefix argument ADD is non-nil, then add the saved filters instead
 of replacing the current filters.
 
 \(fn NAME)" t nil)
- (autoload 'ibuffer-filter-by-mode "ibuf-ext.el")
- (autoload 'ibuffer-filter-by-used-mode "ibuf-ext.el")
- (autoload 'ibuffer-filter-by-name "ibuf-ext.el")
- (autoload 'ibuffer-filter-by-filename "ibuf-ext.el")
- (autoload 'ibuffer-filter-by-size-gt  "ibuf-ext.el")
- (autoload 'ibuffer-filter-by-size-lt  "ibuf-ext.el")
- (autoload 'ibuffer-filter-by-content "ibuf-ext.el")
- (autoload 'ibuffer-filter-by-predicate "ibuf-ext.el")
+ (autoload 'ibuffer-filter-by-mode "ibuf-ext")
+ (autoload 'ibuffer-filter-by-used-mode "ibuf-ext")
+ (autoload 'ibuffer-filter-by-name "ibuf-ext")
+ (autoload 'ibuffer-filter-by-filename "ibuf-ext")
+ (autoload 'ibuffer-filter-by-size-gt  "ibuf-ext")
+ (autoload 'ibuffer-filter-by-size-lt  "ibuf-ext")
+ (autoload 'ibuffer-filter-by-content "ibuf-ext")
+ (autoload 'ibuffer-filter-by-predicate "ibuf-ext")
 
 (autoload (quote ibuffer-toggle-sorting-mode) "ibuf-ext" "\
 Toggle the current sorting mode.
@@ -13079,10 +13379,10 @@ Default sorting modes are:
 Toggle whether or not sorting is in reverse order.
 
 \(fn)" t nil)
- (autoload 'ibuffer-do-sort-by-major-mode "ibuf-ext.el")
- (autoload 'ibuffer-do-sort-by-mode-name "ibuf-ext.el")
- (autoload 'ibuffer-do-sort-by-alphabetic "ibuf-ext.el")
- (autoload 'ibuffer-do-sort-by-size "ibuf-ext.el")
+ (autoload 'ibuffer-do-sort-by-major-mode "ibuf-ext")
+ (autoload 'ibuffer-do-sort-by-mode-name "ibuf-ext")
+ (autoload 'ibuffer-do-sort-by-alphabetic "ibuf-ext")
+ (autoload 'ibuffer-do-sort-by-size "ibuf-ext")
 
 (autoload (quote ibuffer-bs-show) "ibuf-ext" "\
 Emulate `bs-show' from the bs.el package.
@@ -13231,8 +13531,8 @@ defaults to one.
 ;;;***
 
 ;;;### (autoloads (define-ibuffer-filter define-ibuffer-op define-ibuffer-sorter
-;;;;;;  define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (17178
-;;;;;;  22146))
+;;;;;;  define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (17226
+;;;;;;  24576))
 ;;; Generated autoloads from ibuf-macs.el
 
 (autoload (quote define-ibuffer-column) "ibuf-macs" "\
@@ -13318,7 +13618,7 @@ bound to the current value of the filter.
 ;;;***
 
 ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers)
-;;;;;;  "ibuffer" "ibuffer.el" (17178 22146))
+;;;;;;  "ibuffer" "ibuffer.el" (17187 59901))
 ;;; Generated autoloads from ibuffer.el
 
 (autoload (quote ibuffer-list-buffers) "ibuffer" "\
@@ -13359,7 +13659,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" (17178 22143))
+;;;;;;  "calendar/icalendar.el" (17254 64014))
 ;;; Generated autoloads from calendar/icalendar.el
 
 (autoload (quote icalendar-export-file) "icalendar" "\
@@ -13381,7 +13681,7 @@ written into the buffer `*icalendar-errors*'.
 \(fn MIN MAX ICAL-FILENAME)" t nil)
 
 (autoload (quote icalendar-import-file) "icalendar" "\
-Import a iCalendar file and append to a diary file.
+Import an iCalendar file and append to a diary file.
 Argument ICAL-FILENAME output iCalendar file.
 Argument DIARY-FILENAME input `diary-file'.
 Optional argument NON-MARKING determines whether events are created as
@@ -13411,8 +13711,8 @@ buffer `*icalendar-errors*'.
 
 ;;;***
 
-;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (17178
-;;;;;;  22146))
+;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from icomplete.el
 
 (defvar icomplete-mode nil "\
@@ -13433,7 +13733,7 @@ With a numeric argument, turn Icomplete mode on iff ARG is positive.
 
 ;;;***
 
-;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (17178 22153))
+;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (17187 59902))
 ;;; Generated autoloads from progmodes/icon.el
 
 (autoload (quote icon-mode) "icon" "\
@@ -13474,7 +13774,7 @@ with no args, if that value is non-nil.
 ;;;***
 
 ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17226 24577))
 ;;; Generated autoloads from progmodes/idlw-shell.el
 
 (autoload (quote idlwave-shell) "idlw-shell" "\
@@ -13500,7 +13800,7 @@ See also the variable `idlwave-shell-prompt-pattern'.
 ;;;***
 
 ;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el"
-;;;;;;  (17178 20481))
+;;;;;;  (17226 24577))
 ;;; Generated autoloads from progmodes/idlwave.el
 
 (autoload (quote idlwave-mode) "idlwave" "\
@@ -13636,8 +13936,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" (17178
-;;;;;;  22146))
+;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17244
+;;;;;;  4913))
 ;;; Generated autoloads from ido.el
 
 (defvar ido-mode nil "\
@@ -13898,7 +14198,7 @@ DEF, if non-nil, is the default value.
 
 ;;;***
 
-;;;### (autoloads (ielm) "ielm" "ielm.el" (17178 22146))
+;;;### (autoloads (ielm) "ielm" "ielm.el" (17187 59901))
 ;;; Generated autoloads from ielm.el
  (add-hook 'same-window-buffer-names "*ielm*")
 
@@ -13911,7 +14211,7 @@ Switches to the buffer `*ielm*', or creates it if it does not exist.
 ;;;***
 
 ;;;### (autoloads (iimage-mode turn-on-iimage-mode) "iimage" "iimage.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from iimage.el
 
 (autoload (quote turn-on-iimage-mode) "iimage" "\
@@ -13928,8 +14228,8 @@ 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-header image-type-from-data) "image"
-;;;;;;  "image.el" (17178 22146))
+;;;;;;  image-type-from-file-name image-type-from-file-header image-type-from-buffer
+;;;;;;  image-type-from-data) "image" "image.el" (17254 63790))
 ;;; Generated autoloads from image.el
 
 (autoload (quote image-type-from-data) "image" "\
@@ -13939,6 +14239,13 @@ be determined.
 
 \(fn DATA)" nil nil)
 
+(autoload (quote image-type-from-buffer) "image" "\
+Determine the image type from data in the current buffer.
+Value is a symbol specifying the image type or nil if type cannot
+be determined.
+
+\(fn)" nil nil)
+
 (autoload (quote image-type-from-file-header) "image" "\
 Determine the type of image file FILE from its first few bytes.
 Value is a symbol specifying the image type, or nil if type cannot
@@ -13946,6 +14253,13 @@ be determined.
 
 \(fn FILE)" nil nil)
 
+(autoload (quote image-type-from-file-name) "image" "\
+Determine the type of image file FILE from its name.
+Value is a symbol specifying the image type, or nil if type cannot
+be determined.
+
+\(fn FILE)" nil nil)
+
 (autoload (quote image-type-available-p) "image" "\
 Return non-nil if image type TYPE is available.
 Image types are symbols like `xbm' or `jpeg'.
@@ -13964,6 +14278,8 @@ Optional PROPS are additional image attributes to assign to the image,
 like, e.g. `:mask MASK'.
 Value is the image created, or nil if images of type TYPE are not supported.
 
+Images should not be larger than specified by `max-image-size'.
+
 \(fn FILE-OR-DATA &optional TYPE DATA-P &rest PROPS)" nil nil)
 
 (autoload (quote put-image) "image" "\
@@ -14032,7 +14348,9 @@ is supported, and FILE exists, is used to construct the image
 specification to be returned.  Return nil if no specification is
 satisfied.
 
-The image is looked for first on `load-path' and then in `data-directory'.
+The image is looked for in `image-load-path'.
+
+Image files should not be larger than specified by `max-image-size'.
 
 \(fn SPECS)" nil nil)
 
@@ -14062,7 +14380,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" (17178 22146))
+;;;;;;  "image-file.el" (17187 59901))
 ;;; Generated autoloads from image-file.el
 
 (defvar image-file-name-extensions (quote ("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm")) "\
@@ -14125,7 +14443,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" (17178 20481))
+;;;;;;  "image-mode" "image-mode.el" (17226 24576))
 ;;; Generated autoloads from image-mode.el
  (push '("\\.jpe?g\\'"    . image-mode) auto-mode-alist)
  (push '("\\.png\\'"      . image-mode) auto-mode-alist)
@@ -14163,7 +14481,7 @@ information on these modes.
 ;;;***
 
 ;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar
-;;;;;;  imenu-sort-function) "imenu" "imenu.el" (17178 22146))
+;;;;;;  imenu-sort-function) "imenu" "imenu.el" (17187 59901))
 ;;; Generated autoloads from imenu.el
 
 (defvar imenu-sort-function nil "\
@@ -14283,7 +14601,7 @@ for more information.
 
 ;;;### (autoloads (indian-char-glyph indian-glyph-char in-is13194-pre-write-conversion
 ;;;;;;  in-is13194-post-read-conversion indian-compose-string indian-compose-region)
-;;;;;;  "ind-util" "language/ind-util.el" (17178 20481))
+;;;;;;  "ind-util" "language/ind-util.el" (17187 59881))
 ;;; Generated autoloads from language/ind-util.el
 
 (autoload (quote indian-compose-region) "ind-util" "\
@@ -14326,7 +14644,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" (17178 22153))
+;;;;;;  "progmodes/inf-lisp.el" (17187 59902))
 ;;; Generated autoloads from progmodes/inf-lisp.el
 
 (defvar inferior-lisp-filter-regexp "\\`\\s *\\(:\\(\\w\\|\\s_\\)\\)?\\s *\\'" "\
@@ -14393,7 +14711,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-standalone info-emacs-manual info info-other-window)
-;;;;;;  "info" "info.el" (17178 22146))
+;;;;;;  "info" "info.el" (17244 4913))
 ;;; Generated autoloads from info.el
 
 (autoload (quote info-other-window) "info" "\
@@ -14478,18 +14796,17 @@ Selecting other nodes:
 \\[Info-menu]   Pick menu item specified by name (or abbreviation).
           Picking a menu item causes another node to be selected.
 \\[Info-directory]      Go to the Info directory node.
+\\[Info-top-node]       Go to the Top node of this file.
+\\[Info-final-node]     Go to the final node in this file.
+\\[Info-backward-node]  Go backward one node, considering all nodes as forming one sequence.
+\\[Info-forward-node]   Go forward one node, considering all nodes as forming one sequence.
+\\[Info-next-reference] Move cursor to next cross-reference or menu item.
+\\[Info-prev-reference] Move cursor to previous cross-reference or menu item.
 \\[Info-follow-reference]       Follow a cross reference.  Reads name of reference.
 \\[Info-history-back]   Move back in history to the last node you were at.
 \\[Info-history-forward]        Move forward in history to the node you returned from after using \\[Info-history-back].
 \\[Info-history]        Go to menu of visited nodes.
 \\[Info-toc]    Go to table of contents of the current Info file.
-\\[Info-top-node]       Go to the Top node of this file.
-\\[Info-final-node]     Go to the final node in this file.
-\\[Info-backward-node]  Go backward one node, considering all nodes as forming one sequence.
-\\[Info-forward-node]   Go forward one node, considering all nodes as forming one sequence.
-\\[Info-index]  Look up a topic in this file's Index and move to that node.
-\\[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.
 
 Moving within a node:
 \\[Info-scroll-up]      Normally, scroll forward a full screen.
@@ -14503,22 +14820,22 @@ Moving within a node:
 \\[beginning-of-buffer] Go to beginning of node.
 
 Advanced commands:
-\\[Info-copy-current-node-name] Put name of current Info node in the kill ring.
-\\[clone-buffer]        Select a new cloned Info buffer in another window.
-\\[Info-edit]   Edit contents of selected node.
-1 .. 9  Pick first ... ninth item in node's menu.
-          Every third `*' is highlighted to help pick the right number.
-\\[Info-goto-node]      Move to node specified by name.
-          You may include a filename as well, as (FILENAME)NODENAME.
-\\[universal-argument] \\[info] Move to new Info file with completion.
-\\[universal-argument] N \\[info]       Select Info buffer with prefix number in the name *info*<N>.
 \\[Info-search] Search through this Info file for specified regexp,
           and select the node in which the next occurrence is found.
 \\[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-next-reference] Move cursor to next cross-reference or menu item.
-\\[Info-prev-reference] Move cursor to previous cross-reference or menu item.
+\\[Info-index]  Look up a topic in this file's Index and move to that node.
+\\[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.
+          You may include a filename as well, as (FILENAME)NODENAME.
+1 .. 9  Pick first ... ninth item in node's menu.
+          Every third `*' is highlighted to help pick the right number.
+\\[Info-copy-current-node-name] Put name of current Info node in the kill ring.
+\\[clone-buffer]        Select a new cloned Info buffer in another window.
+\\[universal-argument] \\[info] Move to new Info file with completion.
+\\[universal-argument] N \\[info]       Select Info buffer with prefix number in the name *info*<N>.
 
 \(fn)" nil nil)
  (put 'Info-goto-emacs-command-node 'info-file "emacs")
@@ -14553,7 +14870,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"
-;;;;;;  (17178 22146))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from info-look.el
 
 (autoload (quote info-lookup-reset) "info-look" "\
@@ -14601,7 +14918,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" (17178 22146))
+;;;;;;  info-xref-check) "info-xref" "info-xref.el" (17187 59901))
 ;;; Generated autoloads from info-xref.el
 
 (autoload (quote info-xref-check) "info-xref" "\
@@ -14628,7 +14945,7 @@ quite a while.
 ;;;***
 
 ;;;### (autoloads (batch-info-validate Info-validate Info-split Info-tagify)
-;;;;;;  "informat" "informat.el" (17178 22146))
+;;;;;;  "informat" "informat.el" (17187 59901))
 ;;; Generated autoloads from informat.el
 
 (autoload (quote Info-tagify) "informat" "\
@@ -14669,7 +14986,7 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\"
 
 ;;;### (autoloads (isearch-process-search-multibyte-characters isearch-toggle-input-method
 ;;;;;;  isearch-toggle-specified-input-method) "isearch-x" "international/isearch-x.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from international/isearch-x.el
 
 (autoload (quote isearch-toggle-specified-input-method) "isearch-x" "\
@@ -14689,8 +15006,8 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (17178
-;;;;;;  22147))
+;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from isearchb.el
 
 (autoload (quote isearchb-activate) "isearchb" "\
@@ -14704,7 +15021,7 @@ accessed via isearchb.
 ;;;***
 
 ;;;### (autoloads (iso-accents-mode) "iso-acc" "obsolete/iso-acc.el"
-;;;;;;  (17178 22152))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from obsolete/iso-acc.el
 
 (autoload (quote iso-accents-mode) "iso-acc" "\
@@ -14737,7 +15054,7 @@ and a negative argument disables it.
 ;;;### (autoloads (iso-cvt-define-menu iso-cvt-write-only iso-cvt-read-only
 ;;;;;;  iso-sgml2iso iso-iso2sgml iso-iso2duden iso-iso2gtex iso-gtex2iso
 ;;;;;;  iso-tex2iso iso-iso2tex iso-german iso-spanish) "iso-cvt"
-;;;;;;  "international/iso-cvt.el" (17178 20480))
+;;;;;;  "international/iso-cvt.el" (17187 59880))
 ;;; Generated autoloads from international/iso-cvt.el
 
 (autoload (quote iso-spanish) "iso-cvt" "\
@@ -14821,7 +15138,7 @@ Add submenus to the File menu, to convert to and from various formats.
 ;;;***
 
 ;;;### (autoloads nil "iso-transl" "international/iso-transl.el"
-;;;;;;  (17178 20504))
+;;;;;;  (17187 59894))
 ;;; Generated autoloads from international/iso-transl.el
  (or key-translation-map (setq key-translation-map (make-sparse-keymap)))
  (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map)
@@ -14834,7 +15151,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"
-;;;;;;  (17178 22154))
+;;;;;;  (17254 63791))
 ;;; Generated autoloads from textmodes/ispell.el
 
 (defvar ispell-personal-dictionary nil "\
@@ -15120,8 +15437,8 @@ You can bind this to the key C-c i in GNUS or mail by adding to
 
 ;;;***
 
-;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (17178
-;;;;;;  22147))
+;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (17226
+;;;;;;  24576))
 ;;; Generated autoloads from iswitchb.el
 
 (defvar iswitchb-mode nil "\
@@ -15147,7 +15464,7 @@ This mode enables switching between buffers using substrings.  See
 ;;;### (autoloads (read-hiragana-string japanese-zenkaku-region japanese-hankaku-region
 ;;;;;;  japanese-hiragana-region japanese-katakana-region japanese-zenkaku
 ;;;;;;  japanese-hankaku japanese-hiragana japanese-katakana setup-japanese-environment-internal)
-;;;;;;  "japan-util" "language/japan-util.el" (17178 20481))
+;;;;;;  "japan-util" "language/japan-util.el" (17187 59881))
 ;;; Generated autoloads from language/japan-util.el
 
 (autoload (quote setup-japanese-environment-internal) "japan-util" "\
@@ -15224,8 +15541,8 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading.
 
 ;;;***
 
-;;;### (autoloads (jit-lock-register) "jit-lock" "jit-lock.el" (17178
-;;;;;;  22147))
+;;;### (autoloads (jit-lock-register) "jit-lock" "jit-lock.el" (17238
+;;;;;;  21257))
 ;;; Generated autoloads from jit-lock.el
 
 (autoload (quote jit-lock-register) "jit-lock" "\
@@ -15239,7 +15556,7 @@ If non-nil, CONTEXTUAL means that a contextual fontification would be useful.
 ;;;***
 
 ;;;### (autoloads (jka-compr-uninstall jka-compr-handler) "jka-compr"
-;;;;;;  "jka-compr.el" (17178 22147))
+;;;;;;  "jka-compr.el" (17187 59901))
 ;;; Generated autoloads from jka-compr.el
 
 (defvar jka-compr-inhibit nil "\
@@ -15264,7 +15581,7 @@ by `jka-compr-installed'.
 
 ;;;### (autoloads (keypad-setup keypad-numlock-shifted-setup keypad-shifted-setup
 ;;;;;;  keypad-numlock-setup keypad-setup) "keypad" "emulation/keypad.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from emulation/keypad.el
 
 (defvar keypad-setup nil "\
@@ -15320,7 +15637,7 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.'
 ;;;***
 
 ;;;### (autoloads (kinsoku) "kinsoku" "international/kinsoku.el"
-;;;;;;  (17178 20480))
+;;;;;;  (17187 59880))
 ;;; Generated autoloads from international/kinsoku.el
 
 (autoload (quote kinsoku) "kinsoku" "\
@@ -15341,8 +15658,8 @@ the context of text formatting.
 
 ;;;***
 
-;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (17178
-;;;;;;  20480))
+;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (17187
+;;;;;;  59880))
 ;;; Generated autoloads from international/kkc.el
 
 (defvar kkc-after-update-conversion-functions nil "\
@@ -15367,7 +15684,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" (17178 22147))
+;;;;;;  "kmacro.el" (17187 59901))
 ;;; Generated autoloads from kmacro.el
  (global-set-key "\C-x(" 'kmacro-start-macro)
  (global-set-key "\C-x)" 'kmacro-end-macro)
@@ -15474,7 +15791,7 @@ If kbd macro currently being defined end it before activating it.
 
 ;;;### (autoloads (kannada-post-read-conversion kannada-compose-string
 ;;;;;;  kannada-compose-region) "knd-util" "language/knd-util.el"
-;;;;;;  (17178 20481))
+;;;;;;  (17187 59881))
 ;;; Generated autoloads from language/knd-util.el
 
 (defconst kannada-consonant "[\x51f75-\x51fb9]")
@@ -15497,7 +15814,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (setup-korean-environment-internal) "korea-util"
-;;;;;;  "language/korea-util.el" (17178 20481))
+;;;;;;  "language/korea-util.el" (17187 59881))
 ;;; Generated autoloads from language/korea-util.el
 
 (defvar default-korean-keyboard (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "") "\
@@ -15512,7 +15829,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (lm lm-test-run) "landmark" "play/landmark.el"
-;;;;;;  (17178 22152))
+;;;;;;  (17226 24576))
 ;;; Generated autoloads from play/landmark.el
 
 (defalias (quote landmark-repeat) (quote lm-test-run))
@@ -15546,8 +15863,8 @@ Use \\[describe-mode] for more info.
 
 ;;;### (autoloads (lao-compose-region lao-composition-function lao-post-read-conversion
 ;;;;;;  lao-transcribe-roman-to-lao-string lao-transcribe-single-roman-syllable-to-lao
-;;;;;;  lao-compose-string) "lao-util" "language/lao-util.el" (17178
-;;;;;;  20481))
+;;;;;;  lao-compose-string) "lao-util" "language/lao-util.el" (17187
+;;;;;;  59881))
 ;;; Generated autoloads from language/lao-util.el
 
 (autoload (quote lao-compose-string) "lao-util" "\
@@ -15596,7 +15913,7 @@ Not documented
 
 ;;;### (autoloads (latexenc-find-file-coding-system latexenc-coding-system-to-inputenc
 ;;;;;;  latexenc-inputenc-to-coding-system latex-inputenc-coding-alist)
-;;;;;;  "latexenc" "international/latexenc.el" (17178 20480))
+;;;;;;  "latexenc" "international/latexenc.el" (17187 59880))
 ;;; Generated autoloads from international/latexenc.el
 
 (defvar latex-inputenc-coding-alist (quote (("ansinew" . windows-1252) ("applemac" . mac-roman) ("ascii" . us-ascii) ("cp1250" . windows-1250) ("cp1252" . windows-1252) ("cp1257" . cp1257) ("cp437de" . cp437) ("cp437" . cp437) ("cp850" . cp850) ("cp852" . cp852) ("cp865" . cp865) ("latin1" . iso-8859-1) ("latin2" . iso-8859-2) ("latin3" . iso-8859-3) ("latin4" . iso-8859-4) ("latin5" . iso-8859-5) ("latin9" . iso-8859-15) ("next" . next) ("utf8" . utf-8) ("utf8x" . utf-8))) "\
@@ -15627,7 +15944,7 @@ coding system names is determined from `latex-inputenc-coding-alist'.
 ;;;***
 
 ;;;### (autoloads (latin1-display-ucs-per-lynx latin1-display latin1-display)
-;;;;;;  "latin1-disp" "international/latin1-disp.el" (17178 20480))
+;;;;;;  "latin1-disp" "international/latin1-disp.el" (17187 59880))
 ;;; Generated autoloads from international/latin1-disp.el
 
 (defvar latin1-display nil "\
@@ -15671,7 +15988,7 @@ use either \\[customize] or the function `latin1-display'.")
 ;;;***
 
 ;;;### (autoloads (turn-on-lazy-lock lazy-lock-mode) "lazy-lock"
-;;;;;;  "obsolete/lazy-lock.el" (17178 22152))
+;;;;;;  "obsolete/lazy-lock.el" (17187 59902))
 ;;; Generated autoloads from obsolete/lazy-lock.el
 
 (autoload (quote lazy-lock-mode) "lazy-lock" "\
@@ -15739,7 +16056,7 @@ Unconditionally turn on Lazy Lock mode.
 ;;;***
 
 ;;;### (autoloads (ld-script-mode) "ld-script" "progmodes/ld-script.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from progmodes/ld-script.el
 
 (add-to-list (quote auto-mode-alist) (quote ("\\.lds" . ld-script-mode)))
@@ -15752,7 +16069,7 @@ A major mode to edit GNU ld script files
 ;;;***
 
 ;;;### (autoloads (ledit-from-lisp-mode ledit-mode) "ledit" "ledit.el"
-;;;;;;  (17178 22149))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from ledit.el
 
 (defconst ledit-save-files t "\
@@ -15786,7 +16103,7 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (life) "life" "play/life.el" (17178 22152))
+;;;### (autoloads (life) "life" "play/life.el" (17187 59902))
 ;;; Generated autoloads from play/life.el
 
 (autoload (quote life) "life" "\
@@ -15799,8 +16116,8 @@ generations (this defaults to 1).
 
 ;;;***
 
-;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (17178
-;;;;;;  22150))
+;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (17244
+;;;;;;  4913))
 ;;; Generated autoloads from loadhist.el
 
 (autoload (quote unload-feature) "loadhist" "\
@@ -15823,7 +16140,7 @@ such as redefining an Emacs function.
 ;;;***
 
 ;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches)
-;;;;;;  "locate" "locate.el" (17178 22150))
+;;;;;;  "locate" "locate.el" (17254 63790))
 ;;; Generated autoloads from locate.el
 
 (defvar locate-ls-subdir-switches "-al" "\
@@ -15848,7 +16165,7 @@ shown; this is often useful to constrain a big search.
 
 ;;;***
 
-;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (17178 22150))
+;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (17226 24576))
 ;;; Generated autoloads from log-edit.el
 
 (autoload (quote log-edit) "log-edit" "\
@@ -15869,8 +16186,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" (17178
-;;;;;;  22150))
+;;;### (autoloads (log-view-mode) "log-view" "log-view.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from log-view.el
 
 (autoload (quote log-view-mode) "log-view" "\
@@ -15880,8 +16197,8 @@ Major mode for browsing CVS log output.
 
 ;;;***
 
-;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (17178
-;;;;;;  22150))
+;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (17238
+;;;;;;  21257))
 ;;; Generated autoloads from longlines.el
 
 (autoload (quote longlines-mode) "longlines" "\
@@ -15902,8 +16219,8 @@ are indicated with a symbol.
 ;;;***
 
 ;;;### (autoloads (print-region lpr-region print-buffer lpr-buffer
-;;;;;;  lpr-command lpr-switches printer-name) "lpr" "lpr.el" (17178
-;;;;;;  22150))
+;;;;;;  lpr-command lpr-switches printer-name) "lpr" "lpr.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from lpr.el
 
 (defvar lpr-windows-system (memq system-type (quote (emx win32 w32 mswindows ms-dos windows-nt))))
@@ -15997,7 +16314,7 @@ for further customization of the printer command.
 ;;;***
 
 ;;;### (autoloads (ls-lisp-support-shell-wildcards) "ls-lisp" "ls-lisp.el"
-;;;;;;  (17178 22150))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from ls-lisp.el
 
 (defvar ls-lisp-support-shell-wildcards t "\
@@ -16008,8 +16325,8 @@ Otherwise they are treated as Emacs regexps (for backward compatibility).")
 
 ;;;***
 
-;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17178
-;;;;;;  22143))
+;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from calendar/lunar.el
 
 (autoload (quote phases-of-moon) "lunar" "\
@@ -16022,8 +16339,8 @@ This function is suitable for execution in a .emacs file.
 
 ;;;***
 
-;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17178
-;;;;;;  22153))
+;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from progmodes/m4-mode.el
 
 (autoload (quote m4-mode) "m4-mode" "\
@@ -16035,7 +16352,7 @@ A major mode to edit m4 macro files.
 ;;;***
 
 ;;;### (autoloads (macroexpand-all) "macroexp" "emacs-lisp/macroexp.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from emacs-lisp/macroexp.el
 
 (autoload (quote macroexpand-all) "macroexp" "\
@@ -16049,7 +16366,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" (17178 22150))
+;;;;;;  name-last-kbd-macro) "macros" "macros.el" (17187 59901))
 ;;; Generated autoloads from macros.el
 
 (autoload (quote name-last-kbd-macro) "macros" "\
@@ -16138,7 +16455,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" (17178 22150))
+;;;;;;  "mail/mail-extr.el" (17187 59901))
 ;;; Generated autoloads from mail/mail-extr.el
 
 (autoload (quote mail-extract-address-components) "mail-extr" "\
@@ -16169,7 +16486,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"
-;;;;;;  (17178 22150))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from mail/mail-hist.el
 
 (autoload (quote mail-hist-define-keys) "mail-hist" "\
@@ -16200,8 +16517,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" (17178
-;;;;;;  22150))
+;;;;;;  mail-use-rfc822) "mail-utils" "mail/mail-utils.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from mail/mail-utils.el
 
 (defvar mail-use-rfc822 nil "\
@@ -16253,7 +16570,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" (17178 22150))
+;;;;;;  "mailabbrev" "mail/mailabbrev.el" (17238 21257))
 ;;; Generated autoloads from mail/mailabbrev.el
 
 (autoload (quote mail-abbrevs-setup) "mailabbrev" "\
@@ -16276,8 +16593,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" (17178
-;;;;;;  22150))
+;;;;;;  mail-complete-style) "mailalias" "mail/mailalias.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from mail/mailalias.el
 
 (defvar mail-complete-style (quote angles) "\
@@ -16322,9 +16639,22 @@ current header, calls `mail-complete-function' and passes prefix arg if any.
 
 ;;;***
 
+;;;### (autoloads (mailclient-send-it) "mailclient" "mail/mailclient.el"
+;;;;;;  (17226 24564))
+;;; Generated autoloads from mail/mailclient.el
+
+(autoload (quote mailclient-send-it) "mailclient" "\
+Pass current buffer on to the system's mail client.
+Suitable value for `send-mail-function'.
+The mail client is taken to be the handler of mailto URLs.
+
+\(fn)" nil nil)
+
+;;;***
+
 ;;;### (autoloads (makefile-bsdmake-mode makefile-makepp-mode makefile-gmake-mode
 ;;;;;;  makefile-automake-mode makefile-mode) "make-mode" "progmodes/make-mode.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17238 21257))
 ;;; Generated autoloads from progmodes/make-mode.el
 
 (autoload (quote makefile-mode) "make-mode" "\
@@ -16436,8 +16766,8 @@ An adapted `makefile-mode' that knows about BSD make.
 
 ;;;***
 
-;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (17178
-;;;;;;  22151))
+;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from makesum.el
 
 (autoload (quote make-command-summary) "makesum" "\
@@ -16448,7 +16778,7 @@ Previous contents of that buffer are killed first.
 
 ;;;***
 
-;;;### (autoloads (man-follow man) "man" "man.el" (17178 22151))
+;;;### (autoloads (man-follow man) "man" "man.el" (17238 21257))
 ;;; Generated autoloads from man.el
 
 (defalias (quote manual-entry) (quote man))
@@ -16475,7 +16805,7 @@ Get a Un*x manual page of the item under point and put it in a buffer.
 
 ;;;***
 
-;;;### (autoloads (master-mode) "master" "master.el" (17178 22151))
+;;;### (autoloads (master-mode) "master" "master.el" (17187 59902))
 ;;; Generated autoloads from master.el
 
 (autoload (quote master-mode) "master" "\
@@ -16497,8 +16827,8 @@ yourself the value of `master-of' by calling `master-show-slave'.
 
 ;;;***
 
-;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17178
-;;;;;;  22151))
+;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17254
+;;;;;;  63790))
 ;;; Generated autoloads from menu-bar.el
 
 (put (quote menu-bar-mode) (quote standard-value) (quote (t)))
@@ -16529,15 +16859,12 @@ turn on menu bars; otherwise, turn off menu bars.
 ;;;;;;  message-bounce message-resend message-insinuate-rmail message-forward-rmail-make-body
 ;;;;;;  message-forward-make-body message-forward message-recover
 ;;;;;;  message-supersede message-cancel-news message-followup message-wide-reply
-;;;;;;  message-reply message-news message-mail message-mode message-reduce-to-to-cc
-;;;;;;  message-cross-post-followup-to message-cross-post-insert-note
-;;;;;;  message-cross-post-followup-to-header message-add-archive-header
-;;;;;;  message-mark-insert-file message-mark-inserted-region message-change-subject
-;;;;;;  message-signature-insert-empty-line message-signature-file
-;;;;;;  message-signature message-indent-citation-function message-cite-function
-;;;;;;  message-yank-prefix message-citation-line-function message-send-mail-function
-;;;;;;  message-user-organization-file message-signature-separator
-;;;;;;  message-from-style) "message" "gnus/message.el" (17178 22145))
+;;;;;;  message-reply message-news message-mail message-mode message-signature-insert-empty-line
+;;;;;;  message-signature-file message-signature message-indent-citation-function
+;;;;;;  message-cite-function message-yank-prefix message-citation-line-function
+;;;;;;  message-send-mail-function message-user-organization-file
+;;;;;;  message-signature-separator message-from-style) "message"
+;;;;;;  "gnus/message.el" (17254 63788))
 ;;; Generated autoloads from gnus/message.el
 
 (defvar message-from-style (quote default) "\
@@ -16633,58 +16960,6 @@ If nil, don't insert a signature.")
 
 (define-mail-user-agent (quote message-user-agent) (quote message-mail) (quote message-send-and-exit) (quote message-kill-buffer) (quote message-send-hook))
 
-(autoload (quote message-change-subject) "message" "\
-Ask for NEW-SUBJECT header, append (was: <Old Subject>).
-
-\(fn NEW-SUBJECT)" t nil)
-
-(autoload (quote message-mark-inserted-region) "message" "\
-Mark some region in the current article with enclosing tags.
-See `message-mark-insert-begin' and `message-mark-insert-end'.
-
-\(fn BEG END)" t nil)
-
-(autoload (quote message-mark-insert-file) "message" "\
-Insert FILE at point, marking it with enclosing tags.
-See `message-mark-insert-begin' and `message-mark-insert-end'.
-
-\(fn FILE)" t nil)
-
-(autoload (quote message-add-archive-header) "message" "\
-Insert \"X-No-Archive: Yes\" in the header and a note in the body.
-The note can be customized using `message-archive-note'.  When called with a
-prefix argument, ask for a text to insert.  If you don't want the note in the
-body, set  `message-archive-note' to nil.
-
-\(fn)" t nil)
-
-(autoload (quote message-cross-post-followup-to-header) "message" "\
-Mangles FollowUp-To and Newsgroups header to point to TARGET-GROUP.
-With prefix-argument just set Follow-Up, don't cross-post.
-
-\(fn TARGET-GROUP)" t nil)
-
-(autoload (quote message-cross-post-insert-note) "message" "\
-Insert a in message body note about a set Followup or Crosspost.
-If there have been previous notes, delete them.  TARGET-GROUP specifies the
-group to Followup-To.  When CROSS-POST is t, insert note about
-crossposting.  IN-OLD specifies whether TARGET-GROUP is a member of
-OLD-GROUPS.  OLD-GROUPS lists the old-groups the posting would have
-been made to before the user asked for a Crosspost.
-
-\(fn TARGET-GROUP CROSS-POST IN-OLD OLD-GROUPS)" nil nil)
-
-(autoload (quote message-cross-post-followup-to) "message" "\
-Crossposts message and set Followup-To to TARGET-GROUP.
-With prefix-argument just set Follow-Up, don't cross-post.
-
-\(fn TARGET-GROUP)" t nil)
-
-(autoload (quote message-reduce-to-to-cc) "message" "\
-Replace contents of To: header with contents of Cc: or Bcc: header.
-
-\(fn)" t nil)
-
 (autoload (quote message-mode) "message" "\
 Major mode for editing mail and news to be sent.
 Like Text Mode but with these additional commands:\\<message-mode-map>
@@ -16843,7 +17118,7 @@ which specify the range to operate on.
 ;;;***
 
 ;;;### (autoloads (metapost-mode metafont-mode) "meta-mode" "progmodes/meta-mode.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17238 21257))
 ;;; Generated autoloads from progmodes/meta-mode.el
 
 (autoload (quote metafont-mode) "meta-mode" "\
@@ -16870,7 +17145,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"
-;;;;;;  (17178 22150))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from mail/metamail.el
 
 (autoload (quote metamail-interpret-header) "metamail" "\
@@ -16914,8 +17189,8 @@ redisplayed as output is inserted.
 ;;;***
 
 ;;;### (autoloads (mh-letter-mode mh-smail-other-window mh-user-agent-compose
-;;;;;;  mh-smail-batch mh-smail) "mh-comp" "mh-e/mh-comp.el" (17178
-;;;;;;  20480))
+;;;;;;  mh-smail-batch mh-smail) "mh-comp" "mh-e/mh-comp.el" (17254
+;;;;;;  63790))
 ;;; Generated autoloads from mh-e/mh-comp.el
 
 (autoload (quote mh-smail) "mh-comp" "\
@@ -16969,16 +17244,13 @@ Mode for composing letters in MH-E.\\<mh-letter-mode-map>
 When you have finished composing, type \\[mh-send-letter] to send the message
 using the MH mail handling system.
 
-There are two types of MIME directives used by MH-E: Gnus and MH. The option
-`mh-compose-insertion' controls what type of directives are inserted by MH-E
-commands. These directives can be converted to MIME body parts by running
-\\[mh-edit-mhn] for mhn directives or \\[mh-mml-to-mime] for Gnus directives.
-This step is mandatory if these directives are added manually. If the
-directives are inserted with MH-E commands such as \\[mh-compose-insertion],
-the directives are expanded automatically when the letter is sent.
+There are two types of tags used by MH-E when composing MIME messages: MML and
+MH. The option `mh-compose-insertion' controls what type of tags are inserted
+by MH-E commands. These tags can be converted to MIME body parts by running
+\\[mh-mh-to-mime] for MH-style directives or \\[mh-mml-to-mime] for MML tags.
 
-Options that control this mode can be changed with
-\\[customize-group]; specify the \"mh-compose\" group.
+Options that control this mode can be changed with \\[customize-group];
+specify the \"mh-compose\" group.
 
 When a message is composed, the hooks `text-mode-hook' and
 `mh-letter-mode-hook' are run.
@@ -16990,7 +17262,7 @@ When a message is composed, the hooks `text-mode-hook' and
 ;;;***
 
 ;;;### (autoloads (mh-folder-mode mh-version mh-nmail mh-rmail) "mh-e"
-;;;;;;  "mh-e/mh-e.el" (17178 22151))
+;;;;;;  "mh-e/mh-e.el" (17254 63790))
 ;;; Generated autoloads from mh-e/mh-e.el
 
 (autoload (quote mh-rmail) "mh-e" "\
@@ -17068,7 +17340,7 @@ messages in that region.
 
 ;;;***
 
-;;;### (autoloads nil "mh-init" "mh-e/mh-init.el" (17178 20480))
+;;;### (autoloads nil "mh-init" "mh-e/mh-init.el" (17238 21257))
 ;;; Generated autoloads from mh-e/mh-init.el
 
 (put (quote mh-progs) (quote risky-local-variable) t)
@@ -17080,7 +17352,7 @@ messages in that region.
 ;;;***
 
 ;;;### (autoloads (midnight-delay-set clean-buffer-list) "midnight"
-;;;;;;  "midnight.el" (17178 22151))
+;;;;;;  "midnight.el" (17187 59902))
 ;;; Generated autoloads from midnight.el
 
 (autoload (quote clean-buffer-list) "midnight" "\
@@ -17107,7 +17379,7 @@ to its second argument TM.
 ;;;***
 
 ;;;### (autoloads (minibuffer-electric-default-mode) "minibuf-eldef"
-;;;;;;  "minibuf-eldef.el" (17178 22151))
+;;;;;;  "minibuf-eldef.el" (17187 59902))
 ;;; Generated autoloads from minibuf-eldef.el
 
 (defvar minibuffer-electric-default-mode nil "\
@@ -17136,7 +17408,7 @@ Returns non-nil if the new state is enabled.
 ;;;***
 
 ;;;### (autoloads (mixal-mode) "mixal-mode" "progmodes/mixal-mode.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17238 21095))
 ;;; Generated autoloads from progmodes/mixal-mode.el
 
 (autoload (quote mixal-mode) "mixal-mode" "\
@@ -17151,7 +17423,7 @@ Major mode for the mixal asm language.
 
 ;;;### (autoloads (malayalam-composition-function malayalam-post-read-conversion
 ;;;;;;  malayalam-compose-region) "mlm-util" "language/mlm-util.el"
-;;;;;;  (17178 20481))
+;;;;;;  (17187 59881))
 ;;; Generated autoloads from language/mlm-util.el
 
 (autoload (quote malayalam-compose-region) "mlm-util" "\
@@ -17174,7 +17446,7 @@ PATTERN regexp.
 ;;;***
 
 ;;;### (autoloads (mm-inline-external-body) "mm-extern" "gnus/mm-extern.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/mm-extern.el
 
 (autoload (quote mm-inline-external-body) "mm-extern" "\
@@ -17188,7 +17460,7 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing.
 ;;;***
 
 ;;;### (autoloads (mm-inline-partial) "mm-partial" "gnus/mm-partial.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/mm-partial.el
 
 (autoload (quote mm-inline-partial) "mm-partial" "\
@@ -17202,7 +17474,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" (17178 22146))
+;;;;;;  "mm-url" "gnus/mm-url.el" (17226 24575))
 ;;; Generated autoloads from gnus/mm-url.el
 
 (autoload (quote mm-url-insert-file-contents) "mm-url" "\
@@ -17218,8 +17490,8 @@ Insert file contents of URL using `mm-url-program'.
 
 ;;;***
 
-;;;### (autoloads (mm-uu-dissect) "mm-uu" "gnus/mm-uu.el" (17178
-;;;;;;  22146))
+;;;### (autoloads (mm-uu-dissect) "mm-uu" "gnus/mm-uu.el" (17226
+;;;;;;  24575))
 ;;; Generated autoloads from gnus/mm-uu.el
 
 (autoload (quote mm-uu-dissect) "mm-uu" "\
@@ -17230,7 +17502,7 @@ Dissect the current buffer and return a list of uu handles.
 ;;;***
 
 ;;;### (autoloads (mml1991-sign mml1991-encrypt) "mml1991" "gnus/mml1991.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/mml1991.el
 
 (autoload (quote mml1991-encrypt) "mml1991" "\
@@ -17247,7 +17519,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" (17178 22146))
+;;;;;;  "mml2015" "gnus/mml2015.el" (17187 59901))
 ;;; Generated autoloads from gnus/mml2015.el
 
 (autoload (quote mml2015-decrypt) "mml2015" "\
@@ -17288,7 +17560,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (modula-2-mode) "modula2" "progmodes/modula2.el"
-;;;;;;  (17178 20481))
+;;;;;;  (17187 59880))
 ;;; Generated autoloads from progmodes/modula2.el
 
 (autoload (quote modula-2-mode) "modula2" "\
@@ -17320,7 +17592,7 @@ followed by the first character of the construct.
 ;;;***
 
 ;;;### (autoloads (unmorse-region morse-region) "morse" "play/morse.el"
-;;;;;;  (17178 22152))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from play/morse.el
 
 (autoload (quote morse-region) "morse" "\
@@ -17335,8 +17607,8 @@ Convert morse coded text in region to ordinary ASCII text.
 
 ;;;***
 
-;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (17178
-;;;;;;  22151))
+;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from mouse-sel.el
 
 (defvar mouse-sel-mode nil "\
@@ -17389,7 +17661,7 @@ primary selection and region.
 
 ;;;***
 
-;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (17178 22152))
+;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (17226 24576))
 ;;; Generated autoloads from play/mpuz.el
 
 (autoload (quote mpuz) "mpuz" "\
@@ -17399,7 +17671,7 @@ Multiplication puzzle with GNU Emacs.
 
 ;;;***
 
-;;;### (autoloads (msb-mode) "msb" "msb.el" (17178 22151))
+;;;### (autoloads (msb-mode) "msb" "msb.el" (17187 59914))
 ;;; Generated autoloads from msb.el
 
 (defvar msb-mode nil "\
@@ -17427,7 +17699,7 @@ different buffer menu using the function `msb'.
 ;;;;;;  describe-current-coding-system describe-current-coding-system-briefly
 ;;;;;;  describe-coding-system describe-character-set list-charset-chars
 ;;;;;;  read-charset list-character-sets) "mule-diag" "international/mule-diag.el"
-;;;;;;  (17178 20480))
+;;;;;;  (17226 24576))
 ;;; Generated autoloads from international/mule-diag.el
 
 (defvar non-iso-charset-alist (\` ((mac-roman (ascii latin-iso8859-1 mule-unicode-2500-33ff mule-unicode-0100-24ff mule-unicode-e000-ffff) mac-roman-decoder ((0 255))) (viscii (ascii vietnamese-viscii-lower vietnamese-viscii-upper) viet-viscii-nonascii-translation-table ((0 255))) (vietnamese-tcvn (ascii vietnamese-viscii-lower vietnamese-viscii-upper) viet-tcvn-nonascii-translation-table ((0 255))) (koi8-r (ascii cyrillic-iso8859-5) cyrillic-koi8-r-nonascii-translation-table ((32 255))) (alternativnyj (ascii cyrillic-iso8859-5) cyrillic-alternativnyj-nonascii-translation-table ((32 255))) (koi8-u (ascii cyrillic-iso8859-5 mule-unicode-0100-24ff) cyrillic-koi8-u-nonascii-translation-table ((32 255))) (big5 (ascii chinese-big5-1 chinese-big5-2) decode-big5-char ((32 127) ((161 254) 64 126 161 254))) (sjis (ascii katakana-jisx0201 japanese-jisx0208) decode-sjis-char ((32 127 161 223) ((129 159 224 239) 64 126 128 252))))) "\
@@ -17600,7 +17872,7 @@ system which uses fontsets).
 ;;;;;;  coding-system-translation-table-for-decode coding-system-pre-write-conversion
 ;;;;;;  coding-system-post-read-conversion lookup-nested-alist set-nested-alist
 ;;;;;;  truncate-string-to-width store-substring string-to-sequence)
-;;;;;;  "mule-util" "international/mule-util.el" (17178 20480))
+;;;;;;  "mule-util" "international/mule-util.el" (17187 59880))
 ;;; Generated autoloads from international/mule-util.el
 
 (autoload (quote string-to-sequence) "mule-util" "\
@@ -17729,7 +18001,7 @@ basis, this may not be accurate.
 ;;;***
 
 ;;;### (autoloads (mwheel-install mouse-wheel-mode) "mwheel" "mwheel.el"
-;;;;;;  (17178 22151))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from mwheel.el
 
 (defvar mouse-wheel-mode nil "\
@@ -17759,7 +18031,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" (17178 22151))
+;;;;;;  "net-utils" "net/net-utils.el" (17187 59902))
 ;;; Generated autoloads from net/net-utils.el
 
 (autoload (quote traceroute) "net-utils" "\
@@ -17855,7 +18127,7 @@ Open a network connection to HOST on PORT.
 ;;;;;;  comment-kill comment-set-column comment-indent comment-indent-default
 ;;;;;;  comment-normalize-vars comment-multi-line comment-padding
 ;;;;;;  comment-style comment-column) "newcomment" "newcomment.el"
-;;;;;;  (17178 22151))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from newcomment.el
 
 (defalias (quote indent-for-comment) (quote comment-indent))
@@ -18036,8 +18308,28 @@ unless optional argument SOFT is non-nil.
 
 ;;;***
 
+;;;### (autoloads (newsticker-show-news newsticker-start) "newsticker"
+;;;;;;  "net/newsticker.el" (17229 28054))
+;;; Generated autoloads from net/newsticker.el
+
+(autoload (quote newsticker-start) "newsticker" "\
+Start the newsticker.
+Start the timers for display and retrieval.  If the newsticker, i.e. the
+timers, are running already a warning message is printed unless
+DO-NOT-COMPLAIN-IF-RUNNING is not nil.
+Run `newsticker-start-hook' if newsticker was not running already.
+
+\(fn &optional DO-NOT-COMPLAIN-IF-RUNNING)" t nil)
+
+(autoload (quote newsticker-show-news) "newsticker" "\
+Switch to newsticker buffer.  You may want to bind this to a key.
+
+\(fn)" t nil)
+
+;;;***
+
 ;;;### (autoloads (nndiary-generate-nov-databases) "nndiary" "gnus/nndiary.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/nndiary.el
 
 (autoload (quote nndiary-generate-nov-databases) "nndiary" "\
@@ -18047,8 +18339,8 @@ Generate NOV databases in all nndiary directories.
 
 ;;;***
 
-;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (17178
-;;;;;;  22146))
+;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from gnus/nndoc.el
 
 (autoload (quote nndoc-add-type) "nndoc" "\
@@ -18063,7 +18355,7 @@ symbol in the alist.
 ;;;***
 
 ;;;### (autoloads (nnfolder-generate-active-file) "nnfolder" "gnus/nnfolder.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/nnfolder.el
 
 (autoload (quote nnfolder-generate-active-file) "nnfolder" "\
@@ -18075,7 +18367,7 @@ This command does not work if you use short group names.
 ;;;***
 
 ;;;### (autoloads (nnkiboze-generate-groups) "nnkiboze" "gnus/nnkiboze.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/nnkiboze.el
 
 (autoload (quote nnkiboze-generate-groups) "nnkiboze" "\
@@ -18087,7 +18379,7 @@ Finds out what articles are to be part of the nnkiboze groups.
 ;;;***
 
 ;;;### (autoloads (nnml-generate-nov-databases) "nnml" "gnus/nnml.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/nnml.el
 
 (autoload (quote nnml-generate-nov-databases) "nnml" "\
@@ -18098,7 +18390,7 @@ Generate NOV databases in all nnml directories.
 ;;;***
 
 ;;;### (autoloads (nnsoup-revert-variables nnsoup-set-variables nnsoup-pack-replies)
-;;;;;;  "nnsoup" "gnus/nnsoup.el" (17178 22146))
+;;;;;;  "nnsoup" "gnus/nnsoup.el" (17187 59901))
 ;;; Generated autoloads from gnus/nnsoup.el
 
 (autoload (quote nnsoup-pack-replies) "nnsoup" "\
@@ -18119,7 +18411,7 @@ Revert posting and mailing methods to the standard Emacs methods.
 ;;;***
 
 ;;;### (autoloads (disable-command enable-command disabled-command-function)
-;;;;;;  "novice" "novice.el" (17178 22151))
+;;;;;;  "novice" "novice.el" (17187 59902))
 ;;; Generated autoloads from novice.el
 
 (defvar disabled-command-function (quote disabled-command-function) "\
@@ -18152,7 +18444,7 @@ to future sessions.
 ;;;***
 
 ;;;### (autoloads (nroff-mode) "nroff-mode" "textmodes/nroff-mode.el"
-;;;;;;  (17178 22154))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from textmodes/nroff-mode.el
 
 (autoload (quote nroff-mode) "nroff-mode" "\
@@ -18167,7 +18459,7 @@ closing requests for requests that are used in matched pairs.
 ;;;***
 
 ;;;### (autoloads (octave-help) "octave-hlp" "progmodes/octave-hlp.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from progmodes/octave-hlp.el
 
 (autoload (quote octave-help) "octave-hlp" "\
@@ -18181,7 +18473,7 @@ If KEY is not a string, prompt for it with completion.
 ;;;***
 
 ;;;### (autoloads (inferior-octave) "octave-inf" "progmodes/octave-inf.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17187 59926))
 ;;; Generated autoloads from progmodes/octave-inf.el
 
 (autoload (quote inferior-octave) "octave-inf" "\
@@ -18204,7 +18496,7 @@ startup file, `~/.emacs-octave'.
 ;;;***
 
 ;;;### (autoloads (octave-mode) "octave-mod" "progmodes/octave-mod.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17238 21257))
 ;;; Generated autoloads from progmodes/octave-mod.el
 
 (autoload (quote octave-mode) "octave-mod" "\
@@ -18303,7 +18595,7 @@ including a reproducible test case and send the message.
 ;;;***
 
 ;;;### (autoloads (edit-options list-options) "options" "obsolete/options.el"
-;;;;;;  (17178 22152))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from obsolete/options.el
 
 (autoload (quote list-options) "options" "\
@@ -18324,10 +18616,10 @@ The Custom feature is intended to make this obsolete.
 
 ;;;***
 
-;;;### (autoloads (orgtbl-mode turn-on-orgtbl org-remember-handler
-;;;;;;  org-remember-annotation org-store-link org-diary org-agenda
-;;;;;;  org-agenda-mode org-mode) "org" "textmodes/org.el" (17178
-;;;;;;  22154))
+;;;### (autoloads (org-export-icalendar-combine-agenda-files org-export-icalendar-all-agenda-files
+;;;;;;  orgtbl-mode turn-on-orgtbl org-remember-handler org-remember-annotation
+;;;;;;  org-store-link org-diary org-agenda org-agenda-mode org-mode)
+;;;;;;  "org" "textmodes/org.el" (17244 4914))
 ;;; Generated autoloads from textmodes/org.el
 
 (autoload (quote org-mode) "org" "\
@@ -18482,10 +18774,23 @@ The `org-mode' table editor as a minor mode for use in other modes.
 
 \(fn &optional ARG)" t nil)
 
+(autoload (quote org-export-icalendar-all-agenda-files) "org" "\
+Export all files in `org-agenda-files' to iCalendar .ics files.
+Each iCalendar file will be located in the same directory as the Org-mode
+file, but with extension `.ics'.
+
+\(fn)" t nil)
+
+(autoload (quote org-export-icalendar-combine-agenda-files) "org" "\
+Export all files in `org-agenda-files' to a single combined iCalendar file.
+The file is stored under the name `org-combined-agenda-icalendar-file'.
+
+\(fn)" t nil)
+
 ;;;***
 
 ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el"
-;;;;;;  (17178 22152))
+;;;;;;  (17226 24576))
 ;;; Generated autoloads from outline.el
 
 (autoload (quote outline-mode) "outline" "\
@@ -18540,7 +18845,7 @@ See the command `outline-mode' for more information on this mode.
 
 ;;;***
 
-;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17178 22152))
+;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17187 59902))
 ;;; Generated autoloads from paren.el
 
 (defvar show-paren-mode nil "\
@@ -18566,7 +18871,7 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time.
 ;;;***
 
 ;;;### (autoloads (parse-time-string) "parse-time" "calendar/parse-time.el"
-;;;;;;  (17178 20480))
+;;;;;;  (17187 59880))
 ;;; Generated autoloads from calendar/parse-time.el
 
 (autoload (quote parse-time-string) "parse-time" "\
@@ -18578,8 +18883,8 @@ unknown are returned as nil.
 
 ;;;***
 
-;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (17178
-;;;;;;  22153))
+;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (17238
+;;;;;;  21257))
 ;;; Generated autoloads from progmodes/pascal.el
 
 (autoload (quote pascal-mode) "pascal" "\
@@ -18599,7 +18904,7 @@ Other useful functions are:
 \\[pascal-beg-of-defun] - Move to beginning of current function.
 \\[pascal-end-of-defun] - Move to end of current function.
 \\[pascal-goto-defun]   - Goto function prompted for in the minibuffer.
-\\[pascal-outline]      - Enter pascal-outline-mode (see also pascal-outline).
+\\[pascal-outline-mode] - Enter `pascal-outline-mode'.
 
 Variables controlling indentation/edit style:
 
@@ -18632,7 +18937,7 @@ no args, if that value is non-nil.
 ;;;***
 
 ;;;### (autoloads (pc-bindings-mode) "pc-mode" "emulation/pc-mode.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from emulation/pc-mode.el
 
 (autoload (quote pc-bindings-mode) "pc-mode" "\
@@ -18650,7 +18955,7 @@ C-Escape does list-buffers.
 ;;;***
 
 ;;;### (autoloads (pc-selection-mode pc-selection-mode) "pc-select"
-;;;;;;  "emulation/pc-select.el" (17178 22144))
+;;;;;;  "emulation/pc-select.el" (17187 59901))
 ;;; Generated autoloads from emulation/pc-select.el
 
 (defvar pc-selection-mode nil "\
@@ -18727,8 +19032,8 @@ you must modify it using \\[customize] or \\[pc-selection-mode].")
 
 ;;;***
 
-;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (17178
-;;;;;;  22152))
+;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from pcmpl-cvs.el
 
 (autoload (quote pcomplete/cvs) "pcmpl-cvs" "\
@@ -18739,7 +19044,7 @@ Completion rules for the `cvs' command.
 ;;;***
 
 ;;;### (autoloads (pcomplete/tar pcomplete/make pcomplete/bzip2 pcomplete/gzip)
-;;;;;;  "pcmpl-gnu" "pcmpl-gnu.el" (17178 22152))
+;;;;;;  "pcmpl-gnu" "pcmpl-gnu.el" (17187 59902))
 ;;; Generated autoloads from pcmpl-gnu.el
 
 (autoload (quote pcomplete/gzip) "pcmpl-gnu" "\
@@ -18767,7 +19072,7 @@ Completion for the GNU tar utility.
 ;;;***
 
 ;;;### (autoloads (pcomplete/mount pcomplete/umount pcomplete/kill)
-;;;;;;  "pcmpl-linux" "pcmpl-linux.el" (17178 22152))
+;;;;;;  "pcmpl-linux" "pcmpl-linux.el" (17187 59902))
 ;;; Generated autoloads from pcmpl-linux.el
 
 (autoload (quote pcomplete/kill) "pcmpl-linux" "\
@@ -18787,8 +19092,8 @@ Completion for GNU/Linux `mount'.
 
 ;;;***
 
-;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (17178
-;;;;;;  22152))
+;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from pcmpl-rpm.el
 
 (autoload (quote pcomplete/rpm) "pcmpl-rpm" "\
@@ -18804,7 +19109,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" (17178 22152))
+;;;;;;  "pcmpl-unix" "pcmpl-unix.el" (17187 59902))
 ;;; Generated autoloads from pcmpl-unix.el
 
 (autoload (quote pcomplete/cd) "pcmpl-unix" "\
@@ -18850,8 +19155,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" (17178
-;;;;;;  22152))
+;;;;;;  pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (17226
+;;;;;;  24576))
 ;;; Generated autoloads from pcomplete.el
 
 (autoload (quote pcomplete) "pcomplete" "\
@@ -18910,7 +19215,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" (17178 22152))
+;;;;;;  "pcvs.el" (17238 21257))
 ;;; Generated autoloads from pcvs.el
 
 (autoload (quote cvs-checkout) "pcvs" "\
@@ -18987,7 +19292,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d
 
 ;;;***
 
-;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (17178 22152))
+;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (17196 27217))
 ;;; 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)))
@@ -18995,7 +19300,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d
 ;;;***
 
 ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17187 59914))
 ;;; Generated autoloads from progmodes/perl-mode.el
 
 (autoload (quote perl-mode) "perl-mode" "\
@@ -19053,8 +19358,8 @@ 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-region) "pgg"
-;;;;;;  "gnus/pgg.el" (17178 22146))
-;;; Generated autoloads from gnus/pgg.el
+;;;;;;  "pgg.el" (17187 59901))
+;;; Generated autoloads from pgg.el
 
 (autoload (quote pgg-encrypt-region) "pgg" "\
 Encrypt the current region between START and END for RCPTS.
@@ -19141,7 +19446,7 @@ Import public keys in the current buffer.
 ;;;***
 
 ;;;### (autoloads (picture-mode) "picture" "textmodes/picture.el"
-;;;;;;  (17178 22154))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from textmodes/picture.el
 
 (autoload (quote picture-mode) "picture" "\
@@ -19213,7 +19518,7 @@ they are not defaultly assigned to keys.
 ;;;***
 
 ;;;### (autoloads (po-find-file-coding-system) "po" "textmodes/po.el"
-;;;;;;  (17178 22154))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from textmodes/po.el
 
 (autoload (quote po-find-file-coding-system) "po" "\
@@ -19224,7 +19529,7 @@ Called through `file-coding-system-alist', before the file is visited for real.
 
 ;;;***
 
-;;;### (autoloads (pong) "pong" "play/pong.el" (17178 22152))
+;;;### (autoloads (pong) "pong" "play/pong.el" (17187 59902))
 ;;; Generated autoloads from play/pong.el
 
 (autoload (quote pong) "pong" "\
@@ -19241,7 +19546,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" (17178 22144))
+;;;;;;  pp-to-string) "pp" "emacs-lisp/pp.el" (17187 59901))
 ;;; Generated autoloads from emacs-lisp/pp.el
 
 (autoload (quote pp-to-string) "pp" "\
@@ -19299,7 +19604,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"
-;;;;;;  (17178 22152))
+;;;;;;  (17226 24577))
 ;;; Generated autoloads from printing.el
 
 (autoload (quote pr-interface) "printing" "\
@@ -19887,7 +20192,7 @@ are both set to t.
 ;;;***
 
 ;;;### (autoloads (run-prolog prolog-mode) "prolog" "progmodes/prolog.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from progmodes/prolog.el
 
 (autoload (quote prolog-mode) "prolog" "\
@@ -19907,7 +20212,7 @@ Run an inferior Prolog process, input and output via buffer *prolog*.
 
 ;;;***
 
-;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17178 22153))
+;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17187 59902))
 ;;; 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"))) "\
@@ -19916,8 +20221,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").")
 
 ;;;***
 
-;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (17178
-;;;;;;  22153))
+;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (17226
+;;;;;;  24577))
 ;;; Generated autoloads from progmodes/ps-mode.el
 
 (autoload (quote ps-mode) "ps-mode" "\
@@ -19966,7 +20271,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" (17178 22153))
+;;;;;;  "ps-mule" "ps-mule.el" (17226 24577))
 ;;; Generated autoloads from ps-mule.el
 
 (defvar ps-multibyte-buffer nil "\
@@ -20087,8 +20392,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" (17178
-;;;;;;  22153))
+;;;;;;  ps-page-dimensions-database) "ps-print" "ps-print.el" (17226
+;;;;;;  24577))
 ;;; 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")) "\
@@ -20285,7 +20590,7 @@ If EXTENSION is any other symbol, it is ignored.
 ;;;***
 
 ;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17238 21257))
 ;;; Generated autoloads from progmodes/python.el
 
 (add-to-list (quote interpreter-mode-alist) (quote ("jython" . jython-mode)))
@@ -20349,7 +20654,7 @@ Runs `jython-mode-hook' after `python-mode-hook'.
 ;;;***
 
 ;;;### (autoloads (quoted-printable-decode-region) "qp" "gnus/qp.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/qp.el
 
 (autoload (quote quoted-printable-decode-region) "qp" "\
@@ -20372,7 +20677,7 @@ them into characters should be done separately.
 ;;;;;;  quail-defrule quail-install-decode-map quail-install-map
 ;;;;;;  quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout
 ;;;;;;  quail-define-package quail-use-package quail-title) "quail"
-;;;;;;  "international/quail.el" (17178 20480))
+;;;;;;  "international/quail.el" (17226 24576))
 ;;; Generated autoloads from international/quail.el
 
 (autoload (quote quail-title) "quail" "\
@@ -20603,8 +20908,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" (17178
-;;;;;;  22151))
+;;;;;;  quickurl-ask quickurl) "quickurl" "net/quickurl.el" (17187
+;;;;;;  59902))
 ;;; 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" "\
@@ -20675,8 +20980,25 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'.
 
 ;;;***
 
-;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (17178
-;;;;;;  22151))
+;;;### (autoloads (rcirc) "rcirc" "net/rcirc.el" (17244 4913))
+;;; Generated autoloads from net/rcirc.el
+
+(autoload (quote rcirc) "rcirc" "\
+Connect to IRC.
+
+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',
+respectively.
+
+\(fn &optional SERVER PORT NICK CHANNELS)" t nil)
+
+(defalias (quote irc) (quote rcirc))
+
+;;;***
+
+;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (17226
+;;;;;;  24576))
 ;;; Generated autoloads from net/rcompile.el
 
 (autoload (quote remote-compile) "rcompile" "\
@@ -20688,7 +21010,7 @@ See \\[compile].
 ;;;***
 
 ;;;### (autoloads (re-builder) "re-builder" "emacs-lisp/re-builder.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from emacs-lisp/re-builder.el
 
 (defalias (quote regexp-builder) (quote re-builder))
@@ -20700,7 +21022,7 @@ Construct a regexp interactively.
 
 ;;;***
 
-;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17178 22153))
+;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17238 21257))
 ;;; Generated autoloads from recentf.el
 
 (defvar recentf-mode nil "\
@@ -20721,6 +21043,8 @@ Returns non-nil if the new state is enabled.
 When recentf mode is enabled, it maintains a menu for visiting files
 that were operated on recently.
 
+\\{recentf-mode-map}
+
 \(fn &optional ARG)" t nil)
 
 ;;;***
@@ -20728,8 +21052,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" (17178
-;;;;;;  22153))
+;;;;;;  delete-rectangle move-to-column-force) "rect" "rect.el" (17226
+;;;;;;  24577))
 ;;; Generated autoloads from rect.el
 
 (autoload (quote move-to-column-force) "rect" "\
@@ -20851,8 +21175,8 @@ rectangle which were empty.
 
 ;;;***
 
-;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (17178
-;;;;;;  22154))
+;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from textmodes/refill.el
 
 (autoload (quote refill-mode) "refill" "\
@@ -20868,7 +21192,7 @@ refilling if they would cause auto-filling.
 ;;;***
 
 ;;;### (autoloads (reftex-reset-scanning-information reftex-mode
-;;;;;;  turn-on-reftex) "reftex" "textmodes/reftex.el" (17178 22154))
+;;;;;;  turn-on-reftex) "reftex" "textmodes/reftex.el" (17226 24578))
 ;;; Generated autoloads from textmodes/reftex.el
 
 (autoload (quote turn-on-reftex) "reftex" "\
@@ -20918,7 +21242,7 @@ This enforces rescanning the buffer on next use.
 ;;;***
 
 ;;;### (autoloads (reftex-citation) "reftex-cite" "textmodes/reftex-cite.el"
-;;;;;;  (17178 22154))
+;;;;;;  (17226 24577))
 ;;; Generated autoloads from textmodes/reftex-cite.el
 
 (autoload (quote reftex-citation) "reftex-cite" "\
@@ -20948,7 +21272,7 @@ While entering the regexp, completion on knows citation keys is possible.
 ;;;***
 
 ;;;### (autoloads (reftex-isearch-minor-mode) "reftex-global" "textmodes/reftex-global.el"
-;;;;;;  (17178 22154))
+;;;;;;  (17226 24577))
 ;;; Generated autoloads from textmodes/reftex-global.el
 
 (autoload (quote reftex-isearch-minor-mode) "reftex-global" "\
@@ -20965,7 +21289,7 @@ With no argument, this command toggles
 ;;;***
 
 ;;;### (autoloads (reftex-index-phrases-mode) "reftex-index" "textmodes/reftex-index.el"
-;;;;;;  (17178 22154))
+;;;;;;  (17226 24577))
 ;;; Generated autoloads from textmodes/reftex-index.el
 
 (autoload (quote reftex-index-phrases-mode) "reftex-index" "\
@@ -20998,7 +21322,7 @@ Here are all local bindings.
 ;;;***
 
 ;;;### (autoloads (reftex-all-document-files) "reftex-parse" "textmodes/reftex-parse.el"
-;;;;;;  (17178 22154))
+;;;;;;  (17226 24578))
 ;;; Generated autoloads from textmodes/reftex-parse.el
 
 (autoload (quote reftex-all-document-files) "reftex-parse" "\
@@ -21011,7 +21335,7 @@ of master file.
 ;;;***
 
 ;;;### (autoloads (regexp-opt-depth regexp-opt) "regexp-opt" "emacs-lisp/regexp-opt.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from emacs-lisp/regexp-opt.el
 
 (autoload (quote regexp-opt) "regexp-opt" "\
@@ -21038,7 +21362,7 @@ This means the number of non-shy regexp grouping constructs
 
 ;;;***
 
-;;;### (autoloads (repeat) "repeat" "repeat.el" (17178 22153))
+;;;### (autoloads (repeat) "repeat" "repeat.el" (17187 59902))
 ;;; Generated autoloads from repeat.el
 
 (autoload (quote repeat) "repeat" "\
@@ -21056,7 +21380,7 @@ can be modified by the global variable `repeat-on-final-keystroke'.
 ;;;***
 
 ;;;### (autoloads (reporter-submit-bug-report) "reporter" "mail/reporter.el"
-;;;;;;  (17178 22150))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from mail/reporter.el
 
 (autoload (quote reporter-submit-bug-report) "reporter" "\
@@ -21088,7 +21412,7 @@ mail-sending package is used for editing and sending the message.
 ;;;***
 
 ;;;### (autoloads (reposition-window) "reposition" "reposition.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from reposition.el
 
 (autoload (quote reposition-window) "reposition" "\
@@ -21115,8 +21439,8 @@ first comment line visible (if point is in a comment).
 
 ;;;***
 
-;;;### (autoloads (resume-suspend-hook) "resume" "resume.el" (17178
-;;;;;;  22153))
+;;;### (autoloads (resume-suspend-hook) "resume" "resume.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from resume.el
 
 (autoload (quote resume-suspend-hook) "resume" "\
@@ -21127,7 +21451,7 @@ Clear out the file used for transmitting args when Emacs resumes.
 ;;;***
 
 ;;;### (autoloads (global-reveal-mode reveal-mode) "reveal" "reveal.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from reveal.el
 
 (autoload (quote reveal-mode) "reveal" "\
@@ -21164,7 +21488,7 @@ With zero or negative ARG turn mode off.
 
 ;;;### (autoloads (file-name-shadow-mode file-name-shadow-tty-properties
 ;;;;;;  file-name-shadow-properties) "rfn-eshadow" "rfn-eshadow.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from rfn-eshadow.el
 
 (defvar file-name-shadow-properties (quote (face file-name-shadow field shadow)) "\
@@ -21209,7 +21533,7 @@ Returns non-nil if the new state is enabled.
 ;;;***
 
 ;;;### (autoloads (make-ring ring-p) "ring" "emacs-lisp/ring.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from emacs-lisp/ring.el
 
 (autoload (quote ring-p) "ring" "\
@@ -21224,7 +21548,7 @@ Make a ring that can contain SIZE elements.
 
 ;;;***
 
-;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (17178 22151))
+;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (17187 59902))
 ;;; Generated autoloads from net/rlogin.el
  (add-hook 'same-window-regexps "^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)")
 
@@ -21275,8 +21599,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" (17178
-;;;;;;  22151))
+;;;;;;  rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17226
+;;;;;;  24576))
 ;;; Generated autoloads from mail/rmail.el
 
 (autoload (quote rmail-movemail-variant-p) "rmail" "\
@@ -21534,7 +21858,7 @@ Set PASSWORD to be used for retrieving mail from a POP or IMAP server.
 ;;;***
 
 ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "mail/rmailedit.el"
-;;;;;;  (17178 22151))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from mail/rmailedit.el
 
 (autoload (quote rmail-edit-current-message) "rmailedit" "\
@@ -21546,7 +21870,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" (17178 22151))
+;;;;;;  "mail/rmailkwd.el" (17187 59902))
 ;;; Generated autoloads from mail/rmailkwd.el
 
 (autoload (quote rmail-add-label) "rmailkwd" "\
@@ -21585,7 +21909,7 @@ With prefix argument N moves forward N messages with these labels.
 ;;;***
 
 ;;;### (autoloads (set-rmail-inbox-list) "rmailmsc" "mail/rmailmsc.el"
-;;;;;;  (17178 22151))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from mail/rmailmsc.el
 
 (autoload (quote set-rmail-inbox-list) "rmailmsc" "\
@@ -21599,7 +21923,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" (17178 22151))
+;;;;;;  "mail/rmailout.el" (17226 24576))
 ;;; Generated autoloads from mail/rmailout.el
 
 (defvar rmail-output-file-alist nil "\
@@ -21666,8 +21990,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" (17178
-;;;;;;  22151))
+;;;;;;  rmail-sort-by-date) "rmailsort" "mail/rmailsort.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from mail/rmailsort.el
 
 (autoload (quote rmail-sort-by-date) "rmailsort" "\
@@ -21719,7 +22043,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" (17178 22151))
+;;;;;;  "rmailsum" "mail/rmailsum.el" (17226 24576))
 ;;; Generated autoloads from mail/rmailsum.el
 
 (defvar rmail-summary-scroll-between-messages t "\
@@ -21801,7 +22125,7 @@ Setting this variable has an effect only before reading a mail.")
 ;;;***
 
 ;;;### (autoloads (news-post-news) "rnewspost" "obsolete/rnewspost.el"
-;;;;;;  (17178 22152))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from obsolete/rnewspost.el
 
 (autoload (quote news-post-news) "rnewspost" "\
@@ -21814,7 +22138,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" (17178 22153))
+;;;;;;  rot13-string rot13) "rot13" "rot13.el" (17187 59902))
 ;;; Generated autoloads from rot13.el
 
 (autoload (quote rot13) "rot13" "\
@@ -21855,7 +22179,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"
-;;;;;;  (17178 22152))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from obsolete/rsz-mini.el
 
 (defvar resize-minibuffer-mode nil "\
@@ -21895,8 +22219,8 @@ This function is obsolete.
 
 ;;;***
 
-;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (17178
-;;;;;;  22153))
+;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from ruler-mode.el
 
 (autoload (quote ruler-mode) "ruler-mode" "\
@@ -21906,8 +22230,8 @@ Display a ruler in the header line if ARG > 0.
 
 ;;;***
 
-;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (17178
-;;;;;;  22144))
+;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from emacs-lisp/rx.el
 
 (autoload (quote rx-to-string) "rx" "\
@@ -22214,8 +22538,34 @@ enclosed in `(and ...)'.
 
 ;;;***
 
+;;;### (autoloads (savehist-save savehist-load) "savehist" "savehist.el"
+;;;;;;  (17254 63791))
+;;; Generated autoloads from savehist.el
+
+(autoload (quote savehist-load) "savehist" "\
+Load the minibuffer histories from `savehist-file'.
+Unless NO-HOOK is specified, the function will also add the save function
+to `kill-emacs-hook' and on a timer, ensuring that the minibuffer contents
+will be saved before leaving Emacs.
+
+This function should be normally used from your Emacs init file.  Since it
+removes your current minibuffer histories, it is unwise to call it at any
+other time.
+
+\(fn &optional NO-HOOK)" t nil)
+
+(autoload (quote savehist-save) "savehist" "\
+Save the histories from `savehist-history-variables' to `savehist-file'.
+Unbound symbols referenced in `savehist-history-variables' are ignored.
+If AUTO-SAVE is non-nil, compare the saved contents to the one last saved,
+ and don't save the buffer if they are the same.
+
+\(fn &optional AUTO-SAVE)" t nil)
+
+;;;***
+
 ;;;### (autoloads (dsssl-mode scheme-mode) "scheme" "progmodes/scheme.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17226 24577))
 ;;; Generated autoloads from progmodes/scheme.el
 
 (autoload (quote scheme-mode) "scheme" "\
@@ -22257,7 +22607,7 @@ that variable's value is a string.
 ;;;***
 
 ;;;### (autoloads (gnus-score-mode) "score-mode" "gnus/score-mode.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/score-mode.el
 
 (autoload (quote gnus-score-mode) "score-mode" "\
@@ -22270,8 +22620,8 @@ This mode is an extended emacs-lisp mode.
 
 ;;;***
 
-;;;### (autoloads (scribe-mode) "scribe" "obsolete/scribe.el" (17178
-;;;;;;  22152))
+;;;### (autoloads (scribe-mode) "scribe" "obsolete/scribe.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from obsolete/scribe.el
 
 (autoload (quote scribe-mode) "scribe" "\
@@ -22296,7 +22646,7 @@ Interesting variables:
 ;;;***
 
 ;;;### (autoloads (scroll-all-mode) "scroll-all" "scroll-all.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from scroll-all.el
 
 (defvar scroll-all-mode nil "\
@@ -22320,7 +22670,7 @@ apply to all visible windows in the same frame.
 ;;;***
 
 ;;;### (autoloads (scroll-lock-mode) "scroll-lock" "scroll-lock.el"
-;;;;;;  (17178 22134))
+;;;;;;  (17187 59900))
 ;;; Generated autoloads from scroll-lock.el
 
 (autoload (quote scroll-lock-mode) "scroll-lock" "\
@@ -22335,12 +22685,14 @@ during scrolling.
 ;;;***
 
 ;;;### (autoloads (mail-other-frame mail-other-window mail mail-mailing-lists
-;;;;;;  mail-mode mail-default-directory mail-signature mail-citation-hook
-;;;;;;  mail-personal-alias-file mail-alias-file mail-default-reply-to
-;;;;;;  mail-archive-file-name mail-header-separator send-mail-function
-;;;;;;  mail-yank-ignored-headers mail-interactive mail-self-blind
-;;;;;;  mail-specify-envelope-from mail-from-style) "sendmail" "mail/sendmail.el"
-;;;;;;  (17178 22151))
+;;;;;;  mail-mode mail-send-nonascii mail-bury-selects-summary mail-default-headers
+;;;;;;  mail-default-directory mail-signature-file mail-signature
+;;;;;;  mail-citation-prefix-regexp mail-citation-hook mail-indentation-spaces
+;;;;;;  mail-yank-prefix mail-setup-hook mail-personal-alias-file
+;;;;;;  mail-alias-file mail-default-reply-to mail-archive-file-name
+;;;;;;  mail-header-separator send-mail-function mail-yank-ignored-headers
+;;;;;;  mail-interactive mail-self-blind mail-specify-envelope-from
+;;;;;;  mail-from-style) "sendmail" "mail/sendmail.el" (17244 4913))
 ;;; Generated autoloads from mail/sendmail.el
 
 (defvar mail-from-style (quote angles) "\
@@ -22392,7 +22744,7 @@ nil means let mailer mail back a message to report errors.")
 
 (custom-autoload (quote mail-yank-ignored-headers) "sendmail")
 
-(defvar send-mail-function (quote sendmail-send-it) "\
+(defvar send-mail-function (if (and window-system (memq system-type (quote (darwin windows-nt)))) (quote mailclient-send-it) (quote sendmail-send-it)) "\
 Function to call to send the current buffer as mail.
 The headers should be delimited by a line which is
 not a valid RFC822 header or continuation line,
@@ -22436,6 +22788,32 @@ This file need not actually exist.")
 
 (custom-autoload (quote mail-personal-alias-file) "sendmail")
 
+(defvar mail-setup-hook nil "\
+Normal hook, run each time a new outgoing mail message is initialized.
+The function `mail-setup' runs this hook.")
+
+(custom-autoload (quote mail-setup-hook) "sendmail")
+
+(defvar mail-aliases t "\
+Alist of mail address aliases,
+or t meaning should be initialized from your mail aliases file.
+\(The file's name is normally `~/.mailrc', but `mail-personal-alias-file'
+can specify a different file name.)
+The alias definitions in the file have this form:
+    alias ALIAS MEANING")
+
+(defvar mail-yank-prefix nil "\
+*Prefix insert on lines of yanked message being replied to.
+nil means use indentation.")
+
+(custom-autoload (quote mail-yank-prefix) "sendmail")
+
+(defvar mail-indentation-spaces 3 "\
+*Number of spaces to insert at the beginning of each cited line.
+Used by `mail-yank-original' via `mail-indent-citation'.")
+
+(custom-autoload (quote mail-indentation-spaces) "sendmail")
+
 (defvar mail-citation-hook nil "\
 *Hook for modifying a citation just inserted in the mail buffer.
 Each hook function can find the citation between (point) and (mark t),
@@ -22449,6 +22827,14 @@ instead of no action.")
 
 (custom-autoload (quote mail-citation-hook) "sendmail")
 
+(defvar mail-citation-prefix-regexp "[  ]*[-a-z0-9A-Z]*>+[      ]*\\|[  ]*" "\
+*Regular expression to match a citation prefix plus whitespace.
+It should match whatever sort of citation prefixes you want to handle,
+with whitespace before and after; it should also match just whitespace.
+The default value matches citations like `foo-bar>' plus whitespace.")
+
+(custom-autoload (quote mail-citation-prefix-regexp) "sendmail")
+
 (defvar mail-signature nil "\
 *Text inserted at end of mail buffer when a message is initialized.
 If t, it means to insert the contents of the file `mail-signature-file'.
@@ -22460,6 +22846,11 @@ and should insert whatever you want to insert.")
 
 (custom-autoload (quote mail-signature) "sendmail")
 
+(defvar mail-signature-file "~/.signature" "\
+*File containing the text inserted at end of mail buffer.")
+
+(custom-autoload (quote mail-signature-file) "sendmail")
+
 (defvar mail-default-directory "~/" "\
 *Directory for mail buffers.
 Value of `default-directory' for mail buffers.
@@ -22467,6 +22858,32 @@ This directory is used for auto-save files of mail buffers.")
 
 (custom-autoload (quote mail-default-directory) "sendmail")
 
+(defvar mail-default-headers nil "\
+*A string containing header lines, to be inserted in outgoing messages.
+It is inserted before you edit the message,
+so you can edit or delete these lines.")
+
+(custom-autoload (quote mail-default-headers) "sendmail")
+
+(defvar mail-bury-selects-summary t "\
+*If non-nil, try to show RMAIL summary buffer after returning from mail.
+The functions \\[mail-send-on-exit] or \\[mail-dont-send] select
+the RMAIL summary buffer before returning, if it exists and this variable
+is non-nil.")
+
+(custom-autoload (quote mail-bury-selects-summary) "sendmail")
+
+(defvar mail-send-nonascii (quote mime) "\
+*Specify whether to allow sending non-ASCII characters in mail.
+If t, that means do allow it.  nil means don't allow it.
+`query' means ask the user each time.
+`mime' means add an appropriate MIME header if none already present.
+The default is `mime'.
+Including non-ASCII characters in a mail message can be problematical
+for the recipient, who may not know how to decode them properly.")
+
+(custom-autoload (quote mail-send-nonascii) "sendmail")
+
 (autoload (quote mail-mode) "sendmail" "\
 Major mode for editing mail to be sent.
 Like Text Mode but with these additional commands:
@@ -22506,9 +22923,9 @@ See also the function `select-message-coding-system'.")
 Default coding system for encoding the outgoing mail.
 This variable is used only when `sendmail-coding-system' is nil.
 
-This variable is set/changed by the command set-language-environment.
+This variable is set/changed by the command `set-language-environment'.
 User should not set this variable manually,
-instead use sendmail-coding-system to get a constant encoding
+instead use `sendmail-coding-system' to get a constant encoding
 of outgoing mails regardless of the current language environment.
 See also the function `select-message-coding-system'.")
  (add-hook 'same-window-buffer-names "*mail*")
@@ -22540,8 +22957,13 @@ is inserted.
 The normal hook `mail-setup-hook' is run after the message is
 initialized.  It can add more default fields to the message.
 
-When calling from a program, the first argument if non-nil says
-not to erase the existing contents of the `*mail*' buffer.
+The first argument, NOERASE, determines what to do when there is
+an existing modified `*mail*' buffer.  If NOERASE is nil, the
+existing mail buffer is used, and the user is prompted whether to
+keep the old contents or to erase them.  If NOERASE has the value
+`new', a new mail buffer will be created instead of using the old
+one.  Any other non-nil value means to always select the old
+buffer without erasing the contents.
 
 The second through fifth arguments,
  TO, SUBJECT, IN-REPLY-TO and CC, specify if non-nil
@@ -22571,7 +22993,7 @@ Like `mail' command, but display mail buffer in another frame.
 ;;;***
 
 ;;;### (autoloads (server-mode server-start server-getenv) "server"
-;;;;;;  "server.el" (17178 22153))
+;;;;;;  "server.el" (17254 64443))
 ;;; Generated autoloads from server.el
 
 (autoload (quote server-getenv) "server" "\
@@ -22619,7 +23041,7 @@ Server mode runs a process that accepts commands from the
 
 ;;;***
 
-;;;### (autoloads (ses-mode) "ses" "ses.el" (17178 22153))
+;;;### (autoloads (ses-mode) "ses" "ses.el" (17226 24577))
 ;;; Generated autoloads from ses.el
 
 (autoload (quote ses-mode) "ses" "\
@@ -22638,7 +23060,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"
-;;;;;;  (17178 22154))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from textmodes/sgml-mode.el
 
 (autoload (quote sgml-mode) "sgml-mode" "\
@@ -22706,7 +23128,7 @@ To work around that, do:
 ;;;***
 
 ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17244 4914))
 ;;; Generated autoloads from progmodes/sh-script.el
 
 (autoload (quote sh-mode) "sh-script" "\
@@ -22769,7 +23191,7 @@ with your script for an edit-interpret-debug cycle.
 
 ;;;***
 
-;;;### (autoloads (sha1) "sha1" "gnus/sha1.el" (17178 22146))
+;;;### (autoloads (sha1) "sha1" "gnus/sha1.el" (17187 59901))
 ;;; Generated autoloads from gnus/sha1.el
 
 (autoload (quote sha1) "sha1" "\
@@ -22784,7 +23206,7 @@ If BINARY is non-nil, return a string in binary form.
 ;;;***
 
 ;;;### (autoloads (list-load-path-shadows) "shadow" "emacs-lisp/shadow.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from emacs-lisp/shadow.el
 
 (autoload (quote list-load-path-shadows) "shadow" "\
@@ -22831,8 +23253,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" (17178
-;;;;;;  22153))
+;;;;;;  shadow-define-cluster) "shadowfile" "shadowfile.el" (17226
+;;;;;;  24577))
 ;;; Generated autoloads from shadowfile.el
 
 (autoload (quote shadow-define-cluster) "shadowfile" "\
@@ -22871,7 +23293,7 @@ Set up file shadowing.
 ;;;***
 
 ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17226 24577))
 ;;; Generated autoloads from shell.el
 
 (defvar shell-dumb-shell-regexp "cmd\\(proxy\\)?\\.exe" "\
@@ -22918,7 +23340,7 @@ Otherwise, one argument `-i' is passed to the shell.
 ;;;***
 
 ;;;### (autoloads (sieve-upload-and-bury sieve-upload sieve-manage)
-;;;;;;  "sieve" "gnus/sieve.el" (17178 22146))
+;;;;;;  "sieve" "gnus/sieve.el" (17226 24575))
 ;;; Generated autoloads from gnus/sieve.el
 
 (autoload (quote sieve-manage) "sieve" "\
@@ -22939,7 +23361,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (sieve-mode) "sieve-mode" "gnus/sieve-mode.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/sieve-mode.el
 
 (autoload (quote sieve-mode) "sieve-mode" "\
@@ -22954,8 +23376,8 @@ Turning on Sieve mode runs `sieve-mode-hook'.
 
 ;;;***
 
-;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17178
-;;;;;;  22153))
+;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from progmodes/simula.el
 
 (autoload (quote simula-mode) "simula" "\
@@ -23004,7 +23426,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" (17178 22153))
+;;;;;;  define-skeleton) "skeleton" "skeleton.el" (17187 59902))
 ;;; Generated autoloads from skeleton.el
 
 (defvar skeleton-filter (quote identity) "\
@@ -23114,7 +23536,7 @@ symmetrical ones, and the same character twice for the others.
 ;;;***
 
 ;;;### (autoloads (smerge-mode smerge-ediff) "smerge-mode" "smerge-mode.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17226 24577))
 ;;; Generated autoloads from smerge-mode.el
 
 (autoload (quote smerge-ediff) "smerge-mode" "\
@@ -23133,7 +23555,7 @@ Minor mode to simplify editing output from the diff3 program.
 ;;;***
 
 ;;;### (autoloads (smiley-buffer smiley-region) "smiley" "gnus/smiley.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/smiley.el
 
 (autoload (quote smiley-region) "smiley" "\
@@ -23151,7 +23573,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" (17178 22151))
+;;;;;;  "mail/smtpmail.el" (17187 59902))
 ;;; Generated autoloads from mail/smtpmail.el
 
 (autoload (quote smtpmail-send-it) "smtpmail" "\
@@ -23166,7 +23588,7 @@ Send mail that was queued as a result of setting `smtpmail-queue-mail'.
 
 ;;;***
 
-;;;### (autoloads (snake) "snake" "play/snake.el" (17178 22152))
+;;;### (autoloads (snake) "snake" "play/snake.el" (17187 59902))
 ;;; Generated autoloads from play/snake.el
 
 (autoload (quote snake) "snake" "\
@@ -23190,7 +23612,7 @@ Snake mode keybindings:
 ;;;***
 
 ;;;### (autoloads (snmpv2-mode snmp-mode) "snmp-mode" "net/snmp-mode.el"
-;;;;;;  (17178 22151))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from net/snmp-mode.el
 
 (autoload (quote snmp-mode) "snmp-mode" "\
@@ -23221,7 +23643,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" (17178 22143))
+;;;;;;  "solar" "calendar/solar.el" (17229 28052))
 ;;; 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 ")"))) "\
@@ -23292,8 +23714,8 @@ Requires floating point.
 
 ;;;***
 
-;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (17178
-;;;;;;  22152))
+;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from play/solitaire.el
 
 (autoload (quote solitaire) "solitaire" "\
@@ -23370,7 +23792,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" (17178 22153))
+;;;;;;  sort-lines sort-subr) "sort" "sort.el" (17187 59902))
 ;;; Generated autoloads from sort.el
 
 (autoload (quote sort-subr) "sort" "\
@@ -23512,8 +23934,8 @@ From a program takes two point or marker arguments, BEG and END.
 
 ;;;***
 
-;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17178
-;;;;;;  22146))
+;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from gnus/spam.el
 
 (autoload (quote spam-initialize) "spam" "\
@@ -23525,7 +23947,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" (17178 22146))
+;;;;;;  "gnus/spam-report.el" (17226 24576))
 ;;; Generated autoloads from gnus/spam-report.el
 
 (autoload (quote spam-report-process-queue) "spam-report" "\
@@ -23568,7 +23990,7 @@ Spam reports will be queued with the method used when
 ;;;***
 
 ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar"
-;;;;;;  "speedbar.el" (17178 22153))
+;;;;;;  "speedbar.el" (17238 21257))
 ;;; Generated autoloads from speedbar.el
 
 (defalias (quote speedbar) (quote speedbar-frame-mode))
@@ -23593,7 +24015,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" (17178 22154))
+;;;;;;  "spell" "textmodes/spell.el" (17187 59902))
 ;;; Generated autoloads from textmodes/spell.el
 
 (put (quote spell-filter) (quote risky-local-variable) t)
@@ -23629,8 +24051,8 @@ Check spelling of string supplied as argument.
 
 ;;;***
 
-;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (17178
-;;;;;;  22152))
+;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from play/spook.el
 
 (autoload (quote spook) "spook" "\
@@ -23648,8 +24070,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" (17178
-;;;;;;  22153))
+;;;;;;  sql-add-product-keywords) "sql" "progmodes/sql.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from progmodes/sql.el
 
 (autoload (quote sql-add-product-keywords) "sql" "\
@@ -24080,8 +24502,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" (17178
-;;;;;;  22153))
+;;;;;;  strokes-global-set-stroke) "strokes" "strokes.el" (17226
+;;;;;;  24577))
 ;;; Generated autoloads from strokes.el
 
 (autoload (quote strokes-global-set-stroke) "strokes" "\
@@ -24192,7 +24614,7 @@ Read a complex stroke and insert its glyph into the current buffer.
 ;;;***
 
 ;;;### (autoloads (studlify-buffer studlify-word studlify-region)
-;;;;;;  "studly" "play/studly.el" (17178 20480))
+;;;;;;  "studly" "play/studly.el" (17187 59879))
 ;;; Generated autoloads from play/studly.el
 
 (autoload (quote studlify-region) "studly" "\
@@ -24213,7 +24635,7 @@ Studlify-case the current buffer.
 ;;;***
 
 ;;;### (autoloads (sc-cite-original) "supercite" "mail/supercite.el"
-;;;;;;  (17178 22151))
+;;;;;;  (17229 28053))
 ;;; Generated autoloads from mail/supercite.el
 
 (autoload (quote sc-cite-original) "supercite" "\
@@ -24245,8 +24667,8 @@ before, and `sc-post-hook' is run after the guts of this function.
 
 ;;;***
 
-;;;### (autoloads (syntax-ppss) "syntax" "emacs-lisp/syntax.el" (17178
-;;;;;;  22144))
+;;;### (autoloads (syntax-ppss) "syntax" "emacs-lisp/syntax.el" (17244
+;;;;;;  4913))
 ;;; Generated autoloads from emacs-lisp/syntax.el
 
 (autoload (quote syntax-ppss) "syntax" "\
@@ -24259,7 +24681,7 @@ Point is at POS when this function returns.
 
 ;;;***
 
-;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (17178 22153))
+;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (17187 59902))
 ;;; Generated autoloads from tabify.el
 
 (autoload (quote untabify) "tabify" "\
@@ -24294,7 +24716,7 @@ The variable `tab-width' controls the spacing of tab stops.
 ;;;;;;  table-recognize table-insert-row-column table-insert-column
 ;;;;;;  table-insert-row table-insert table-point-left-cell-hook
 ;;;;;;  table-point-entered-cell-hook table-load-hook table-cell-map-hook)
-;;;;;;  "table" "textmodes/table.el" (17178 22154))
+;;;;;;  "table" "textmodes/table.el" (17187 59902))
 ;;; Generated autoloads from textmodes/table.el
 
 (defvar table-cell-map-hook nil "\
@@ -24882,7 +25304,7 @@ converts a table into plain text without frames.  It is a companion to
 
 ;;;***
 
-;;;### (autoloads (talk talk-connect) "talk" "talk.el" (17178 22153))
+;;;### (autoloads (talk talk-connect) "talk" "talk.el" (17187 59902))
 ;;; Generated autoloads from talk.el
 
 (autoload (quote talk-connect) "talk" "\
@@ -24897,7 +25319,7 @@ Connect to the Emacs talk group from the current X display or tty frame.
 
 ;;;***
 
-;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (17178 22153))
+;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (17244 4914))
 ;;; Generated autoloads from tar-mode.el
 
 (autoload (quote tar-mode) "tar-mode" "\
@@ -24921,7 +25343,7 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'.
 ;;;***
 
 ;;;### (autoloads (tcl-help-on-word inferior-tcl tcl-mode) "tcl"
-;;;;;;  "progmodes/tcl.el" (17178 20481))
+;;;;;;  "progmodes/tcl.el" (17187 59880))
 ;;; Generated autoloads from progmodes/tcl.el
 
 (autoload (quote tcl-mode) "tcl" "\
@@ -24972,7 +25394,7 @@ Prefix argument means invert sense of `tcl-use-smart-word-finder'.
 
 ;;;***
 
-;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (17178 22151))
+;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (17187 59902))
 ;;; Generated autoloads from net/telnet.el
  (add-hook 'same-window-regexps "\\*telnet-.*\\*\\(\\|<[0-9]+>\\)")
 
@@ -24999,8 +25421,8 @@ Normally input is edited in Emacs and sent a line at a time.
 
 ;;;***
 
-;;;### (autoloads (ansi-term term make-term) "term" "term.el" (17178
-;;;;;;  22153))
+;;;### (autoloads (ansi-term term make-term) "term" "term.el" (17244
+;;;;;;  4914))
 ;;; Generated autoloads from term.el
 
 (autoload (quote make-term) "term" "\
@@ -25028,8 +25450,8 @@ Start a terminal-emulator in a new buffer.
 
 ;;;***
 
-;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (17178
-;;;;;;  22154))
+;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (17226
+;;;;;;  24577))
 ;;; Generated autoloads from terminal.el
 
 (autoload (quote terminal-emulator) "terminal" "\
@@ -25066,7 +25488,7 @@ subprocess started.
 ;;;***
 
 ;;;### (autoloads (testcover-this-defun) "testcover" "emacs-lisp/testcover.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from emacs-lisp/testcover.el
 
 (autoload (quote testcover-this-defun) "testcover" "\
@@ -25076,7 +25498,7 @@ Start coverage on function under point.
 
 ;;;***
 
-;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17178 22152))
+;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17187 59902))
 ;;; Generated autoloads from play/tetris.el
 
 (autoload (quote tetris) "tetris" "\
@@ -25107,7 +25529,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"
-;;;;;;  (17178 22154))
+;;;;;;  (17238 21257))
 ;;; Generated autoloads from textmodes/tex-mode.el
 
 (defvar tex-shell-file-name nil "\
@@ -25409,7 +25831,7 @@ Major mode to edit DocTeX files.
 ;;;***
 
 ;;;### (autoloads (texi2info texinfo-format-region texinfo-format-buffer)
-;;;;;;  "texinfmt" "textmodes/texinfmt.el" (17178 22154))
+;;;;;;  "texinfmt" "textmodes/texinfmt.el" (17187 59902))
 ;;; Generated autoloads from textmodes/texinfmt.el
 
 (autoload (quote texinfo-format-buffer) "texinfmt" "\
@@ -25449,7 +25871,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" (17178 22154))
+;;;;;;  "texinfo" "textmodes/texinfo.el" (17244 4914))
 ;;; Generated autoloads from textmodes/texinfo.el
 
 (defvar texinfo-open-quote "``" "\
@@ -25536,7 +25958,7 @@ value of `texinfo-mode-hook'.
 ;;;### (autoloads (thai-auto-composition-mode thai-composition-function
 ;;;;;;  thai-post-read-conversion thai-compose-buffer thai-compose-string
 ;;;;;;  thai-compose-region) "thai-util" "language/thai-util.el"
-;;;;;;  (17178 22147))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from language/thai-util.el
 
 (autoload (quote thai-compose-region) "thai-util" "\
@@ -25580,7 +26002,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" (17178 22154))
+;;;;;;  "thingatpt" "thingatpt.el" (17187 59902))
 ;;; Generated autoloads from thingatpt.el
 
 (autoload (quote forward-thing) "thingatpt" "\
@@ -25637,7 +26059,7 @@ Not documented
 
 ;;;### (autoloads (thumbs-dired-setroot thumbs-dired-show-all thumbs-dired-show-marked
 ;;;;;;  thumbs-show-all-from-dir thumbs-find-thumb) "thumbs" "thumbs.el"
-;;;;;;  (17178 22154))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from thumbs.el
 
 (autoload (quote thumbs-find-thumb) "thumbs" "\
@@ -25676,7 +26098,7 @@ In dired, call the setroot program on the image at point.
 ;;;;;;  tibetan-composition-function tibetan-decompose-string tibetan-decompose-region
 ;;;;;;  tibetan-compose-region tibetan-compose-string tibetan-transcription-to-tibetan
 ;;;;;;  tibetan-tibetan-to-transcription tibetan-char-p) "tibet-util"
-;;;;;;  "language/tibet-util.el" (17178 20481))
+;;;;;;  "language/tibet-util.el" (17187 59881))
 ;;; Generated autoloads from language/tibet-util.el
 
 (autoload (quote tibetan-char-p) "tibet-util" "\
@@ -25755,7 +26177,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (tildify-buffer tildify-region) "tildify" "textmodes/tildify.el"
-;;;;;;  (17178 22154))
+;;;;;;  (17226 24578))
 ;;; Generated autoloads from textmodes/tildify.el
 
 (autoload (quote tildify-region) "tildify" "\
@@ -25779,7 +26201,7 @@ This function performs no refilling of the changed text.
 ;;;***
 
 ;;;### (autoloads (display-time-mode display-time display-time-day-and-date)
-;;;;;;  "time" "time.el" (17178 22154))
+;;;;;;  "time" "time.el" (17187 59902))
 ;;; Generated autoloads from time.el
 
 (defvar display-time-day-and-date nil "\
@@ -25822,8 +26244,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" (17178
-;;;;;;  20480))
+;;;;;;  date-to-time) "time-date" "calendar/time-date.el" (17226
+;;;;;;  24571))
 ;;; Generated autoloads from calendar/time-date.el
 
 (autoload (quote date-to-time) "time-date" "\
@@ -25909,7 +26331,7 @@ If DATE is malformed, return a time value of zeros.
 ;;;***
 
 ;;;### (autoloads (time-stamp-toggle-active time-stamp) "time-stamp"
-;;;;;;  "time-stamp.el" (17178 22154))
+;;;;;;  "time-stamp.el" (17196 26624))
 ;;; Generated autoloads from time-stamp.el
 
 (autoload (quote time-stamp) "time-stamp" "\
@@ -25925,10 +26347,11 @@ look like one of the following:
 The time stamp is written between the brackets or quotes:
       Time-stamp: <2001-02-18 10:20:51 gildea>
 The time stamp is updated only if the variable `time-stamp-active' is non-nil.
-The format of the time stamp is set by the variable `time-stamp-format'.
-The variables `time-stamp-line-limit', `time-stamp-start', `time-stamp-end',
-`time-stamp-count', and `time-stamp-inserts-lines' control finding the
-template.
+The format of the time stamp is set by the variable `time-stamp-pattern' or
+`time-stamp-format'.  The variables `time-stamp-pattern',
+`time-stamp-line-limit', `time-stamp-start', `time-stamp-end',
+`time-stamp-count', and `time-stamp-inserts-lines' control finding 
+the template.
 
 \(fn)" t nil)
 
@@ -25944,7 +26367,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"
-;;;;;;  (17178 20480))
+;;;;;;  (17226 24571))
 ;;; Generated autoloads from calendar/timeclock.el
 
 (autoload (quote timeclock-modeline-display) "timeclock" "\
@@ -26045,7 +26468,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" (17178 22144))
+;;;;;;  "emacs-lisp/timer.el" (17187 59901))
 ;;; Generated autoloads from emacs-lisp/timer.el
 
 (defalias (quote disable-timeout) (quote cancel-timer))
@@ -26116,7 +26539,7 @@ be detected.
 ;;;***
 
 ;;;### (autoloads (batch-titdic-convert titdic-convert) "titdic-cnv"
-;;;;;;  "international/titdic-cnv.el" (17178 20480))
+;;;;;;  "international/titdic-cnv.el" (17187 59880))
 ;;; Generated autoloads from international/titdic-cnv.el
 
 (autoload (quote titdic-convert) "titdic-cnv" "\
@@ -26139,8 +26562,8 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\".
 ;;;***
 
 ;;;### (autoloads (tamil-composition-function tamil-post-read-conversion
-;;;;;;  tamil-compose-region) "tml-util" "language/tml-util.el" (17178
-;;;;;;  20481))
+;;;;;;  tamil-compose-region) "tml-util" "language/tml-util.el" (17187
+;;;;;;  59881))
 ;;; Generated autoloads from language/tml-util.el
 
 (autoload (quote tamil-compose-region) "tml-util" "\
@@ -26163,7 +26586,7 @@ PATTERN regexp.
 ;;;***
 
 ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm"
-;;;;;;  "tmm.el" (17178 22155))
+;;;;;;  "tmm.el" (17187 59902))
 ;;; Generated autoloads from tmm.el
  (define-key global-map "\M-`" 'tmm-menubar)
  (define-key global-map [f10] 'tmm-menubar)
@@ -26204,7 +26627,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" (17178 20480))
+;;;;;;  "todo-mode" "calendar/todo-mode.el" (17187 59880))
 ;;; Generated autoloads from calendar/todo-mode.el
 
 (autoload (quote todo-add-category) "todo-mode" "\
@@ -26265,8 +26688,8 @@ 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-mode) "tool-bar"
-;;;;;;  "toolbar/tool-bar.el" (17178 22155))
-;;; Generated autoloads from toolbar/tool-bar.el
+;;;;;;  "tool-bar.el" (17238 21257))
+;;; Generated autoloads from tool-bar.el
 
 (defvar tool-bar-mode nil "\
 Non-nil if Tool-Bar mode is enabled.
@@ -26297,7 +26720,7 @@ PROPS are additional items to add to the menu item specification.  See
 Info node `(elisp)Tool Bar'.  Items are added from left to right.
 
 ICON is the base name of a file containing the image to use.  The
-function will first try to use lc-ICON.xpm if display-color-cells
+function will first try to use low-color/ICON.xpm if display-color-cells
 is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally
 ICON.xbm, using `find-image'.
 
@@ -26314,7 +26737,7 @@ PROPS are additional items to add to the menu item specification.  See
 Info node `(elisp)Tool Bar'.  Items are added from left to right.
 
 ICON is the base name of a file containing the image to use.  The
-function will first try to use lc-ICON.xpm if display-color-cells
+function will first try to use low-color/ICON.xpm if display-color-cells
 is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally
 ICON.xbm, using `find-image'.
 
@@ -26350,7 +26773,7 @@ MAP must contain appropriate binding for `[menu-bar]' which holds a keymap.
 ;;;***
 
 ;;;### (autoloads (tpu-edt-on tpu-edt-mode) "tpu-edt" "emulation/tpu-edt.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from emulation/tpu-edt.el
 
 (defvar tpu-edt-mode nil "\
@@ -26378,7 +26801,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" (17178 22144))
+;;;;;;  "tpu-extras" "emulation/tpu-extras.el" (17187 59901))
 ;;; Generated autoloads from emulation/tpu-extras.el
 
 (autoload (quote tpu-set-scroll-margins) "tpu-extras" "\
@@ -26398,7 +26821,7 @@ Constrain the cursor to the flow of the text.
 
 ;;;***
 
-;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (17178 22144))
+;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (17187 59901))
 ;;; Generated autoloads from emacs-lisp/tq.el
 
 (autoload (quote tq-create) "tq" "\
@@ -26412,7 +26835,7 @@ to a tcp server on another machine.
 ;;;***
 
 ;;;### (autoloads (trace-function-background trace-function trace-buffer)
-;;;;;;  "trace" "emacs-lisp/trace.el" (17178 22144))
+;;;;;;  "trace" "emacs-lisp/trace.el" (17187 59901))
 ;;; Generated autoloads from emacs-lisp/trace.el
 
 (defvar trace-buffer "*trace-output*" "\
@@ -26445,7 +26868,7 @@ the window or buffer configuration at all.
 
 ;;;### (autoloads (tramp-completion-file-name-handler tramp-file-name-handler
 ;;;;;;  tramp-completion-file-name-regexp tramp-file-name-regexp)
-;;;;;;  "tramp" "net/tramp.el" (17178 22151))
+;;;;;;  "tramp" "net/tramp.el" (17238 21257))
 ;;; Generated autoloads from net/tramp.el
 
 (defvar tramp-unified-filenames (not (featurep (quote xemacs))) "\
@@ -26522,7 +26945,7 @@ Falls back to normal file name handler if no tramp file name handler exists.
 ;;;***
 
 ;;;### (autoloads (2C-split 2C-associate-buffer 2C-two-columns) "two-column"
-;;;;;;  "textmodes/two-column.el" (17178 22154))
+;;;;;;  "textmodes/two-column.el" (17187 59902))
 ;;; Generated autoloads from textmodes/two-column.el
  (autoload '2C-command "two-column" () t 'keymap)
  (global-set-key "\C-x6" '2C-command)
@@ -26573,7 +26996,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"
-;;;;;;  (17178 22155))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from type-break.el
 
 (defvar type-break-mode nil "\
@@ -26756,7 +27179,7 @@ FRAC should be the inverse of the fractional value; for example, a value of
 ;;;***
 
 ;;;### (autoloads (ununderline-region underline-region) "underline"
-;;;;;;  "textmodes/underline.el" (17178 22154))
+;;;;;;  "textmodes/underline.el" (17187 59902))
 ;;; Generated autoloads from textmodes/underline.el
 
 (autoload (quote underline-region) "underline" "\
@@ -26777,7 +27200,7 @@ which specify the range to operate on.
 ;;;***
 
 ;;;### (autoloads (unforward-rmail-message undigestify-rmail-message)
-;;;;;;  "undigest" "mail/undigest.el" (17178 22151))
+;;;;;;  "undigest" "mail/undigest.el" (17187 59902))
 ;;; Generated autoloads from mail/undigest.el
 
 (autoload (quote undigestify-rmail-message) "undigest" "\
@@ -26796,7 +27219,7 @@ following the containing message.
 ;;;***
 
 ;;;### (autoloads (unrmail batch-unrmail) "unrmail" "mail/unrmail.el"
-;;;;;;  (17178 22151))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from mail/unrmail.el
 
 (autoload (quote batch-unrmail) "unrmail" "\
@@ -26815,8 +27238,8 @@ Convert Rmail file FILE to system inbox format file TO-FILE.
 
 ;;;***
 
-;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (17178
-;;;;;;  22144))
+;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (17187
+;;;;;;  59901))
 ;;; Generated autoloads from emacs-lisp/unsafep.el
 
 (autoload (quote unsafep) "unsafep" "\
@@ -26828,7 +27251,7 @@ of symbols with local bindings.
 
 ;;;***
 
-;;;### (autoloads nil "url" "url/url.el" (17178 22157))
+;;;### (autoloads nil "url" "url/url.el" (17238 21257))
 ;;; Generated autoloads from url/url.el
 
 (defvar url-configuration-directory "~/.url")
@@ -26836,7 +27259,7 @@ of symbols with local bindings.
 ;;;***
 
 ;;;### (autoloads (url-register-auth-scheme url-get-authentication)
-;;;;;;  "url-auth" "url/url-auth.el" (17178 22155))
+;;;;;;  "url-auth" "url/url-auth.el" (17187 59902))
 ;;; Generated autoloads from url/url-auth.el
 
 (autoload (quote url-get-authentication) "url-auth" "\
@@ -26878,8 +27301,8 @@ RATING   a rating between 1 and 10 of the strength of the authentication.
 ;;;***
 
 ;;;### (autoloads (url-cache-expired url-cache-extract url-is-cached
-;;;;;;  url-store-in-cache) "url-cache" "url/url-cache.el" (17178
-;;;;;;  22156))
+;;;;;;  url-store-in-cache) "url-cache" "url/url-cache.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from url/url-cache.el
 
 (autoload (quote url-store-in-cache) "url-cache" "\
@@ -26904,7 +27327,7 @@ Return t iff a cached file has expired.
 
 ;;;***
 
-;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (17178 22156))
+;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (17187 59902))
 ;;; Generated autoloads from url/url-cid.el
 
 (autoload (quote url-cid) "url-cid" "\
@@ -26916,8 +27339,8 @@ Not documented
 
 ;;;### (autoloads (url-cookie-setup-save-timer url-cookie-handle-set-cookie
 ;;;;;;  url-cookie-generate-header-lines url-cookie-retrieve url-cookie-write-file
-;;;;;;  url-cookie-parse-file) "url-cookie" "url/url-cookie.el" (17178
-;;;;;;  22156))
+;;;;;;  url-cookie-parse-file) "url-cookie" "url/url-cookie.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from url/url-cookie.el
 
 (autoload (quote url-cookie-parse-file) "url-cookie" "\
@@ -26953,7 +27376,7 @@ Reset the cookie saver timer.
 ;;;***
 
 ;;;### (autoloads (url-dav-vc-registered url-dav-supported-p) "url-dav"
-;;;;;;  "url/url-dav.el" (17178 22156))
+;;;;;;  "url/url-dav.el" (17187 59902))
 ;;; Generated autoloads from url/url-dav.el
 
 (autoload (quote url-dav-supported-p) "url-dav" "\
@@ -26968,8 +27391,8 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (url-file) "url-file" "url/url-file.el" (17178
-;;;;;;  22156))
+;;;### (autoloads (url-file) "url-file" "url/url-file.el" (17244
+;;;;;;  4914))
 ;;; Generated autoloads from url/url-file.el
 
 (autoload (quote url-file) "url-file" "\
@@ -26980,7 +27403,7 @@ Handle file: and ftp: URLs.
 ;;;***
 
 ;;;### (autoloads (url-open-stream url-gateway-nslookup-host) "url-gw"
-;;;;;;  "url/url-gw.el" (17178 22156))
+;;;;;;  "url/url-gw.el" (17187 59902))
 ;;; Generated autoloads from url/url-gw.el
 
 (autoload (quote url-gateway-nslookup-host) "url-gw" "\
@@ -26998,8 +27421,8 @@ Will not make a connection if `url-gateway-unplugged' is non-nil.
 ;;;***
 
 ;;;### (autoloads (url-insert-file-contents url-file-local-copy url-copy-file
-;;;;;;  url-handler-mode) "url-handlers" "url/url-handlers.el" (17178
-;;;;;;  22156))
+;;;;;;  url-handler-mode) "url-handlers" "url/url-handlers.el" (17244
+;;;;;;  4914))
 ;;; Generated autoloads from url/url-handlers.el
 
 (defvar url-handler-mode nil "\
@@ -27045,7 +27468,7 @@ Not documented
 
 ;;;### (autoloads (url-history-save-history url-history-parse-history
 ;;;;;;  url-history-setup-save-timer) "url-history" "url/url-history.el"
-;;;;;;  (17178 22156))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from url/url-history.el
 
 (autoload (quote url-history-setup-save-timer) "url-history" "\
@@ -27069,7 +27492,7 @@ user for what type to save as.
 ;;;***
 
 ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p
-;;;;;;  url-http) "url-http" "url/url-http.el" (17178 22156))
+;;;;;;  url-http) "url-http" "url/url-http.el" (17244 4914))
 ;;; Generated autoloads from url/url-http.el
 
 (autoload (quote url-http) "url-http" "\
@@ -27122,7 +27545,7 @@ p3p
 
 ;;;***
 
-;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (17178 22156))
+;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (17187 59902))
 ;;; Generated autoloads from url/url-irc.el
 
 (autoload (quote url-irc) "url-irc" "\
@@ -27132,8 +27555,8 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (17178
-;;;;;;  22156))
+;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from url/url-ldap.el
 
 (autoload (quote url-ldap) "url-ldap" "\
@@ -27147,7 +27570,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"
-;;;;;;  (17178 22156))
+;;;;;;  (17226 24578))
 ;;; Generated autoloads from url/url-mailto.el
 
 (autoload (quote url-mail) "url-mailto" "\
@@ -27163,7 +27586,7 @@ Handle the mailto: URL syntax.
 ;;;***
 
 ;;;### (autoloads (url-data url-generic-emulator-loader url-info
-;;;;;;  url-man) "url-misc" "url/url-misc.el" (17178 22156))
+;;;;;;  url-man) "url-misc" "url/url-misc.el" (17187 59902))
 ;;; Generated autoloads from url/url-misc.el
 
 (autoload (quote url-man) "url-misc" "\
@@ -27195,7 +27618,7 @@ Fetch a data URL (RFC 2397).
 ;;;***
 
 ;;;### (autoloads (url-snews url-news) "url-news" "url/url-news.el"
-;;;;;;  (17178 22156))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from url/url-news.el
 
 (autoload (quote url-news) "url-news" "\
@@ -27212,7 +27635,7 @@ Not documented
 
 ;;;### (autoloads (url-ns-user-pref url-ns-prefs isInNet isResolvable
 ;;;;;;  dnsResolve dnsDomainIs isPlainHostName) "url-ns" "url/url-ns.el"
-;;;;;;  (17178 22156))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from url/url-ns.el
 
 (autoload (quote isPlainHostName) "url-ns" "\
@@ -27253,7 +27676,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (url-generic-parse-url url-recreate-url) "url-parse"
-;;;;;;  "url/url-parse.el" (17178 22156))
+;;;;;;  "url/url-parse.el" (17187 59902))
 ;;; Generated autoloads from url/url-parse.el
 
 (autoload (quote url-recreate-url) "url-parse" "\
@@ -27271,7 +27694,7 @@ Format is:
 ;;;***
 
 ;;;### (autoloads (url-setup-privacy-info) "url-privacy" "url/url-privacy.el"
-;;;;;;  (17178 22156))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from url/url-privacy.el
 
 (autoload (quote url-setup-privacy-info) "url-privacy" "\
@@ -27287,7 +27710,7 @@ Not documented
 ;;;;;;  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"
-;;;;;;  (17178 22157))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from url/url-util.el
 
 (defvar url-debug nil "\
@@ -27412,7 +27835,7 @@ This uses `url-current-object', set locally to the buffer.
 ;;;***
 
 ;;;### (autoloads (ask-user-about-supersession-threat ask-user-about-lock)
-;;;;;;  "userlock" "userlock.el" (17178 22157))
+;;;;;;  "userlock" "userlock.el" (17187 59902))
 ;;; Generated autoloads from userlock.el
 
 (autoload (quote ask-user-about-lock) "userlock" "\
@@ -27440,9 +27863,15 @@ The buffer in question is current when this function is called.
 
 ;;;***
 
+;;;### (autoloads nil "utf-7" "international/utf-7.el" (17254 64062))
+;;; Generated autoloads from international/utf-7.el
+(autoload-coding-system 'utf-7 '(require 'utf-7))
+
+;;;***
+
 ;;;### (autoloads (uudecode-decode-region uudecode-decode-region-internal
 ;;;;;;  uudecode-decode-region-external) "uudecode" "gnus/uudecode.el"
-;;;;;;  (17178 22146))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from gnus/uudecode.el
 
 (autoload (quote uudecode-decode-region-external) "uudecode" "\
@@ -27472,7 +27901,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" (17178 22157))
+;;;;;;  vc-checkin-hook vc-checkout-hook) "vc" "vc.el" (17254 63791))
 ;;; Generated autoloads from vc.el
 
 (defvar vc-checkout-hook nil "\
@@ -27759,7 +28188,7 @@ colors. `vc-annotate-background' specifies the background color.
 
 ;;;***
 
-;;;### (autoloads nil "vc-arch" "vc-arch.el" (17178 22157))
+;;;### (autoloads nil "vc-arch" "vc-arch.el" (17187 59902))
 ;;; Generated autoloads from vc-arch.el
  (defun vc-arch-registered (file)
   (if (vc-find-root file "{arch}/=tagging-method")
@@ -27769,7 +28198,7 @@ colors. `vc-annotate-background' specifies the background color.
 
 ;;;***
 
-;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (17178 22157))
+;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (17187 59902))
 ;;; Generated autoloads from vc-cvs.el
  (defun vc-cvs-registered (f)
   (when (file-readable-p (expand-file-name
@@ -27779,7 +28208,7 @@ colors. `vc-annotate-background' specifies the background color.
 
 ;;;***
 
-;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (17178 22157))
+;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (17226 24578))
 ;;; Generated autoloads from vc-mcvs.el
  (defun vc-mcvs-registered (file)
   (if (vc-find-root file "MCVS/CVS")
@@ -27790,7 +28219,7 @@ colors. `vc-annotate-background' specifies the background color.
 ;;;***
 
 ;;;### (autoloads (vc-rcs-master-templates) "vc-rcs" "vc-rcs.el"
-;;;;;;  (17178 22157))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from vc-rcs.el
 
 (defvar vc-rcs-master-templates (quote ("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\
@@ -27803,7 +28232,7 @@ For a description of possible values, see `vc-check-master-templates'.")
 ;;;***
 
 ;;;### (autoloads (vc-sccs-master-templates) "vc-sccs" "vc-sccs.el"
-;;;;;;  (17178 22157))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from vc-sccs.el
 
 (defvar vc-sccs-master-templates (quote ("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\
@@ -27820,7 +28249,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
 
 ;;;***
 
-;;;### (autoloads nil "vc-svn" "vc-svn.el" (17178 22157))
+;;;### (autoloads nil "vc-svn" "vc-svn.el" (17187 59902))
 ;;; Generated autoloads from vc-svn.el
  (defun vc-svn-registered (f)
   (when (file-readable-p (expand-file-name
@@ -27833,7 +28262,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
 ;;;***
 
 ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el"
-;;;;;;  (17178 22153))
+;;;;;;  (17229 28055))
 ;;; Generated autoloads from progmodes/vhdl-mode.el
 
 (autoload (quote vhdl-mode) "vhdl-mode" "\
@@ -28089,16 +28518,16 @@ Usage:
         outputs from this component -> output port created
       - signals that are inputs to AND outputs from subcomponents are
         considered as internal connections -> internal signal created
- 
+
       Purpose:  With appropriate naming conventions it is possible to
     create higher design levels with only a few mouse clicks or key
     strokes.  A new design level can be created by simply generating a new
     component, placing the required subcomponents from the hierarchy
     browser, and wiring everything automatically.
- 
+
       Note: Automatic wiring only works reliably on templates of new
     components and component instantiations that were created by VHDL mode.
- 
+
       Component declarations can be placed in a components package (option
     `vhdl-use-components-package') which can be automatically generated for
     an entire directory or project (`C-c C-c M-p').  The VHDL'93 direct
@@ -28120,7 +28549,7 @@ Usage:
 |     Note: Configurations of subcomponents (i.e. hierarchical configuration
 |   declarations) are currently not considered when displaying
 |   configurations in speedbar.
- 
+
       See the options group `vhdl-compose' for all relevant user options.
 
 
@@ -28374,7 +28803,7 @@ Key bindings:
 
 ;;;***
 
-;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (17178 20480))
+;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (17187 59879))
 ;;; Generated autoloads from emulation/vi.el
 
 (autoload (quote vi-mode) "vi" "\
@@ -28429,7 +28858,7 @@ Syntax table and abbrevs while in vi mode remain as they were in Emacs.
 ;;;### (autoloads (viqr-pre-write-conversion viqr-post-read-conversion
 ;;;;;;  viet-encode-viqr-buffer viet-encode-viqr-region viet-decode-viqr-buffer
 ;;;;;;  viet-decode-viqr-region viet-encode-viscii-char) "viet-util"
-;;;;;;  "language/viet-util.el" (17178 20481))
+;;;;;;  "language/viet-util.el" (17187 59881))
 ;;; Generated autoloads from language/viet-util.el
 
 (autoload (quote viet-encode-viscii-char) "viet-util" "\
@@ -28475,8 +28904,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" (17178
-;;;;;;  22157))
+;;;;;;  view-file-other-window view-file) "view" "view.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from view.el
 
 (defvar view-mode nil "\
@@ -28683,8 +29112,8 @@ Exit View mode and make the current buffer editable.
 
 ;;;***
 
-;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (17178
-;;;;;;  22144))
+;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (17226
+;;;;;;  24575))
 ;;; Generated autoloads from emulation/vip.el
 
 (autoload (quote vip-setup) "vip" "\
@@ -28700,7 +29129,7 @@ Turn on VIP emulation of VI.
 ;;;***
 
 ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17254 63790))
 ;;; Generated autoloads from emulation/viper.el
 
 (autoload (quote toggle-viper-mode) "viper" "\
@@ -28717,7 +29146,7 @@ Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Viper'.
 ;;;***
 
 ;;;### (autoloads (warn lwarn display-warning) "warnings" "emacs-lisp/warnings.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17187 59901))
 ;;; Generated autoloads from emacs-lisp/warnings.el
 
 (defvar warning-prefix-function nil "\
@@ -28805,7 +29234,7 @@ this is equivalent to `display-warning', using
 ;;;***
 
 ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el"
-;;;;;;  (17178 22157))
+;;;;;;  (17226 24579))
 ;;; Generated autoloads from wdired.el
 
 (autoload (quote wdired-change-to-wdired-mode) "wdired" "\
@@ -28821,7 +29250,7 @@ See `wdired-mode'.
 
 ;;;***
 
-;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17178 22151))
+;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17187 59902))
 ;;; Generated autoloads from net/webjump.el
 
 (autoload (quote webjump) "webjump" "\
@@ -28838,7 +29267,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"
-;;;;;;  (17178 22153))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from progmodes/which-func.el
  (put 'which-func-format 'risky-local-variable t)
  (put 'which-func-current 'risky-local-variable t)
@@ -28872,7 +29301,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"
-;;;;;;  (17178 22157))
+;;;;;;  (17254 63791))
 ;;; Generated autoloads from whitespace.el
 
 (autoload (quote whitespace-toggle-leading-check) "whitespace" "\
@@ -28923,9 +29352,7 @@ Check the region for whitespace errors.
 
 (autoload (quote whitespace-cleanup) "whitespace" "\
 Cleanup the five different kinds of whitespace problems.
-
-Use \\[describe-function] whitespace-describe to read a summary of the
-whitespace problems.
+See `whitespace-buffer' docstring for a summary of the problems.
 
 \(fn)" t nil)
 
@@ -28964,7 +29391,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" (17178 22157))
+;;;;;;  widget-browse-at) "wid-browse" "wid-browse.el" (17187 59902))
 ;;; Generated autoloads from wid-browse.el
 
 (autoload (quote widget-browse-at) "wid-browse" "\
@@ -28991,8 +29418,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" (17178
-;;;;;;  22157))
+;;;;;;  widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (17254
+;;;;;;  63791))
 ;;; Generated autoloads from wid-edit.el
 
 (autoload (quote widgetp) "wid-edit" "\
@@ -29034,8 +29461,8 @@ Setup current buffer so editing string widgets works.
 ;;;***
 
 ;;;### (autoloads (windmove-default-keybindings windmove-down windmove-right
-;;;;;;  windmove-up windmove-left) "windmove" "windmove.el" (17178
-;;;;;;  22157))
+;;;;;;  windmove-up windmove-left) "windmove" "windmove.el" (17187
+;;;;;;  59902))
 ;;; Generated autoloads from windmove.el
 
 (autoload (quote windmove-left) "windmove" "\
@@ -29088,7 +29515,7 @@ Default MODIFIER is 'shift.
 ;;;***
 
 ;;;### (autoloads (winner-mode winner-mode) "winner" "winner.el"
-;;;;;;  (17178 22157))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from winner.el
 
 (defvar winner-mode nil "\
@@ -29107,7 +29534,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" (17178 22157))
+;;;;;;  "woman.el" (17238 21257))
 ;;; Generated autoloads from woman.el
 
 (autoload (quote woman) "woman" "\
@@ -29143,7 +29570,7 @@ decompress the file if appropriate.  See the documentation for the
 ;;;***
 
 ;;;### (autoloads (wordstar-mode) "ws-mode" "emulation/ws-mode.el"
-;;;;;;  (17178 22144))
+;;;;;;  (17226 24575))
 ;;; Generated autoloads from emulation/ws-mode.el
 
 (autoload (quote wordstar-mode) "ws-mode" "\
@@ -29256,7 +29683,7 @@ The key bindings are:
 ;;;***
 
 ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el"
-;;;;;;  (17178 22157))
+;;;;;;  (17187 59902))
 ;;; Generated autoloads from xml.el
 
 (autoload (quote xml-parse-file) "xml" "\
@@ -29281,8 +29708,8 @@ If PARSE-NS is non-nil, then QNAMES are expanded.
 
 ;;;***
 
-;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17178
-;;;;;;  22157))
+;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17187
+;;;;;;  59919))
 ;;; Generated autoloads from xt-mouse.el
 
 (defvar xterm-mouse-mode nil "\
@@ -29311,7 +29738,7 @@ down the SHIFT key while pressing the mouse button.
 ;;;***
 
 ;;;### (autoloads (yenc-extract-filename yenc-decode-region) "yenc"
-;;;;;;  "gnus/yenc.el" (17178 22146))
+;;;;;;  "gnus/yenc.el" (17187 59901))
 ;;; Generated autoloads from gnus/yenc.el
 
 (autoload (quote yenc-decode-region) "yenc" "\
@@ -29327,7 +29754,7 @@ Extract file name from an yenc header.
 ;;;***
 
 ;;;### (autoloads (psychoanalyze-pinhead apropos-zippy insert-zippyism
-;;;;;;  yow) "yow" "play/yow.el" (17178 22152))
+;;;;;;  yow) "yow" "play/yow.el" (17187 59902))
 ;;; Generated autoloads from play/yow.el
 
 (autoload (quote yow) "yow" "\
@@ -29353,7 +29780,7 @@ Zippy goes to the analyst.
 
 ;;;***
 
-;;;### (autoloads (zone) "zone" "play/zone.el" (17178 22152))
+;;;### (autoloads (zone) "zone" "play/zone.el" (17229 28054))
 ;;; Generated autoloads from play/zone.el
 
 (autoload (quote zone) "zone" "\
@@ -29364,7 +29791,7 @@ Zone out, completely.
 ;;;***
 
 ;;;### (autoloads (zone-mode zone-mode-update-serial-hook) "zone-mode"
-;;;;;;  "net/zone-mode.el" (17178 22151))
+;;;;;;  "net/zone-mode.el" (17187 59902))
 ;;; Generated autoloads from net/zone-mode.el
 
 (autoload (quote zone-mode-update-serial-hook) "zone-mode" "\
@@ -29406,9 +29833,9 @@ Zone-mode does two things:
 ;;;;;;  "calendar/cal-menu.el" "calendar/cal-move.el" "calendar/cal-persia.el"
 ;;;;;;  "calendar/cal-tex.el" "calendar/cal-x.el" "case-table.el"
 ;;;;;;  "cdl.el" "cus-dep.el" "cus-load.el" "cus-start.el" "custom.el"
-;;;;;;  "dos-fns.el" "dos-vars.el" "dos-w32.el" "ediff-diff.el" "ediff-init.el"
-;;;;;;  "ediff-merg.el" "ediff-ptch.el" "ediff-vers.el" "ediff-wind.el"
-;;;;;;  "electric.el" "emacs-lisp/assoc.el" "emacs-lisp/authors.el"
+;;;;;;  "dframe.el" "dos-fns.el" "dos-vars.el" "dos-w32.el" "ediff-diff.el"
+;;;;;;  "ediff-init.el" "ediff-merg.el" "ediff-ptch.el" "ediff-vers.el"
+;;;;;;  "ediff-wind.el" "electric.el" "emacs-lisp/assoc.el" "emacs-lisp/authors.el"
 ;;;;;;  "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el" "emacs-lisp/byte-run.el"
 ;;;;;;  "emacs-lisp/cl-compat.el" "emacs-lisp/cl-extra.el" "emacs-lisp/cl-macs.el"
 ;;;;;;  "emacs-lisp/cl-seq.el" "emacs-lisp/cl-specs.el" "emacs-lisp/cust-print.el"
@@ -29431,7 +29858,7 @@ Zone-mode does two things:
 ;;;;;;  "eshell/esh-cmd.el" "eshell/esh-ext.el" "eshell/esh-groups.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" "faces.el" "files.el" "finder-inf.el"
+;;;;;;  "eshell/esh-var.el" "ezimage.el" "faces.el" "files.el" "finder-inf.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"
@@ -29453,59 +29880,59 @@ Zone-mode does two things:
 ;;;;;;  "gnus/nnmail.el" "gnus/nnmaildir.el" "gnus/nnmbox.el" "gnus/nnmh.el"
 ;;;;;;  "gnus/nnnil.el" "gnus/nnoo.el" "gnus/nnrss.el" "gnus/nnslashdot.el"
 ;;;;;;  "gnus/nnspool.el" "gnus/nntp.el" "gnus/nnultimate.el" "gnus/nnvirtual.el"
-;;;;;;  "gnus/nnwarchive.el" "gnus/nnweb.el" "gnus/nnwfm.el" "gnus/pgg-def.el"
-;;;;;;  "gnus/pgg-gpg.el" "gnus/pgg-parse.el" "gnus/pgg-pgp.el" "gnus/pgg-pgp5.el"
-;;;;;;  "gnus/pop3.el" "gnus/rfc1843.el" "gnus/rfc2045.el" "gnus/rfc2047.el"
-;;;;;;  "gnus/rfc2104.el" "gnus/rfc2231.el" "gnus/sieve-manage.el"
-;;;;;;  "gnus/smime.el" "gnus/spam-stat.el" "gnus/starttls.el" "gnus/utf7.el"
-;;;;;;  "gnus/webmail.el" "help.el" "indent.el" "international/characters.el"
-;;;;;;  "international/fontset.el" "international/iso-ascii.el" "international/iso-insert.el"
-;;;;;;  "international/ja-dic-cnv.el" "international/ja-dic-utl.el"
-;;;;;;  "international/latin-1.el" "international/latin-2.el" "international/latin-3.el"
-;;;;;;  "international/latin-4.el" "international/latin-5.el" "international/latin-8.el"
-;;;;;;  "international/latin-9.el" "international/mule-cmds.el" "international/mule-conf.el"
+;;;;;;  "gnus/nnwarchive.el" "gnus/nnweb.el" "gnus/nnwfm.el" "gnus/pop3.el"
+;;;;;;  "gnus/rfc1843.el" "gnus/rfc2045.el" "gnus/rfc2047.el" "gnus/rfc2104.el"
+;;;;;;  "gnus/rfc2231.el" "gnus/sieve-manage.el" "gnus/smime.el"
+;;;;;;  "gnus/spam-stat.el" "gnus/starttls.el" "gnus/utf7.el" "gnus/webmail.el"
+;;;;;;  "help.el" "indent.el" "international/characters.el" "international/fontset.el"
+;;;;;;  "international/iso-ascii.el" "international/ja-dic-cnv.el"
+;;;;;;  "international/ja-dic-utl.el" "international/latin-1.el"
+;;;;;;  "international/latin-2.el" "international/latin-3.el" "international/latin-4.el"
+;;;;;;  "international/latin-5.el" "international/latin-8.el" "international/latin-9.el"
+;;;;;;  "international/mule-cmds.el" "international/mule-conf.el"
 ;;;;;;  "international/mule.el" "international/ogonek.el" "international/subst-big5.el"
 ;;;;;;  "international/subst-gb2312.el" "international/subst-jis.el"
 ;;;;;;  "international/subst-ksc.el" "international/ucs-tables.el"
-;;;;;;  "international/utf-16.el" "international/utf-7.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-customize.el"
-;;;;;;  "mh-e/mh-funcs.el" "mh-e/mh-gnus.el" "mh-e/mh-identity.el"
-;;;;;;  "mh-e/mh-inc.el" "mh-e/mh-index.el" "mh-e/mh-junk.el" "mh-e/mh-loaddefs.el"
-;;;;;;  "mh-e/mh-mime.el" "mh-e/mh-pick.el" "mh-e/mh-print.el" "mh-e/mh-seq.el"
-;;;;;;  "mh-e/mh-speed.el" "mh-e/mh-utils.el" "misc.el" "mouse-copy.el"
-;;;;;;  "mouse-drag.el" "mouse.el" "net/eudc-vars.el" "net/eudcb-bbdb.el"
-;;;;;;  "net/eudcb-ldap.el" "net/eudcb-ph.el" "net/ldap.el" "net/netrc.el"
-;;;;;;  "net/tls.el" "net/tramp-ftp.el" "net/tramp-smb.el" "net/tramp-util.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-customize.el" "mh-e/mh-funcs.el" "mh-e/mh-gnus.el"
+;;;;;;  "mh-e/mh-identity.el" "mh-e/mh-inc.el" "mh-e/mh-index.el"
+;;;;;;  "mh-e/mh-junk.el" "mh-e/mh-loaddefs.el" "mh-e/mh-mime.el"
+;;;;;;  "mh-e/mh-pick.el" "mh-e/mh-print.el" "mh-e/mh-seq.el" "mh-e/mh-speed.el"
+;;;;;;  "mh-e/mh-utils.el" "misc.el" "mouse-copy.el" "mouse-drag.el"
+;;;;;;  "mouse.el" "net/eudc-vars.el" "net/eudcb-bbdb.el" "net/eudcb-ldap.el"
+;;;;;;  "net/eudcb-ph.el" "net/ldap.el" "net/netrc.el" "net/tls.el"
+;;;;;;  "net/tramp-ftp.el" "net/tramp-smb.el" "net/tramp-util.el"
 ;;;;;;  "net/tramp-uu.el" "net/tramp-vc.el" "net/trampver.el" "obsolete/awk-mode.el"
 ;;;;;;  "obsolete/bg-mouse.el" "obsolete/float.el" "obsolete/hilit19.el"
-;;;;;;  "obsolete/iso-swed.el" "obsolete/keyswap.el" "obsolete/mlsupport.el"
-;;;;;;  "obsolete/ooutline.el" "obsolete/profile.el" "obsolete/rnews.el"
-;;;;;;  "obsolete/sc.el" "obsolete/sun-curs.el" "obsolete/sun-fns.el"
-;;;;;;  "obsolete/swedish.el" "obsolete/uncompress.el" "obsolete/x-apollo.el"
-;;;;;;  "obsolete/x-menu.el" "patcomp.el" "paths.el" "pcvs-info.el"
-;;;;;;  "pcvs-parse.el" "pcvs-util.el" "play/gamegrid.el" "play/gametree.el"
-;;;;;;  "play/meese.el" "progmodes/ada-prj.el" "progmodes/cc-align.el"
-;;;;;;  "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el" "progmodes/cc-cmds.el"
-;;;;;;  "progmodes/cc-compat.el" "progmodes/cc-defs.el" "progmodes/cc-fonts.el"
-;;;;;;  "progmodes/cc-langs.el" "progmodes/cc-menus.el" "progmodes/cc-vars.el"
-;;;;;;  "progmodes/ebnf-abn.el" "progmodes/ebnf-bnf.el" "progmodes/ebnf-dtd.el"
-;;;;;;  "progmodes/ebnf-ebx.el" "progmodes/ebnf-iso.el" "progmodes/ebnf-otz.el"
-;;;;;;  "progmodes/ebnf-yac.el" "progmodes/idlw-complete-structtag.el"
+;;;;;;  "obsolete/iso-insert.el" "obsolete/iso-swed.el" "obsolete/keyswap.el"
+;;;;;;  "obsolete/mlsupport.el" "obsolete/ooutline.el" "obsolete/profile.el"
+;;;;;;  "obsolete/rnews.el" "obsolete/sc.el" "obsolete/sun-curs.el"
+;;;;;;  "obsolete/sun-fns.el" "obsolete/swedish.el" "obsolete/uncompress.el"
+;;;;;;  "obsolete/x-apollo.el" "obsolete/x-menu.el" "patcomp.el"
+;;;;;;  "paths.el" "pcvs-info.el" "pcvs-parse.el" "pcvs-util.el"
+;;;;;;  "pgg-def.el" "pgg-gpg.el" "pgg-parse.el" "pgg-pgp.el" "pgg-pgp5.el"
+;;;;;;  "play/gamegrid.el" "play/gametree.el" "play/meese.el" "progmodes/ada-prj.el"
+;;;;;;  "progmodes/cc-align.el" "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el"
+;;;;;;  "progmodes/cc-cmds.el" "progmodes/cc-compat.el" "progmodes/cc-defs.el"
+;;;;;;  "progmodes/cc-fonts.el" "progmodes/cc-langs.el" "progmodes/cc-menus.el"
+;;;;;;  "progmodes/cc-vars.el" "progmodes/ebnf-abn.el" "progmodes/ebnf-bnf.el"
+;;;;;;  "progmodes/ebnf-dtd.el" "progmodes/ebnf-ebx.el" "progmodes/ebnf-iso.el"
+;;;;;;  "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" "scroll-bar.el"
+;;;;;;  "replace.el" "s-region.el" "saveplace.el" "sb-image.el" "scroll-bar.el"
 ;;;;;;  "select.el" "simple.el" "soundex.el" "startup.el" "subdirs.el"
 ;;;;;;  "subr.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"
@@ -29521,13 +29948,13 @@ Zone-mode does two things:
 ;;;;;;  "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"
-;;;;;;  "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"
+;;;;;;  "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") (17178 25595 473948))
+;;;;;;  "x-dnd.el") (17254 64782 199896))
 
 ;;;***
 
diff --git a/lisp/locate.el b/lisp/locate.el
index 390e0ec72b3..5b61ed522e9 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -376,13 +376,13 @@ do not work in subdirectories.
   (set (make-local-variable 'dired-directory) "/")
   (set (make-local-variable 'dired-subdir-switches) locate-ls-subdir-switches)
   (setq dired-switches-alist nil)
-  (make-local-variable 'dired-move-to-filename-regexp)
+  (make-local-variable 'directory-listing-before-filename-regexp)
   ;; This should support both Unix and Windoze style names
-  (setq dired-move-to-filename-regexp
+  (setq directory-listing-before-filename-regexp
         (concat "^."
                 (make-string (1- locate-filename-indentation) ?\ )
                 "\\(/\\|[A-Za-z]:\\)\\|"
-                (default-value 'dired-move-to-filename-regexp)))
+                (default-value 'directory-listing-before-filename-regexp)))
   (make-local-variable 'dired-actual-switches)
   (setq dired-actual-switches "")
   (make-local-variable 'dired-permission-flags-regexp)
diff --git a/lisp/longlines.el b/lisp/longlines.el
index 00a2782d0a3..4ee85d646e5 100644
--- a/lisp/longlines.el
+++ b/lisp/longlines.el
@@ -6,7 +6,7 @@
 ;;             Alex Schroeder <alex@gnu.org>
 ;;             Chong Yidong <cyd@stupidchicken.com>
 ;; Maintainer: Chong Yidong <cyd@stupidchicken.com>
-;; Keywords: convenience
+;; Keywords: convenience, wp
 
 ;; This file is part of GNU Emacs.
 
@@ -119,11 +119,14 @@ are indicated with a symbol."
                     'longlines-window-change-function nil t))
         (let ((buffer-undo-list t)
               (inhibit-read-only t)
+              (after-change-functions nil)
               (mod (buffer-modified-p)))
           ;; Turning off undo is OK since (spaces + newlines) is
           ;; conserved, except for a corner case in
           ;; longlines-wrap-lines that we'll never encounter from here
-          (longlines-decode-region (point-min) (point-max))
+          (save-restriction
+            (widen)
+            (longlines-decode-region (point-min) (point-max)))
           (longlines-wrap-region (point-min) (point-max))
           (set-buffer-modified-p mod))
         (when (and longlines-show-hard-newlines
@@ -140,8 +143,11 @@ are indicated with a symbol."
     (if longlines-showing
         (longlines-unshow-hard-newlines))
     (let ((buffer-undo-list t)
+          (after-change-functions nil)
           (inhibit-read-only t))
-      (longlines-encode-region (point-min) (point-max)))
+      (save-restriction
+        (widen)
+        (longlines-encode-region (point-min) (point-max))))
     (remove-hook 'change-major-mode-hook 'longlines-mode-off t)
     (remove-hook 'before-kill-functions 'longlines-encode-region t)
     (remove-hook 'after-change-functions 'longlines-after-change-function t)
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 059351cf4be..31e31442378 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -146,14 +146,18 @@ loaddefs.el-CMD:
         echo ;;; End:>> $@
         echo ;;; loaddefs.el ends here>> $@
 
+# Use . instead of $(lisp) because $(lisp) is an absolute file name,
+# including a drive letter and any leading directories, so the generated
+# loaddefs.el will mention file names that on other machine reference
+# possibly non-existent directories.
 autoloads: $(lisp)/loaddefs.el doit
-        @echo Directories: $(WINS)
+        @echo Directories: . $(WINS)
         $(emacs) -l autoload \
                 --eval $(ARGQUOTE)(setq find-file-hook nil \
                         find-file-suppress-same-file-warnings t \
                         generated-autoload-file \
                           $(DQUOTE)$(lisp)/loaddefs.el$(DQUOTE))$(ARGQUOTE) \
-                -f batch-update-autoloads $(lisp) $(WINS)
+                -f batch-update-autoloads . $(WINS)
 
 $(lisp)/subdirs.el:
         $(MAKE) $(MFLAGS) update-subdirs
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 7a28a00edc8..f32088d1b88 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -189,7 +189,7 @@ A large number or nil slows down menu responsiveness."
 (define-key menu-bar-file-menu [dired]
   '(menu-item "Open Directory..." dired
               :enable (menu-bar-non-minibuffer-window-p)
-              :help "Read a directory, operate on its files"))
+              :help "Read a directory, to operate on its files"))
 (define-key menu-bar-file-menu [open-file]
   '(menu-item "Open File..." find-file-existing
               :enable (menu-bar-non-minibuffer-window-p)
@@ -197,7 +197,7 @@ A large number or nil slows down menu responsiveness."
 (define-key menu-bar-file-menu [new-file]
   '(menu-item "Visit New File..." find-file
               :enable (menu-bar-non-minibuffer-window-p)
-              :help "Read or create a file and edit it"))
+              :help "Specify a new file's name, to edit the file"))
 
 
 ;; The "Edit" menu items
@@ -1342,7 +1342,7 @@ key, a click, or a menu-item"))
               :help "Display manual section that describes a key"))
 
 (define-key menu-bar-help-menu [eliza]
-  '(menu-item "Emacs Psychiatrist" doctor
+  '(menu-item "Emacs Psychotherapist" doctor
               :help "Our doctor will help you feel better"))
 (define-key menu-bar-help-menu [sep4]
   '("--"))
diff --git a/lisp/mh-e/.arch-inventory b/lisp/mh-e/.arch-inventory
index ae09e5e84d3..2fada52b96f 100644
--- a/lisp/mh-e/.arch-inventory
+++ b/lisp/mh-e/.arch-inventory
@@ -1 +1,4 @@
-precious ^mh-loaddefs\.el$
+# Auto-generated lisp files, which ignore
+precious ^(mh-loaddefs)\.el$
+
+# arch-tag: 03c1cf02-6c80-44af-b4ec-b41b53fbf8f2
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 1f37898af76..d0dcac9c728 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,211 @@
+2005-10-27  Bill Wohler  <wohler@newt.com>
+
+        * mh-customize.el (mh-adaptive-cmd-note-flag)
+        (mh-scan-format-file, mh-scan-prog): Sync docstrings with manual.
+
+        * mh-e.el (mh-scan-format-mh, mh-note-deleted, mh-note-refiled)
+        (mh-note-cur, mh-scan-good-msg-regexp)
+        (mh-scan-deleted-msg-regexp, mh-scan-refiled-msg-regexp)
+        (mh-scan-valid-regexp, mh-scan-cur-msg-number-regexp)
+        (mh-scan-date-regexp, mh-scan-rcpt-regexp, mh-scan-body-regexp)
+        (mh-scan-subject-regexp, mh-scan-format-regexp)
+        (mh-folder-font-lock-keywords, mh-set-cmd-note): Sync docstrings
+        with manual.
+
+        * mh-funcs.el (mh-note-copied): Sync docstrings with manual.
+
+        * mh-utils.el (mh-goto-msg): Use mh-scan-msg-search-regexp instead
+        of hard-coded string.
+        (mh-mail-header-separator, mh-signature-separator-regexp): Use
+        "regular expression" in docstring instead of regexp.
+        (mh-scan-msg-number-regexp)
+        (mh-scan-msg-overflow-regexp, mh-scan-msg-format-regexp)
+        (mh-scan-msg-format-string, mh-scan-msg-search-regexp)
+        (mh-cmd-note): Sync docstrings with manual.
+
+        * mh-comp.el (mh-insert-signature, mh-insert-auto-fields):
+        Checkdoc fixes.
+
+        * mh-customize.el (mh-compose-insertion, mh-x-face-file): Ditto.
+        
+        * mh-mime.el (mh-mh-to-mime, mh-mml-attach-file) 
+        (mh-mml-secure-message-sign, mh-mml-secure-message-encrypt) 
+        (mh-mml-secure-message-signencrypt): Ditto
+
+2005-10-24  Bill Wohler  <wohler@newt.com>
+
+        * mh-gnus.el: Load mml.el in order to see if
+        mml-minibuffer-read-disposition is defined or not.
+
+        * mh-mime.el: Now that mh-gnus.el loads mml, we shouldn't need the
+        mml autoloads.
+
+2005-10-23  Miles Bader  <miles@gnu.org>
+
+        * .arch-inventory: New file.
+
+2005-10-23  Bill Wohler  <wohler@newt.com>
+
+        * mh-customize.el (mh-interpret-number-as-range-flag): Sync
+        docstring with manual.
+
+        * mh-identity.el (mh-assoc-ignore-case): Merge with version in
+        mh-alias.el and move to mh-acros.el
+
+        * mh-alias.el (mh-assoc-ignore-case): Merge with version in
+        mh-identity.el and move to mh-acros.el
+
+        * mh-acros.el (mh-assoc-ignore-case): Merge of function from
+        mh-identity.el and mh-alias.el.
+
+        * mh-mime.el: Autoload mm-uu for mm-uu-dissect to avoid compiler
+        warning in Emacs 22.
+
+2005-10-23  Satyaki Das  <satyaki@theforce.stanford.edu>
+
+        * mh-identity.el (mh-assoc-ignore-case): New macro that uses
+        assoc-string (if the function is available) and falls back on
+        assoc-ignore-case if assoc-string is not found.
+        (mh-identity-field-handler): Use mh-assoc-ignore-case since
+        assoc-ignore-case is a obsolete function in Emacs 22.
+
+        * mh-e.el (mh-folder-buttons-init-flag): New variable that keeps
+        track of whether the tool-bar in mh-folder-mode has been
+        initialized yet.
+        (mh-folder-mode): Initialize the tool-bar for folders the first
+        time we get into mh-letter-mode.
+
+        * mh-customize.el (mh-buffer-exists-p): New function which tests
+        presence of buffers of a given mode.
+        (mh-tool-bar-define): New functions
+        mh-tool-bar-folder-buttons-init and
+        mh-tool-bar-letter-buttons-init are defined. These functions are
+        used to create the tool-bar from the corresponding customizable
+        variables.
+
+        * mh-comp.el (mh-letter-buttons-init-flag): New variable that
+        keeps track of whether the tool-bar in mh-letter-mode has been
+        initialized yet.
+        (mh-letter-mode): Initialize the tool-bar for drafts the first
+        time we get into mh-letter-mode.
+
+2005-10-23  Bill Wohler  <wohler@newt.com>
+
+        * mh-comp.el (mh-letter-menu): Rename
+        mh-mhn-compose-external-compressed-tar to
+        mh-mh-compose-external-compressed-tar. Rename
+        mh-mhn-compose-anon-ftp to mh-mh-compose-anon-ftp. Rename
+        mh-edit-mhn to mh-mh-to-mime. Rename mh-mhn-directive-present-p to
+        mh-mh-directive-present-p. Rename mh-revert-mhn-edit to
+        mh-mh-to-mime-undo. Rename mh-gnus-pgp-support-flag to
+        mh-pgp-support-flag. Rename mh-compose-insertion value from 'mhn
+        to 'mh.
+        (mh-insert-signature): Rename mh-mhn-directive-present-p to
+        mh-mh-directive-present-p.
+        (mh-send-letter): Rename mh-mhn-directive-present-p to
+        mh-mh-directive-present-p. Rename mh-edit-mhn to mh-mh-to-mime.
+        (mh-letter-mode-map): Rename mh-edit-mhn to mh-mh-to-mime. Rename
+        mh-mhn-compose-anon-ftp to mh-mh-compose-anon-ftp. Rename
+        mh-mhn-compose-external-compressed-tar to
+        mh-mh-compose-external-compressed-tar. Rename mh-revert-mhn-edit
+        to mh-mh-to-mime-undo. Rename mh-mhn-compose-external-type to
+        mh-mh-compose-external-type. Rename mh-mhn-compose-anon-ftp to
+        mh-mh-compose-anon-ftp. Rename
+        mh-mhn-compose-external-compressed-tar to
+        mh-mh-compose-external-compressed-tar. Rename mh-revert-mhn-edit
+        to mh-mh-to-mime-undo. Rename mh-mhn-compose-external-type to
+        mh-mh-compose-external-type.
+        (mh-send-letter, mh-letter-mode-map): Rename mh-edit-mhn to
+        mh-mh-to-mime, mh-revert-mhn-edit to mh-mh-to-mime-undo.
+        (mh-reply, mh-yank-cur-msg, mh-insert-prefix-string): Rename
+        mh-yank-from-start-of-msg to mh-yank-behavior.
+        (mh-letter-mode, mh-to-field, mh-to-fcc, mh-insert-signature)
+        (mh-check-whom, mh-insert-auto-fields, mh-send-letter)
+        (mh-insert-letter, mh-yank-cur-msg, mh-insert-prefix-string)
+        (mh-fully-kill-draft, mh-open-line, mh-letter-complete)
+        (mh-letter-complete-or-space, mh-letter-confirm-address)
+        (mh-letter-next-header-field-or-indent)
+        (mh-letter-previous-header-field)
+        (mh-letter-toggle-header-field-display): Sync docstrings with
+        manual.
+
+        * mh-customize.el (mh-edit-mhn-hook): Rename to
+        mh-mh-to-mime-hook.
+        (mh-yank-from-start-of-msg): Rename to mh-yank-behavior.
+        (mh-compose-insertion): Rename values from 'gnus and 'mhn to 'mh
+        and user-visible values from mhn and Gnus to MH and MML.
+        (mh-before-send-letter-hook): Added 'ispell-message option.
+        (mh-mml-method-default): Rename mh-gnus-pgp-support-flag to
+        mh-pgp-support-flag.
+        (mh-compose-insertion, mh-compose-space-does-completion-flag)
+        (mh-delete-yanked-msg-window-flag)
+        (mh-extract-from-attribution-verb, mh-ins-buf-prefix)
+        (mh-letter-complete-function, mh-letter-fill-column)
+        (mh-mml-method-default, mh-signature-file-name)
+        (mh-signature-separator-flag, mh-x-face-file)
+        (mh-yank-behavior, mail-citation-hook)
+        (mh-before-send-letter-hook, mh-mh-to-mime-hook): Sync docstrings
+        with manual.
+
+        * mh-gnus.el (mml-minibuffer-read-disposition): New function
+        provided for Emacs 21 environments that lack it.
+
+        * mh-mime.el (mh-mml-query-cryptographic-method): Use default
+        prompt convention.
+        (mh-compose-forward): mh-mh-forward-message requires string arg.
+        (mh-minibuffer-read-type): New function.
+        (mh-mhn-args): Rename to mh-mh-to-mime-args.
+        (mh-mhn-compose-insertion): Rename to mh-mh-attach-file.
+        (mh-mhn-compose-forw): Rename to mh-mh-forward-message.
+        (mh-mhn-compose-type): Rename to mh-mh-compose-type.
+        (mh-mhn-compose-anon-ftp): Rename to mh-mh-compose-anon-ftp.
+        Rename mh-mhn-compose-external-type to
+        mh-mh-compose-external-type.
+        (mh-mhn-compose-external-compressed-tar): Rename to
+        mh-mh-compose-external-compressed-tar. Rename
+        mh-mhn-compose-external-type to mh-mh-compose-external-type.
+        (mh-mhn-compose-external-type): Rename to
+        mh-mh-compose-external-type.
+        (mh-edit-mhn): Rename to mh-mh-to-mime. Rename mh-mhn-args to
+        mh-mh-to-mime-args. Rename mh-edit-mhn-hook to mh-mh-to-mime-hook.
+        Use correct program in message.
+        (mh-mhn-directive-present-p): Rename to mh-mh-directive-present-p.
+        (mh-mml-directive-present-p): Rename to mh-mml-tag-present-p.
+        (mh-compose-forward, mh-mh-attach-file)
+        (mh-mh-compose-anon-ftp, mh-mh-compose-external-compressed-tar)
+        (mh-mh-compose-external-type, mh-mh-forward-message)
+        (mh-mml-attach-file): Use mml-minibuffer-read-description,
+        mh-minibuffer-read-type.
+        (mh-mime-content-types): Moved comment about only being used in
+        Emacs 20 to docstring.
+        (mh-mh-compose-external-type): Rename extra-param argument to
+        parameters.
+        (mh-mml-to-mime, mh-secure-message)
+        (mh-mml-unsecure-message, mh-mime-display-part)
+        (mh-mime-display-single): Rename mh-gnus-pgp-support-flag to
+        mh-pgp-support-flag.
+        (mh-compose-insertion): Rename mh-mhn-compose-insertion to
+        mh-mh-attach-file.
+        (mh-compose-forward): Rename mh-mhn-compose-forw to
+        mh-mh-forward-message.
+        (mh-mhn-compose-insertion): Rename mh-mhn-compose-type to
+        mh-mh-compose-type.
+        (mh-compose-insertion, mh-compose-forward, mh-mh-to-mime-args)
+        (mh-mh-attach-file, mh-mh-compose-type)
+        (mh-mh-compose-anon-ftp, mh-mh-compose-external-compressed-tar)
+        (mh-mh-compose-external-compressed-tar)
+        (mh-mh-compose-external-type, mh-mh-forward-message)
+        (mh-mh-to-mime, mh-mh-quote-unescaped-sharp,
+        (mh-mh-to-mime-undo, mh-mh-directive-present-p, mh-mml-to-mime)
+        (mh-mml-attach-file, mh-secure-message, mh-mml-unsecure-message)
+        (mh-mml-secure-message-sign, mh-mml-secure-message-encrypt)
+        (mh-mml-directive-present-p, mh-destroy-postponed-handles)
+        (mh-display-smileys, mh-display-emphasis, mh-mime-save-parts):
+        Sync docstrings with manual.
+
+        * mh-utils.el (mh-gnus-pgp-support-flag): Rename to
+        mh-pgp-support-flag.
+
 2005-10-17  Peter S Galbraith  <psg@debian.org>
 
         * mh-identity.el (mh-identity-field-handler): Use
diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el
index 5cb1c26248b..8136c56ca90 100644
--- a/lisp/mh-e/mh-acros.el
+++ b/lisp/mh-e/mh-acros.el
@@ -134,6 +134,14 @@ various structure fields. Lookup `defstruct' for more details."
            (load (format "%s.el" (ad-get-arg 0)) t t))
       ad-do-it))
 
+(defmacro mh-assoc-ignore-case (key alist)
+  "Check if KEY is present in ALIST while ignoring case to do the comparison.
+Compatibility macro for Emacs versions that lack `assoc-string', introduced in
+Emacs 22."
+  (if (fboundp 'assoc-string)
+      `(assoc-string ,key ,alist t)
+    `(assoc-ignore-case ,key ,alist)))
+
 (provide 'mh-acros)
 
 ;;; Local Variables:
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index d72036fe25d..5367d2cbc18 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -73,14 +73,6 @@ You can update the alias list manually using \\[mh-alias-reload].")
 
 ;;; Alias Loading
 
-(defmacro mh-assoc-ignore-case (key alist)
-  "Search for string KEY in ALIST.
-This is a wrapper around `assoc-string' or `assoc-ignore-case'. Avoid
-`assoc-ignore-case' which is now an obsolete function."
-  (cond ((fboundp 'assoc-string) `(assoc-string ,key ,alist t))
-        ((fboundp 'assoc-ignore-case) `(assoc-ignore-case ,key ,alist))
-        (t (error "The macro mh-assoc-ignore-case not implemented properly"))))
-
 (defun mh-alias-tstamp (arg)
   "Check whether alias files have been modified.
 Return t if any file listed in the Aliasfile MH profile component has been
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 753f4ad50aa..4b670bdd825 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -350,8 +350,8 @@ See also `mh-send'."
              (mh-forwarded-letter-subject orig-from orig-subject)))
         (mh-insert-fields "Subject:" forw-subject)
         (goto-char (point-min))
-        ;; If using MML, translate mhn
-        (if (equal mh-compose-insertion 'gnus)
+        ;; If using MML, translate MH-style directive
+        (if (equal mh-compose-insertion 'mml)
             (save-excursion
               (goto-char (mh-mail-header-end))
               (while
@@ -527,8 +527,8 @@ See also `mh-send'."
                        (group-reply (if (mh-variant-p 'nmh 'mu-mh)
                                         '("-group" "-nocc" "me")
                                       '("-cc" "all" "-nocc" "me"))))
-                 (cond ((or (eq mh-yank-from-start-of-msg 'autosupercite)
-                            (eq mh-yank-from-start-of-msg 'autoattrib))
+                 (cond ((or (eq mh-yank-behavior 'autosupercite)
+                            (eq mh-yank-behavior 'autoattrib))
                         '("-noformat"))
                        (includep '("-filter" "mhl.reply"))
                        (t '())))
@@ -551,8 +551,8 @@ See also `mh-send'."
         (message "Composing a reply...done")
         (mh-compose-and-send-mail draft "" folder message to subject cc
                                   mh-note-repl "Replied:" config))
-      (when (and (or (eq 'autosupercite mh-yank-from-start-of-msg)
-                     (eq 'autoattrib mh-yank-from-start-of-msg))
+      (when (and (or (eq 'autosupercite mh-yank-behavior)
+                     (eq 'autoattrib mh-yank-behavior))
                  (eq (mh-show-buffer-message-number) mh-sent-from-msg))
         (undo-boundary)
         (mh-yank-cur-msg))
@@ -788,13 +788,13 @@ Returns t if found, nil if not."
     ["Insert Signature"         mh-insert-signature t]
     ("Encrypt/Sign Message"
      ["Sign Message"
-      mh-mml-secure-message-sign mh-gnus-pgp-support-flag]
+      mh-mml-secure-message-sign mh-pgp-support-flag]
      ["Encrypt Message"
-      mh-mml-secure-message-encrypt mh-gnus-pgp-support-flag]
+      mh-mml-secure-message-encrypt mh-pgp-support-flag]
      ["Sign+Encrypt Message"
-      mh-mml-secure-message-signencrypt mh-gnus-pgp-support-flag]
+      mh-mml-secure-message-signencrypt mh-pgp-support-flag]
      ["Disable Security"
-      mh-mml-unsecure-message mh-gnus-pgp-support-flag]
+      mh-mml-unsecure-message mh-pgp-support-flag]
      "--"
      "Security Method"
      ["PGP (MIME)" (setq mh-mml-method-default "pgpmime")
@@ -810,19 +810,19 @@ Returns t if found, nil if not."
      ["Save Method as Default"
       (customize-save-variable 'mh-mml-method-default mh-mml-method-default) t]
      )
-    ["Compose Insertion (MIME)..."      mh-compose-insertion t]
-    ["Compose Compressed tar (MIME)..."
-     mh-mhn-compose-external-compressed-tar t]
-    ["Compose Get File (MIME)..."       mh-mhn-compose-anon-ftp t]
-    ["Compose Forward (MIME)..."        mh-compose-forward t]
+    ["Compose Insertion..."      mh-compose-insertion t]
+    ["Compose Compressed tar (MH)..."
+     mh-mh-compose-external-compressed-tar t]
+    ["Compose Get File (MH)..."       mh-mh-compose-anon-ftp t]
+    ["Compose Forward..."        mh-compose-forward t]
     ;; The next two will have to be merged. But I also need to make sure the
-    ;; user can't mix directives of both types.
-    ["Pull in All Compositions (mhn)"
-     mh-edit-mhn (mh-mhn-directive-present-p)]
-    ["Pull in All Compositions (gnus)"
-     mh-mml-to-mime (mh-mml-directive-present-p)]
-    ["Revert to Non-MIME Edit (mhn)"
-     mh-revert-mhn-edit (equal mh-compose-insertion 'mhn)]
+    ;; user can't mix tags of both types.
+    ["Pull in All Compositions (MH)"
+     mh-mh-to-mime (mh-mh-directive-present-p)]
+    ["Pull in All Compositions (MML)"
+     mh-mml-to-mime (mh-mml-tag-present-p)]
+    ["Revert to Non-MIME Edit (MH)"
+     mh-mh-to-mime-undo (equal mh-compose-insertion 'mh)]
     ["Kill This Draft"          mh-fully-kill-draft t]))
 
 ;;; Help Messages
@@ -871,6 +871,8 @@ work better in MH-Letter mode."
   (defvar tool-bar-mode)
   (defvar tool-bar-map))
 
+(defvar mh-letter-buttons-init-flag nil)
+
 ;;;###autoload
 (define-derived-mode mh-letter-mode text-mode "MH-Letter"
   "Mode for composing letters in MH-E.\\<mh-letter-mode-map>
@@ -878,16 +880,13 @@ work better in MH-Letter mode."
 When you have finished composing, type \\[mh-send-letter] to send the message
 using the MH mail handling system.
 
-There are two types of MIME directives used by MH-E: Gnus and MH. The option
-`mh-compose-insertion' controls what type of directives are inserted by MH-E
-commands. These directives can be converted to MIME body parts by running
-\\[mh-edit-mhn] for mhn directives or \\[mh-mml-to-mime] for Gnus directives.
-This step is mandatory if these directives are added manually. If the
-directives are inserted with MH-E commands such as \\[mh-compose-insertion],
-the directives are expanded automatically when the letter is sent.
+There are two types of tags used by MH-E when composing MIME messages: MML and
+MH. The option `mh-compose-insertion' controls what type of tags are inserted
+by MH-E commands. These tags can be converted to MIME body parts by running
+\\[mh-mh-to-mime] for MH-style directives or \\[mh-mml-to-mime] for MML tags.
 
-Options that control this mode can be changed with
-\\[customize-group]; specify the \"mh-compose\" group.
+Options that control this mode can be changed with \\[customize-group];
+specify the \"mh-compose\" group.
 
 When a message is composed, the hooks `text-mode-hook' and
 `mh-letter-mode-hook' are run.
@@ -900,6 +899,10 @@ When a message is composed, the hooks `text-mode-hook' and
   (make-local-variable 'mh-previous-window-config)
   (make-local-variable 'mh-sent-from-folder)
   (make-local-variable 'mh-sent-from-msg)
+  (mh-do-in-gnu-emacs
+   (unless mh-letter-buttons-init-flag
+     (mh-tool-bar-letter-buttons-init)
+     (setq mh-letter-buttons-init-flag t)))
   ;; Set the local value of mh-mail-header-separator according to what is
   ;; present in the buffer...
   (set (make-local-variable 'mh-mail-header-separator)
@@ -1016,7 +1019,7 @@ Header is treated specially by inserting a tab before continuation lines."
 
 ;;;###mh-autoload
 (defun mh-to-field ()
-  "Move point to the end of a specified header field.
+  "Move to specified header field.
 The field is indicated by the previous keystroke (the last keystroke
 of the command) according to the list in the variable `mh-to-field-choices'.
 Create the field if it does not exist.  Set the mark to point before moving."
@@ -1047,8 +1050,9 @@ Create the field if it does not exist.  Set the mark to point before moving."
 
 ;;;###mh-autoload
 (defun mh-to-fcc (&optional folder)
-  "Insert an Fcc: FOLDER field in the current message.
-Prompt for the field name with a completion list of the current folders."
+  "Move to \"Fcc:\" header field.
+This command will prompt you for the FOLDER name in which to file a copy of
+the draft."
   (interactive)
   (or folder
       (setq folder (mh-prompt-for-folder
@@ -1080,23 +1084,33 @@ Prompt for the field name with a completion list of the current folders."
 
 ;;;###mh-autoload
 (defun mh-insert-signature (&optional file)
-  "Insert the signature specified by `mh-signature-file-name' or FILE at point.
-A signature separator (`-- ') will be added if the signature block does not
+  "Insert signature in message.
+This command inserts your signature at the current cursor location.
+
+By default, the text of your signature is taken from the file
+\"~/.signature\". You can read from other sources by changing the option
+`mh-signature-file-name' or passing in a signature FILE.
+
+A signature separator (\"-- \") will be added if the signature block does not
 contain one and `mh-signature-separator-flag' is on.
+
 The value of `mh-letter-insert-signature-hook' is a list of functions to be
-called, with no arguments, after the signature is inserted.
-The signature can also be inserted with `mh-identity-list'."
-(interactive)
+called, with no arguments, after the signature is inserted. These functions
+may access the actual name of the file or the function used to insert the
+signature with `mh-signature-file-name'.
+
+The signature can also be inserted using Identities (see `mh-identity-list')"
+  (interactive)
   (save-excursion
     (insert "\n")
     (let ((mh-signature-file-name (or file mh-signature-file-name))
-          (mh-mhn-p (mh-mhn-directive-present-p))
-          (mh-mml-p (mh-mml-directive-present-p)))
+          (mh-mh-p (mh-mh-directive-present-p))
+          (mh-mml-p (mh-mml-tag-present-p)))
       (save-restriction
         (narrow-to-region (point) (point))
         (cond
          ((mh-file-is-vcard-p mh-signature-file-name)
-          (if (equal mh-compose-insertion 'gnus)
+          (if (equal mh-compose-insertion 'mml)
               (insert "<#part type=\"text/x-vcard\" filename=\""
                       mh-signature-file-name
                       "\" disposition=inline description=VCard>\n<#/part>")
@@ -1105,7 +1119,7 @@ The signature can also be inserted with `mh-identity-list'."
                     "\" [VCard] " (expand-file-name mh-signature-file-name))))
          (t
           (cond
-           (mh-mhn-p
+           (mh-mh-p
             (insert "#\n" "Content-Description: Signature\n"))
            (mh-mml-p
             (mml-insert-tag 'part 'type "text/plain" 'disposition "inline"
@@ -1124,7 +1138,7 @@ The signature can also be inserted with `mh-identity-list'."
                    mh-signature-separator-flag
                    (> (point-max) (point-min))
                    (not (mh-signature-separator-p)))
-          (cond (mh-mhn-p
+          (cond (mh-mh-p
                  (forward-line 2))
                 (mh-mml-p
                  (forward-line 1)))
@@ -1135,7 +1149,10 @@ The signature can also be inserted with `mh-identity-list'."
 
 ;;;###mh-autoload
 (defun mh-check-whom ()
-  "Verify recipients of the current letter, showing expansion of any aliases."
+  "Verify recipients, showing expansion of any aliases.
+This command expands aliases so you can check the actual address(es) in the
+alias. A new buffer named \"*MH-E Recipients*\" is created with the output of
+\"whom\"."
   (interactive)
   (let ((file-name buffer-file-name))
     (save-buffer)
@@ -1215,7 +1232,7 @@ The versions of MH-E, Emacs, and MH are shown."
 
 ;;;###mh-autoload
 (defun mh-insert-auto-fields (&optional non-interactive)
-  "Insert custom fields if To or Cc match `mh-auto-fields-list'.
+  "Insert custom fields if recipient is found in `mh-auto-fields-list'.
 Sets buffer-local `mh-insert-auto-fields-done-local' when done and inserted
 something.  If NON-INTERACTIVE is non-nil, do not be verbose and only
 attempt matches if `mh-insert-auto-fields-done-local' is nil.
@@ -1348,12 +1365,17 @@ there."
 
 ;;;###mh-autoload
 (defun mh-send-letter (&optional arg)
-  "Send the draft letter in the current buffer.
-If optional prefix argument ARG is provided, monitor delivery.
-The value of `mh-before-send-letter-hook' is a list of functions to be called,
-with no arguments, before doing anything.
-Run `\\[mh-edit-mhn]' if mhn directives are present; otherwise
-run `\\[mh-mml-to-mime]' if mml directives are present."
+  "Save draft and send message.
+When you are all through editing a message, you send it with this command. You
+can give an argument ARG to monitor the first stage of the delivery\; this
+output can be found in a buffer called \"*MH-E Mail Delivery*\".
+
+The value of `mh-before-send-letter-hook' is a list of functions to be called
+at the beginning of this command. For example, if you want to check your
+spelling in your message before sending, add the `ispell-message' function.
+
+In case the MH \"send\" program is installed under a different name, use
+`mh-send-prog' to tell MH-E the name."
   (interactive "P")
   (run-hooks 'mh-before-send-letter-hook)
   (if (and (mh-insert-auto-fields t)
@@ -1361,9 +1383,9 @@ run `\\[mh-mml-to-mime]' if mml directives are present."
            (goto-char (point-min)))
       (if (not (y-or-n-p "Auto fields inserted, send? "))
           (error "Send aborted")))
-  (cond ((mh-mhn-directive-present-p)
-         (mh-edit-mhn))
-        ((or (mh-mml-directive-present-p) (not (mh-ascii-buffer-p)))
+  (cond ((mh-mh-directive-present-p)
+         (mh-mh-to-mime))
+        ((or (mh-mml-tag-present-p) (not (mh-ascii-buffer-p)))
          (mh-mml-to-mime)))
   (save-buffer)
   (message "Sending...")
@@ -1419,15 +1441,16 @@ run `\\[mh-mml-to-mime]' if mml directives are present."
 
 ;;;###mh-autoload
 (defun mh-insert-letter (folder message verbatim)
-  "Insert a message into the current letter.
-Removes the header fields according to the variable
-`mh-invisible-header-fields-compiled'.
-Prefixes each non-blank line with `mh-ins-buf-prefix', unless
-`mh-yank-from-start-of-msg' is set for supercite in which case supercite is
-used to format the message.
-Prompts for FOLDER and MESSAGE.  If prefix argument VERBATIM provided, do
-not indent and do not delete headers.  Leaves the mark before the letter
-and point after it."
+  "Insert a message.
+This command prompts you for the FOLDER and MESSAGE number and inserts the
+message, indented by `mh-ins-buf-prefix' (\"> \") unless `mh-yank-behavior' is
+set to one of the supercite flavors in which case supercite is used to format
+the message. Certain undesirable header fields (see
+`mh-invisible-header-fields-compiled') are removed before insertion.
+
+If given a prefix argument VERBATIM, the header is left intact, the message is
+not indented, and \"> \" is not inserted before each line. This command leaves
+the mark before the letter and point after it."
   (interactive
    (list (mh-prompt-for-folder "Message from" mh-sent-from-folder nil)
          (read-string (concat "Message number"
@@ -1468,13 +1491,25 @@ and point after it."
 ;;;###mh-autoload
 (defun mh-yank-cur-msg ()
   "Insert the current message into the draft buffer.
-Prefix each non-blank line in the message with the string in
-`mh-ins-buf-prefix'.  If a region is set in the message's buffer, then
-only the region will be inserted.  Otherwise, the entire message will
-be inserted if `mh-yank-from-start-of-msg' is non-nil.  If this variable
-is nil, the portion of the message following the point will be yanked.
-If `mh-delete-yanked-msg-window-flag' is non-nil, any window displaying the
-yanked message will be deleted."
+
+It is often useful to insert a snippet of text from a letter that someone
+mailed to provide some context for your reply. This command does this by
+adding an attribution, yanking a portion of text from the message to which
+you're replying, and inserting `mh-ins-buf-prefix' (`> ') before each line.
+
+The attribution consists of the sender's name and email address
+followed by the content of the `mh-extract-from-attribution-verb'
+option.
+
+You can also turn on the `mh-delete-yanked-msg-window-flag' option to delete
+the window containing the original message after yanking it to make more room
+on your screen for your reply.
+
+You can control how the message to which you are replying is yanked
+into your reply using `mh-yank-behavior'.
+
+If this isn't enough, you can gain full control over the appearance of the
+included text by setting `mail-citation-hook' to a function that modifies it."
   (interactive)
   (if (and mh-sent-from-folder
            (save-excursion (set-buffer mh-sent-from-folder) mh-show-buffer)
@@ -1491,9 +1526,9 @@ yanked message will be deleted."
                (yank-region (mh-mark-active-p nil))
                (mh-ins-str
                 (cond ((and yank-region
-                            (or (eq 'supercite mh-yank-from-start-of-msg)
-                                (eq 'autosupercite mh-yank-from-start-of-msg)
-                                (eq t mh-yank-from-start-of-msg)))
+                            (or (eq 'supercite mh-yank-behavior)
+                                (eq 'autosupercite mh-yank-behavior)
+                                (eq t mh-yank-behavior)))
                        ;; supercite needs the full header
                        (concat
                         (buffer-substring (point-min) (mh-mail-header-end))
@@ -1501,20 +1536,18 @@ yanked message will be deleted."
                         (buffer-substring (region-beginning) (region-end))))
                       (yank-region
                        (buffer-substring (region-beginning) (region-end)))
-                      ((or (eq 'body mh-yank-from-start-of-msg)
-                           (eq 'attribution
-                               mh-yank-from-start-of-msg)
-                           (eq 'autoattrib
-                               mh-yank-from-start-of-msg))
+                      ((or (eq 'body mh-yank-behavior)
+                           (eq 'attribution mh-yank-behavior)
+                           (eq 'autoattrib mh-yank-behavior))
                        (buffer-substring
                         (save-excursion
                           (goto-char (point-min))
                           (mh-goto-header-end 1)
                           (point))
                         (point-max)))
-                      ((or (eq 'supercite mh-yank-from-start-of-msg)
-                           (eq 'autosupercite mh-yank-from-start-of-msg)
-                           (eq t mh-yank-from-start-of-msg))
+                      ((or (eq 'supercite mh-yank-behavior)
+                           (eq 'autosupercite mh-yank-behavior)
+                           (eq t mh-yank-behavior))
                        (buffer-substring (point-min) (point-max)))
                       (t
                        (buffer-substring (point) (point-max))))))
@@ -1526,8 +1559,8 @@ yanked message will be deleted."
             (push-mark)                 ;Needed for sc-cite-original
             (goto-char (point-min))     ;Needed for sc-cite-original
             (mh-insert-prefix-string mh-ins-buf-prefix)
-            (when (or (eq 'attribution mh-yank-from-start-of-msg)
-                      (eq 'autoattrib mh-yank-from-start-of-msg))
+            (when (or (eq 'attribution mh-yank-behavior)
+                      (eq 'autoattrib mh-yank-behavior))
               (insert from-attr)
               (mh-identity-insert-attribution-verb nil)
               (insert "\n\n"))
@@ -1569,12 +1602,12 @@ yanked message will be deleted."
 
 (defun mh-insert-prefix-string (mh-ins-string)
   "Insert prefix string before each line in buffer.
-The inserted letter is cited using `sc-cite-original' if
-`mh-yank-from-start-of-msg' is one of 'supercite or 'autosupercite. Otherwise,
-simply insert MH-INS-STRING before each line."
+The inserted letter is cited using `sc-cite-original' if `mh-yank-behavior' is
+one of 'supercite or 'autosupercite. Otherwise, simply insert MH-INS-STRING
+before each line."
   (goto-char (point-min))
-  (cond ((or (eq mh-yank-from-start-of-msg 'supercite)
-             (eq mh-yank-from-start-of-msg 'autosupercite))
+  (cond ((or (eq mh-yank-behavior 'supercite)
+             (eq mh-yank-behavior 'autosupercite))
          (sc-cite-original))
         (mail-citation-hook
          (run-hooks 'mail-citation-hook))
@@ -1589,8 +1622,10 @@ simply insert MH-INS-STRING before each line."
 
 ;;;###mh-autoload
 (defun mh-fully-kill-draft ()
-  "Kill the draft message file and the draft message buffer.
-Use \\[kill-buffer] if you don't want to delete the draft message file."
+  "Quit editing and delete draft message.
+If for some reason you are not happy with the draft, you can use the this
+command to kill the draft buffer and delete the draft message. Use the
+\\[kill-buffer] command if you don't want to delete the draft message."
   (interactive)
   (if (y-or-n-p "Kill draft message? ")
       (let ((config mh-previous-window-config))
@@ -1618,8 +1653,10 @@ Use \\[kill-buffer] if you don't want to delete the draft message file."
 ;;;###mh-autoload
 (defun mh-open-line ()
   "Insert a newline and leave point after it.
-In addition, insert newline and quoting characters before text after point.
-This is useful in breaking up paragraphs in replies."
+This command is similar to the \\[open-line] command in that it inserts a
+newline after point. It differs in that it also inserts the right number of
+quoting characters and spaces so that the next line begins in the same column
+as it was. This is useful when breaking up paragraphs in replies."
   (interactive)
   (let ((column (current-column))
         (prefix (mh-current-fill-prefix)))
@@ -1707,10 +1744,12 @@ Any match found replaces the text from BEGIN to END."
 
 (defun mh-letter-complete (arg)
   "Perform completion on header field or word preceding point.
-If the field contains addresses (for example, `To:' or `Cc:') or folders (for
-example, `Fcc:') then this function will provide alias completion. Elsewhere,
-this function runs `mh-letter-complete-function' instead and passes the prefix
-ARG, if present."
+If the field contains addresses (for example, \"To:\" or \"Cc:\") or folders
+\(for example, \"Fcc:\") then this command will provide alias completion. In
+the body of the message, this command runs `mh-letter-complete-function'
+instead, which is set to \"'ispell-complete-word\" by default. This command
+takes a prefix argument ARG that is passed to the
+`mh-letter-complete-function'."
   (interactive "P")
   (let ((func nil))
     (cond ((not (mh-in-header-p))
@@ -1722,11 +1761,8 @@ ARG, if present."
 
 (defun mh-letter-complete-or-space (arg)
   "Perform completion or insert space.
-If `mh-compose-space-does-completion-flag' is nil (the default) a space is
-inserted.
-
-Otherwise, if point is in the message header and the preceding character is
-not whitespace then do completion. Otherwise insert a space character.
+Turn on the `mh-compose-space-does-completion-flag' option to use this command
+to perform completion in the header. Otherwise, a space is inserted.
 
 ARG is the number of spaces inserted."
   (interactive "p")
@@ -1744,7 +1780,10 @@ ARG is the number of spaces inserted."
           (t (self-insert-command arg)))))
 
 (defun mh-letter-confirm-address ()
-  "Flash alias expansion if `mh-alias-flash-on-comma' is non-nil."
+  "Flash alias expansion.
+Addresses are separated by a comma\; and when you press the comma, this
+command flashes the alias expansion in the minibuffer if
+`mh-alias-flash-on-comma' is turned on."
   (interactive)
   (cond ((not (mh-in-header-p)) (self-insert-command 1))
         ((eq (cdr (assoc (mh-letter-header-field-at-point)
@@ -1768,8 +1807,12 @@ name."
 ;;;###mh-autoload
 (defun mh-letter-next-header-field-or-indent (arg)
   "Move to next field or indent depending on point.
-In the message header, go to the next field. Elsewhere call
-`indent-relative' as usual with optional prefix ARG."
+Within the header of the message, this command moves between fields, but skips
+those fields listed in `mh-compose-skipped-header-fields'. After the last
+field, this command then moves point to the message body before cycling back
+to the first field. If point is already past the first line of the message
+body, then this command indents by calling `indent-relative' with the given
+prefix argument ARG."
   (interactive "P")
   (let ((header-end (save-excursion
                       (goto-char (mh-mail-header-end))
@@ -1801,7 +1844,10 @@ If we are at the last header field go to the start of the message body."
 ;;;###mh-autoload
 (defun mh-letter-previous-header-field ()
   "Cycle to the previous header field.
-If we are at the first header field go to the start of the message body."
+This command moves backwards between the fields and cycles to the body of the
+message after the first field. Unlike the
+\\[mh-letter-next-header-field-or-indent] command, it will always take point
+to the last field from anywhere in the body."
   (interactive)
   (let ((header-end (mh-mail-header-end)))
     (if (>= (point) header-end)
@@ -1851,11 +1897,11 @@ except that it is callable from a mouse button."
 
 (defun mh-letter-toggle-header-field-display (arg)
   "Toggle display of header field at point.
-If the header is long or spread over multiple lines then hiding it will show
-the first few characters and replace the rest with an ellipsis.
 
-If ARG is negative then header is hidden, if positive it is displayed. If ARG
-is the symbol `long' then keep at most the first 4 lines."
+Use this command to display ellipsed header fields. This command is a toggle
+so entering it again will hide the field. This command takes a prefix argument
+ARG: if negative then the field is hidden, if positive then the field is
+displayed."
   (interactive (list nil))
   (when (and (mh-in-header-p)
              (progn
@@ -1881,6 +1927,8 @@ is the symbol `long' then keep at most the first 4 lines."
                  (remove-text-properties begin end '(invisible nil))
                  (search-forward ":" (line-end-position) t)
                  (mh-letter-skip-leading-whitespace-in-header-field))
+                ;; XXX Redesign to make usable by user. Perhaps use a positive
+                ;; numeric prefix to make that many lines visible.
                 ((eq arg 'long)
                  (end-of-line 4)
                  (mh-letter-truncate-header-field end)
@@ -1939,7 +1987,7 @@ Otherwise return the empty string."
   "\C-c\C-^"            mh-insert-signature ;if no C-s
   "\C-c\C-c"            mh-send-letter
   "\C-c\C-d"            mh-insert-identity
-  "\C-c\C-e"            mh-edit-mhn
+  "\C-c\C-e"            mh-mh-to-mime
   "\C-c\C-f\C-b"        mh-to-field
   "\C-c\C-f\C-c"        mh-to-field
   "\C-c\C-f\C-d"        mh-to-field
@@ -1957,26 +2005,26 @@ Otherwise return the empty string."
   "\C-c\C-i"            mh-insert-letter
   "\C-c\C-m\C-e"        mh-mml-secure-message-encrypt
   "\C-c\C-m\C-f"        mh-compose-forward
-  "\C-c\C-m\C-g"        mh-mhn-compose-anon-ftp
+  "\C-c\C-m\C-g"        mh-mh-compose-anon-ftp
   "\C-c\C-m\C-i"        mh-compose-insertion
   "\C-c\C-m\C-m"        mh-mml-to-mime
   "\C-c\C-m\C-n"        mh-mml-unsecure-message
   "\C-c\C-m\C-s"        mh-mml-secure-message-sign
-  "\C-c\C-m\C-t"        mh-mhn-compose-external-compressed-tar
-  "\C-c\C-m\C-u"        mh-revert-mhn-edit
-  "\C-c\C-m\C-x"        mh-mhn-compose-external-type
+  "\C-c\C-m\C-t"        mh-mh-compose-external-compressed-tar
+  "\C-c\C-m\C-u"        mh-mh-to-mime-undo
+  "\C-c\C-m\C-x"        mh-mh-compose-external-type
   "\C-c\C-mee"          mh-mml-secure-message-encrypt
   "\C-c\C-mes"          mh-mml-secure-message-signencrypt
   "\C-c\C-mf"           mh-compose-forward
-  "\C-c\C-mg"           mh-mhn-compose-anon-ftp
+  "\C-c\C-mg"           mh-mh-compose-anon-ftp
   "\C-c\C-mi"           mh-compose-insertion
   "\C-c\C-mm"           mh-mml-to-mime
   "\C-c\C-mn"           mh-mml-unsecure-message
   "\C-c\C-mse"          mh-mml-secure-message-signencrypt
   "\C-c\C-mss"          mh-mml-secure-message-sign
-  "\C-c\C-mt"           mh-mhn-compose-external-compressed-tar
-  "\C-c\C-mu"           mh-revert-mhn-edit
-  "\C-c\C-mx"           mh-mhn-compose-external-type
+  "\C-c\C-mt"           mh-mh-compose-external-compressed-tar
+  "\C-c\C-mu"           mh-mh-to-mime-undo
+  "\C-c\C-mx"           mh-mh-compose-external-type
   "\C-c\C-o"            mh-open-line
   "\C-c\C-q"            mh-fully-kill-draft
   "\C-c\C-s"            mh-insert-signature
diff --git a/lisp/mh-e/mh-customize.el b/lisp/mh-e/mh-customize.el
index d26819d6f63..9708de52005 100644
--- a/lisp/mh-e/mh-customize.el
+++ b/lisp/mh-e/mh-customize.el
@@ -762,13 +762,15 @@ installed and you want to use BogoFilter, then you can set this option to
 
 ;;; Editing a Draft (:group 'mh-letter)
 
-(defcustom mh-compose-insertion (if (locate-library "mml") 'gnus 'mhn)
-  "Type of MIME message directives in messages.
-
-By default, this option is set to `Gnus' if it is supported. This option can
-also be set manually to `mhn' if mhn directives are preferred."
-  :type '(choice (const :tag "Gnus" gnus)
-                 (const :tag "mhn"  mhn))
+(defcustom mh-compose-insertion (if (locate-library "mml") 'mml 'mh)
+  "Type of tags used when composing MIME messages.
+In addition to MH-style directives, MH-E also supports MML (MIME Meta
+Language) tags. (see Info node `(emacs-mime)Composing'). This option can be
+used to choose between them. By default, this option is set to \"MML\" if it
+is supported since it provides a lot more functionality. This option can also
+be set to \"MH\" if MH-style directives are preferred."
+  :type '(choice (const :tag "MML" mml)
+                 (const :tag "MH"  mh))
   :group 'mh-letter)
 
 (defcustom mh-compose-skipped-header-fields
@@ -779,20 +781,24 @@ also be set manually to `mhn' if mhn directives are preferred."
   :group 'mh-letter)
 
 (defcustom mh-compose-space-does-completion-flag nil
-  "*Non-nil means that <SPC> does completion in message header."
+  "*On means \\<mh-letter-mode-map>\\[mh-letter-complete-or-space] does completion in message header."
   :type 'boolean
   :group 'mh-letter)
 
 (defcustom mh-delete-yanked-msg-window-flag nil
-  "*Non-nil means delete any window displaying the message.
-If this option is on, yanking the current message into a draft letter with
-\\<mh-letter-mode-map>\\[mh-yank-cur-msg] deletes any windows displaying the
-message."
+  "*On means delete any window displaying the message.
+This deletes the window containing the original message after yanking it with
+\\<mh-letter-mode-map>\\[mh-yank-cur-msg] to make more room on your screen for
+your reply."
   :type 'boolean
   :group 'mh-letter)
 
 (defcustom mh-extract-from-attribution-verb "wrote:"
-  "*Verb to use for attribution when a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg]."
+  "*Verb to use for attribution when a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg].
+The attribution consists of the sender's name and email address followed by
+the content of this option. This option can be set to \"wrote:\", \"a
+écrit:\", and \"schrieb:\". You can also use the \"Custom String\" menu item
+to enter your own verb."
   :type '(choice (const "wrote:")
                  (const "a écrit:")
                  (const "schrieb:")
@@ -800,28 +806,41 @@ message."
   :group 'mh-letter)
 
 (defcustom mh-ins-buf-prefix "> "
-  "*String to put before each non-blank line of a yanked or inserted message.
-Used when the message is inserted into an outgoing letter
-by \\<mh-letter-mode-map>\\[mh-insert-letter] or \\[mh-yank-cur-msg]."
+  "*String to put before each line of a yanked or inserted message.
+The prefix \"> \" is the default setting of this option. I suggest that you
+not modify this option since it is used by many mailers and news readers:
+messages are far easier to read if several included messages have all been
+indented by the same string."
   :type 'string
   :group 'mh-letter)
 
 (defcustom mh-letter-complete-function 'ispell-complete-word
   "*Function to call when completing outside of address or folder fields.
-By default, this is set to `ispell-complete-word'."
+In the body of the message, \\<mh-letter-mode-map>\\[mh-letter-complete] runs
+this function, which is set to \"ispell-complete-word\" by default."
   :type '(choice function (const nil))
   :group 'mh-letter)
 
 (defcustom mh-letter-fill-column 72
-  "*Fill column to use in `mh-letter-mode'.
-This is usually less than in other text modes because email messages get
-quoted by some prefix (sometimes many times) when they are replied to,
-and it's best to avoid quoted lines that span more than 80 columns."
+  "*Fill column to use in MH Letter mode.
+By default, this option is 72 to allow others to quote your message without
+line wrapping."
   :type 'integer
   :group 'mh-letter)
 
-(defcustom mh-mml-method-default (if mh-gnus-pgp-support-flag "pgpmime" "none")
-  "Default method to use in security directives."
+(defcustom mh-mml-method-default (if mh-pgp-support-flag "pgpmime" "none")
+  "Default method to use in security tags.
+This option is used to select between a variety of mail security mechanisms.
+The default is \"PGP (MIME)\" if it is supported\; otherwise, the default is
+\"None\". Other mechanisms include vanilla \"PGP\" and \"S/MIME\".
+
+The `pgg' customization group may have some settings which may interest you
+\(see Info node `(pgg)').
+
+In particular, I set the option `pgg-encrypt-for-me' to t so that all messages
+I encrypt are encrypted with my public key as well. If you keep a copy of all
+of your outgoing mail with a \"Fcc:\" header field, this setting is vital so
+that you can read the mail you write!"
   :type '(choice (const :tag "PGP (MIME)" "pgpmime")
                  (const :tag "PGP" "pgp")
                  (const :tag "S/MIME" "smime")
@@ -831,13 +850,13 @@ and it's best to avoid quoted lines that span more than 80 columns."
 (defcustom mh-signature-file-name "~/.signature"
   "*Source of user's signature.
 
-By default, the text of your signature is taken from the file `~/.signature'.
+By default, the text of your signature is taken from the file \"~/.signature\".
 You can read from other files by changing this option. This file may contain a
 vCard in which case an attachment is added with the vCard.
 
 This option may also be a symbol, in which case that function is called. You
 may not want a signature separator to be added for you; instead you may want
-to insert one yourself. Variables that you may find useful to do this include
+to insert one yourself. Options that you may find useful to do this include
 `mh-signature-separator' (when inserting a signature separator) and
 `mh-signature-separator-regexp' (for finding said separator). The function
 `mh-signature-separator-p', which reports t if the buffer contains a
@@ -850,7 +869,7 @@ option."
   :group 'mh-letter)
 
 (defcustom mh-signature-separator-flag t
-  "*Non-nil means a signature separator should be inserted.
+  "*On means a signature separator should be inserted.
 It is not recommended that you change this option since various mail user
 agents, including MH-E, use the separator to present the signature
 differently, and to suppress the signature when replying or yanking a letter
@@ -861,21 +880,21 @@ into a draft."
 (defcustom mh-x-face-file "~/.face"
   "*File containing face header field to insert in outgoing mail.
 
-If the file starts with either of the strings `X-Face:', `Face:' or
-`X-Image-URL:' then the contents are added to the message header verbatim.
-Otherwise it is assumed that the file contains the value of the `X-Face:'
+If the file starts with either of the strings \"X-Face:\", \"Face:\" or
+\"X-Image-URL:\" then the contents are added to the message header verbatim.
+Otherwise it is assumed that the file contains the value of the \"X-Face:\"
 header field.
 
-The `X-Face:' header field, which is a low-resolution, black and white image,
-can be generated using the `compface' command, which can be obtained from
-ftp://ftp.cs.indiana.edu/pub/faces/compface/compface.tar.Z. The \"Online
-X-Face Convertor\" at http://www.dairiki.org/xface/ is a useful resource for
-quick conversion of images into `X-Face:' header fields.
+The \"X-Face:\" header field, which is a low-resolution, black and white
+image, can be generated using the \"compface\"
+\(ftp://ftp.cs.indiana.edu/pub/faces/compface/compface.tar.Z) command. The
+\"Online X-Face Converter\" (http://www.dairiki.org/xface/) is a useful
+resource for quick conversion of images into \"X-Face:\" header fields.
 
-Use the `make-face' script (http://quimby.gnus.org/circus/face/make-face) to
-convert a JPEG image to the higher resolution, color, `Face:' header field.
+Use the \"make-face\" (http://quimby.gnus.org/circus/face/make-face) script to
+convert a JPEG image to the higher resolution, color, \"Face:\" header field.
 
-The URL of any image can be used for the `X-Image-URL:' field and no
+The URL of any image can be used for the \"X-Image-URL:\" field and no
 processing of the image is required.
 
 To prevent the setting of any of these header fields, either set
@@ -884,39 +903,34 @@ doesn't exist."
   :type 'file
   :group 'mh-letter)
 
-(defcustom mh-yank-from-start-of-msg 'attribution
+(defcustom mh-yank-behavior 'attribution
   "*Controls which part of a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg].
-If t, include the entire message, with full headers.  This is historically
-here for use with supercite, but is now deprecated in favor of the setting
-`supercite' below.
-
-If the symbol `body', then yank the message minus the header.
-
-If the symbol `supercite', include the entire message, with full headers.
-This also causes the invocation of `sc-cite-original' without the setting
-of `mail-citation-hook', now deprecated practice.
-
-If the symbol `autosupercite', do as for `supercite' automatically when
-show buffer matches the message being replied-to.  When this option is used,
-the -noformat switch is passed to the repl program to override a -filter or
--format switch.
 
-If the symbol `attribution', then yank the message minus the header and add
-a simple attribution line at the top.
-
-If the symbol `autoattrib', do as for `attribution' automatically when show
-buffer matches the message being replied-to.  You can make sure this is
-always the case by setting `mh-reply-show-message-flag' to t (which is the
-default) and optionally `mh-delete-yanked-msg-window-flag' to t as well such
-that the show window is never displayed.  When the `autoattrib' option is
-used, the -noformat switch is passed to the repl program to override a
--filter or -format switch.
-
-If nil, yank only the portion of the message following the point.
-
-If the show buffer has a region, this variable is ignored unless its value is
-one of `attribution' or `autoattrib' in which case the attribution is added
-to the yanked region."
+To include the entire message, including the entire header, use \"Body and
+Header\". Use \"Body\" to yank just the body without the header. To yank only
+the portion of the message following the point, set this option to \"Below
+Point\".
+
+Choose \"Invoke supercite\" to pass the entire message and header through
+supercite.
+
+If the \"Body With Attribution\" setting is used, then the message minus the
+header is yanked and a simple attribution line is added at the top using the
+value of the `mh-extract-from-attribution-verb' option. This is the default.
+
+If the \"Invoke supercite\" or \"Body With Attribution\" settings are used,
+the \"-noformat\" argument is passed to the \"repl\" program to override a
+\"-filter\" or \"-format\" argument. These settings also have
+\"Automatically\" variants that perform the action automatically when you
+reply so that you don't need to use \\[mh-yank-cur-msg] at all. Note that this
+automatic action is only performed if the show buffer matches the message
+being replied to. People who use the automatic variants tend to turn on the
+`mh-delete-yanked-msg-window-flag' option as well so that the show window is
+never displayed.
+
+If the show buffer has a region, the `mh-yank-behavior' option is ignored
+unless its value is one of Attribution variants in which case the attribution
+is added to the yanked region."
   :type '(choice (const :tag "Body and Header" t)
                  (const :tag "Body" body)
                  (const :tag "Below Point" nil)
@@ -932,9 +946,11 @@ to the yanked region."
 ;;; Ranges (:group 'mh-ranges)
 
 (defcustom mh-interpret-number-as-range-flag t
-  "Non-nil means interpret a number as a range.
-If the variable is non-nil, and you use an integer, N, when asked for a
-range to scan, then MH-E uses the range \"last:N\"."
+  "On means interpret a number as a range.
+Since one of the most frequent ranges used is \"last:N\", MH-E will interpret
+input such as \"200\" as \"last:200\" if this option is on (which is the
+default). If you need to scan just the message 200, then use the range
+\"200:200\"."
   :type 'boolean
   :group 'mh-ranges)
 
@@ -943,38 +959,48 @@ range to scan, then MH-E uses the range \"last:N\"."
 ;;; Scan Line Formats (:group 'mh-scan-line-formats)
 
 (defcustom mh-adaptive-cmd-note-flag t
-  "*Non-nil means that the message number width is determined dynamically.
-This is done once when a folder is first opened by running scan on the last
-message of the folder. The message number for the last message is extracted
-and its width calculated. This width is used when calling `mh-set-cmd-note'.
-
-If you prefer fixed-width message numbers, set this variable to nil and call
-`mh-set-cmd-note' with the width specified by the scan format in
-`mh-scan-format-file'. For example, the default width is 4, so you would use
-\"(mh-set-cmd-note 4)\" if `mh-scan-format-file' were nil."
+  "*On means that the message number width is determined dynamically.
+If you've created your own format to handle long message numbers, you'll be
+pleased to know you no longer need it since MH-E adapts its internal format
+based upon the largest message number if this option is on (the default).
+
+If you prefer fixed-width message numbers, turn off this option and call
+`mh-set-cmd-note' with the width specified by your format file (see
+`mh-scan-format-file'). For example, the default width is 4, so you would use
+\"(mh-set-cmd-note 4)\"."
   :type 'boolean
   :group 'mh-scan-line-formats)
 
 (defcustom mh-scan-format-file t
   "Specifies the format file to pass to the scan program.
-If t, the format string will be taken from the either `mh-scan-format-mh'
-or `mh-scan-format-nmh' depending on whether MH or nmh is in use.
-If nil, the default scan output will be used.
-
-If you customize the scan format, you may need to modify a few variables
-containing regexps that MH-E uses to identify specific portions of the output.
-Use `M-x apropos RET mh-scan.*regexp' to obtain a list of these variables. You
-may also have to call `mh-set-cmd-note' with the width of your message
-numbers. See also `mh-adaptive-cmd-note-flag'."
+
+The default setting for this option is \"Use MH-E scan Format\". This means
+that the format string will be taken from the either `mh-scan-format-mh' or
+`mh-scan-format-nmh' depending on whether MH or nmh (or GNU mailutils) is in
+use. You can also set this option to \"Use Default scan Format\" to get the
+same output as you would get if you ran \"scan\" from the shell. If you have a
+format file that you want MH-E to use but not MH, you can set this option to
+\"Specify a scan Format File\" and enter the name of your format file.
+
+If you change the format of the scan lines you'll need to tell MH-E how to
+parse the new format. As you will see, quite a lot of variables are involved
+to do that. Use \"M-x apropos RET mh-scan.*regexp\" to obtain a list of these
+variables. You may also have to call `mh-set-cmd-note' to modify `mh-cmd-note'
+with the column for your notations if you turn off
+`mh-adaptive-cmd-note-flag'. However, you will need to set the `mh-cmd-note'
+variable manually with `setq' if `mh-scan-format-file' is set to anything
+other than \"Use MH-E scan Format\"."
   :type '(choice (const :tag "Use MH-E scan Format" t)
                  (const :tag "Use Default scan Format" nil)
                  (file  :tag "Specify a scan Format File"))
   :group 'mh-scan-line-formats)
 
 (defcustom mh-scan-prog "scan"
-  "*Program to run to generate one-line-per-message listing of a folder.
-Normally \"scan\" or a file name linked to scan.  This file is searched
-for relative to the `mh-progs' directory unless it is an absolute pathname."
+  "*Program used to scan messages.
+The name of the program that generates a listing of one line per message is
+held in this option. Unless this variable contains an absolute pathname, it is
+assumed to be in the `mh-progs' directory. You may link another program to
+`scan' (see \"mh-profile(5)\") to produce a different type of listing."
   :type 'string
   :group 'mh-scan-line-formats)
 (make-variable-buffer-local 'mh-scan-prog)
@@ -1659,6 +1685,14 @@ and the default-toolbar."
                   (const :tag "Don't use a toolbar" nil))
     :group 'mh-toolbar))
 
+(defun mh-buffer-exists-p (mode)
+  "Test whether a buffer with major mode MODE is present."
+  (loop for buf in (buffer-list)
+        when (save-excursion
+               (set-buffer buf)
+               (eq major-mode mode))
+        return t))
+
 (defmacro mh-tool-bar-define (defaults &rest buttons)
   "Define a tool bar for MH-E.
 DEFAULTS is the list of buttons that are present by default. It is a list of
@@ -1790,33 +1824,42 @@ where,
        (defvar mh-letter-tool-bar-map nil)
        ;; GNU Emacs tool bar specific code
        (mh-do-in-gnu-emacs
+         ;; Tool bar initialization functions
+         (defun mh-tool-bar-folder-buttons-init ()
+           (when (mh-buffer-exists-p 'mh-folder-mode)
+             (mh-image-load-path)
+             (setq mh-folder-tool-bar-map
+                   (let ((tool-bar-map (make-sparse-keymap)))
+                     ,@(nreverse folder-button-setter)
+                     tool-bar-map))
+             (setq mh-show-tool-bar-map
+                   (let ((tool-bar-map (make-sparse-keymap)))
+                     ,@(nreverse show-button-setter)
+                     tool-bar-map))
+             (setq mh-show-seq-tool-bar-map
+                   (let ((tool-bar-map (copy-keymap mh-show-tool-bar-map)))
+                     ,@(nreverse show-seq-button-setter)
+                     tool-bar-map))
+             (setq mh-folder-seq-tool-bar-map
+                   (let ((tool-bar-map (copy-keymap mh-folder-tool-bar-map)))
+                     ,@(nreverse sequence-button-setter)
+                     tool-bar-map))))
+         (defun mh-tool-bar-letter-buttons-init ()
+           (when (mh-buffer-exists-p 'mh-letter-mode)
+             (mh-image-load-path)
+             (setq mh-letter-tool-bar-map
+                   (let ((tool-bar-map (make-sparse-keymap)))
+                     ,@(nreverse letter-button-setter)
+                     tool-bar-map))))
          ;; Custom setter functions
          (defun mh-tool-bar-folder-buttons-set (symbol value)
            "Construct toolbar for `mh-folder-mode' and `mh-show-mode'."
            (set-default symbol value)
-           (setq mh-folder-tool-bar-map
-                 (let ((tool-bar-map (make-sparse-keymap)))
-                   ,@(nreverse folder-button-setter)
-                   tool-bar-map))
-           (setq mh-show-tool-bar-map
-                 (let ((tool-bar-map (make-sparse-keymap)))
-                   ,@(nreverse show-button-setter)
-                   tool-bar-map))
-           (setq mh-show-seq-tool-bar-map
-                 (let ((tool-bar-map (copy-keymap mh-show-tool-bar-map)))
-                   ,@(nreverse show-seq-button-setter)
-                   tool-bar-map))
-           (setq mh-folder-seq-tool-bar-map
-                 (let ((tool-bar-map (copy-keymap mh-folder-tool-bar-map)))
-                   ,@(nreverse sequence-button-setter)
-                   tool-bar-map)))
+           (mh-tool-bar-folder-buttons-init))
          (defun mh-tool-bar-letter-buttons-set (symbol value)
            "Construct toolbar for `mh-letter-mode'."
            (set-default symbol value)
-           (setq mh-letter-tool-bar-map
-                 (let ((tool-bar-map (make-sparse-keymap)))
-                   ,@(nreverse letter-button-setter)
-                   tool-bar-map))))
+           (mh-tool-bar-letter-buttons-init)))
        ;; XEmacs specific code
        (mh-do-in-xemacs
          (defvar mh-toolbar-folder-vector-map
@@ -1983,26 +2026,17 @@ This button runs `mh-previous-undeleted-msg'")
 
 (defcustom mail-citation-hook nil
   "*Hook for modifying a citation just inserted in the mail buffer.
-Each hook function can find the citation between point and mark.
-And each hook function should leave point and mark around the citation
-text as modified.
-
-If this hook is entirely empty (nil), the text of the message is inserted
-with `mh-ins-buf-prefix' prefixed to each line.
-
-See also the variable `mh-yank-from-start-of-msg', which controls how
-much of the message passed to the hook.
-
-This hook was historically provided to set up supercite.  You may now leave
-this nil and set up supercite by setting the variable
-`mh-yank-from-start-of-msg' to 'supercite or, for more automatic insertion,
-to 'autosupercite.
-
-The hook 'trivial-cite is NOT part of Emacs.  It is provided from tc.el,
-available here:
- http://shasta.cs.uiuc.edu/~lrclause/tc.html
-If you use it, customize `mh-yank-from-start-of-msg' to
- \"Entire message with headers\"."
+You can gain full control over the appearance of the included text by setting
+this hook to a function that modifies it. This hook is ignored if the option
+`mh-yank-behavior' is set to one of the supercite flavors. Otherwise, this
+option controls how much of the message is passed to the hook. The function
+can find the citation between point and mark and it should leave point and
+mark around the modified citation text for the next hook function. The
+standard prefix `mh-ins-buf-prefix' is not added if this hook is set.
+
+For example, if you use the hook function trivial-cite
+\(http://shasta.cs.uiuc.edu/~lrclause/tc.html) (which is NOT part of Emacs),
+set `mh-yank-behavior' to \"Body and Header\"."
   :type 'hook
   :options '(trivial-cite)
   :group 'mh-hooks
@@ -2022,8 +2056,11 @@ See also `mh-quit-hook'."
   :group 'mh-show)
 
 (defcustom mh-before-send-letter-hook nil
-  "Invoked at the beginning of the \\<mh-letter-mode-map>\\[mh-send-letter] command."
+  "Invoked at the beginning of the \\<mh-letter-mode-map>\\[mh-send-letter] command.
+For example, if you want to check your spelling in your message before
+sending, add the `ispell-message' function."
   :type 'hook
+  :options '(ispell-message)
   :group 'mh-hooks
   :group 'mh-letter)
 
@@ -2033,8 +2070,8 @@ See also `mh-quit-hook'."
   :group 'mh-hooks
   :group 'mh-show)
 
-(defcustom mh-edit-mhn-hook nil
-  "Invoked on the formatted letter by \\<mh-letter-mode-map>\\[mh-edit-mhn]."
+(defcustom mh-mh-to-mime-hook nil
+  "Invoked on the formatted letter by \\<mh-letter-mode-map>\\[mh-mh-to-mime]."
   :type 'hook
   :group 'mh-hooks
   :group 'mh-letter)
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index c0b57ee56ca..c442947b789 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -131,7 +131,8 @@ The string is displayed after the folder's name.  nil for no annotation.")
    "%<(mymbox{from})%<{to}To:%14(friendly{to})%>%>"
    "%<(zero)%17(friendly{from})%>  "
    "%{subject}%<{body}<<%{body}%>")
-  "*Scan format string for MH, provided to the scan program via the -format arg.
+  "*Scan format string for MH.
+This string is passed to the scan program via the -format arg.
 This format is identical to the default except that additional hints for
 fontification have been added to the fifth column (remember that in Emacs, the
 first column is 0).
@@ -167,88 +168,106 @@ mailboxes of the current user, `c' if the Cc: field matches, `b' if the Bcc:
 field matches, and `n' if a non-empty Newsgroups: field is present.")
 
 (defvar mh-note-deleted ?D
-  "Deleted messages are marked by this character.
+  "Messages that have been deleted are marked by this character.
 See also `mh-scan-deleted-msg-regexp'.")
 
 (defvar mh-note-refiled ?^
-  "Refiled messages are marked by this character.
+  "Messages that have been refiled are marked by this character.
 See also `mh-scan-refiled-msg-regexp'.")
 
 (defvar mh-note-cur ?+
-  "The current message (in MH) is marked by this character.
+  "The current message (in MH, not in MH-E) is marked by this character.
 See also `mh-scan-cur-msg-number-regexp'.")
 
 (defvar mh-scan-good-msg-regexp  "^\\( *[0-9]+\\)[^D^0-9]"
-  "This regexp specifies the scan lines that are 'good' messages.
-Note that the default setting of `mh-folder-font-lock-keywords' expects this
-expression to contain at least one parenthesized expression which matches the
-message number as in the default of \"^\\\\( *[0-9]+\\\\)[^D^0-9]\".")
+  "This regular expression matches \"good\" messages.
+It must match from the beginning of the line. Note that the default setting of
+`mh-folder-font-lock-keywords' expects this expression to contain at least one
+parenthesized expression which matches the message number as in the default of
+\"^\\\\( *[0-9]+\\\\)[^D^0-9]\". This regular expression should be correct as
+it is needed by non-fontifying functions.")
 
 (defvar mh-scan-deleted-msg-regexp "^\\( *[0-9]+\\)D"
-  "This regexp matches deleted messages.
-Note that the default setting of `mh-folder-font-lock-keywords' expects this
-expression to contain at least one parenthesized expression which matches the
-message number as in the default of \"^\\\\( *[0-9]+\\\\)D\".
-See also `mh-note-deleted'.")
+  "This regular expression matches deleted messages.
+It must match from the beginning of the line. Note that the default setting of
+`mh-folder-font-lock-keywords' expects this expression to contain at least one
+parenthesized expression which matches the message number as in the default of
+\"^\\\\( *[0-9]+\\\\)D\". This regular expression should be correct as it is
+needed by non-fontifying functions. See also `mh-note-deleted'.")
 
 (defvar mh-scan-refiled-msg-regexp  "^\\( *[0-9]+\\)\\^"
-  "This regexp matches refiled messages.
-Note that the default setting of `mh-folder-font-lock-keywords' expects this
-expression to contain at least one parenthesized expression which matches the
-message number as in the default of \"^\\\\( *[0-9]+\\\\)\\\\^\".
-See also `mh-note-refiled'.")
+  "This regular expression matches refiled messages.
+It must match from the beginning of the line. Note that the default setting of
+`mh-folder-font-lock-keywords' expects this expression to contain at least one
+parenthesized expression which matches the message number as in the default of
+\"^\\\\( *[0-9]+\\\\)\\\\^\". This regular expression should be correct as it
+is needed by non-fontifying functions. See also `mh-note-refiled'.")
 
 (defvar mh-scan-valid-regexp "^ *[0-9]"
-  "This regexp matches scan lines for messages (not error messages).")
+  "This regular expression describes a valid scan line.
+This is used to eliminate error messages that are occasionally produced by
+\"inc\".")
 
 (defvar mh-scan-cur-msg-number-regexp "^\\( *[0-9]+\\+\\).*"
-  "This regexp matches the current message.
-Note that the default setting of `mh-folder-font-lock-keywords' expects this
-expression to contain at least one parenthesized expression which matches the
-message number as in the default of \"^\\\\( *[0-9]+\\\\+\\\\).*\". Don't
-disable this regexp as it's needed by non-fontifying functions.
-See also `mh-note-cur'.")
+  "This regular expression matches the current message.
+It must match from the beginning of the line. Note that the default setting of
+`mh-folder-font-lock-keywords' expects this expression to contain at least one
+parenthesized expression which matches the message number as in the default of
+\"^\\\\( *[0-9]+\\\\+\\\\).*\". This regular expression should be correct as
+it is needed by non-fontifying functions. See also `mh-note-cur'.")
 
 (defvar mh-scan-date-regexp "\\([0-9][0-9]/[0-9][0-9]\\)"
-  "This regexp matches a valid date.
-Note that the default setting of `mh-folder-font-lock-keywords' expects this
-expression to contain only one parenthesized expression which matches the date
-field as in the default of \"\\\\([0-9][0-9]/[0-9][0-9]\\\\)\"}.
-See also `mh-scan-format-regexp'.")
+  "This regular expression matches a valid date.
+It must not be anchored to the beginning or the end of the line. Note that the
+default setting of `mh-folder-font-lock-keywords' expects this expression to
+contain only one parenthesized expression which matches the date field as in
+the default of \"\\\\([0-9][0-9]/[0-9][0-9]\\\\)\"}. If this regular
+expression is not correct, the date will not be highlighted. See also
+`mh-scan-format-regexp'.")
 
 (defvar mh-scan-rcpt-regexp  "\\(To:\\)\\(..............\\)"
-  "This regexp specifies the recipient in messages you sent.
+  "This regular expression specifies the recipient in messages you sent.
 Note that the default setting of `mh-folder-font-lock-keywords'
 expects this expression to contain two parenthesized expressions. The
 first is expected to match the `To:' that the default scan format
 file generates. The second is expected to match the recipient's name
-as in the default of \"\\\\(To:\\\\)\\\\(..............\\\\)\".")
+as in the default of \"\\\\(To:\\\\)\\\\(..............\\\\)\". If this
+regular expression is not correct, the recipient will not be highlighted.")
 
 (defvar mh-scan-body-regexp "\\(<<\\([^\n]+\\)?\\)"
-  "This regexp matches the message body fragment displayed in scan lines.
+  "This regular expression matches the message body fragment.
 Note that the default setting of `mh-folder-font-lock-keywords' expects this
 expression to contain at least one parenthesized expression which matches the
-body text as in the default of \"\\\\(<<\\\\([^\\n]+\\\\)?\\\\)\".")
+body text as in the default of \"\\\\(<<\\\\([^\\n]+\\\\)?\\\\)\". If this
+regular expression is not correct, the body fragment will not be highlighted.")
 
 (defvar mh-scan-subject-regexp
   "^ *[0-9]+........[ ]*...................\\([Rr][Ee]\\(\\[[0-9]+\\]\\)?:\\s-*\\)*\\([^<\n]*\\)"
-  "This regexp matches the subject.
-Note that the default setting of `mh-folder-font-lock-keywords' expects this
-expression to contain at least three parenthesized expressions. The first is
-expected to match the `Re:' string, if any. The second matches an optional
-bracketed number after `Re:', such as in `Re[2]:' (and is thus a
-sub-expression of the first expression) and the third is expected to match
-the subject line itself as in the default of \"^ *[0-9]+........[ ]*...................\\\\([Rr][Ee]\\\\(\\\\\\=[[0-9]+\\\\]\\\\)?:\\\\s-*\\\\)*\\\\([^<\\n]*\\\\)\".")
+  "This regular expression matches the subject.
+It must match from the beginning of the line. Note that the default setting
+of `mh-folder-font-lock-keywords' expects this expression to contain at least
+three parenthesized expressions. The first is expected to match the `Re:'
+string, if any. The second matches an optional bracketed number after `Re:',
+such as in `Re[2]:' (and is thus a sub-expression of the first expression) and
+the third is expected to match the subject line itself as in the default of
+\(broken on multiple lines for readability):
+  ^ *[0-9]+........[ ]*...................
+  \\\\([Rr][Ee]\\\\(\\\\\\=[[0-9]+\\\\]\\\\)?:\\\\s-*\\\\)*
+  \\\\([^<\\n]*\\\\)
+This regular expression should be correct as it is needed by non-fontifying
+functions.")
 
 (defvar mh-scan-format-regexp
   (concat "\\([bct]\\)" mh-scan-date-regexp " *\\(..................\\)")
-  "This regexp matches the output of scan.
+  "This regular expression matches the output of scan.
 Note that the default setting of `mh-folder-font-lock-keywords' expects this
 expression to contain at least three parenthesized expressions. The first
-should match the fontification hint, the second is found in
-`mh-scan-date-regexp', and the third should match the user name as in the
-default of \"(concat \"\\\\([bct]\\\\)\" mh-scan-date-regexp
-                     \"*\\\\(..................\\\\)\")\".")
+should match the fontification hint (see `mh-scan-format-nmh'), the second is
+found in `mh-scan-date-regexp', and the third should match the user name as in
+the default of \"(concat \"\\\\([bct]\\\\)\" mh-scan-date-regexp
+                         \"*\\\\(..................\\\\)\")\".
+If this regular expression is not correct, the notation hints and the sender
+will not be highlighted.")
 
 
 
@@ -281,7 +300,7 @@ default of \"(concat \"\\\\([bct]\\\\)\" mh-scan-date-regexp
    (list mh-scan-format-regexp
          '(1 mh-folder-date-face)
          '(3 mh-folder-scan-format-face)))
-  "Regexp keywords used to fontify the MH-Folder buffer.")
+  "Keywords (regular expressions) used to fontify the MH-Folder buffer.")
 
 (defvar mh-scan-cmd-note-width 1
   "Number of columns consumed by the cmd-note field in `mh-scan-format'.
@@ -1507,6 +1526,8 @@ is used in previous versions and XEmacs."
            (not (member 'mh-folder-mode which-func-modes)))
   (push 'mh-folder-mode which-func-modes))
 
+(defvar mh-folder-buttons-init-flag nil)
+
 ;; Autoload cookie needed by desktop.el
 ;;;###autoload
 (define-derived-mode mh-folder-mode fundamental-mode "MH-Folder"
@@ -1560,8 +1581,10 @@ MH-Folder buffer, then the MH-E command will perform the operation on all
 messages in that region.
 
 \\{mh-folder-mode-map}"
-
-  (mh-image-load-path)
+  (mh-do-in-gnu-emacs
+   (unless mh-folder-buttons-init-flag
+     (mh-tool-bar-folder-buttons-init)
+     (setq mh-folder-buttons-init-flag t)))
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults '(mh-folder-font-lock-keywords t))
   (make-local-variable 'desktop-save-buffer)
@@ -1697,10 +1720,13 @@ Return in the folder's buffer."
     (mh-notate-deleted-and-refiled)))
 
 (defun mh-set-cmd-note (width)
-  "Set `mh-cmd-note' to WIDTH characters (minimum of 2).
+  "Set `mh-cmd-note' to WIDTH (minimum of 2).
+
+If `mh-scan-format-file' is set to \"Use Default scan Format\" or \"Specify a
+scan Format File\", then this function will NOT update `mh-cmd-note'. In these
+cases, the user should change `mh-cmd-note' with `setq' if necessary.
 
-If `mh-scan-format-file' specifies nil or a filename, then this function
-will NOT update `mh-cmd-note'."
+Note that columns in Emacs start with 0."
   ;; Add one to the width to always have whitespace in column zero.
   (setq width (max (1+ width) 2))
   (if (and (equal mh-scan-format-file t)
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index 6ce1da8fe90..755be4a1560 100644
--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@@ -51,7 +51,7 @@ For example, '(\"-nolimit\" \"-textfield\" \"subject\") is a useful setting.")
 ;;; Scan Line Formats
 
 (defvar mh-note-copied "C"
-  "Copied messages are marked by this character.")
+  "Messages that have been copied are marked by this character.")
 
 (defvar mh-note-printed "P"
   "Messages that have been printed are marked by this character.")
diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el
index 54f5c730385..23209275d12 100644
--- a/lisp/mh-e/mh-gnus.el
+++ b/lisp/mh-e/mh-gnus.el
@@ -30,11 +30,14 @@
 
 ;;; Code:
 
-(load "mm-decode" t t)                  ; Non-fatal dependency
-(load "mm-uu" t t)                      ; Non-fatal dependency
-(load "mailcap" t t)                    ; Non-fatal dependency
-(load "smiley" t t)                     ; Non-fatal dependency
+;;; Load libraries in a non-fatal way in order to see if certain functions are
+;;; pre-defined.
 (load "mailabbrev" t t)
+(load "mailcap" t t)
+(load "mm-decode" t t)
+(load "mm-uu" t t)
+(load "mml" t t)
+(load "smiley" t t)
 
 (defmacro mh-defun-compat (function arg-list &rest body)
   "This is a macro to define functions which are not defined.
@@ -56,26 +59,26 @@ BODY."
       `(defmacro ,function ,arg-list ,@body))))
 (put 'mh-defmacro-compat 'lisp-indent-function 'defun)
 
-;; Copy of original function from gnus-util.el
+;; Copy of original function from gnus-util.el.
 (mh-defun-compat gnus-local-map-property (map)
   "Return a list suitable for a text property list specifying keymap MAP."
   (cond (mh-xemacs-flag (list 'keymap map))
         ((>= emacs-major-version 21) (list 'keymap map))
         (t (list 'local-map map))))
 
-;; Copy of original function from mm-decode.el
+;; Copy of original function from mm-decode.el.
 (mh-defun-compat mm-merge-handles (handles1 handles2)
   (append (if (listp (car handles1)) handles1 (list handles1))
           (if (listp (car handles2)) handles2 (list handles2))))
 
-;; Copy of function from mm-decode.el
+;; Copy of function from mm-decode.el.
 (mh-defun-compat mm-set-handle-multipart-parameter (handle parameter value)
   ;; HANDLE could be a CTL.
   (if handle
       (put-text-property 0 (length (car handle)) parameter value
                          (car handle))))
 
-;; Copy of function from mm-view.el
+;; Copy of function from mm-view.el.
 (mh-defun-compat mm-inline-text-vcard (handle)
   (let (buffer-read-only)
     (mm-insert-inline
@@ -89,15 +92,15 @@ BODY."
                                       'vcard-standard-filter))))))))
 
 ;; Function from mm-decode.el used in PGP messages. Just define it with older
-;; gnus to avoid compiler warning.
+;; Gnus to avoid compiler warning.
 (mh-defun-compat mm-possibly-verify-or-decrypt (parts ctl)
   nil)
 
-;; Copy of original macro is in mm-decode.el
+;; Copy of original macro is in mm-decode.el.
 (mh-defmacro-compat mm-handle-multipart-ctl-parameter (handle parameter)
   `(get-text-property 0 ,parameter (car ,handle)))
 
-;; Copy of original function in mm-decode.el
+;; Copy of original function in mm-decode.el.
 (mh-defun-compat mm-readable-p (handle)
   "Say whether the content of HANDLE is readable."
   (and (< (with-current-buffer (mm-handle-buffer handle)
@@ -107,7 +110,7 @@ BODY."
          (and (eq (mm-body-7-or-8) '7bit)
               (not (mm-long-lines-p 76))))))
 
-;; Copy of original function in mm-bodies.el
+;; Copy of original function in mm-bodies.el.
 (mh-defun-compat mm-long-lines-p (length)
   "Say whether any of the lines in the buffer is longer than LENGTH."
   (save-excursion
@@ -126,10 +129,25 @@ BODY."
   nil)
 
 (mh-defun-compat mm-destroy-parts (list)
-  "Older emacs don't have this function."
+  "Older versions of Emacs don't have this function."
   nil)
 
-;;; This is mm-save-part from gnus 5.10 since that function in emacs21.2 is
+;; Copy of original function in mml.el.
+(mh-defun-compat mml-minibuffer-read-disposition (type &optional default)
+  (unless default (setq default
+                        (if (and (string-match "\\`text/" type)
+                                 (not (string-match "\\`text/rtf\\'" type)))
+                            "inline"
+                          "attachment")))
+  (let ((disposition (completing-read
+                      (format "Disposition (default %s): " default)
+                      '(("attachment") ("inline") (""))
+                      nil t nil nil default)))
+    (if (not (equal disposition ""))
+        disposition
+      default)))
+
+;;; This is mm-save-part from Gnus 5.10 since that function in emacs21.2 is
 ;;; buggy (the args to read-file-name are incorrect). When all supported
 ;;; versions of Emacs come with at least Gnus 5.10, we can delete this
 ;;; function and rename calls to mh-mm-save-part to mm-save-part.
@@ -152,7 +170,7 @@ BODY."
          (mm-save-part-to-file handle file))))
 
 (defun mh-mm-text-html-renderer ()
-  "Find the renderer gnus is using to display text/html MIME parts."
+  "Find the renderer Gnus is using to display text/html MIME parts."
   (or (and (boundp 'mm-inline-text-html-renderer) mm-inline-text-html-renderer)
       (and (boundp 'mm-text-html-renderer) mm-text-html-renderer)))
 
diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el
index c3f34ae75b2..9d81a2acbe2 100644
--- a/lisp/mh-e/mh-identity.el
+++ b/lisp/mh-e/mh-identity.el
@@ -124,7 +124,7 @@ The field name is downcased. If the FIELD begins with the character
 `:', then it must have a special handler defined in
 `mh-identity-handlers', else return an error since it is not a valid
 header field."
-  (or (cdr (assoc-ignore-case field mh-identity-handlers))
+  (or (cdr (mh-assoc-ignore-case field mh-identity-handlers))
       (and (eq (aref field 0) ?:)
            (error "Field %s - unknown mh-identity-handler" field))
       (cdr (assoc ":default" mh-identity-handlers))
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index fb7bace7ead..14acfd7765c 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -28,8 +28,9 @@
 ;;; Commentary:
 
 ;; Internal support for MH-E package.
-;; Support for generating an mhn composition file.
-;; MIME is supported only by MH 6.8 or later.
+;; Support for generating MH-style directives for mhn or mhbuild as well as
+;; MML (MIME Meta Language) tags. MH-style directives are supported by MH 6.8
+;; or later.
 
 ;;; Change Log:
 
@@ -41,45 +42,41 @@
 (require 'gnus-util)
 (require 'mh-gnus)
 
-(autoload 'gnus-article-goto-header "gnus-art")
 (autoload 'article-emphasize "gnus-art")
-(autoload 'gnus-get-buffer-create "gnus")
+(autoload 'gnus-article-goto-header "gnus-art")
 (autoload 'gnus-eval-format "gnus-spec")
-(autoload 'widget-convert-button "wid-edit")
+(autoload 'gnus-get-buffer-create "gnus")
 (autoload 'message-options-set-recipient "message")
+(autoload 'mm-uu-dissect "mm-uu")
 (autoload 'mml-unsecure-message "mml-sec")
-(autoload 'mml-minibuffer-read-file "mml")
-(autoload 'mml-minibuffer-read-description "mml")
-(autoload 'mml-insert-empty-tag "mml")
-(autoload 'mml-to-mime "mml")
-(autoload 'mml-attach-file "mml")
 (autoload 'rfc2047-decode-region "rfc2047")
+(autoload 'widget-convert-button "wid-edit")
 
 ;;;###mh-autoload
 (defun mh-compose-insertion (&optional inline)
-  "Add a directive to insert a MIME part from a file, using mhn or gnus.
-If the variable `mh-compose-insertion' is set to 'mhn, then that will be used.
-If it is set to 'gnus, then that will be used instead.
+  "Add tag to include a file such as an image or sound.
+You are prompted for the filename containing the object, the media type if it
+cannot be determined automatically, and a content description. If you're using
+MH-style directives, you will also be prompted for additional attributes.
+
+The option `mh-compose-insertion' controls what type of tags are inserted.
 Optional argument INLINE means make it an inline attachment."
   (interactive "P")
-  (if (equal mh-compose-insertion 'gnus)
+  (if (equal mh-compose-insertion 'mml)
       (if inline
           (mh-mml-attach-file "inline")
         (mh-mml-attach-file))
-    (call-interactively 'mh-mhn-compose-insertion)))
+    (call-interactively 'mh-mh-attach-file)))
 
 ;;;###mh-autoload
 (defun mh-compose-forward (&optional description folder messages)
-  "Add a MIME directive to forward a message, using mhn or gnus.
-If the variable `mh-compose-insertion' is set to 'mhn, then that will be used.
-If it is set to 'gnus, then that will be used instead.
-Optional argument DESCRIPTION is a description of the attachment.
-Optional argument FOLDER is the folder from which the forwarded message should
-come.
-Optional argument MESSAGES is the range of messages to forward.
-If any of the optional arguments are absent, they are prompted for."
+  "Add tag to forward a message.
+You are prompted for a content DESCRIPTION, the name of the FOLDER in which
+the messages to forward are located, and the MESSAGES' numbers.
+
+The option `mh-compose-insertion' controls what type of tags are inserted."
   (interactive (let*
-                   ((description (read-string "Forw Content-description: "))
+                   ((description (mml-minibuffer-read-description))
                     (folder (mh-prompt-for-folder "Message from"
                                                   mh-sent-from-folder nil))
                     (messages (let ((default-message
@@ -105,24 +102,24 @@ If any of the optional arguments are absent, they are prompted for."
     (if (null range)
         (error "No messages in specified range"))
     (dolist (message range)
-      (if (equal mh-compose-insertion 'gnus)
+      (if (equal mh-compose-insertion 'mml)
           (mh-mml-forward-message description folder (format "%s" message))
-        (mh-mhn-compose-forw description folder message)))))
+        (mh-mh-forward-message description folder (format "%s" message))))))
 
 ;; To do:
 ;; paragraph code should not fill # lines if MIME enabled.
-;; implement mh-auto-edit-mhn (if non-nil, \\[mh-send-letter]
-;;      invokes mh-edit-mhn automatically before sending.)
-;;      actually, instead of mh-auto-edit-mhn,
+;; implement mh-auto-mh-to-mime (if non-nil, \\[mh-send-letter]
+;;      invokes mh-mh-to-mime automatically before sending.)
+;;      actually, instead of mh-auto-mh-to-mime,
 ;;      should read automhnproc from profile
 ;; MIME option to mh-forward
 ;; command to move to content-description insertion point
 
-(defvar mh-mhn-args nil
-  "Extra arguments to have \\[mh-edit-mhn] pass to the \"mhn\" command.
-The arguments are passed to mhn if \\[mh-edit-mhn] is given a
-prefix argument.  Normally default arguments to mhn are specified in the
-MH profile.")
+(defvar mh-mh-to-mime-args nil
+  "Extra arguments for \\[mh-mh-to-mime] to pass to the \"mhbuild\" command.
+The arguments are passed to \"mhbuild\" if \\[mh-mh-to-mime] is given a prefix
+argument. Normally default arguments to \"mhbuild\" are specified in the MH
+profile.")
 
 (defvar mh-media-type-regexp
   (concat (regexp-opt '("text" "image" "audio" "video" "application"
@@ -196,7 +193,6 @@ Returns nil if file command not on system."
                 (mh-file-mime-type-substitute (match-string 0) filename)))
           (kill-buffer tmp-buffer)))))))
 
-;;; This is needed for Emacs20 which doesn't have mailcap-mime-types.
 (defvar mh-mime-content-types
   '(("application/mac-binhex40") ("application/msword")
     ("application/octet-stream") ("application/pdf") ("application/pgp-keys")
@@ -218,8 +214,34 @@ Returns nil if file command not on system."
     ("text/richtext") ("text/x-vcard") ("text/xml")
 
     ("video/mpeg") ("video/quicktime"))
-  "Valid MIME content types.
-See documentation for \\[mh-edit-mhn].")
+  "Valid MIME content types for Emacs 20.
+Obsolete; use `mailcap-mime-types'.
+
+See also \\[mh-mh-to-mime].")
+
+;;; Delete mh-minibuffer-read-type and mh-mime-content-types and use
+;;; mml-minibuffer-read-type when Emacs20 is no longer supported unless we
+;;; think (mh-file-mime-type) is better than (mm-default-file-encoding).
+
+(defun mh-minibuffer-read-type (filename &optional default)
+  "Return the content type associated with the given FILENAME.
+If the \"file\" command exists and recognizes the given file, then its value
+is returned\; otherwise, the user is prompted for a type (see
+`mailcap-mime-types' and for Emacs 20, `mh-mime-content-types').
+Optional argument DEFAULT is returned if a type isn't entered."
+  (mailcap-parse-mimetypes)
+  (let* ((default (or default
+                      (mm-default-file-encoding filename)
+                      "application/octet-stream"))
+         (type (or (mh-file-mime-type filename)
+                   (completing-read
+                    (format "Content type (default %s): " default)
+                    (if (fboundp 'mailcap-mime-types)
+                        (mapcar 'list (mailcap-mime-types))
+                      mh-mime-content-types)))))
+    (if (not (equal type ""))
+        type
+      default)))
 
 ;; RFC 2045 - Multipurpose Internet Mail Extensions (MIME) Part One:
 ;;            Format of Internet Message Bodies.
@@ -248,35 +270,27 @@ See documentation for \\[mh-edit-mhn].")
   "Valid MIME access-type values.")
 
 ;;;###mh-autoload
-(defun mh-mhn-compose-insertion (filename type description attributes)
-  "Add a directive to insert a MIME message part from a file.
-This is the typical way to insert non-text parts in a message.
-
-Arguments are FILENAME, which tells where to find the file, TYPE, the MIME
-content type, DESCRIPTION, a line of text for the Content-Description field.
-ATTRIBUTES is a comma separated list of name=value pairs that is appended to
-the Content-Type field of the attachment.
-
-See also \\[mh-edit-mhn]."
-  (interactive (let ((filename (read-file-name "Insert contents of: ")))
+(defun mh-mh-attach-file (filename type description attributes)
+  "Add a tag to insert a MIME message part from a file.
+You are prompted for the FILENAME containing the object, the media TYPE if it
+cannot be determined automatically, and a content DESCRIPTION. In addition,
+you are also prompted for additional ATTRIBUTES.
+
+See also \\[mh-mh-to-mime]."
+  (interactive (let ((filename (mml-minibuffer-read-file "Attach file: ")))
                  (list
                   filename
-                  (or (mh-file-mime-type filename)
-                      (completing-read "Content-Type: "
-                                       (if (fboundp 'mailcap-mime-types)
-                                           (mapcar 'list (mailcap-mime-types))
-                                         mh-mime-content-types)))
-                  (read-string "Content-Description: ")
-                  (read-string "Content-Attributes: "
+                  (mh-minibuffer-read-type filename)
+                  (mml-minibuffer-read-description)
+                  (read-string "Attributes: "
                                (concat "name=\""
                                        (file-name-nondirectory filename)
                                        "\"")))))
-  (mh-mhn-compose-type filename type description attributes ))
+  (mh-mh-compose-type filename type description attributes))
 
-(defun mh-mhn-compose-type (filename type
+(defun mh-mh-compose-type (filename type
                                      &optional description attributes comment)
-  "Insert a mhn directive to insert a file.
-
+  "Insert an MH-style directive to insert a file.
 The file specified by FILENAME is encoded as TYPE. An optional DESCRIPTION is
 used as the Content-Description field, optional set of ATTRIBUTES and an
 optional COMMENT can also be included."
@@ -292,75 +306,62 @@ optional COMMENT can also be included."
   (insert "] " (expand-file-name filename))
   (insert "\n"))
 
-
 ;;;###mh-autoload
-(defun mh-mhn-compose-anon-ftp (host filename type description)
-  "Add a directive for a MIME anonymous ftp external body part.
-This directive tells MH to include a reference to a message/external-body part
-retrievable by anonymous FTP.
+(defun mh-mh-compose-anon-ftp (host filename type description)
+  "Add tag to include anonymous ftp reference to a file.
+You can even have your message initiate an \"ftp\" transfer when the
+recipient reads the message. You are prompted for the remote
+HOST and FILENAME, the media TYPE, and the content DESCRIPTION.
 
-Arguments are HOST and FILENAME, which tell where to find the file, TYPE, the
-MIME content type, and DESCRIPTION, a line of text for the Content-description
-header.
-
-See also \\[mh-edit-mhn]."
+See also \\[mh-mh-to-mime]."
   (interactive (list
                 (read-string "Remote host: ")
                 (read-string "Remote filename: ")
-                (completing-read "External Content-Type: "
-                                 (if (fboundp 'mailcap-mime-types)
-                                     (mapcar 'list (mailcap-mime-types))
-                                   mh-mime-content-types))
-                (read-string "External Content-Description: ")))
-  (mh-mhn-compose-external-type "anon-ftp" host filename
-                                type description))
+                (mh-minibuffer-read-type "DUMMY-FILENAME")
+                (mml-minibuffer-read-description)))
+  (mh-mh-compose-external-type "anon-ftp" host filename
+                               type description))
 
 ;;;###mh-autoload
-(defun mh-mhn-compose-external-compressed-tar (host filename description)
-  "Add a directive to include a MIME reference to a compressed tar file.
-The file should be available via anonymous ftp. This directive tells MH to
-include a reference to a message/external-body part.
-
-Arguments are HOST and FILENAME, which tell where to find the file, and
-DESCRIPTION, a line of text for the Content-description header.
-
-See also \\[mh-edit-mhn]."
+(defun mh-mh-compose-external-compressed-tar (host filename description)
+  "Add tag to include anonymous ftp reference to a compressed tar file.
+In addition to retrieving the file via anonymous \"ftp\" as per the
+\\[mh-mh-compose-anon-ftp] command, the file will also be uncompressed and
+untarred. You are prompted for the remote HOST and FILENAME and the content
+DESCRIPTION.
+
+See also \\[mh-mh-to-mime]."
   (interactive (list
                 (read-string "Remote host: ")
                 (read-string "Remote filename: ")
-                (read-string "Tar file Content-description: ")))
-  (mh-mhn-compose-external-type "anon-ftp" host filename
-                                "application/octet-stream"
-                                description
-                                "type=tar; conversions=x-compress"
-                                "mode=image"))
+                (mml-minibuffer-read-description)))
+  (mh-mh-compose-external-type "anon-ftp" host filename
+                               "application/octet-stream"
+                               description
+                               "type=tar; conversions=x-compress"
+                               "mode=image"))
 
 ;;;###mh-autoload
-(defun mh-mhn-compose-external-type (access-type host filename type
-                                                 &optional description
-                                                 attributes extra-params
-                                                 comment)
-  "Add a directive to include a MIME reference to a remote file.
-The file should be available via anonymous ftp. This directive tells MH to
-include a reference to a message/external-body part.
-
-Arguments are ACCESS-TYPE, HOST and FILENAME, which tell where to find the
-file and TYPE which is the MIME Content-Type. Optional arguments include
-DESCRIPTION, a line of text for the Content-description header, ATTRIBUTES,
-EXTRA-PARAMS, and COMMENT.
-
-See also \\[mh-edit-mhn]."
+(defun mh-mh-compose-external-type (access-type host filename type
+                                                &optional description
+                                                attributes parameters
+                                                comment)
+  "Add tag to refer to a remote file.
+This command is a general utility for referencing external files. In fact, all
+of the other commands that insert directives to access external files call
+this command. You are prompted for the ACCESS-TYPE, remote HOST and FILENAME,
+and content TYPE. If you provide a prefix argument, you are also prompted for
+a content DESCRIPTION, ATTRIBUTES, PARAMETERS, and a COMMENT.
+
+See also \\[mh-mh-to-mime]."
   (interactive (list
-                (completing-read "Access Type: " mh-access-types)
+                (completing-read "Access type: " mh-access-types)
                 (read-string "Remote host: ")
-                (read-string "Remote url-path: ")
-                (completing-read "Content-Type: "
-                                 (if (fboundp 'mailcap-mime-types)
-                                     (mapcar 'list (mailcap-mime-types))
-                                   mh-mime-content-types))
-                (if current-prefix-arg (read-string "Content-description: "))
+                (read-string "Remote filename: ")
+                (mh-minibuffer-read-type "DUMMY-FILENAME")
+                (if current-prefix-arg (mml-minibuffer-read-description))
                 (if current-prefix-arg (read-string "Attributes: "))
-                (if current-prefix-arg (read-string "Extra Parameters: "))
+                (if current-prefix-arg (read-string "Parameters: "))
                 (if current-prefix-arg (read-string "Comment: "))))
   (beginning-of-line)
   (insert "#@" type)
@@ -378,25 +379,24 @@ See also \\[mh-edit-mhn]."
   (let ((directory (file-name-directory filename)))
     (and directory
          (insert "; directory=\"" directory "\"")))
-  (and extra-params
-       (insert "; " extra-params))
+  (and parameters
+       (insert "; " parameters))
   (insert "\n"))
 
 ;;;###mh-autoload
-(defun mh-mhn-compose-forw (&optional description folder messages)
-  "Add a forw directive to this message, to forward a message with MIME.
-This directive tells MH to include the named messages in this one.
-
-Arguments are DESCRIPTION, a line of text for the Content-description header,
-and FOLDER and MESSAGES, which name the message(s) to be forwarded.
+(defun mh-mh-forward-message (&optional description folder messages)
+  "Add tag to forward a message.
+You are prompted for a content DESCRIPTION, the name of the FOLDER in which
+the messages to forward are located, and the MESSAGES' numbers.
 
-See also \\[mh-edit-mhn]."
+See also \\[mh-mh-to-mime]."
   (interactive (list
-                (read-string "Forw Content-description: ")
+                (mml-minibuffer-read-description)
                 (mh-prompt-for-folder "Message from" mh-sent-from-folder nil)
                 (read-string (concat "Messages"
                                      (if (numberp mh-sent-from-msg)
-                                         (format " (default %d): " mh-sent-from-msg)
+                                         (format " (default %d): "
+                                                 mh-sent-from-msg)
                                        ": ")))))
   (beginning-of-line)
   (insert "#forw [")
@@ -417,62 +417,59 @@ See also \\[mh-edit-mhn]."
   (insert "\n"))
 
 ;;;###mh-autoload
-(defun mh-edit-mhn (&optional extra-args)
-  "Format the current draft for MIME, expanding any mhn directives.
-
-Process the current draft with the mhn program, which, using directives
-already inserted in the draft, fills in all the MIME components and header
-fields.
-
-This step is performed automatically when sending the message, but this
-function may be called manually before sending the draft as well.
-
-The `\\[mh-revert-mhn-edit]' command undoes this command. The arguments in the
-list `mh-mhn-args' are passed to mhn if this function is passed an optional
-prefix argument EXTRA-ARGS.
-
-For assistance with creating mhn directives to insert various types of
-components in a message, see \\[mh-mhn-compose-insertion] (generic insertion
-from a file), \\[mh-mhn-compose-anon-ftp] (external reference to file via
-anonymous ftp), \\[mh-mhn-compose-external-compressed-tar] \ \(reference to
-compressed tar file via anonymous ftp), and \\[mh-mhn-compose-forw] (forward
-message).
-
-The value of `mh-edit-mhn-hook' is a list of functions to be called, with no
-arguments, after performing the conversion.
-
-The mhn program is part of MH version 6.8 or later."
+(defun mh-mh-to-mime (&optional extra-args)
+  "Compose MIME message from MH-style directives.
+Typically, you send a message with attachments just like any other message.
+However, you may take a sneak preview of the MIME encoding if you wish by
+running this command.
+
+If you wish to pass additional arguments to \"mhbuild\" (\"mhn\") to affect
+how it builds your message, use the `mh-mh-to-mime-args' option. For example,
+you can build a consistency check into the message by setting
+`mh-mh-to-mime-args' to \"-check\". The recipient of your message can then run
+\"mhbuild -check\" on the message--\"mhbuild\" (\"mhn\") will complain if the
+message has been corrupted on the way. This command only consults this option
+when given a prefix argument EXTRA-ARGS.
+
+The value of `mh-mh-to-mime-hook' is a list of functions to be called after
+the message has been formatted.
+
+The effects of this command can be undone by running \\[mh-mh-to-mime-undo]."
   (interactive "*P")
-  (mh-mhn-quote-unescaped-sharp)
+  (mh-mh-quote-unescaped-sharp)
   (save-buffer)
-  (message "mhn editing...")
+  (message "Running %s..." (if (mh-variant-p 'nmh) "mhbuild" "mhn"))
   (cond
    ((mh-variant-p 'nmh)
     (mh-exec-cmd-error nil
-                       "mhbuild" (if extra-args mh-mhn-args) buffer-file-name))
+                       "mhbuild"
+                       (if extra-args mh-mh-to-mime-args)
+                       buffer-file-name))
    (t
     (mh-exec-cmd-error (format "mhdraft=%s" buffer-file-name)
-                       "mhn" (if extra-args mh-mhn-args) buffer-file-name)))
+                       "mhn"
+                       (if extra-args mh-mh-to-mime-args)
+                       buffer-file-name)))
   (revert-buffer t t)
-  (message "mhn editing...done")
-  (run-hooks 'mh-edit-mhn-hook))
+  (message "Running %s...done" (if (mh-variant-p 'nmh) "mhbuild" "mhn"))
+  (run-hooks 'mh-mh-to-mime-hook))
 
-(defun mh-mhn-quote-unescaped-sharp ()
-  "Quote `#' characters that haven't been quoted for `mhbuild'.
+(defun mh-mh-quote-unescaped-sharp ()
+  "Quote `#' characters that haven't been quoted for \"mhbuild\".
 If the `#' character is present in the first column, but it isn't part of a
-MHN directive then `mhbuild' gives an error. This function will quote all such
-characters."
+MH-style directive then \"mhbuild\" gives an error. This function will quote
+all such characters."
   (save-excursion
     (goto-char (point-min))
     (while (re-search-forward "^#" nil t)
       (beginning-of-line)
-      (unless (mh-mhn-directive-present-p (point) (line-end-position))
+      (unless (mh-mh-directive-present-p (point) (line-end-position))
         (insert "#"))
       (goto-char (line-end-position)))))
 
 ;;;###mh-autoload
-(defun mh-revert-mhn-edit (noconfirm)
-  "Undo the effect of \\[mh-edit-mhn] by reverting to the backup file.
+(defun mh-mh-to-mime-undo (noconfirm)
+  "Undo effects of \\[mh-mh-to-mime].
 Optional non-nil argument NOCONFIRM means don't ask for confirmation."
   (interactive "*P")
   (if (null buffer-file-name)
@@ -499,25 +496,25 @@ Optional non-nil argument NOCONFIRM means don't ask for confirmation."
     (after-find-file nil)))
 
 ;;;###mh-autoload
-(defun mh-mhn-directive-present-p (&optional begin end)
-  "Check if the text between BEGIN and END might be a MHN directive.
+(defun mh-mh-directive-present-p (&optional begin end)
+  "Check if the text between BEGIN and END might be a MH-style directive.
 The optional argument BEGIN defaults to the beginning of the buffer, while END
 defaults to the the end of the buffer."
   (unless begin (setq begin (point-min)))
   (unless end (setq end (point-max)))
   (save-excursion
-    (block 'search-for-mhn-directive
+    (block 'search-for-mh-directive
       (goto-char begin)
       (while (re-search-forward "^#" end t)
         (let ((s (buffer-substring-no-properties (point) (line-end-position))))
           (cond ((equal s ""))
                 ((string-match "^forw[ \t\n]+" s)
-                 (return-from 'search-for-mhn-directive t))
+                 (return-from 'search-for-mh-directive t))
                 (t (let ((first-token (car (split-string s "[ \t;@]"))))
                      (when (and first-token
                                 (string-match mh-media-type-regexp
                                               first-token))
-                       (return-from 'search-for-mhn-directive t)))))))
+                       (return-from 'search-for-mh-directive t)))))))
       nil)))
 
 
@@ -526,12 +523,15 @@ defaults to the the end of the buffer."
 
 ;;;###mh-autoload
 (defun mh-mml-to-mime ()
-  "Compose MIME message from mml directives.
-This step is performed automatically when sending the message, but this
-function may be called manually before sending the draft as well."
+  "Compose MIME message from MML tags.
+Typically, you send a message with attachments just like any other message.
+However, you may take a sneak preview of the MIME encoding if you wish by
+running this command.
+
+This action can be undone by running \\[undo]."
   (interactive)
   (require 'message)
-  (when mh-gnus-pgp-support-flag ;; This is only needed for PGP
+  (when mh-pgp-support-flag ;; This is only needed for PGP
     (message-options-set-recipient))
   (let ((saved-text (buffer-string))
         (buffer (current-buffer))
@@ -573,53 +573,45 @@ number."
   (if current-prefix-arg
       (let ((def (or (car mh-mml-cryptographic-method-history)
                      mh-mml-method-default)))
-        (completing-read (format "Method: [%s] " def)
+        (completing-read (format "Method (default %s): " def)
                          '(("pgp") ("pgpmime") ("smime"))
                          nil t nil 'mh-mml-cryptographic-method-history def))
     mh-mml-method-default))
 
 ;;;###mh-autoload
 (defun mh-mml-attach-file (&optional disposition)
-  "Attach a file to the outgoing MIME message.
-The file is not inserted or encoded until you send the message with
-`\\[mh-send-letter]'.
-Message disposition is \"inline\" or \"attachment\" and is prompted for if
-DISPOSITION is nil.
+  "Add a tag to insert a MIME message part from a file.
+You are prompted for the filename containing the object, the media type if it
+cannot be determined automatically, a content description and the DISPOSITION
+of the attachment.
 
-This is basically `mml-attach-file' from gnus, modified such that a prefix
+This is basically `mml-attach-file' from Gnus, modified such that a prefix
 argument yields an `inline' disposition and Content-Type is determined
 automatically."
   (let* ((file (mml-minibuffer-read-file "Attach file: "))
-         (type (or (mh-file-mime-type file)
-                   (completing-read "Content-Type: "
-                                    (if (fboundp 'mailcap-mime-types)
-                                        (mapcar 'list (mailcap-mime-types))
-                                      mh-mime-content-types))))
+         (type (mh-minibuffer-read-type file))
          (description (mml-minibuffer-read-description))
          (dispos (or disposition
-                     (completing-read "Disposition: [attachment] "
-                                      '(("attachment")("inline"))
-                                      nil t nil nil
-                                      "attachment"))))
+                     (mml-minibuffer-read-disposition type))))
     (mml-insert-empty-tag 'part 'type type 'filename file
                           'disposition dispos 'description description)))
 
 (defvar mh-identity-pgg-default-user-id)
 
 (defun mh-secure-message (method mode &optional identity)
-  "Add directive to Encrypt/Sign an entire message.
+  "Add tag to encrypt or sign message.
 METHOD should be one of: \"pgpmime\", \"pgp\", \"smime\".
 MODE should be one of: \"sign\", \"encrypt\", \"signencrypt\", \"none\".
 IDENTITY is optionally the default-user-id to use."
-  (if (not mh-gnus-pgp-support-flag)
-      (error "Sorry.  Your version of gnus does not support PGP/GPG")
+  (if (not mh-pgp-support-flag)
+      (error "Your version of Gnus does not support PGP/GPG")
     ;; Check the arguments
     (let ((valid-methods (list "pgpmime" "pgp" "smime"))
           (valid-modes (list "sign" "encrypt" "signencrypt" "none")))
       (if (not (member method valid-methods))
-          (error "Sorry. METHOD \"%s\" is invalid" method))
+          (error "Method \"%s\" is invalid" method))
       (if (not (member mode valid-modes))
-          (error "Sorry. MODE \"%s\" is invalid" mode))
+          (error "Mode \"%s\" is invalid" mode))
       (mml-unsecure-message)
       (if (not (string= mode "none"))
         (save-excursion
@@ -632,34 +624,46 @@ IDENTITY is optionally the default-user-id to use."
 
 ;;;###mh-autoload
 (defun mh-mml-unsecure-message (&optional ignore)
-  "Remove any secure message directives.
-The IGNORE argument is not used."
+  "Remove any secure message tags.
+The argument IGNORE is not used."
   (interactive "P")
-  (if (not mh-gnus-pgp-support-flag)
-      (error "Sorry.  Your version of gnus does not support PGP/GPG")
+  (if (not mh-pgp-support-flag)
+      (error "Your version of Gnus does not support PGP/GPG")
     (mml-unsecure-message)))
 
 ;;;###mh-autoload
 (defun mh-mml-secure-message-sign (method)
-  "Add security directive to sign the entire message using METHOD."
+  "Add tag to sign the message.
+A proper multipart message is created for you when you send the message. Use
+the \\[mh-mml-unsecure-message] command to remove this tag. Use a prefix
+argument METHOD to be prompted for one of the possible security methods
+\(see `mh-mml-method-default')."
   (interactive (list (mh-mml-query-cryptographic-method)))
   (mh-secure-message method "sign" mh-identity-pgg-default-user-id))
 
 ;;;###mh-autoload
 (defun mh-mml-secure-message-encrypt (method)
-  "Add security directive to encrypt the entire message using METHOD."
+  "Add tag to encrypt the message.
+A proper multipart message is created for you when you send the message. Use
+the \\[mh-mml-unsecure-message] command to remove this tag. Use a prefix
+argument METHOD to be prompted for one of the possible security methods
+\(see `mh-mml-method-default')."
   (interactive (list (mh-mml-query-cryptographic-method)))
   (mh-secure-message method "encrypt" mh-identity-pgg-default-user-id))
 
 ;;;###mh-autoload
 (defun mh-mml-secure-message-signencrypt (method)
-  "Add security directive to encrypt and sign the entire message using METHOD."
+  "Add tag to encrypt and sign the message.
+A proper multipart message is created for you when you send the message. Use
+the \\[mh-mml-unsecure-message] command to remove this tag. Use a prefix
+argument METHOD to be prompted for one of the possible security methods
+\(see `mh-mml-method-default')."
   (interactive (list (mh-mml-query-cryptographic-method)))
   (mh-secure-message method "signencrypt" mh-identity-pgg-default-user-id))
 
 ;;;###mh-autoload
-(defun mh-mml-directive-present-p ()
-  "Check if the current buffer has text which may be an MML directive."
+(defun mh-mml-tag-present-p ()
+  "Check if the current buffer has text which may be a MML tag."
   (save-excursion
     (goto-char (point-min))
     (re-search-forward
@@ -682,7 +686,7 @@ The IGNORE argument is not used."
 
 ;;;###mh-autoload
 (defun mh-destroy-postponed-handles ()
-  "Free MIME data for externally displayed mime parts."
+  "Free MIME data for externally displayed MIME parts."
   (let ((mime-data (mh-buffer-data)))
     (when mime-data
       (mm-destroy-parts (mh-mime-handles mime-data)))
@@ -736,13 +740,13 @@ This is used to decide if smileys and graphical emphasis will be displayed."
 
 ;;;###mh-autoload
 (defun mh-display-smileys ()
-  "Function to display smileys."
+  "Display smileys."
   (when (and mh-graphical-smileys-flag (mh-small-show-buffer-p))
     (mh-funcall-if-exists smiley-region (point-min) (point-max))))
 
 ;;;###mh-autoload
 (defun mh-display-emphasis ()
-  "Function to display graphical emphasis."
+  "Display graphical emphasis."
   (when (and mh-graphical-emphasis-flag (mh-small-show-buffer-p))
     (flet ((article-goto-body ()))      ; shadow this function to do nothing
       (save-excursion
@@ -799,8 +803,7 @@ Set from last use.")
   "Store the MIME parts of the current message.
 If ARG, prompt for directory, else use that specified by the variable
 `mh-mime-save-parts-default-directory'. These directories may be superseded by
-mh_profile directives, since this function calls on mhstore or mhn to do the
-actual storing."
+MH profile components, since this function calls on mhstore to do the work."
   (interactive "P")
   (let ((msg (if (eq major-mode 'mh-show-mode)
                  (mh-show-buffer-message-number)
@@ -940,7 +943,7 @@ displayed."
          (mh-mime-display-single handle))
         ((equal (car handle) "multipart/alternative")
          (mh-mime-display-alternative (cdr handle)))
-        ((and mh-gnus-pgp-support-flag
+        ((and mh-pgp-support-flag
               (or (equal (car handle) "multipart/signed")
                   (equal (car handle) "multipart/encrypted")))
          (mh-mime-display-security handle))
@@ -1047,7 +1050,7 @@ This is only useful if a Content-Disposition header is not present."
                                      (mm-inlined-p handle)))))))
     (save-restriction
       (narrow-to-region (point) (if (eobp) (point) (1+ (point))))
-      (cond ((and mh-gnus-pgp-support-flag
+      (cond ((and mh-pgp-support-flag
                   (equal type "application/pgp-signature"))
              nil)             ; skip signatures as they are already handled...
             ((not displayp)
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 2dbd313b1d2..87f521d605a 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -86,32 +86,37 @@ of `search' in the CL package."
 ;;; Scan Line Formats
 
 (defvar mh-scan-msg-number-regexp "^ *\\([0-9]+\\)"
-  "This regexp is used to extract the message number from a scan line.
-Note that the message number must be placed in a parenthesized expression as
-in the default of \"^ *\\\\([0-9]+\\\\)\".")
+  "This regular expression extracts the message number.
+It must match from the beginning of the line. Note that the message number
+must be placed in a parenthesized expression as in the default of
+\"^ *\\\\([0-9]+\\\\)\".")
 
 (defvar mh-scan-msg-overflow-regexp "^[?0-9][0-9]"
-  "This regexp matches scan lines in which the message number overflowed.")
+  "This regular expression matches overflowed message numbers.")
 
 (defvar mh-scan-msg-format-regexp "%\\([0-9]*\\)(msg)"
-  "This regexp is used to find the message number width in a scan format.
+  "This regular expression finds the message number width in a scan format.
 Note that the message number must be placed in a parenthesized expression as
-in the default of \"%\\\\([0-9]*\\\\)(msg)\".")
+in the default of \"%\\\\([0-9]*\\\\)(msg)\". This variable is only consulted
+if `mh-scan-format-file' is set to \"Use MH-E scan Format\".")
 
 (defvar mh-scan-msg-format-string "%d"
   "This is a format string for width of the message number in a scan format.
-Use `0%d' for zero-filled message numbers.")
+Use `0%d' for zero-filled message numbers. This variable is only consulted if
+`mh-scan-format-file' is set to \"Use MH-E scan Format\".")
 
 (defvar mh-scan-msg-search-regexp "^[^0-9]*%d[^0-9]"
-  "This format string regexp matches the scan line for a particular message.
-Use `%d' to represent the location of the message number within the
-expression as in the default of \"^[^0-9]*%d[^0-9]\".")
+  "This regular expression matches a particular message.
+It is a format string; use `%d' to represent the location of the message
+number within the expression as in the default of \"^[^0-9]*%d[^0-9]\".")
 
 (defvar mh-cmd-note 4
-  "This is the number of characters to skip over before inserting notation.
+  "Column where notations begin.
 This variable should be set with the function `mh-set-cmd-note'. This variable
-may be updated dynamically if `mh-adaptive-cmd-note-flag' is non-nil and
-`mh-scan-format-file' is t.")
+may be updated dynamically if `mh-adaptive-cmd-note-flag' is on and
+`mh-scan-format-file' is set to \"Use MH-E scan Format\".
+
+Note that columns in Emacs start with 0.")
 (make-variable-buffer-local 'mh-cmd-note)
 
 (defvar mh-note-seq ?%
@@ -133,12 +138,12 @@ This variable should not be used directly in programs. Programs should use
 `mh-mail-header-separator' in `mh-letter-mode'; in other contexts, you may
 have to perform this initialization yourself.
 
-Do not make this a regexp as it may be the argument to `insert' and it is
-passed through `regexp-quote' before being used by functions like
+Do not make this a regular expression as it may be the argument to `insert'
+and it is passed through `regexp-quote' before being used by functions like
 `re-search-forward'.")
 
 (defvar mh-signature-separator-regexp "^-- $"
-  "Regexp used to find signature separator.
+  "This regular expression matches the signature separator.
 See `mh-signature-separator'.")
 
 (defvar mh-signature-separator "-- \n"
@@ -175,8 +180,8 @@ Use `mh-signature-separator-regexp' when searching for a separator.")
 (defvar mh-globals-hash (make-hash-table)
   "Keeps track of MIME data on a per buffer basis.")
 
-(defvar mh-gnus-pgp-support-flag (not (not (locate-library "mml2015")))
-  "Non-nil means installed Gnus has PGP support.")
+(defvar mh-pgp-support-flag (not (not (locate-library "mml2015")))
+  "Non-nil means PGP support is available.")
 
 (defvar mh-mm-inline-media-tests
   `(("image/jpeg"
@@ -410,10 +415,10 @@ Argument LIMIT limits search."
 
 (defun mh-show-font-lock-fontify-region (beg end loudly)
   "Limit font-lock in `mh-show-mode' to the header.
-Used when `mh-highlight-citation-p' is set to gnus, leaving the body to be
-dealt with by gnus highlighting. The region between BEG and END is
-given over to be fontified and LOUDLY controls if a user sees a
-message about the fontification operation."
+Used when `mh-highlight-citation-p' is set to \"'gnus\", leaving the body to
+be dealt with by gnus highlighting. The region between BEG and END is given
+over to be fontified and LOUDLY controls if a user sees a message about the
+fontification operation."
   (let ((header-end (mh-mail-header-end)))
     (cond
      ((and (< beg header-end)(< end header-end))
@@ -432,7 +437,7 @@ message about the fontification operation."
         (require 'gnus-cite))))
 
 (defun mh-gnus-article-highlight-citation ()
-  "Highlight cited text in current buffer using gnus."
+  "Highlight cited text in current buffer using Gnus."
   (interactive)
   ;; Requiring gnus-cite should have been sufficient. However for Emacs21.1,
   ;; recursive-load-depth-limit is only 10, so an error occurs. Also it may be
@@ -1853,7 +1858,7 @@ Non-nil third argument DONT-SHOW means not to show the message."
   (let ((point (point))
         (return-value t))
     (goto-char (point-min))
-    (unless (re-search-forward (format "^[ ]*%s[^0-9]+" number) nil t)
+    (unless (re-search-forward (format mh-scan-msg-search-regexp number) nil t)
       (goto-char point)
       (unless no-error-if-no-message
         (error "No message %d" number))
diff --git a/lisp/mouse.el b/lisp/mouse.el
index d71d80bd41f..743aba94d5e 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -768,7 +768,7 @@ If the click is in the echo area, display the `*Messages*' buffer."
         (save-excursion
           ;; Swallow the up-event.
           (read-event)
-          (set-buffer "*Messages*")
+          (set-buffer (get-buffer-create "*Messages*"))
           (goto-char (point-max))
           (display-buffer (current-buffer)))
       ;; Give temporary modes such as isearch a chance to turn off.
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index f50ca07a488..758346e3647 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -2666,36 +2666,6 @@ away in the internal cache."
 ;;;; Directory information caching support.
 ;;;; ------------------------------------------------------------
 
-(defconst ange-ftp-date-regexp
-  (let* ((l "\\([A-Za-z]\\|[^\0-\177]\\)")
-         ;; In some locales, month abbreviations are as short as 2 letters,
-         ;; and they can be padded on the right with spaces.
-         ;; weiand: changed: month ends with . or , or .,
-;;old    (month (concat l l "+ *"))
-         (month (concat l l "+[.]?,? *"))
-         ;; Recognize any non-ASCII character.
-         ;; The purpose is to match a Kanji character.
-         (k "[^\0-\177]")
-         (s " ")
-         (mm "[ 0-1][0-9]")
-         ;; weiand: changed: day ends with .
-;;old    (dd "[ 0-3][0-9]")
-         (dd "[ 0-3][0-9][.]?")
-         (western (concat "\\(" month s dd "\\|" dd s month "\\)"))
-         (japanese (concat mm k s dd k)))
-         ;; Require the previous column to end in a digit.
-         ;; This avoids recognizing `1 may 1997' as a date in the line:
-         ;; -r--r--r--   1 may      1997        1168 Oct 19 16:49 README
-         ;; albinus:
-         ;; Require also the following column to start in a digit.
-         ;; This avoids recognizing `kfs 10' as a date in the line:
-         ;; -rw-------   1 kfs                    10 May 27  2003 .autorun.lck
-;;  (concat "[0-9]" s "\\(" western "\\|" japanese "\\)" s))
-    (concat "[0-9]" s "\\(" western "\\|" japanese "\\)" s "+[0-9]"))
-  "Regular expression to match up to the column before the file name in a
-directory listing.  This regular expression is designed to recognize dates
-regardless of the language.")
-
 (defvar ange-ftp-add-file-entry-alist nil
   "Alist saying how to add file entries on certain OS types.
 Association list of pairs \( TYPE \. FUNC \), where FUNC
@@ -2730,13 +2700,8 @@ The main reason for this alist is to deal with file versions in VMS.")
   ;;Extract the filename from the current line of a dired-like listing.
   `(let ((eol (progn (end-of-line) (point))))
      (beginning-of-line)
-     (if (re-search-forward ange-ftp-date-regexp eol t)
-         (progn
-           (skip-chars-forward " ")
-           (skip-chars-forward "^ " eol)
-           (skip-chars-forward " " eol)
-           ;; We bomb on filenames starting with a space.
-           (buffer-substring (point) eol)))))
+     (if (re-search-forward directory-listing-before-filename-regexp eol t)
+         (buffer-substring (point) eol))))
 
 ;; This deals with the F switch. Should also do something about
 ;; unquoting names obtained with the SysV b switch and the GNU Q
@@ -2851,7 +2816,7 @@ match subdirectories as well.")
       ;; (3) The twilight zone.
       ;; We'll assume (1) for now.
       nil)
-     ((re-search-forward ange-ftp-date-regexp nil t)
+     ((re-search-forward directory-listing-before-filename-regexp nil t)
       (beginning-of-line)
       (ange-ftp-ls-parser switches))
      ((re-search-forward "^[^ \n\t]+ +\\([0-9]+\\|-\\|=\\) " nil t)
@@ -5532,7 +5497,7 @@ Other orders of $ and _ seem to all work just fine.")
   (let ((tbl (make-hash-table :test 'equal)))
     (goto-char (point-min))
     (save-match-data
-      (while (re-search-forward ange-ftp-date-regexp nil t)
+      (while (re-search-forward directory-listing-before-filename-regexp nil t)
         (end-of-line)
         (skip-chars-backward " ")
         (let ((end (point)))
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 74bace58958..54fddf9261c 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -713,7 +713,8 @@ narrowed."
                 (setq browse-url-temp-file-name
                       (convert-standard-filename
                        (make-temp-file
-                        (expand-file-name "burl" browse-url-temp-dir)))))
+                        (expand-file-name "burl" browse-url-temp-dir)
+                        nil ".html"))))
             (setq file-name browse-url-temp-file-name)
             (write-region (point-min) (point-max) file-name nil 'no-message)))
       (browse-url-of-file file-name))))
diff --git a/lisp/gnus/pgg-def.el b/lisp/pgg-def.el
index c6197db447d..c6197db447d 100644
--- a/lisp/gnus/pgg-def.el
+++ b/lisp/pgg-def.el
diff --git a/lisp/gnus/pgg-gpg.el b/lisp/pgg-gpg.el
index 6ba017c731c..6ba017c731c 100644
--- a/lisp/gnus/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
diff --git a/lisp/gnus/pgg-parse.el b/lisp/pgg-parse.el
index 422ccc6ac23..422ccc6ac23 100644
--- a/lisp/gnus/pgg-parse.el
+++ b/lisp/pgg-parse.el
diff --git a/lisp/gnus/pgg-pgp.el b/lisp/pgg-pgp.el
index 2735a0b7b27..2735a0b7b27 100644
--- a/lisp/gnus/pgg-pgp.el
+++ b/lisp/pgg-pgp.el
diff --git a/lisp/gnus/pgg-pgp5.el b/lisp/pgg-pgp5.el
index ffe467ec044..ffe467ec044 100644
--- a/lisp/gnus/pgg-pgp5.el
+++ b/lisp/pgg-pgp5.el
diff --git a/lisp/gnus/pgg.el b/lisp/pgg.el
index af59833c6c0..af59833c6c0 100644
--- a/lisp/gnus/pgg.el
+++ b/lisp/pgg.el
diff --git a/lisp/play/blackbox.el b/lisp/play/blackbox.el
index ffde5c46021..fb0474d1460 100644
--- a/lisp/play/blackbox.el
+++ b/lisp/play/blackbox.el
@@ -51,11 +51,11 @@
 ;;                 2   H 4       H
 ;;
 ;; Rays which enter and exit are numbered.  You can see that rays 1 & 5 pass
-;; thru the box undisturbed. Ray 2 is deflected by the northwesternmost
+;; thru the box undisturbed.  Ray 2 is deflected by the northwesternmost
 ;; ball.  Likewise rays 3 and 4. Rays which hit balls and are absorbed are
 ;; marked with H.  The bottom of the left and the right of the bottom hit
 ;; the southeastern ball directly.  Rays may also hit balls after being
-;; reflected. Consider the H on the bottom next to the 4.  It bounces off
+;; reflected.  Consider the H on the bottom next to the 4.  It bounces off
 ;; the NW-ern most ball and hits the central ball.  A ray shot from above
 ;; the right side 5 would hit the SE-ern most ball.  The R beneath the 5
 ;; is because the ball is returned instantly.  It is not allowed into
@@ -69,8 +69,6 @@
 
 ;;; Code:
 
-(defvar blackbox-mode-map nil "")
-
 (defvar bb-board nil
   "Blackbox board.")
 
@@ -89,23 +87,28 @@
 (defvar bb-balls-placed nil
   "List of already placed balls.")
 
-(unless blackbox-mode-map
-  (setq blackbox-mode-map (make-keymap))
-  (suppress-keymap blackbox-mode-map t)
-  (define-key blackbox-mode-map "\C-f" 'bb-right)
-  (define-key blackbox-mode-map [right] 'bb-right)
-  (define-key blackbox-mode-map "\C-b" 'bb-left)
-  (define-key blackbox-mode-map [left] 'bb-left)
-  (define-key blackbox-mode-map "\C-p" 'bb-up)
-  (define-key blackbox-mode-map [up] 'bb-up)
-  (define-key blackbox-mode-map "\C-n" 'bb-down)
-  (define-key blackbox-mode-map [down] 'bb-down)
-  (define-key blackbox-mode-map "\C-e" 'bb-eol)
-  (define-key blackbox-mode-map "\C-a" 'bb-bol)
-  (define-key blackbox-mode-map " " 'bb-romp)
-  (define-key blackbox-mode-map [insert] 'bb-romp)
-  (define-key blackbox-mode-map "\C-m" 'bb-done)
-  (define-key blackbox-mode-map [kp-enter] 'bb-done))
+;; This is used below to remap existing bindings for cursor motion to
+;; blackbox-specific bindings in blackbox-mode-map.  This is so that
+;; users who prefer non-default key bindings for cursor motion don't
+;; lose that when they play Blackbox.
+(defun blackbox-redefine-key (map oldfun newfun)
+  "Redefine keys that run the function OLDFUN to run NEWFUN instead."
+  (define-key map (vector 'remap oldfun) newfun))
+
+
+(defvar blackbox-mode-map 
+  (let ((map (make-keymap)))
+    (suppress-keymap map t)
+    (blackbox-redefine-key map 'backward-char 'bb-left)
+    (blackbox-redefine-key map 'forward-char 'bb-right)
+    (blackbox-redefine-key map 'previous-line 'bb-up)
+    (blackbox-redefine-key map 'next-line 'bb-down)
+    (blackbox-redefine-key map 'move-end-of-line 'bb-eol)
+    (blackbox-redefine-key map 'move-beginning-of-line 'bb-bol)
+    (define-key map " " 'bb-romp)
+    (define-key map [insert] 'bb-romp)
+    (blackbox-redefine-key map 'newline 'bb-done)
+    map))
 
 ;; Blackbox mode is suitable only for specially formatted data.
 (put 'blackbox-mode 'mode-class 'special)
@@ -431,5 +434,5 @@ a reflection."
 
 (provide 'blackbox)
 
-;;; arch-tag: 6c474c62-5617-4b10-9b44-ac430168c0e2
+;; arch-tag: 6c474c62-5617-4b10-9b44-ac430168c0e2
 ;;; blackbox.el ends here
diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index ea502646e61..899bb34cabf 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -954,7 +954,7 @@ Otherwise call the Doctor to parse preceding sentence."
                       (doctor-type '(are you (doc$ afraidof) that \?)))
                      ((zerop (random 2))
                       (doctor-type '(don\'t tell me what to do \. i am the
-                                            psychiatrist here!))
+                                            doctor here!))
                       (doctor-rthing))
                      (t
                       (doctor-type '((doc$ whysay) that i shouldn\'t
@@ -1552,8 +1552,8 @@ Hack on previous word, setting global variable OWNER to correct result."
         (t (doctor-type '((doc$ whysay)(list subj verb obj))))))
 
 (defun doctor-symptoms ()
-  (doctor-type '((doc$ maybe) you should consult a doctor of medicine\,
-                 i am a psychiatrist \.)))
+  (doctor-type '((doc$ maybe) you should consult a medical doctor\;
+                 i am a psychotherapist. \.)))
 
 (defun doctor-hates ()
   (doctor-svo sent found 1 t)
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index bf09669083d..91ace236dbb 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -349,11 +349,14 @@ Also display the main routine in the disassembly buffer if present."
     'gdb-mouse-set-clear-breakpoint)
   (define-key gud-minor-mode-map [left-fringe mouse-1]
     'gdb-mouse-set-clear-breakpoint)
+  (define-key gud-minor-mode-map [left-fringe mouse-2]
+    'gdb-mouse-until)
+  (define-key gud-minor-mode-map [left-fringe drag-mouse-1]
+    'gdb-mouse-until)
   (define-key gud-minor-mode-map [left-margin mouse-3]
-    'gdb-mouse-toggle-breakpoint)
-;  Currently only works in margin.
-;  (define-key gud-minor-mode-map [left-fringe mouse-3]
-;    'gdb-mouse-toggle-breakpoint)
+    'gdb-mouse-toggle-breakpoint-margin)
+  (define-key gud-minor-mode-map [left-fringe mouse-3]
+    'gdb-mouse-toggle-breakpoint-fringe)
 
   (setq comint-input-sender 'gdb-send)
   ;;
@@ -397,6 +400,21 @@ Also display the main routine in the disassembly buffer if present."
   (gdb-set-gud-minor-mode-existing-buffers)
   (run-hooks 'gdba-mode-hook))
 
+(defun gdb-mouse-until (event)
+  "Execute source lines by dragging the overlay arrow (fringe) with the mouse."
+  (interactive "e")
+  (if gud-overlay-arrow-position
+        (let ((start (event-start event))
+              (end  (event-end event))
+              (buffer (marker-buffer gud-overlay-arrow-position)) (line))
+          (if (equal buffer (window-buffer (posn-window end)))
+              (with-current-buffer buffer
+                (when (or (equal start end)
+                          (equal (posn-point start)
+                                 (marker-position gud-overlay-arrow-position)))
+                  (setq line (line-number-at-pos (posn-point end)))
+                  (gud-call (concat "until " (number-to-string line)))))))))
+
 (defcustom gdb-use-colon-colon-notation nil
   "If non-nil use FUN::VAR format to display variables in the speedbar."
   :type 'boolean
@@ -802,7 +820,8 @@ The key should be one of the cars in `gdb-buffer-rules-assoc'."
   "A comint send filter for gdb.
 This filter may simply queue input for a later time."
   (with-current-buffer gud-comint-buffer
-    (remove-text-properties (point-min) (point-max) '(face)))
+    (let ((inhibit-read-only t))
+      (remove-text-properties (point-min) (point-max) '(face))))
   (let ((item (concat string "\n")))
     (if gud-running
       (progn
@@ -1181,7 +1200,7 @@ happens to be appropriate."
 (defmacro def-gdb-auto-update-trigger (name demand-predicate gdb-command
                                             output-handler)
   `(defun ,name (&optional ignored)
-     (if (and (,demand-predicate)
+     (if (and ,demand-predicate
               (not (member ',name
                            gdb-pending-triggers)))
          (progn
@@ -1213,7 +1232,7 @@ happens to be appropriate."
   `(progn
      (def-gdb-auto-update-trigger ,trigger-name
        ;; The demand predicate:
-       (lambda () (gdb-get-buffer ',buffer-key))
+       (gdb-get-buffer ',buffer-key)
        ,gdb-command
        ,output-handler-name)
      (def-gdb-auto-update-handler ,output-handler-name
@@ -1399,8 +1418,8 @@ static char *magick[] = {
                 (gud-remove nil)
               (gud-break nil)))))))
 
-(defun gdb-mouse-toggle-breakpoint (event)
-  "Enable/disable breakpoint in left fringe/margin with mouse click."
+(defun gdb-mouse-toggle-breakpoint-margin (event)
+  "Enable/disable breakpoint in left margin with mouse click."
   (interactive "e")
   (mouse-minibuffer-check event)
   (let ((posn (event-end event)))
@@ -1418,7 +1437,33 @@ static char *magick[] = {
                                  0 'gdb-enabled (car (posn-string posn)))
                                 "disable "
                               "enable ")
-                            bptno "\n")) 'ignore))))))))
+                            bptno "\n"))
+                  'ignore))))))))
+
+(defun gdb-mouse-toggle-breakpoint-fringe (event)
+  "Enable/disable breakpoint in left fringe with mouse click."
+  (interactive "e")
+  (mouse-minibuffer-check event)
+  (let* ((posn (event-end event))
+         (pos (posn-point posn))
+         obj)
+    (when (numberp pos)
+      (with-selected-window (posn-window posn)
+        (save-excursion
+          (set-buffer (window-buffer (selected-window)))
+          (goto-char pos)
+          (dolist (overlay (overlays-in pos pos))
+            (when (overlay-get overlay 'put-break)
+              (setq obj (overlay-get overlay 'before-string))))
+          (when (stringp obj)
+            (gdb-enqueue-input
+             (list
+              (concat
+               (if (get-text-property 0 'gdb-enabled obj)
+                   "disable "
+                 "enable ")
+               (get-text-property 0 'gdb-bptno obj) "\n")
+              'ignore))))))))
 
 (defun gdb-breakpoints-buffer-name ()
   (with-current-buffer gud-comint-buffer
@@ -2108,11 +2153,10 @@ corresponding to the mode line clicked."
                       'gdb-locals-buffer-name
                       'gdb-locals-mode)
 
-(def-gdb-auto-updated-buffer gdb-locals-buffer
-  gdb-invalidate-locals
+(def-gdb-auto-update-trigger gdb-invalidate-locals
+  (gdb-get-buffer 'gdb-locals-buffer)
   "server info locals\n"
-  gdb-info-locals-handler
-  gdb-info-locals-custom)
+  gdb-info-locals-handler)
 
 ;; Abbreviate for arrays and structures.
 ;; These can be expanded using gud-display.
@@ -2142,9 +2186,6 @@ corresponding to the mode line clicked."
                 (set-window-point window p)))))
   (run-hooks 'gdb-info-locals-hook))
 
-(defun gdb-info-locals-custom ()
-  nil)
-
 (defvar gdb-locals-mode-map
   (let ((map (make-sparse-keymap)))
     (suppress-keymap map)
@@ -2455,7 +2496,7 @@ of the current session."
         (error (setq gdb-find-file-unhook t)))))
 
 ;;from put-image
-(defun gdb-put-string (putstring pos &optional dprop)
+(defun gdb-put-string (putstring pos &optional dprop &rest sprops)
   "Put string PUTSTRING in front of POS in the current buffer.
 PUTSTRING is displayed by putting an overlay into the current buffer with a
 `before-string' string that has a `display' property whose value is
@@ -2466,7 +2507,9 @@ PUTSTRING."
     (let ((overlay (make-overlay pos pos buffer))
           (prop (or dprop
                     (list (list 'margin 'left-margin) putstring))))
-      (put-text-property 0 (length string) 'display prop string)
+      (put-text-property 0 1 'display prop string)
+      (if sprops
+          (add-text-properties 0 1 sprops string))
       (overlay-put overlay 'put-break t)
       (overlay-put overlay 'before-string string))))
 
@@ -2487,23 +2530,26 @@ BUFFER nil or omitted means use the current buffer."
         (putstring (if enabled "B" "b"))
         (source-window (get-buffer-window (current-buffer) 0)))
     (add-text-properties
-     0 1 '(help-echo "mouse-1: set/clear bkpt, mouse-3: enable/disable bkpt")
+     0 1 '(help-echo "mouse-1: clear bkpt, mouse-3: enable/disable bkpt")
      putstring)
-    (if enabled (add-text-properties
-                 0 1 `(gdb-bptno ,bptno gdb-enabled t) putstring)
+    (if enabled
+        (add-text-properties
+         0 1 `(gdb-bptno ,bptno gdb-enabled t) putstring)
       (add-text-properties
        0 1 `(gdb-bptno ,bptno gdb-enabled nil) putstring))
     (gdb-remove-breakpoint-icons start end)
     (if (display-images-p)
         (if (>= (or left-fringe-width
-                   (if source-window (car (window-fringes source-window)))
-                   gdb-buffer-fringe-width) 8)
+                    (if source-window (car (window-fringes source-window)))
+                    gdb-buffer-fringe-width) 8)
             (gdb-put-string
              nil (1+ start)
              `(left-fringe breakpoint
                            ,(if enabled
                                 'breakpoint-enabled
-                              'breakpoint-disabled)))
+                              'breakpoint-disabled))
+             'gdb-bptno bptno
+             'gdb-enabled enabled)
           (when (< left-margin-width 2)
             (save-current-buffer
               (setq left-margin-width 2)
@@ -2526,10 +2572,10 @@ BUFFER nil or omitted means use the current buffer."
                        (find-image `((:type xpm :data
                                             ,breakpoint-xpm-data
                                             :conversion disabled
-                                            :ascent 100)
+                                            :ascent 100 :pointer hand)
                                      (:type pbm :data
                                             ,breakpoint-disabled-pbm-data
-                                            :ascent 100))))))
+                                            :ascent 100 :pointer hand))))))
            (+ start 1)
            putstring
            'left-margin))
@@ -2564,12 +2610,9 @@ BUFFER nil or omitted means use the current buffer."
                       'gdb-assembler-buffer-name
                       'gdb-assembler-mode)
 
-(def-gdb-auto-updated-buffer gdb-assembler-buffer
+(def-gdb-auto-update-handler gdb-assembler-handler
   gdb-invalidate-assembler
-  (concat gdb-server-prefix "disassemble "
-          (if (member gdb-frame-address '(nil "main")) nil "0x")
-          gdb-frame-address "\n")
-  gdb-assembler-handler
+  gdb-assembler-buffer
   gdb-assembler-custom)
 
 (defun gdb-assembler-custom ()
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 8f962381d24..a0c58260839 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -135,13 +135,16 @@ Used to grey out relevant togolbar icons.")
                                (memq gud-minor-mode '(gdbmi gdba gdb dbx jdb))))
     ([until]    menu-item "Continue to selection" gud-until
                   :enable (and (not gud-running)
-                               (memq gud-minor-mode '(gdbmi gdba gdb perldb))))
+                               (memq gud-minor-mode '(gdbmi gdba gdb perldb)))
+                  :visible (not (and (memq gud-minor-mode '(gdbmi gdba))
+                                     (> (car (window-fringes)) 0))))
     ([remove]   menu-item "Remove Breakpoint" gud-remove
                   :enable (not gud-running)
                   :visible (not (and (memq gud-minor-mode '(gdbmi gdba))
                                      (> (car (window-fringes)) 0))))
     ([tbreak]   menu-item "Temporary Breakpoint" gud-tbreak
-                  :enable (memq gud-minor-mode '(gdbmi gdba gdb sdb xdb bashdb)))
+                  :enable (memq gud-minor-mode
+                                '(gdbmi gdba gdb sdb xdb bashdb)))
     ([break]    menu-item "Set Breakpoint" gud-break
                   :enable (not gud-running)
                   :visible (not (and (memq gud-minor-mode '(gdbmi gdba))
@@ -2530,7 +2533,7 @@ It is saved for when this flag is not set.")
               (save-restriction
                 (widen)
                 (if (marker-buffer gud-delete-prompt-marker)
-                    (progn
+                    (let ((inhibit-read-only t))
                       (delete-region (process-mark proc)
                                      gud-delete-prompt-marker)
                       (set-marker gud-delete-prompt-marker nil)))
diff --git a/lisp/replace.el b/lisp/replace.el
index 2d79754b4f0..31963f7538c 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1129,11 +1129,17 @@ See also `multi-occur'."
                                     (append
                                      (when prefix-face
                                        `(font-lock-face prefix-face))
-                                     '(occur-prefix t)))
+                                     `(occur-prefix t mouse-face (highlight)
+                                       occur-target ,marker follow-link t
+                                       help-echo "mouse-2: go to this occurrence")))
                              ;; We don't put `mouse-face' on the newline,
                              ;; because that loses.  And don't put it
                              ;; on context lines to reduce flicker.
-                             (propertize curstring 'mouse-face 'highlight)
+                             (propertize curstring 'mouse-face (list 'highlight)
+                                         'occur-target marker
+                                         'follow-link t
+                                         'help-echo
+                                         "mouse-2: go to this occurrence")
                              "\n"))
                            (data
                             (if (= nlines 0)
@@ -1154,11 +1160,7 @@ See also `multi-occur'."
                         (let ((beg (point))
                               (end (progn (insert data) (point))))
                           (unless (= nlines 0)
-                            (insert "-------\n"))
-                          (add-text-properties
-                           beg end
-                           `(occur-target ,marker follow-link t
-                                          help-echo "mouse-2: go to this occurrence")))))
+                            (insert "-------\n")))))
                     (goto-char endpt))
                   (if endpt
                       (progn
diff --git a/lisp/savehist.el b/lisp/savehist.el
index efbc1e934a6..98012d02114 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -1,10 +1,10 @@
 ;;; savehist.el --- Save minibuffer history.
 
-;; Copyright (C) 1997, 2005 Free Software Foundation
+;; Copyright (C) 1997,2005 Free Software Foundation
 
 ;; Author: Hrvoje Niksic <hniksic@xemacs.org>
 ;; Keywords: minibuffer
-;; Version: 7
+;; Version: 9
 
 ;; This file is part of GNU Emacs.
 
@@ -27,24 +27,25 @@
 
 ;; Many editors (e.g. Vim) have the feature of saving minibuffer
 ;; history to an external file after exit.  This package provides the
-;; same feature in Emacs.  When Emacs is about the exit,
-;; `savehist-save' will dump the contents of various minibuffer
-;; histories (as determined by `savehist-history-variables') to a save
-;; file (`~/.emacs-history' by default).  Although the package was
-;; designed for saving the minibuffer histories, any variables can be
-;; saved that way.
+;; same feature in Emacs.  When set up, it saves recorded minibuffer
+;; histories to a file (`~/.emacs-history' by default).  Additional
+;; variables may be specified by customizing
+;; `savehist-additional-variables'.
 
 ;; To use savehist, put the following to `~/.emacs':
 ;;
 ;; (require 'savehist)
 ;; (savehist-load)
 
-;; Be sure to have `savehist.el' in a directory that is in your
-;; load-path, and byte-compile it.
+;; If you are using a version of Emacs that does not ship with this
+;; package, be sure to have `savehist.el' in a directory that is in
+;; your load-path, and to byte-compile it.
 
 ;;; Code:
 
 (require 'custom)
+(eval-when-compile
+  (require 'cl))
 
 ;; User variables
 
@@ -52,65 +53,25 @@
   "Save minibuffer history."
   :group 'minibuffer)
 
-(defcustom savehist-history-variables
-  '(
-    ;; Catch-all minibuffer history
-    minibuffer-history
-    ;; File-oriented commands
-    file-name-history
-    ;; Regexp-related reads
-    regexp-history
-    ;; Searches in minibuffer (via `M-r' and such)
-    minibuffer-history-search-history
-    ;; Query replace
-    query-replace-history
-    ;; eval-expression (`M-:')
-    read-expression-history
-    ;; shell-command (`M-!')
-    shell-command-history
-    ;; compile
-    compile-history
-    ;; find-tag (`M-.')
-    find-tag-history
-    ;; grep
-    grep-history
-    ;; Viper stuff
-    vip-ex-history vip-search-history
-    vip-replace1-history vip-replace2-history
-    vip-shell-history vip-search-history
-
-    ;; XEmacs-specific:
-    ;; Buffer-related commands
-    buffer-history
-    ;; Reads of variables and functions
-    variable-history function-history
-    ;; Extended commands
-    read-command-history
-
-    ;; Info, lookup, and bookmark historys
-    Info-minibuffer-history
-    Info-search-history
-    Manual-page-minibuffer-history
-
-    ;; Emacs-specific:
-    ;; Extended commands
-    extended-command-history)
-  "*List of symbols to be saved.
-Every symbol should refer to a variable.  The variable will be saved
-only if it is bound and has a non-nil value.  Thus it is safe to
-specify a superset of the variables a user is expected to want to
-save.
-
-Default value contains minibuffer history variables used by Emacs, XEmacs,
-and Viper (uh-oh).  Note that, if you customize this variable, you
-can lose the benefit of future versions of Emacs adding new values to
-the list.  Because of that it might be more useful to add values using
-`add-to-list'."
+(defcustom savehist-save-minibuffer-history t
+  "If non-nil, save all recorded minibuffer histories."
+  :type 'boolean
+  :group 'savehist)
+
+(defcustom savehist-additional-variables ()
+  "List of additional variables to save.
+Each element is a symbol whose value will be persisted across Emacs
+sessions that use savehist.  The contents of variables should be
+printable with the Lisp printer.  If the variable's value is a list,
+it will be trimmed to `savehist-length' elements.
+
+You don't need to add minibuffer history variables to this list.  All
+minibuffer histories will be saved automatically."
   :type '(repeat (symbol :tag "Variable"))
   :group 'savehist)
 
 (defcustom savehist-file "~/.emacs-history"
-  "*File name to save minibuffer history to.
+  "File name to save minibuffer history to.
 The minibuffer history is a series of Lisp expressions, which should be
 loaded using `savehist-load' from your .emacs.  See `savehist-load' for
 more details."
@@ -118,14 +79,15 @@ more details."
   :group 'savehist)
 
 (defcustom savehist-length 100
-  "*Maximum length of a minibuffer list.
-If set to nil, the length is unlimited."
+  "Maximum length of a minibuffer list.
+Minibuffer histories with more entries are trimmed when saved, the older
+entries being removed first.  If set to nil, the length is unlimited."
   :type '(choice integer
                  (const :tag "Unlimited" nil))
   :group 'savehist)
 
 (defcustom savehist-modes #o600
-  "*Default permissions of the history file.
+  "Default permissions of the history file.
 This is decimal, not octal.  The default is 384 (0600 in octal).
 Set to nil to use the default permissions that Emacs uses, typically
 mandated by umask.  The default is a bit more restrictive to protect
@@ -134,7 +96,7 @@ the user's privacy."
   :group 'savehist)
 
 (defcustom savehist-autosave-interval (* 5 60)
-  "*The interval during which savehist should autosave the history buffer."
+  "The interval during which savehist should autosave the history buffer."
   :type 'integer
   :group 'savehist)
 
@@ -154,46 +116,65 @@ unwise, unless you know what you are doing.")
 
 (defvar savehist-last-checksum nil)
 
+(defvar savehist-minibuffer-history-variables nil)
+
 (defconst savehist-no-conversion (if (featurep 'xemacs) 'binary 'no-conversion)
-  ;; FIXME: Why not use savehist-coding-system?
-  "Coding system without conversion, only used for calculating checksums.")
+  "Coding system without conversion, only used for calculating checksums.
+It should be as discriminating as `savehist-coding-system' but faster.")
 
-;; Functions
+;; Functions.
+
+(defun savehist-install ()
+  "Hook savehist into Emacs.
+This will install `savehist-autosave' in `kill-emacs-hook' and on a timer.
+To undo this, call `savehist-uninstall'."
+  (add-hook 'minibuffer-setup-hook 'savehist-minibuffer-hook)
+  (add-hook 'kill-emacs-hook 'savehist-autosave)
+  ;; Install an invocation of savehist-autosave on a timer.  This
+  ;; should not cause noticeable delays for users -- savehist-autosave
+  ;; executes in under 5 ms on my system.
+  (unless savehist-timer
+    (setq savehist-timer
+          (if (featurep 'xemacs)
+              (start-itimer
+               "savehist" 'savehist-autosave savehist-autosave-interval
+               savehist-autosave-interval)
+            (run-with-timer savehist-autosave-interval savehist-autosave-interval
+                            'savehist-autosave)))))
+
+(defun savehist-uninstall ()
+  "Undo installing savehist."
+  (remove-hook 'minibuffer-setup-hook 'savehist-minibuffer-hook)
+  (remove-hook 'kill-emacs-hook 'savehist-autosave)
+  (when savehist-timer
+    (if (featurep 'xemacs)
+        (delete-itimer savehist-timer)
+      (cancel-timer savehist-timer))
+    (setq savehist-timer nil)))
 
 ;;;###autoload
-(defun savehist-load (&optional no-hook)
+(defun savehist-load (&optional no-install)
   "Load the minibuffer histories from `savehist-file'.
-Unless NO-HOOK is specified, the function will also add the save function
-to `kill-emacs-hook' and on a timer, ensuring that the minibuffer contents
-will be saved before leaving Emacs.
+Unless NO-INSTALL is present and non-nil, the function will also install
+`savehist-autosave' in `kill-emacs-hook' and on a timer, ensuring that
+history is saved before leaving Emacs.
 
-This function should be normally used from your Emacs init file.  Since it
-removes your current minibuffer histories, it is unwise to call it at any
-other time."
+This function should be normally used from your Emacs init file.  Since
+it removes your current minibuffer histories, it is unwise to call it at
+any other time."
   (interactive "P")
-  (unless no-hook
-    (add-hook 'kill-emacs-hook 'savehist-autosave)
-    ;; Install an invocation of savehist-autosave on a timer.  This
-    ;; should not cause a noticeable delay -- savehist-autosave
-    ;; executes in under 5 ms on my system.
-    (unless savehist-timer
-      (setq savehist-timer
-            (if (featurep 'xemacs)
-                (start-itimer
-                 "savehist" 'savehist-autosave savehist-autosave-interval
-                 savehist-autosave-interval)
-              (run-with-idle-timer savehist-autosave-interval savehist-autosave-interval
-                                   'savehist-autosave)))))
   ;; Don't set coding-system-for-read here.  We rely on autodetection
   ;; and the coding cookie to convey that information.  That way, if
   ;; the user changes the value of savehist-coding-system, we can
   ;; still correctly load the old file.
-  (load savehist-file t (not (interactive-p))))
+  (load savehist-file t (not (interactive-p)))
+  (unless no-install
+    (savehist-install)))
 
 ;;;###autoload
 (defun savehist-save (&optional auto-save)
-  "Save the histories from `savehist-history-variables' to `savehist-file'.
-Unbound symbols referenced in `savehist-history-variables' are ignored.
+  "Save the values of minibuffer history variables.
+Unbound symbols referenced in `savehist-additional-variables' are ignored.
 If AUTO-SAVE is non-nil, compare the saved contents to the one last saved,
  and don't save the buffer if they are the same."
   (interactive)
@@ -205,8 +186,13 @@ If AUTO-SAVE is non-nil, compare the saved contents to the one last saved,
           (print-string-length nil)
           (print-level nil)
           (print-readably t)
-          (print-quoted t))
-      (dolist (sym savehist-history-variables)
+          (print-quoted t)
+          (symbol-list (append
+                        (and savehist-save-minibuffer-history
+                             (cons 'savehist-minibuffer-history-variables
+                                   savehist-minibuffer-history-variables))
+                        savehist-additional-variables)))
+      (dolist (sym symbol-list)
         (when (boundp sym)
           (let ((value (savehist-process-for-saving (symbol-value sym))))
             (prin1 `(setq ,sym ',value) (current-buffer))
@@ -217,8 +203,9 @@ If AUTO-SAVE is non-nil, compare the saved contents to the one last saved,
       (unless (and auto-save (equal checksum savehist-last-checksum))
         ;; Set file-precious-flag when saving the buffer because we
         ;; don't want a half-finished write ruining the entire
-        ;; history.  (Remember that this is run from a timer and from
-        ;; kill-emacs-hook.)
+        ;; history.  Remember that this is run from a timer and from
+        ;; kill-emacs-hook, and also that multiple Emacs instances
+        ;; could write to this file at once.
         (let ((file-precious-flag t)
               (coding-system-for-write savehist-coding-system))
           (write-region (point-min) (point-max) savehist-file nil
@@ -269,6 +256,10 @@ If AUTO-SAVE is non-nil, compare the saved contents to the one last saved,
       ;; The attempt failed: the object is not printable.
       (error nil)))))
 
+(defun savehist-minibuffer-hook ()
+  (add-to-list 'savehist-minibuffer-history-variables
+               minibuffer-history-variable))
+
 (provide 'savehist)
 
 ;; arch-tag: b3ce47f4-c5ad-4ebc-ad02-73aba705cf9f
diff --git a/lisp/server.el b/lisp/server.el
index 55e3005e981..b313986d6a2 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -308,6 +308,11 @@ message."
 
 (defun server-sentinel (proc msg)
   "The process sentinel for Emacs server connections."
+  ;; If this is a new client process, set the query-on-exit flag to nil
+  ;; for this process (it isn't inherited from the server process).
+  (when (and (eq (process-status proc) 'open)
+             (process-query-on-exit-flag proc))
+    (set-process-query-on-exit-flag proc nil))
   (server-log (format "Status changed to %s: %s" (process-status proc) msg) proc)
   (server-delete-client proc))
 
diff --git a/lisp/simple.el b/lisp/simple.el
index 8e481fb7231..2602c35c094 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3545,10 +3545,11 @@ Outline mode sets this."
              ;; Compute the end of the line
              ;; ignoring effectively invisible newlines.
              (save-excursion
-               (end-of-line)
+               ;; Like end-of-line but ignores fields.
+               (skip-chars-forward "^\n")
                (while (and (not (eobp)) (line-move-invisible-p (point)))
                  (goto-char (next-char-property-change (point)))
-                 (end-of-line))
+                 (skip-chars-forward "^\n"))
                (point))))
 
         ;; Move to the desired column.
@@ -4924,11 +4925,11 @@ is the substring.)")
                       (funcall (get minibuffer-completion-table 'completion-base-size-function)))
               (setq completion-base-size 0))))
       ;; Put faces on first uncommon characters and common parts.
-      (when (or completion-base-size completion-common-substring)
+      (when (or completion-common-substring completion-base-size)
         (let* ((common-string-length
-                (if completion-base-size
-                    (- (length mbuf-contents) completion-base-size)
-                  (length completion-common-substring)))
+                (if completion-common-substring
+                    (length completion-common-substring)
+                  (- (length mbuf-contents) completion-base-size)))
                (element-start (next-single-property-change
                                (point-min)
                                'mouse-face))
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index e777f3f8211..87c572372b0 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -4,7 +4,7 @@
 ;;   2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
-;; Keywords: revision-control merge diff3 cvs conflict
+;; Keywords: tools revision-control merge diff3 cvs conflict
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/subr.el b/lisp/subr.el
index 5bc2c3dcc1a..944f73b0365 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -37,7 +37,7 @@ Each element of this list holds the arguments to one call to `defcustom'.")
         (cons arguments custom-declare-variable-list)))
 
 
-;;;; Lisp language features.
+;;;; Basic Lisp macros.
 
 (defalias 'not 'null)
 
@@ -144,6 +144,47 @@ the return value (nil if RESULT is omitted).
 Treated as a declaration when used at the right place in a
 `defmacro' form.  \(See Info anchor `(elisp)Definition of declare'.)"
   nil)
+
+;;;; Basic Lisp functions.
+
+(defun ignore (&rest ignore)
+  "Do nothing and return nil.
+This function accepts any number of arguments, but ignores them."
+  (interactive)
+  nil)
+
+(defun error (&rest args)
+  "Signal an error, making error message by passing all args to `format'.
+In Emacs, the convention is that error messages start with a capital
+letter but *do not* end with a period.  Please follow this convention
+for the sake of consistency."
+  (while t
+    (signal 'error (list (apply 'format args)))))
+
+;; We put this here instead of in frame.el so that it's defined even on
+;; systems where frame.el isn't loaded.
+(defun frame-configuration-p (object)
+  "Return non-nil if OBJECT seems to be a frame configuration.
+Any list whose car is `frame-configuration' is assumed to be a frame
+configuration."
+  (and (consp object)
+       (eq (car object) 'frame-configuration)))
+
+(defun functionp (object)
+  "Non-nil if OBJECT is any kind of function or a special form.
+Also non-nil if OBJECT is a symbol and its function definition is
+\(recursively) a function or special form.  This does not include
+macros."
+  (or (and (symbolp object) (fboundp object)
+           (condition-case nil
+               (setq object (indirect-function object))
+             (error nil))
+           (eq (car-safe object) 'autoload)
+           (not (car-safe (cdr-safe (cdr-safe (cdr-safe (cdr-safe object)))))))
+      (subrp object) (byte-code-function-p object)
+      (eq (car-safe object) 'lambda)))
+
+;;;; List functions.
 
 (defsubst caar (x)
   "Return the car of the car of X."
@@ -240,23 +281,6 @@ of course, also replace TO with a slightly larger value
                 next (+ from (* n inc)))))
       (nreverse seq))))
 
-(defun remove (elt seq)
-  "Return a copy of SEQ with all occurrences of ELT removed.
-SEQ must be a list, vector, or string.  The comparison is done with `equal'."
-  (if (nlistp seq)
-      ;; If SEQ isn't a list, there's no need to copy SEQ because
-      ;; `delete' will return a new object.
-      (delete elt seq)
-    (delete elt (copy-sequence seq))))
-
-(defun remq (elt list)
-  "Return LIST with all occurrences of ELT removed.
-The comparison is done with `eq'.  Contrary to `delq', this does not use
-side-effects, and the argument LIST is not modified."
-  (if (memq elt list)
-      (delq elt (copy-sequence list))
-    list))
-
 (defun copy-tree (tree &optional vecp)
   "Make a copy of TREE.
 If TREE is a cons cell, this recursively copies both its car and its cdr.
@@ -277,6 +301,8 @@ argument VECP, this copies vectors as well as conses."
             (aset tree i (copy-tree (aref tree i) vecp)))
           tree)
       tree)))
+
+;;;; Various list-search functions.
 
 (defun assoc-default (key alist &optional test default)
   "Find object KEY in a pseudo-alist ALIST.
@@ -321,15 +347,67 @@ Non-strings in LIST are ignored."
     (setq list (cdr list)))
   list)
 
+(defun assq-delete-all (key alist)
+  "Delete from ALIST all elements whose car is `eq' to KEY.
+Return the modified alist.
+Elements of ALIST that are not conses are ignored."
+  (while (and (consp (car alist))
+              (eq (car (car alist)) key))
+    (setq alist (cdr alist)))
+  (let ((tail alist) tail-cdr)
+    (while (setq tail-cdr (cdr tail))
+      (if (and (consp (car tail-cdr))
+               (eq (car (car tail-cdr)) key))
+          (setcdr tail (cdr tail-cdr))
+        (setq tail tail-cdr))))
+  alist)
+
+(defun rassq-delete-all (value alist)
+  "Delete from ALIST all elements whose cdr is `eq' to VALUE.
+Return the modified alist.
+Elements of ALIST that are not conses are ignored."
+  (while (and (consp (car alist))
+              (eq (cdr (car alist)) value))
+    (setq alist (cdr alist)))
+  (let ((tail alist) tail-cdr)
+    (while (setq tail-cdr (cdr tail))
+      (if (and (consp (car tail-cdr))
+               (eq (cdr (car tail-cdr)) value))
+          (setcdr tail (cdr tail-cdr))
+        (setq tail tail-cdr))))
+  alist)
+
+(defun remove (elt seq)
+  "Return a copy of SEQ with all occurrences of ELT removed.
+SEQ must be a list, vector, or string.  The comparison is done with `equal'."
+  (if (nlistp seq)
+      ;; If SEQ isn't a list, there's no need to copy SEQ because
+      ;; `delete' will return a new object.
+      (delete elt seq)
+    (delete elt (copy-sequence seq))))
+
+(defun remq (elt list)
+  "Return LIST with all occurrences of ELT removed.
+The comparison is done with `eq'.  Contrary to `delq', this does not use
+side-effects, and the argument LIST is not modified."
+  (if (memq elt list)
+      (delq elt (copy-sequence list))
+    list))
 
 ;;;; Keymap support.
 
+(defmacro kbd (keys)
+  "Convert KEYS to the internal Emacs key representation.
+KEYS should be a string constant in the format used for
+saving keyboard macros (see `edmacro-mode')."
+  (read-kbd-macro keys))
+
 (defun undefined ()
   (interactive)
   (ding))
 
-;Prevent the \{...} documentation construct
-;from mentioning keys that run this command.
+;; Prevent the \{...} documentation construct
+;; from mentioning keys that run this command.
 (put 'undefined 'suppress-keymap t)
 
 (defun suppress-keymap (map &optional nodigits)
@@ -346,76 +424,6 @@ but optional second arg NODIGITS non-nil treats them like other chars."
           (define-key map (char-to-string loop) 'digit-argument)
           (setq loop (1+ loop))))))
 
-(defvar key-substitution-in-progress nil
- "Used internally by `substitute-key-definition'.")
-
-(defun substitute-key-definition (olddef newdef keymap &optional oldmap prefix)
-  "Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF.
-In other words, OLDDEF is replaced with NEWDEF where ever it appears.
-Alternatively, if optional fourth argument OLDMAP is specified, we redefine
-in KEYMAP as NEWDEF those keys which are defined as OLDDEF in OLDMAP.
-
-For most uses, it is simpler and safer to use command remappping like this:
-  \(define-key KEYMAP [remap OLDDEF] NEWDEF)"
-  ;; Don't document PREFIX in the doc string because we don't want to
-  ;; advertise it.  It's meant for recursive calls only.  Here's its
-  ;; meaning
-
-  ;; If optional argument PREFIX is specified, it should be a key
-  ;; prefix, a string.  Redefined bindings will then be bound to the
-  ;; original key, with PREFIX added at the front.
-  (or prefix (setq prefix ""))
-  (let* ((scan (or oldmap keymap))
-         (prefix1 (vconcat prefix [nil]))
-         (key-substitution-in-progress
-          (cons scan key-substitution-in-progress)))
-    ;; Scan OLDMAP, finding each char or event-symbol that
-    ;; has any definition, and act on it with hack-key.
-    (map-keymap
-     (lambda (char defn)
-       (aset prefix1 (length prefix) char)
-       (substitute-key-definition-key defn olddef newdef prefix1 keymap))
-     scan)))
-
-(defun substitute-key-definition-key (defn olddef newdef prefix keymap)
-  (let (inner-def skipped menu-item)
-    ;; Find the actual command name within the binding.
-    (if (eq (car-safe defn) 'menu-item)
-        (setq menu-item defn defn (nth 2 defn))
-      ;; Skip past menu-prompt.
-      (while (stringp (car-safe defn))
-        (push (pop defn) skipped))
-      ;; Skip past cached key-equivalence data for menu items.
-      (if (consp (car-safe defn))
-          (setq defn (cdr defn))))
-    (if (or (eq defn olddef)
-            ;; Compare with equal if definition is a key sequence.
-            ;; That is useful for operating on function-key-map.
-            (and (or (stringp defn) (vectorp defn))
-                 (equal defn olddef)))
-        (define-key keymap prefix
-          (if menu-item
-              (let ((copy (copy-sequence menu-item)))
-                (setcar (nthcdr 2 copy) newdef)
-                copy)
-            (nconc (nreverse skipped) newdef)))
-      ;; Look past a symbol that names a keymap.
-      (setq inner-def
-            (and defn
-                 (condition-case nil (indirect-function defn) (error defn))))
-      ;; For nested keymaps, we use `inner-def' rather than `defn' so as to
-      ;; avoid autoloading a keymap.  This is mostly done to preserve the
-      ;; original non-autoloading behavior of pre-map-keymap times.
-      (if (and (keymapp inner-def)
-               ;; Avoid recursively scanning
-               ;; where KEYMAP does not have a submap.
-               (let ((elt (lookup-key keymap prefix)))
-                 (or (null elt) (natnump elt) (keymapp elt)))
-               ;; Avoid recursively rescanning keymap being scanned.
-               (not (memq inner-def key-substitution-in-progress)))
-          ;; If this one isn't being scanned already, scan it now.
-          (substitute-key-definition olddef newdef keymap inner-def prefix)))))
-
 (defun define-key-after (keymap key definition &optional after)
   "Add binding in KEYMAP for KEY => DEFINITION, right after AFTER's binding.
 This is like `define-key' except that the binding for KEY is placed
@@ -483,12 +491,6 @@ Don't call this function; it is for internal use only."
           (funcall function (car p) (cdr p))))
     (map-keymap function keymap)))
 
-(defmacro kbd (keys)
-  "Convert KEYS to the internal Emacs key representation.
-KEYS should be a string constant in the format used for
-saving keyboard macros (see `edmacro-mode')."
-  (read-kbd-macro keys))
-
 (put 'keyboard-translate-table 'char-table-extra-slots 0)
 
 (defun keyboard-translate (from to)
@@ -496,8 +498,131 @@ saving keyboard macros (see `edmacro-mode')."
 This function creates a `keyboard-translate-table' if necessary
 and then modifies one entry in it."
   (or (char-table-p keyboard-translate-table)
-      (setq keyboard-translate-table (make-char-table 'keyboard-translate-table nil)))
-    (aset keyboard-translate-table from to))
+      (setq keyboard-translate-table
+            (make-char-table 'keyboard-translate-table nil)))
+  (aset keyboard-translate-table from to))
+
+;;;; Key binding commands.
+
+(defun global-set-key (key command)
+  "Give KEY a global binding as COMMAND.
+COMMAND is the command definition to use; usually it is
+a symbol naming an interactively-callable function.
+KEY is a key sequence; noninteractively, it is a string or vector
+of characters or event types, and non-ASCII characters with codes
+above 127 (such as ISO Latin-1) can be included if you use a vector.
+
+Note that if KEY has a local binding in the current buffer,
+that local binding will continue to shadow any global binding
+that you make with this function."
+  (interactive "KSet key globally: \nCSet key %s to command: ")
+  (or (vectorp key) (stringp key)
+      (signal 'wrong-type-argument (list 'arrayp key)))
+  (define-key (current-global-map) key command))
+
+(defun local-set-key (key command)
+  "Give KEY a local binding as COMMAND.
+COMMAND is the command definition to use; usually it is
+a symbol naming an interactively-callable function.
+KEY is a key sequence; noninteractively, it is a string or vector
+of characters or event types, and non-ASCII characters with codes
+above 127 (such as ISO Latin-1) can be included if you use a vector.
+
+The binding goes in the current buffer's local map,
+which in most cases is shared with all other buffers in the same major mode."
+  (interactive "KSet key locally: \nCSet key %s locally to command: ")
+  (let ((map (current-local-map)))
+    (or map
+        (use-local-map (setq map (make-sparse-keymap))))
+    (or (vectorp key) (stringp key)
+        (signal 'wrong-type-argument (list 'arrayp key)))
+    (define-key map key command)))
+
+(defun global-unset-key (key)
+  "Remove global binding of KEY.
+KEY is a string or vector representing a sequence of keystrokes."
+  (interactive "kUnset key globally: ")
+  (global-set-key key nil))
+
+(defun local-unset-key (key)
+  "Remove local binding of KEY.
+KEY is a string or vector representing a sequence of keystrokes."
+  (interactive "kUnset key locally: ")
+  (if (current-local-map)
+      (local-set-key key nil))
+  nil)
+
+;;;; substitute-key-definition and its subroutines.
+
+(defvar key-substitution-in-progress nil
+ "Used internally by `substitute-key-definition'.")
+
+(defun substitute-key-definition (olddef newdef keymap &optional oldmap prefix)
+  "Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF.
+In other words, OLDDEF is replaced with NEWDEF where ever it appears.
+Alternatively, if optional fourth argument OLDMAP is specified, we redefine
+in KEYMAP as NEWDEF those keys which are defined as OLDDEF in OLDMAP.
+
+For most uses, it is simpler and safer to use command remappping like this:
+  \(define-key KEYMAP [remap OLDDEF] NEWDEF)"
+  ;; Don't document PREFIX in the doc string because we don't want to
+  ;; advertise it.  It's meant for recursive calls only.  Here's its
+  ;; meaning
+
+  ;; If optional argument PREFIX is specified, it should be a key
+  ;; prefix, a string.  Redefined bindings will then be bound to the
+  ;; original key, with PREFIX added at the front.
+  (or prefix (setq prefix ""))
+  (let* ((scan (or oldmap keymap))
+         (prefix1 (vconcat prefix [nil]))
+         (key-substitution-in-progress
+          (cons scan key-substitution-in-progress)))
+    ;; Scan OLDMAP, finding each char or event-symbol that
+    ;; has any definition, and act on it with hack-key.
+    (map-keymap
+     (lambda (char defn)
+       (aset prefix1 (length prefix) char)
+       (substitute-key-definition-key defn olddef newdef prefix1 keymap))
+     scan)))
+
+(defun substitute-key-definition-key (defn olddef newdef prefix keymap)
+  (let (inner-def skipped menu-item)
+    ;; Find the actual command name within the binding.
+    (if (eq (car-safe defn) 'menu-item)
+        (setq menu-item defn defn (nth 2 defn))
+      ;; Skip past menu-prompt.
+      (while (stringp (car-safe defn))
+        (push (pop defn) skipped))
+      ;; Skip past cached key-equivalence data for menu items.
+      (if (consp (car-safe defn))
+          (setq defn (cdr defn))))
+    (if (or (eq defn olddef)
+            ;; Compare with equal if definition is a key sequence.
+            ;; That is useful for operating on function-key-map.
+            (and (or (stringp defn) (vectorp defn))
+                 (equal defn olddef)))
+        (define-key keymap prefix
+          (if menu-item
+              (let ((copy (copy-sequence menu-item)))
+                (setcar (nthcdr 2 copy) newdef)
+                copy)
+            (nconc (nreverse skipped) newdef)))
+      ;; Look past a symbol that names a keymap.
+      (setq inner-def
+            (and defn
+                 (condition-case nil (indirect-function defn) (error defn))))
+      ;; For nested keymaps, we use `inner-def' rather than `defn' so as to
+      ;; avoid autoloading a keymap.  This is mostly done to preserve the
+      ;; original non-autoloading behavior of pre-map-keymap times.
+      (if (and (keymapp inner-def)
+               ;; Avoid recursively scanning
+               ;; where KEYMAP does not have a submap.
+               (let ((elt (lookup-key keymap prefix)))
+                 (or (null elt) (natnump elt) (keymapp elt)))
+               ;; Avoid recursively rescanning keymap being scanned.
+               (not (memq inner-def key-substitution-in-progress)))
+          ;; If this one isn't being scanned already, scan it now.
+          (substitute-key-definition olddef newdef keymap inner-def prefix)))))
 
 
 ;;;; The global keymap tree.
@@ -641,6 +766,8 @@ The `posn-' functions access elements of such lists."
   "Return the multi-click count of EVENT, a click or drag event.
 The return value is a positive integer."
   (if (and (consp event) (integerp (nth 2 event))) (nth 2 event) 1))
+
+;;;; Extracting fields of the positions in an event.
 
 (defsubst posn-window (position)
   "Return the window in POSITION.
@@ -830,6 +957,8 @@ is converted into a string by expressing it in decimal."
 (defalias 'point-at-eol 'line-end-position)
 (defalias 'point-at-bol 'line-beginning-position)
 
+(defalias 'user-original-login-name 'user-login-name)
+
 
 ;;;; Hook manipulation functions.
 
@@ -990,7 +1119,143 @@ The return value is the new value of LIST-VAR."
                             (if (and oa ob)
                                 (< oa ob)
                               oa)))))))
+
+;;;; Mode hooks.
 
+(defvar delay-mode-hooks nil
+  "If non-nil, `run-mode-hooks' should delay running the hooks.")
+(defvar delayed-mode-hooks nil
+  "List of delayed mode hooks waiting to be run.")
+(make-variable-buffer-local 'delayed-mode-hooks)
+(put 'delay-mode-hooks 'permanent-local t)
+
+(defvar after-change-major-mode-hook nil
+  "Normal hook run at the very end of major mode functions.")
+
+(defun run-mode-hooks (&rest hooks)
+  "Run mode hooks `delayed-mode-hooks' and HOOKS, or delay HOOKS.
+Execution is delayed if `delay-mode-hooks' is non-nil.
+If `delay-mode-hooks' is nil, run `after-change-major-mode-hook'
+after running the mode hooks.
+Major mode functions should use this."
+  (if delay-mode-hooks
+      ;; Delaying case.
+      (dolist (hook hooks)
+        (push hook delayed-mode-hooks))
+    ;; Normal case, just run the hook as before plus any delayed hooks.
+    (setq hooks (nconc (nreverse delayed-mode-hooks) hooks))
+    (setq delayed-mode-hooks nil)
+    (apply 'run-hooks hooks)
+    (run-hooks 'after-change-major-mode-hook)))
+
+(defmacro delay-mode-hooks (&rest body)
+  "Execute BODY, but delay any `run-mode-hooks'.
+These hooks will be executed by the first following call to
+`run-mode-hooks' that occurs outside any `delayed-mode-hooks' form.
+Only affects hooks run in the current buffer."
+  (declare (debug t) (indent 0))
+  `(progn
+     (make-local-variable 'delay-mode-hooks)
+     (let ((delay-mode-hooks t))
+       ,@body)))
+
+;; PUBLIC: find if the current mode derives from another.
+
+(defun derived-mode-p (&rest modes)
+  "Non-nil if the current major mode is derived from one of MODES.
+Uses the `derived-mode-parent' property of the symbol to trace backwards."
+  (let ((parent major-mode))
+    (while (and (not (memq parent modes))
+                (setq parent (get parent 'derived-mode-parent))))
+    parent))
+
+;;;; Minor modes.
+
+;; If a minor mode is not defined with define-minor-mode,
+;; add it here explicitly.
+;; isearch-mode is deliberately excluded, since you should
+;; not call it yourself.
+(defvar minor-mode-list '(auto-save-mode auto-fill-mode abbrev-mode
+                                         overwrite-mode view-mode
+                                         hs-minor-mode)
+  "List of all minor mode functions.")
+
+(defun add-minor-mode (toggle name &optional keymap after toggle-fun)
+  "Register a new minor mode.
+
+This is an XEmacs-compatibility function.  Use `define-minor-mode' instead.
+
+TOGGLE is a symbol which is the name of a buffer-local variable that
+is toggled on or off to say whether the minor mode is active or not.
+
+NAME specifies what will appear in the mode line when the minor mode
+is active.  NAME should be either a string starting with a space, or a
+symbol whose value is such a string.
+
+Optional KEYMAP is the keymap for the minor mode that will be added
+to `minor-mode-map-alist'.
+
+Optional AFTER specifies that TOGGLE should be added after AFTER
+in `minor-mode-alist'.
+
+Optional TOGGLE-FUN is an interactive function to toggle the mode.
+It defaults to (and should by convention be) TOGGLE.
+
+If TOGGLE has a non-nil `:included' property, an entry for the mode is
+included in the mode-line minor mode menu.
+If TOGGLE has a `:menu-tag', that is used for the menu item's label."
+  (unless (memq toggle minor-mode-list)
+    (push toggle minor-mode-list))
+
+  (unless toggle-fun (setq toggle-fun toggle))
+  (unless (eq toggle-fun toggle)
+    (put toggle :minor-mode-function toggle-fun))
+  ;; Add the name to the minor-mode-alist.
+  (when name
+    (let ((existing (assq toggle minor-mode-alist)))
+      (if existing
+          (setcdr existing (list name))
+        (let ((tail minor-mode-alist) found)
+          (while (and tail (not found))
+            (if (eq after (caar tail))
+                (setq found tail)
+              (setq tail (cdr tail))))
+          (if found
+              (let ((rest (cdr found)))
+                (setcdr found nil)
+                (nconc found (list (list toggle name)) rest))
+            (setq minor-mode-alist (cons (list toggle name)
+                                         minor-mode-alist)))))))
+  ;; Add the toggle to the minor-modes menu if requested.
+  (when (get toggle :included)
+    (define-key mode-line-mode-menu
+      (vector toggle)
+      (list 'menu-item
+            (concat
+             (or (get toggle :menu-tag)
+                 (if (stringp name) name (symbol-name toggle)))
+             (let ((mode-name (if (symbolp name) (symbol-value name))))
+               (if (and (stringp mode-name) (string-match "[^ ]+" mode-name))
+                   (concat " (" (match-string 0 mode-name) ")"))))
+            toggle-fun
+            :button (cons :toggle toggle))))
+
+  ;; Add the map to the minor-mode-map-alist.
+  (when keymap
+    (let ((existing (assq toggle minor-mode-map-alist)))
+      (if existing
+          (setcdr existing keymap)
+        (let ((tail minor-mode-map-alist) found)
+          (while (and tail (not found))
+            (if (eq after (caar tail))
+                (setq found tail)
+              (setq tail (cdr tail))))
+          (if found
+              (let ((rest (cdr found)))
+                (setcdr found nil)
+                (nconc found (list (cons toggle keymap)) rest))
+            (setq minor-mode-map-alist (cons (cons toggle keymap)
+                                             minor-mode-map-alist))))))))
 
 ;;; Load history
 
@@ -1045,7 +1310,23 @@ definition only or variable definition only.
       file)))
 
 
-;;;; Specifying things to do after certain files are loaded.
+;;;; Specifying things to do later.
+
+(defmacro eval-at-startup (&rest body)
+  "Make arrangements to evaluate BODY when Emacs starts up.
+If this is run after Emacs startup, evaluate BODY immediately.
+Always returns nil.
+
+This works by adding a function to `before-init-hook'.
+That function's doc string says which file created it."
+  `(progn
+     (if command-line-processed
+         (progn . ,body)
+       (add-hook 'before-init-hook
+                 '(lambda () ,(concat "From " (or load-file-name "no file"))
+                    . ,body)
+                 t))
+     nil))
 
 (defun eval-after-load (file form)
   "Arrange that, if FILE is ever loaded, FORM will be run at that time.
@@ -1069,7 +1350,8 @@ evaluated whenever that feature is `provide'd."
             ;; Make sure `load-history' contains the files dumped with
             ;; Emacs for the case that FILE is one of them.
             ;; (load-symbol-file-load-history)
-            (assoc file load-history))
+            (when (locate-library file)
+              (assoc (locate-library file) load-history)))
           (eval form))))
   form)
 
@@ -1079,7 +1361,9 @@ This makes or adds to an entry on `after-load-alist'.
 FILE should be the name of a library, with no directory name."
   (eval-after-load file (read)))
 
-;;; open-network-stream is a wrapper around make-network-process.
+;;;; Process stuff.
+
+;; open-network-stream is a wrapper around make-network-process.
 
 (when (featurep 'make-network-process)
   (defun open-network-stream (name buffer host service)
@@ -1379,6 +1663,8 @@ This finishes the change group by reverting all of its changes."
         ;; Revert the undo info to what it was when we grabbed the state.
         (setq buffer-undo-list elt)))))
 
+;;;; Display-related functions.
+
 ;; For compatibility.
 (defalias 'redraw-modeline 'force-mode-line-update)
 
@@ -1516,34 +1802,85 @@ mode.")
 This variable is meaningful on MS-DOG and Windows NT.
 On those systems, it is automatically local in every buffer.
 On other systems, this variable is normally always nil.")
+
+;;;; Misc. useful functions.
+
+(defun find-tag-default ()
+  "Determine default tag to search for, based on text at point.
+If there is no plausible default, return nil."
+  (save-excursion
+    (while (looking-at "\\sw\\|\\s_")
+      (forward-char 1))
+    (if (or (re-search-backward "\\sw\\|\\s_"
+                                (save-excursion (beginning-of-line) (point))
+                                t)
+            (re-search-forward "\\(\\sw\\|\\s_\\)+"
+                               (save-excursion (end-of-line) (point))
+                               t))
+        (progn
+          (goto-char (match-end 0))
+          (condition-case nil
+              (buffer-substring-no-properties
+               (point)
+               (progn (forward-sexp -1)
+                      (while (looking-at "\\s'")
+                        (forward-char 1))
+                      (point)))
+            (error nil)))
+      nil)))
 
-;; This should probably be written in C (i.e., without using `walk-windows').
-(defun get-buffer-window-list (buffer &optional minibuf frame)
-  "Return list of all windows displaying BUFFER, or nil if none.
-BUFFER can be a buffer or a buffer name.
-See `walk-windows' for the meaning of MINIBUF and FRAME."
-  (let ((buffer (if (bufferp buffer) buffer (get-buffer buffer))) windows)
-    (walk-windows (function (lambda (window)
-                              (if (eq (window-buffer window) buffer)
-                                  (setq windows (cons window windows)))))
-                  minibuf frame)
-    windows))
+(defun play-sound (sound)
+  "SOUND is a list of the form `(sound KEYWORD VALUE...)'.
+The following keywords are recognized:
 
-(defun ignore (&rest ignore)
-  "Do nothing and return nil.
-This function accepts any number of arguments, but ignores them."
-  (interactive)
-  nil)
+  :file FILE - read sound data from FILE.  If FILE isn't an
+absolute file name, it is searched in `data-directory'.
 
-(defun error (&rest args)
-  "Signal an error, making error message by passing all args to `format'.
-In Emacs, the convention is that error messages start with a capital
-letter but *do not* end with a period.  Please follow this convention
-for the sake of consistency."
-  (while t
-    (signal 'error (list (apply 'format args)))))
+  :data DATA - read sound data from string DATA.
 
-(defalias 'user-original-login-name 'user-login-name)
+Exactly one of :file or :data must be present.
+
+  :volume VOL - set volume to VOL.  VOL must an integer in the
+range 0..100 or a float in the range 0..1.0.  If not specified,
+don't change the volume setting of the sound device.
+
+  :device DEVICE - play sound on DEVICE.  If not specified,
+a system-dependent default device name is used."
+  (if (fboundp 'play-sound-internal)
+      (play-sound-internal sound)
+    (error "This Emacs binary lacks sound support")))
+
+(defun shell-quote-argument (argument)
+  "Quote an argument for passing as argument to an inferior shell."
+  (if (eq system-type 'ms-dos)
+      ;; Quote using double quotes, but escape any existing quotes in
+      ;; the argument with backslashes.
+      (let ((result "")
+            (start 0)
+            end)
+        (if (or (null (string-match "[^\"]" argument))
+                (< (match-end 0) (length argument)))
+            (while (string-match "[\"]" argument start)
+              (setq end (match-beginning 0)
+                    result (concat result (substring argument start end)
+                                   "\\" (substring argument end (1+ end)))
+                    start (1+ end))))
+        (concat "\"" result (substring argument start) "\""))
+    (if (eq system-type 'windows-nt)
+        (concat "\"" argument "\"")
+      (if (equal argument "")
+          "''"
+        ;; Quote everything except POSIX filename characters.
+        ;; This should be safe enough even for really weird shells.
+        (let ((result "") (start 0) end)
+          (while (string-match "[^-0-9a-zA-Z_./]" argument start)
+            (setq end (match-beginning 0)
+                  result (concat result (substring argument start end)
+                                 "\\" (substring argument end (1+ end)))
+                  start (1+ end)))
+          (concat result (substring argument start)))))))
+
+;;;; Support for yanking and text properties.
 
 (defvar yank-excluded-properties)
 
@@ -1649,7 +1986,7 @@ Strip text properties from the inserted text according to
     (remove-yank-excluded-properties opoint (point))))
 
 
-;; Synchronous shell commands.
+;;;; Synchronous shell commands.
 
 (defun start-process-shell-command (name buffer &rest args)
   "Start a program in a subprocess.  Return the process object for it.
@@ -1705,6 +2042,8 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again."
                   shell-command-switch
                   (mapconcat 'identity (cons command args) " ")))))
 
+;;;; Lisp macros to do various things temporarily.
+
 (defmacro with-current-buffer (buffer &rest body)
   "Execute the forms in BODY with BUFFER as the current buffer.
 The value returned is the value of the last form in BODY.
@@ -1869,96 +2208,8 @@ in BODY."
        (let ((combine-after-change-calls t))
          . ,body)
      (combine-after-change-execute)))
-
-
-(defvar delay-mode-hooks nil
-  "If non-nil, `run-mode-hooks' should delay running the hooks.")
-(defvar delayed-mode-hooks nil
-  "List of delayed mode hooks waiting to be run.")
-(make-variable-buffer-local 'delayed-mode-hooks)
-(put 'delay-mode-hooks 'permanent-local t)
-
-(defvar after-change-major-mode-hook nil
-  "Normal hook run at the very end of major mode functions.")
-
-(defun run-mode-hooks (&rest hooks)
-  "Run mode hooks `delayed-mode-hooks' and HOOKS, or delay HOOKS.
-Execution is delayed if `delay-mode-hooks' is non-nil.
-If `delay-mode-hooks' is nil, run `after-change-major-mode-hook'
-after running the mode hooks.
-Major mode functions should use this."
-  (if delay-mode-hooks
-      ;; Delaying case.
-      (dolist (hook hooks)
-        (push hook delayed-mode-hooks))
-    ;; Normal case, just run the hook as before plus any delayed hooks.
-    (setq hooks (nconc (nreverse delayed-mode-hooks) hooks))
-    (setq delayed-mode-hooks nil)
-    (apply 'run-hooks hooks)
-    (run-hooks 'after-change-major-mode-hook)))
-
-(defmacro delay-mode-hooks (&rest body)
-  "Execute BODY, but delay any `run-mode-hooks'.
-These hooks will be executed by the first following call to
-`run-mode-hooks' that occurs outside any `delayed-mode-hooks' form.
-Only affects hooks run in the current buffer."
-  (declare (debug t) (indent 0))
-  `(progn
-     (make-local-variable 'delay-mode-hooks)
-     (let ((delay-mode-hooks t))
-       ,@body)))
-
-;; PUBLIC: find if the current mode derives from another.
-
-(defun derived-mode-p (&rest modes)
-  "Non-nil if the current major mode is derived from one of MODES.
-Uses the `derived-mode-parent' property of the symbol to trace backwards."
-  (let ((parent major-mode))
-    (while (and (not (memq parent modes))
-                (setq parent (get parent 'derived-mode-parent))))
-    parent))
-
-(defun find-tag-default ()
-  "Determine default tag to search for, based on text at point.
-If there is no plausible default, return nil."
-  (save-excursion
-    (while (looking-at "\\sw\\|\\s_")
-      (forward-char 1))
-    (if (or (re-search-backward "\\sw\\|\\s_"
-                                (save-excursion (beginning-of-line) (point))
-                                t)
-            (re-search-forward "\\(\\sw\\|\\s_\\)+"
-                               (save-excursion (end-of-line) (point))
-                               t))
-        (progn
-          (goto-char (match-end 0))
-          (condition-case nil
-              (buffer-substring-no-properties
-               (point)
-               (progn (forward-sexp -1)
-                      (while (looking-at "\\s'")
-                        (forward-char 1))
-                      (point)))
-            (error nil)))
-      nil)))
-
-(defmacro with-syntax-table (table &rest body)
-  "Evaluate BODY with syntax table of current buffer set to TABLE.
-The syntax table of the current buffer is saved, BODY is evaluated, and the
-saved table is restored, even in case of an abnormal exit.
-Value is what BODY returns."
-  (declare (debug t))
-  (let ((old-table (make-symbol "table"))
-        (old-buffer (make-symbol "buffer")))
-    `(let ((,old-table (syntax-table))
-           (,old-buffer (current-buffer)))
-       (unwind-protect
-           (progn
-             (set-syntax-table ,table)
-             ,@body)
-         (save-current-buffer
-           (set-buffer ,old-buffer)
-           (set-syntax-table ,old-table))))))
+
+;;;; Constructing completion tables.
 
 (defmacro dynamic-completion-table (fun)
   "Use function FUN as a dynamic completion table.
@@ -2018,7 +2269,7 @@ A and B should not be costly (or side-effecting) expressions."
        (or (test-completion string ,a predicate)
            (test-completion string ,b predicate))))))
 
-;;; Matching and substitution
+;;; Matching and match data.
 
 (defvar save-match-data-internal)
 
@@ -2093,6 +2344,47 @@ of a match for REGEXP."
             (looking-at (concat "\\(?:"  regexp "\\)\\'")))))
     (not (null pos))))
 
+(defun subregexp-context-p (regexp pos &optional start)
+  "Return non-nil if POS is in a normal subregexp context in REGEXP.
+A subregexp context is one where a sub-regexp can appear.
+A non-subregexp context is for example within brackets, or within a
+repetition bounds operator `\\=\\{...\\}', or right after a `\\'.
+If START is non-nil, it should be a position in REGEXP, smaller
+than POS, and known to be in a subregexp context."
+  ;; Here's one possible implementation, with the great benefit that it
+  ;; reuses the regexp-matcher's own parser, so it understands all the
+  ;; details of the syntax.  A disadvantage is that it needs to match the
+  ;; error string.
+  (condition-case err
+      (progn
+        (string-match (substring regexp (or start 0) pos) "")
+        t)
+    (invalid-regexp
+     (not (member (cadr err) '("Unmatched [ or [^"
+                               "Unmatched \\{"
+                               "Trailing backslash")))))
+  ;; An alternative implementation:
+  ;; (defconst re-context-re
+  ;;   (let* ((harmless-ch "[^\\[]")
+  ;;          (harmless-esc "\\\\[^{]")
+  ;;          (class-harmless-ch "[^][]")
+  ;;          (class-lb-harmless "[^]:]")
+  ;;          (class-lb-colon-maybe-charclass ":\\([a-z]+:]\\)?")
+  ;;          (class-lb (concat "\\[\\(" class-lb-harmless
+  ;;                            "\\|" class-lb-colon-maybe-charclass "\\)"))
+  ;;          (class
+  ;;           (concat "\\[^?]?"
+  ;;                   "\\(" class-harmless-ch
+  ;;                   "\\|" class-lb "\\)*"
+  ;;                   "\\[?]"))     ; special handling for bare [ at end of re
+  ;;          (braces "\\\\{[0-9,]+\\\\}"))
+  ;;     (concat "\\`\\(" harmless-ch "\\|" harmless-esc
+  ;;             "\\|" class "\\|" braces "\\)*\\'"))
+  ;;   "Matches any prefix that corresponds to a normal subregexp context.")
+  ;; (string-match re-context-re (substring regexp (or start 0) pos))
+  )
+
+;;;; split-string
 
 (defconst split-string-default-separators "[ \f\t\n\r\v]+"
   "The default value of separators for `split-string'.
@@ -2153,6 +2445,8 @@ Modifies the match data; use `save-match-data' if necessary."
               (cons (substring string start)
                     list)))
     (nreverse list)))
+
+;;;; Replacement in strings.
 
 (defun subst-char-in-string (fromchar tochar string &optional inplace)
   "Replace FROMCHAR with TOCHAR in STRING each time it occurs.
@@ -2222,76 +2516,42 @@ and replace a sub-expression, e.g.
       ;; Reconstruct a string from the pieces.
       (setq matches (cons (substring string start l) matches)) ; leftover
       (apply #'concat (nreverse matches)))))
+
+;;;; invisibility specs
 
-(defun subregexp-context-p (regexp pos &optional start)
-  "Return non-nil if POS is in a normal subregexp context in REGEXP.
-A subregexp context is one where a sub-regexp can appear.
-A non-subregexp context is for example within brackets, or within a
-repetition bounds operator `\\=\\{...\\}', or right after a `\\'.
-If START is non-nil, it should be a position in REGEXP, smaller
-than POS, and known to be in a subregexp context."
-  ;; Here's one possible implementation, with the great benefit that it
-  ;; reuses the regexp-matcher's own parser, so it understands all the
-  ;; details of the syntax.  A disadvantage is that it needs to match the
-  ;; error string.
-  (condition-case err
-      (progn
-        (string-match (substring regexp (or start 0) pos) "")
-        t)
-    (invalid-regexp
-     (not (member (cadr err) '("Unmatched [ or [^"
-                               "Unmatched \\{"
-                               "Trailing backslash")))))
-  ;; An alternative implementation:
-  ;; (defconst re-context-re
-  ;;   (let* ((harmless-ch "[^\\[]")
-  ;;          (harmless-esc "\\\\[^{]")
-  ;;          (class-harmless-ch "[^][]")
-  ;;          (class-lb-harmless "[^]:]")
-  ;;          (class-lb-colon-maybe-charclass ":\\([a-z]+:]\\)?")
-  ;;          (class-lb (concat "\\[\\(" class-lb-harmless
-  ;;                            "\\|" class-lb-colon-maybe-charclass "\\)"))
-  ;;          (class
-  ;;           (concat "\\[^?]?"
-  ;;                   "\\(" class-harmless-ch
-  ;;                   "\\|" class-lb "\\)*"
-  ;;                   "\\[?]"))     ; special handling for bare [ at end of re
-  ;;          (braces "\\\\{[0-9,]+\\\\}"))
-  ;;     (concat "\\`\\(" harmless-ch "\\|" harmless-esc
-  ;;             "\\|" class "\\|" braces "\\)*\\'"))
-  ;;   "Matches any prefix that corresponds to a normal subregexp context.")
-  ;; (string-match re-context-re (substring regexp (or start 0) pos))
-  )
+(defun add-to-invisibility-spec (element)
+  "Add ELEMENT to `buffer-invisibility-spec'.
+See documentation for `buffer-invisibility-spec' for the kind of elements
+that can be added."
+  (if (eq buffer-invisibility-spec t)
+      (setq buffer-invisibility-spec (list t)))
+  (setq buffer-invisibility-spec
+        (cons element buffer-invisibility-spec)))
+
+(defun remove-from-invisibility-spec (element)
+  "Remove ELEMENT from `buffer-invisibility-spec'."
+  (if (consp buffer-invisibility-spec)
+    (setq buffer-invisibility-spec (delete element buffer-invisibility-spec))))
 
-(defun shell-quote-argument (argument)
-  "Quote an argument for passing as argument to an inferior shell."
-  (if (eq system-type 'ms-dos)
-      ;; Quote using double quotes, but escape any existing quotes in
-      ;; the argument with backslashes.
-      (let ((result "")
-            (start 0)
-            end)
-        (if (or (null (string-match "[^\"]" argument))
-                (< (match-end 0) (length argument)))
-            (while (string-match "[\"]" argument start)
-              (setq end (match-beginning 0)
-                    result (concat result (substring argument start end)
-                                   "\\" (substring argument end (1+ end)))
-                    start (1+ end))))
-        (concat "\"" result (substring argument start) "\""))
-    (if (eq system-type 'windows-nt)
-        (concat "\"" argument "\"")
-      (if (equal argument "")
-          "''"
-        ;; Quote everything except POSIX filename characters.
-        ;; This should be safe enough even for really weird shells.
-        (let ((result "") (start 0) end)
-          (while (string-match "[^-0-9a-zA-Z_./]" argument start)
-            (setq end (match-beginning 0)
-                  result (concat result (substring argument start end)
-                                 "\\" (substring argument end (1+ end)))
-                  start (1+ end)))
-          (concat result (substring argument start)))))))
+;;;; Syntax tables.
+
+(defmacro with-syntax-table (table &rest body)
+  "Evaluate BODY with syntax table of current buffer set to TABLE.
+The syntax table of the current buffer is saved, BODY is evaluated, and the
+saved table is restored, even in case of an abnormal exit.
+Value is what BODY returns."
+  (declare (debug t))
+  (let ((old-table (make-symbol "table"))
+        (old-buffer (make-symbol "buffer")))
+    `(let ((,old-table (syntax-table))
+           (,old-buffer (current-buffer)))
+       (unwind-protect
+           (progn
+             (set-syntax-table ,table)
+             ,@body)
+         (save-current-buffer
+           (set-buffer ,old-buffer)
+           (set-syntax-table ,old-table))))))
 
 (defun make-syntax-table (&optional oldtable)
   "Return a new syntax table.
@@ -2314,247 +2574,8 @@ If POS is outside the buffer's accessible portion, return nil."
   "Return the syntax class part of the syntax descriptor SYNTAX.
 If SYNTAX is nil, return nil."
   (and syntax (logand (car syntax) 65535)))
-
-(defun add-to-invisibility-spec (element)
-  "Add ELEMENT to `buffer-invisibility-spec'.
-See documentation for `buffer-invisibility-spec' for the kind of elements
-that can be added."
-  (if (eq buffer-invisibility-spec t)
-      (setq buffer-invisibility-spec (list t)))
-  (setq buffer-invisibility-spec
-        (cons element buffer-invisibility-spec)))
-
-(defun remove-from-invisibility-spec (element)
-  "Remove ELEMENT from `buffer-invisibility-spec'."
-  (if (consp buffer-invisibility-spec)
-    (setq buffer-invisibility-spec (delete element buffer-invisibility-spec))))
 
-(defun global-set-key (key command)
-  "Give KEY a global binding as COMMAND.
-COMMAND is the command definition to use; usually it is
-a symbol naming an interactively-callable function.
-KEY is a key sequence; noninteractively, it is a string or vector
-of characters or event types, and non-ASCII characters with codes
-above 127 (such as ISO Latin-1) can be included if you use a vector.
-
-Note that if KEY has a local binding in the current buffer,
-that local binding will continue to shadow any global binding
-that you make with this function."
-  (interactive "KSet key globally: \nCSet key %s to command: ")
-  (or (vectorp key) (stringp key)
-      (signal 'wrong-type-argument (list 'arrayp key)))
-  (define-key (current-global-map) key command))
-
-(defun local-set-key (key command)
-  "Give KEY a local binding as COMMAND.
-COMMAND is the command definition to use; usually it is
-a symbol naming an interactively-callable function.
-KEY is a key sequence; noninteractively, it is a string or vector
-of characters or event types, and non-ASCII characters with codes
-above 127 (such as ISO Latin-1) can be included if you use a vector.
-
-The binding goes in the current buffer's local map,
-which in most cases is shared with all other buffers in the same major mode."
-  (interactive "KSet key locally: \nCSet key %s locally to command: ")
-  (let ((map (current-local-map)))
-    (or map
-        (use-local-map (setq map (make-sparse-keymap))))
-    (or (vectorp key) (stringp key)
-        (signal 'wrong-type-argument (list 'arrayp key)))
-    (define-key map key command)))
-
-(defun global-unset-key (key)
-  "Remove global binding of KEY.
-KEY is a string or vector representing a sequence of keystrokes."
-  (interactive "kUnset key globally: ")
-  (global-set-key key nil))
-
-(defun local-unset-key (key)
-  "Remove local binding of KEY.
-KEY is a string or vector representing a sequence of keystrokes."
-  (interactive "kUnset key locally: ")
-  (if (current-local-map)
-      (local-set-key key nil))
-  nil)
-
-;; We put this here instead of in frame.el so that it's defined even on
-;; systems where frame.el isn't loaded.
-(defun frame-configuration-p (object)
-  "Return non-nil if OBJECT seems to be a frame configuration.
-Any list whose car is `frame-configuration' is assumed to be a frame
-configuration."
-  (and (consp object)
-       (eq (car object) 'frame-configuration)))
-
-(defun functionp (object)
-  "Non-nil if OBJECT is any kind of function or a special form.
-Also non-nil if OBJECT is a symbol and its function definition is
-\(recursively) a function or special form.  This does not include
-macros."
-  (or (and (symbolp object) (fboundp object)
-           (condition-case nil
-               (setq object (indirect-function object))
-             (error nil))
-           (eq (car-safe object) 'autoload)
-           (not (car-safe (cdr-safe (cdr-safe (cdr-safe (cdr-safe object)))))))
-      (subrp object) (byte-code-function-p object)
-      (eq (car-safe object) 'lambda)))
-
-(defun assq-delete-all (key alist)
-  "Delete from ALIST all elements whose car is `eq' to KEY.
-Return the modified alist.
-Elements of ALIST that are not conses are ignored."
-  (while (and (consp (car alist))
-              (eq (car (car alist)) key))
-    (setq alist (cdr alist)))
-  (let ((tail alist) tail-cdr)
-    (while (setq tail-cdr (cdr tail))
-      (if (and (consp (car tail-cdr))
-               (eq (car (car tail-cdr)) key))
-          (setcdr tail (cdr tail-cdr))
-        (setq tail tail-cdr))))
-  alist)
-
-(defun rassq-delete-all (value alist)
-  "Delete from ALIST all elements whose cdr is `eq' to VALUE.
-Return the modified alist.
-Elements of ALIST that are not conses are ignored."
-  (while (and (consp (car alist))
-              (eq (cdr (car alist)) value))
-    (setq alist (cdr alist)))
-  (let ((tail alist) tail-cdr)
-    (while (setq tail-cdr (cdr tail))
-      (if (and (consp (car tail-cdr))
-               (eq (cdr (car tail-cdr)) value))
-          (setcdr tail (cdr tail-cdr))
-        (setq tail tail-cdr))))
-  alist)
-
-(defun make-temp-file (prefix &optional dir-flag suffix)
-  "Create a temporary file.
-The returned file name (created by appending some random characters at the end
-of PREFIX, and expanding against `temporary-file-directory' if necessary),
-is guaranteed to point to a newly created empty file.
-You can then use `write-region' to write new data into the file.
-
-If DIR-FLAG is non-nil, create a new empty directory instead of a file.
-
-If SUFFIX is non-nil, add that at the end of the file name."
-  (let ((umask (default-file-modes))
-        file)
-    (unwind-protect
-        (progn
-          ;; Create temp files with strict access rights.  It's easy to
-          ;; loosen them later, whereas it's impossible to close the
-          ;; time-window of loose permissions otherwise.
-          (set-default-file-modes ?\700)
-          (while (condition-case ()
-                     (progn
-                       (setq file
-                             (make-temp-name
-                              (expand-file-name prefix temporary-file-directory)))
-                       (if suffix
-                           (setq file (concat file suffix)))
-                       (if dir-flag
-                           (make-directory file)
-                         (write-region "" nil file nil 'silent nil 'excl))
-                       nil)
-                   (file-already-exists t))
-            ;; the file was somehow created by someone else between
-            ;; `make-temp-name' and `write-region', let's try again.
-            nil)
-          file)
-      ;; Reset the umask.
-      (set-default-file-modes umask))))
-
-
-;; If a minor mode is not defined with define-minor-mode,
-;; add it here explicitly.
-;; isearch-mode is deliberately excluded, since you should
-;; not call it yourself.
-(defvar minor-mode-list '(auto-save-mode auto-fill-mode abbrev-mode
-                                         overwrite-mode view-mode
-                                         hs-minor-mode)
-  "List of all minor mode functions.")
-
-(defun add-minor-mode (toggle name &optional keymap after toggle-fun)
-  "Register a new minor mode.
-
-This is an XEmacs-compatibility function.  Use `define-minor-mode' instead.
-
-TOGGLE is a symbol which is the name of a buffer-local variable that
-is toggled on or off to say whether the minor mode is active or not.
-
-NAME specifies what will appear in the mode line when the minor mode
-is active.  NAME should be either a string starting with a space, or a
-symbol whose value is such a string.
-
-Optional KEYMAP is the keymap for the minor mode that will be added
-to `minor-mode-map-alist'.
-
-Optional AFTER specifies that TOGGLE should be added after AFTER
-in `minor-mode-alist'.
-
-Optional TOGGLE-FUN is an interactive function to toggle the mode.
-It defaults to (and should by convention be) TOGGLE.
-
-If TOGGLE has a non-nil `:included' property, an entry for the mode is
-included in the mode-line minor mode menu.
-If TOGGLE has a `:menu-tag', that is used for the menu item's label."
-  (unless (memq toggle minor-mode-list)
-    (push toggle minor-mode-list))
-
-  (unless toggle-fun (setq toggle-fun toggle))
-  (unless (eq toggle-fun toggle)
-    (put toggle :minor-mode-function toggle-fun))
-  ;; Add the name to the minor-mode-alist.
-  (when name
-    (let ((existing (assq toggle minor-mode-alist)))
-      (if existing
-          (setcdr existing (list name))
-        (let ((tail minor-mode-alist) found)
-          (while (and tail (not found))
-            (if (eq after (caar tail))
-                (setq found tail)
-              (setq tail (cdr tail))))
-          (if found
-              (let ((rest (cdr found)))
-                (setcdr found nil)
-                (nconc found (list (list toggle name)) rest))
-            (setq minor-mode-alist (cons (list toggle name)
-                                         minor-mode-alist)))))))
-  ;; Add the toggle to the minor-modes menu if requested.
-  (when (get toggle :included)
-    (define-key mode-line-mode-menu
-      (vector toggle)
-      (list 'menu-item
-            (concat
-             (or (get toggle :menu-tag)
-                 (if (stringp name) name (symbol-name toggle)))
-             (let ((mode-name (if (symbolp name) (symbol-value name))))
-               (if (and (stringp mode-name) (string-match "[^ ]+" mode-name))
-                   (concat " (" (match-string 0 mode-name) ")"))))
-            toggle-fun
-            :button (cons :toggle toggle))))
-
-  ;; Add the map to the minor-mode-map-alist.
-  (when keymap
-    (let ((existing (assq toggle minor-mode-map-alist)))
-      (if existing
-          (setcdr existing keymap)
-        (let ((tail minor-mode-map-alist) found)
-          (while (and tail (not found))
-            (if (eq after (caar tail))
-                (setq found tail)
-              (setq tail (cdr tail))))
-          (if found
-              (let ((rest (cdr found)))
-                (setcdr found nil)
-                (nconc found (list (cons toggle keymap)) rest))
-            (setq minor-mode-map-alist (cons (cons toggle keymap)
-                                             minor-mode-map-alist))))))))
-
-;; Clones ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; Text clones
 
 (defun text-clone-maintain (ol1 after beg end &optional len)
   "Propagate the changes made under the overlay OL1 to the other clones.
@@ -2648,27 +2669,11 @@ clone should be incorporated in the clone."
     ;;(overlay-put ol2 'face 'underline)
     (overlay-put ol2 'evaporate t)
     (overlay-put ol2 'text-clones dups)))
+
+;;;; Mail user agents.
 
-(defun play-sound (sound)
-  "SOUND is a list of the form `(sound KEYWORD VALUE...)'.
-The following keywords are recognized:
-
-  :file FILE - read sound data from FILE.  If FILE isn't an
-absolute file name, it is searched in `data-directory'.
-
-  :data DATA - read sound data from string DATA.
-
-Exactly one of :file or :data must be present.
-
-  :volume VOL - set volume to VOL.  VOL must an integer in the
-range 0..100 or a float in the range 0..1.0.  If not specified,
-don't change the volume setting of the sound device.
-
-  :device DEVICE - play sound on DEVICE.  If not specified,
-a system-dependent default device name is used."
-  (if (fboundp 'play-sound-internal)
-      (play-sound-internal sound)
-    (error "This Emacs binary lacks sound support")))
+;; Here we include just enough for other packages to be able
+;; to define them.
 
 (defun define-mail-user-agent (symbol composefunc sendfunc
                                       &optional abortfunc hookvar)
@@ -2704,8 +2709,8 @@ The properties used on SYMBOL are `composefunc', `sendfunc',
   (put symbol 'sendfunc sendfunc)
   (put symbol 'abortfunc (or abortfunc 'kill-buffer))
   (put symbol 'hookvar (or hookvar 'mail-send-hook)))
-
-;; Standardized progress reporting
+
+;;;; Progress reporters.
 
 ;; Progress reporter has the following structure:
 ;;
@@ -2862,7 +2867,7 @@ convenience wrapper around `make-progress-reporter' and friends.
        nil ,@(cdr (cdr spec)))))
 
 
-;;;; Compare Version Strings
+;;;; Comparing version strings.
 
 (defvar version-separator "."
   "*Specify the string used to separate the version elements.
diff --git a/lisp/term.el b/lisp/term.el
index 471d7830de0..4d319c253ae 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1221,6 +1221,7 @@ without any interpretation."
 ;; Which would be better:  "\e[A" or "\eOA"? readline accepts either.
 ;; For my configuration it's definitely better \eOA but YMMV. -mm
 ;; For example: vi works with \eOA while elm wants \e[A ...
+;;; (terminfo: kcuu1, kcud1, kcuf1, kcub1, khome, kend, kpp, knp, kdch1, kbs)
 (defun term-send-up    () (interactive) (term-send-raw-string "\eOA"))
 (defun term-send-down  () (interactive) (term-send-raw-string "\eOB"))
 (defun term-send-right () (interactive) (term-send-raw-string "\eOC"))
@@ -2819,7 +2820,7 @@ See `term-prompt-regexp'."
                                (1- (- term-width (term-current-column)))))
                             (when (= term-width (term-current-column))
                               (term-move-columns -1))))
-                         ((eq char ?\r)
+                         ((eq char ?\r)  ;; (terminfo: cr)
                           ;; Optimize CRLF at end of buffer:
                           (cond ((and (< (setq temp (1+ i)) str-length)
                                       (eq (aref str temp) ?\n)
@@ -2835,7 +2836,7 @@ See `term-prompt-regexp'."
                                 (t ;; Not followed by LF or can't optimize:
                                  (term-vertical-motion 0)
                                  (setq term-current-column term-start-line-column))))
-                         ((eq char ?\n)
+                         ((eq char ?\n)  ;; (terminfo: cud1, ind)
                           (if (not (and term-kill-echo-list
                                         (term-check-kill-echo-list)))
                               (term-down 1 t)))
@@ -2846,16 +2847,15 @@ See `term-prompt-regexp'."
                          ((eq char 0))         ; NUL: Do nothing
                          ((eq char ?\016))     ; Shift Out - ignored
                          ((eq char ?\017))     ; Shift In - ignored
-                         ((eq char ?\^G)
-                          (beep t))     ; Bell
+                         ((eq char ?\^G) ;; (terminfo: bel)
+                          (beep t))
                          ((eq char ?\032)
                           (let ((end (string-match "\r?$" str i)))
                             (if end
                                 (funcall term-command-hook
                                          (prog1 (substring str (1+ i) end)
                                            (setq i (match-end 0))))
-                              (setq term-terminal-parameter
-                                    (substring str i))
+                              (setq term-terminal-parameter (substring str i))
                               (setq term-terminal-state 4)
                               (setq i str-length))))
                          (t   ; insert char FIXME: Should never happen
@@ -3072,7 +3072,7 @@ See `term-prompt-regexp'."
    ((eq parameter 5)
     (setq term-ansi-current-bold t))
 
-;;; Reverse
+;;; Reverse (terminfo: smso)
    ((eq parameter 7)
     (setq term-ansi-current-reverse t))
 
@@ -3080,11 +3080,11 @@ See `term-prompt-regexp'."
    ((eq parameter 8)
     (setq term-ansi-current-invisible t))
 
-;;; Reset underline (i.e. terminfo rmul)
+;;; Reset underline (terminfo: rmul)
    ((eq parameter 24)
     (setq term-ansi-current-underline nil))
 
-;;; Reset reverse (i.e. terminfo rmso)
+;;; Reset reverse (terminfo: rmso)
    ((eq parameter 27)
     (setq term-ansi-current-reverse nil))
 
@@ -3189,7 +3189,7 @@ See `term-prompt-regexp'."
 
 (defun term-handle-ansi-escape (proc char)
   (cond
-   ((or (eq char ?H)  ; cursor motion (terminfo: cup)
+   ((or (eq char ?H)  ; cursor motion (terminfo: cup,home)
         ;; (eq char ?f) ; xterm seems to handle this sequence too, not
         ;; needed for now
         )
@@ -3211,7 +3211,7 @@ See `term-prompt-regexp'."
    ;; \E[B - cursor down (terminfo: cud)
    ((eq char ?B)
     (term-down (max 1 term-terminal-parameter) t))
-   ;; \E[C - cursor right (terminfo: cuf)
+   ;; \E[C - cursor right (terminfo: cuf, cuf1)
    ((eq char ?C)
     (term-move-columns
      (max 1
@@ -3230,14 +3230,14 @@ See `term-prompt-regexp'."
    ;; \E[L - insert lines (terminfo: il, il1)
    ((eq char ?L)
     (term-insert-lines (max 1 term-terminal-parameter)))
-   ;; \E[M - delete lines
+   ;; \E[M - delete lines (terminfo: dl, dl1)
    ((eq char ?M)
     (term-delete-lines (max 1 term-terminal-parameter)))
-   ;; \E[P - delete chars
+   ;; \E[P - delete chars (terminfo: dch, dch1)
    ((eq char ?P)
     (term-delete-chars (max 1 term-terminal-parameter)))
-   ;; \E[@ - insert spaces
-   ((eq char ?@) ;; (terminfo: ich)
+   ;; \E[@ - insert spaces (terminfo: ich)
+   ((eq char ?@)
     (term-insert-spaces (max 1 term-terminal-parameter)))
    ;; \E[?h - DEC Private Mode Set
    ((eq char ?h)
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index fef67eae258..af168eb23ac 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1513,6 +1513,36 @@ as returned by `x-server-vendor'."
         (#x5f1 . ?,Gq(B)
         (#x5f2 . ?,Gr(B)
         ;; Cyrillic
+        (#x680 . ?$,1)R(B)
+        (#x681 . ?$,1)V(B)
+        (#x682 . ?$,1)Z(B)
+        (#x683 . ?$,1)\(B)
+        (#x684 . ?$,1)b(B)
+        (#x685 . ?$,1)n(B)
+        (#x686 . ?$,1)p(B)
+        (#x687 . ?$,1)r(B)
+        (#x688 . ?$,1)v(B)
+        (#x689 . ?$,1)x(B)
+        (#x68a . ?$,1)z(B)
+        (#x68c . ?$,1*8(B)
+        (#x68d . ?$,1*B(B)
+        (#x68e . ?$,1*H(B)
+        (#x68f . ?$,1*N(B)
+        (#x690 . ?$,1)S(B)
+        (#x691 . ?$,1)W(B)
+        (#x692 . ?$,1)[(B)
+        (#x693 . ?$,1)](B)
+        (#x694 . ?$,1)c(B)
+        (#x695 . ?$,1)o(B)
+        (#x696 . ?$,1)q(B)
+        (#x697 . ?$,1)s(B)
+        (#x698 . ?$,1)w(B)
+        (#x699 . ?$,1)y(B)
+        (#x69a . ?$,1){(B)
+        (#x69c . ?$,1*9(B)
+        (#x69d . ?$,1*C(B)
+        (#x69e . ?$,1*I(B)
+        (#x69f . ?$,1*O(B)
         (#x6a1 . ?,Lr(B)
         (#x6a2 . ?,Ls(B)
         (#x6a3 . ?,Lq(B)
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 74c7cbc5762..ee94ff01d64 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1333,7 +1333,7 @@ The buffer to mark them in is `flyspell-large-region-buffer'."
     ;; Loop over incorrect words.
     (while (re-search-forward "\\([^\n]+\\)\n" (point-max) t)
       ;; Bind WORD to the next one.
-      (let ((word (match-string 1)))
+      (let ((word (match-string 1)) (wordpos (point)))
         ;; Here there used to be code to see if WORD is the same
         ;; as the previous iteration, and count the number of consecutive
         ;; identical words, and the loop below would search for that many.
@@ -1350,11 +1350,15 @@ The buffer to mark them in is `flyspell-large-region-buffer'."
         (with-current-buffer flyspell-large-region-buffer
           (goto-char flyspell-large-region-beg)
           (let ((keep t))
-            (while (and keep
-                        (search-forward word flyspell-large-region-end t))
-              (goto-char (- (point) 1))
-              (setq keep (flyspell-word)))
-            (setq flyspell-large-region-beg (point))))))
+            (while keep
+              (if (search-forward word
+                                     flyspell-large-region-end t)
+                  (progn
+                    (setq flyspell-large-region-beg (point))
+                    (goto-char (- (point) 1))
+                    (setq keep (flyspell-word)))
+                (error "Bug: misspelled word `%s' (output pos %d) not found in buffer"
+                       word wordpos)))))))
     ;; we are done
     (if flyspell-issue-message-flag (message "Spell Checking completed.")))
   ;; Kill and forget the buffer with the list of incorrect words.
@@ -1376,6 +1380,7 @@ The buffer to mark them in is `flyspell-large-region-buffer'."
     ;; this is done, we can start checking...
     (if flyspell-issue-message-flag (message "Checking region..."))
     (set-buffer curbuf)
+    (ispell-check-version)
     (let ((c (apply 'call-process-region beg
                     end
                     ispell-program-name
@@ -1388,6 +1393,8 @@ The buffer to mark them in is `flyspell-large-region-buffer'."
                       (if ispell-local-dictionary
                           (setq ispell-dictionary ispell-local-dictionary))
                       (setq args (ispell-get-ispell-args))
+                      (if (eq ispell-parser 'tex)
+                          (setq args (cons "-t" args)))
                       (if ispell-dictionary ; use specified dictionary
                           (setq args
                                 (append (list "-d" ispell-dictionary) args)))
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 95a3cce5144..7c438b4269e 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -445,7 +445,7 @@ where DICTNAME is the name of your default dictionary."
 
 (defvar ispell-local-dictionary-overridden nil
   "Non-nil means the user has explicitly set this buffer's Ispell dictionary.")
-(make-variable-buffer-local 'ispell-local-dictionary)
+(make-variable-buffer-local 'ispell-local-dictionary-overridden)
 
 (defcustom ispell-local-dictionary nil
   "If non-nil, the dictionary to be used for Ispell commands in this buffer.
@@ -721,7 +721,7 @@ LANGUAGE.aff file \(e.g., english.aff\).")
 
 (defvar ispell-aspell-supports-utf8 nil
   "Non-nil means to try to automatically find aspell dictionaries.
-This is set to t in ispell-check-version for aspell >= 0.60.
+This is set to t in `ispell-check-version' for aspell >= 0.60.
 
 Earlier aspell versions do not consistently support UTF-8.  Handling
 this would require some extra guessing in `ispell-aspell-find-dictionary'.")
@@ -894,13 +894,22 @@ and added as a submenu of the \"Edit\" menu.")
   "Find Aspell's dictionaries, and record in `ispell-dictionary-alist'."
   (unless ispell-really-aspell
     (error "This function only works with aspell"))
-  (let ((dictionaries
-         (split-string
-          (with-temp-buffer
-            (call-process ispell-program-name nil t nil "dicts")
-            (buffer-string)))))
-    (setq ispell-dictionary-alist
-          (mapcar #'ispell-aspell-find-dictionary dictionaries))
+  (let* ((dictionaries
+          (split-string
+           (with-temp-buffer
+             (call-process ispell-program-name nil t nil "dicts")
+             (buffer-string))))
+         ;; Search for the named dictionaries.
+         (found
+          (delq nil 
+                (mapcar #'ispell-aspell-find-dictionary dictionaries))))
+    ;; Merge into FOUND any elements from the standard ispell-dictionary-alist
+    ;; which have no element in FOUND at all.    
+    (dolist (dict ispell-dictionary-alist)
+      (unless (assoc (car dict) found)
+        (setq found (nconc found (list dict)))))
+    (setq ispell-dictionary-alist found)
+
     (ispell-aspell-add-aliases)
     ;; Add a default entry
     (let* ((english-dict (assoc "en" ispell-dictionary-alist))
@@ -922,6 +931,9 @@ Assumes that value contains no whitespace."
     (car (split-string (buffer-string)))))
 
 (defun ispell-aspell-find-dictionary (dict-name)
+  ;; This returns nil if the data file does not exist.
+  ;; Can someone please explain the return value format when the
+  ;; file does exist -- rms?
   (let* ((lang ;; Strip out region, variant, etc.
           (and (string-match "^[[:alpha:]]+" dict-name)
                (match-string 0 dict-name)))
@@ -931,35 +943,37 @@ Assumes that value contains no whitespace."
                             (ispell-get-aspell-config-value "data-dir")))
                   "/" lang ".dat"))
          otherchars)
-    ;; This file really should exist; there is no sensible recovery.
-    (with-temp-buffer
-      (insert-file-contents data-file)
-      ;; There is zero or one line with special characters declarations.
-      (when (search-forward-regexp "^special" nil t)
-        (let ((specials (split-string
-                         (buffer-substring (point)
-                                           (progn (end-of-line) (point))))))
-          ;; The line looks like: special ' -** - -** . -** : -*-
-          ;; -** means that this character
-          ;;    - doesn't appear at word start
-          ;;    * may appear in the middle of a word
-          ;;    * may appear at word end
-          ;; `otherchars' is about the middle case.
-          (while specials
-            (when (eq (aref (cadr specials) 1) ?*)
-              (push (car specials) otherchars))
-            (setq specials (cddr specials))))))
-    (list dict-name
-          "[[:alpha:]]"
-          "[^[:alpha:]]"
-          (regexp-opt otherchars)
-          t                             ; We can't tell, so set this to t
-          (list "-d" dict-name "--encoding=utf-8")
-          nil                           ; aspell doesn't support this
-          ;; Here we specify the encoding to use while communicating with
-          ;; aspell.  This doesn't apply to command line arguments, so
-          ;; just don't pass words to spellcheck as arguments...
-          'utf-8)))
+    (condition-case ()
+        (with-temp-buffer
+          (insert-file-contents data-file)
+          ;; There is zero or one line with special characters declarations.
+          (when (search-forward-regexp "^special" nil t)
+            (let ((specials (split-string
+                             (buffer-substring (point)
+                                               (progn (end-of-line) (point))))))
+              ;; The line looks like: special ' -** - -** . -** : -*-
+              ;; -** means that this character
+              ;;    - doesn't appear at word start
+              ;;    * may appear in the middle of a word
+              ;;    * may appear at word end
+              ;; `otherchars' is about the middle case.
+              (while specials
+                (when (eq (aref (cadr specials) 1) ?*)
+                  (push (car specials) otherchars))
+                (setq specials (cddr specials)))))
+          (list dict-name
+                "[[:alpha:]]"
+                "[^[:alpha:]]"
+                (regexp-opt otherchars)
+                t                            ; We can't tell, so set this to t
+                (list "-d" dict-name "--encoding=utf-8")
+                nil                             ; aspell doesn't support this
+                ;; Here we specify the encoding to use while communicating with
+                ;; aspell.  This doesn't apply to command line arguments, so
+                ;; just don't pass words to spellcheck as arguments...
+                'utf-8))
+      (file-error
+       nil))))
 
 (defun ispell-aspell-add-aliases ()
   "Find aspell's dictionary aliases and add them to `ispell-dictionary-alist'."
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index a84f2be28ae..18df2ab226c 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -9574,13 +9574,13 @@ END:VTODO\n"
   (let ((user user-full-name)
         (calname "something")
         (name (or name "unknown"))
-        (timezone "FIXME"))
+        (timezone "Europe/Amsterdam")) ;; FIXME:  How to get the real timezone?
     (princ
      (format "BEGIN:VCALENDAR
 VERSION:2.0
 X-WR-CALNAME:%s
 PRODID:-//%s//Emacs with Org-mode//EN
-X-WR-TIMEZONE:Europe/Amsterdam
+X-WR-TIMEZONE:Europe/%s
 CALSCALE:GREGORIAN\n" name user timezone))))
 
 (defun org-finish-icalendar-file ()
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index 1ed43279c3d..b196001c799 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -159,7 +159,7 @@ to obtain the value of this variable."
   :group 'paragraphs
   :type '(choice regexp (const :tag "Use default value" nil)))
 
-(defcustom sentence-end-base "[.?!][]\"'\xd0c9\x5397d)}]*"
+(defcustom sentence-end-base "[.?!][]\"'$B!I$,1r}(B)}]*"
   "*Regexp matching the basic end of a sentence, not including following space."
   :group 'paragraphs
   :type 'string
@@ -502,9 +502,9 @@ ones already marked."
   (interactive "*p")
   (transpose-subr 'forward-sentence arg))
 
-;;; Local Variables:
-;;; coding: iso-2022-7bit
-;;; End:
+;; Local Variables:
+;; coding: iso-2022-7bit
+;; End:
 
-;;; arch-tag: e727eb1a-527a-4464-b9d7-9d3ec0d1a575
+;; arch-tag: e727eb1a-527a-4464-b9d7-9d3ec0d1a575
 ;;; paragraphs.el ends here
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 3507f6e57cf..a10851aa765 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -1,4 +1,4 @@
-;;; texinfo.el --- major mode for editing Texinfo files
+;;; texinfo.el --- major mode for editing Texinfo files -*- coding: iso-2022-7bit -*-
 
 ;; Copyright (C) 1985, 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997,
 ;;   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
@@ -595,7 +595,7 @@ value of `texinfo-mode-hook'."
   (setq paragraph-start (concat "\b\\|@[a-zA-Z]*[ \n]\\|" paragraph-start))
   (make-local-variable 'sentence-end-base)
   (setq sentence-end-base
-        "\\(@\\(end\\)?dots{}\\|[.?!]\\)[]\"'\xd0c9\x5397d)}]*")
+        "\\(@\\(end\\)?dots{}\\|[.?!]\\)[]\"'$B!I$,1r}(B)}]*")
   (make-local-variable 'adaptive-fill-mode)
   (setq adaptive-fill-mode nil)
   (make-local-variable 'fill-column)
@@ -1059,5 +1059,5 @@ You are prompted for the job number (use a number shown by a previous
 
 (provide 'texinfo)
 
-;;; arch-tag: 005d7c38-43b9-4b7d-aa1d-aea69bae73e1
+;; arch-tag: 005d7c38-43b9-4b7d-aa1d-aea69bae73e1
 ;;; texinfo.el ends here
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index 0fa448d4d7a..9a41507e410 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -339,6 +339,7 @@ Or, alternatively, a SIZE may be specified."
   (cond ((string-match ".*\\.jpe?g\\'" img) 'jpeg)
         ((string-match ".*\\.xpm\\'" img) 'xpm)
         ((string-match ".*\\.xbm\\'" img) 'xbm)
+        ((string-match ".*\\.pbm\\'" img) 'pbm)
         ((string-match ".*\\.gif\\'" img) 'gif)
         ((string-match ".*\\.bmp\\'" img) 'bmp)
         ((string-match ".*\\.png\\'" img) 'png)
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 1bbdd6d37a0..50715cf800c 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -65,37 +65,33 @@ Do so after `tooltip-short-delay'."
   :type 'number
   :group 'tooltip)
 
-(defcustom tooltip-x-offset nil
+(defcustom tooltip-x-offset 5
   "X offset, in pixels, for the display of tooltips.
 The offset is relative to the position of the mouse.  It must
 be chosen so that the tooltip window doesn't contain the mouse
-when it pops up.  If the value is nil, the default offset is 5
-pixels.
+when it pops up.
 
 If `tooltip-frame-parameters' includes the `left' parameter,
 the value of `tooltip-x-offset' is ignored."
   :tag "X offset"
-  :type '(choice (const :tag "Default" nil)
-                 (integer :tag "Offset" :value 1))
+  :type 'integer
   :group 'tooltip)
 
-(defcustom tooltip-y-offset nil
+(defcustom tooltip-y-offset +40
   "Y offset, in pixels, for the display of tooltips.
 The offset is relative to the position of the mouse.  It must
 be chosen so that the tooltip window doesn't contain the mouse
-when it pops up.  If the value is nil, the default offset is -10
-pixels.
+when it pops up.
 
 If `tooltip-frame-parameters' includes the `top' parameter,
 the value of `tooltip-y-offset' is ignored."
   :tag "Y offset"
-  :type '(choice (const :tag "Default" nil)
-                 (integer :tag "Offset" :value 1))
+  :type 'integer
   :group 'tooltip)
 
 (defcustom tooltip-frame-parameters
   '((name . "tooltip")
-    (internal-border-width . 5)
+    (internal-border-width . 2)
     (border-width . 1))
   "Frame parameters used for tooltips.
 
diff --git a/lisp/vc.el b/lisp/vc.el
index f7afbedc354..92d3979d084 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -2061,10 +2061,13 @@ There is a special command, `*l', to mark all files currently locked."
   ;; when vc-dired-mode-map is initialized.
   (set-keymap-parent vc-dired-mode-map dired-mode-map)
   (add-hook 'dired-after-readin-hook 'vc-dired-hook nil t)
-  ;; The following is slightly modified from dired.el,
+  ;; The following is slightly modified from files.el,
   ;; because file lines look a bit different in vc-dired-mode
   ;; (the column before the date does not end in a digit).
-  (set (make-local-variable 'dired-move-to-filename-regexp)
+  ;; albinus: It should be done in the original declaration.  Problem
+  ;; is the optional empty state-info; otherwise ")" would be good
+  ;; enough as delimeter.
+  (set (make-local-variable 'directory-listing-before-filename-regexp)
   (let* ((l "\\([A-Za-z]\\|[^\0-\177]\\)")
          ;; In some locales, month abbreviations are as short as 2 letters,
          ;; and they can be followed by ".".
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index d3ae080e485..8ef4d449e01 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -518,9 +518,7 @@ and:
 ;;;###autoload
 (defun whitespace-cleanup ()
   "Cleanup the five different kinds of whitespace problems.
-
-Use \\[describe-function] whitespace-describe to read a summary of the
-whitespace problems."
+See `whitespace-buffer' docstring for a summary of the problems."
   (interactive)
   ;; If this buffer really contains a file, then run, else quit.
   (whitespace-check-whitespace-mode current-prefix-arg)
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 1d5cb3625f0..064725c8bfe 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -403,10 +403,7 @@ new value.")
     ;; We want to avoid the face with image buttons.
     (unless (widget-get widget :suppress-face)
       (overlay-put overlay 'face (widget-apply widget :button-face-get))
-      ; Text terminals cannot change mouse pointer shape, so use mouse
-      ; face instead.
-      (or (display-graphic-p)
-          (overlay-put overlay 'mouse-face widget-mouse-face)))
+      (overlay-put overlay 'mouse-face widget-mouse-face))
     (overlay-put overlay 'pointer 'hand)
     (overlay-put overlay 'follow-link follow-link)
     (overlay-put overlay 'help-echo help-echo)))
@@ -664,11 +661,9 @@ button is pressed or inactive, respectively.  These are currently ignored."
   "Move to where you click, and if it is an active field, invoke it."
   (interactive "e")
   (mouse-set-point event)
-  (if (widget-event-point event)
-      (let* ((pos (widget-event-point event))
-             (button (get-char-property pos 'button)))
-        (if button
-            (widget-button-click event)))))
+  (let ((pos (widget-event-point event)))
+    (if (and pos (get-char-property pos 'button))
+        (widget-button-click event))))
 
 ;;; Buttons.
 
diff --git a/lisp/widget.el b/lisp/widget.el
index 8e9b0977c05..1985efb7cd6 100644
--- a/lisp/widget.el
+++ b/lisp/widget.el
@@ -39,37 +39,37 @@
 ;; external libraries call it.  We save a kb or two of purespace by
 ;; dummying-out such definitions generally.
 (defmacro define-widget-keywords (&rest keys)
-;;;  ;; Don't use backquote, since that makes trouble trying to
-;;;  ;; re-bootstrap from just the .el files.
-;;;  (list 'eval-and-compile
-;;;    (list 'let (list (list 'keywords (list 'quote keys)))
-;;;      (list 'while 'keywords
-;;;       (list 'or (list 'boundp (list 'car 'keywords))
-;;;           (list 'set (list 'car 'keywords) (list 'car 'keywords)))
-;;;       (list 'setq 'keywords (list 'cdr 'keywords)))))
+  ;; ;; Don't use backquote, since that makes trouble trying to
+  ;; ;; re-bootstrap from just the .el files.
+  ;; (list 'eval-and-compile
+  ;;   (list 'let (list (list 'keywords (list 'quote keys)))
+  ;;     (list 'while 'keywords
+  ;;    (list 'or (list 'boundp (list 'car 'keywords))
+  ;;      (list 'set (list 'car 'keywords) (list 'car 'keywords)))
+  ;;    (list 'setq 'keywords (list 'cdr 'keywords)))))
   )
 
-;;;(define-widget-keywords :documentation-indent
-;;;  :complete-function :complete :button-overlay
-;;;  :field-overlay
-;;;  :documentation-shown :button-prefix
-;;;  :button-suffix :mouse-down-action :glyph-up :glyph-down :glyph-inactive
-;;;  :prompt-internal :prompt-history :prompt-match
-;;;  :prompt-value  :deactivate :active
-;;;  :inactive :activate :sibling-args :delete-button-args
-;;;  :insert-button-args :append-button-args :button-args
-;;;  :tag-glyph :off-glyph :on-glyph :valid-regexp
-;;;  :secret :sample-face :sample-face-get :case-fold
-;;;  :create :convert-widget :format :value-create :offset :extra-offset
-;;;  :tag :doc :from :to :args :value :action
-;;;  :value-set :value-delete :match :parent :delete :menu-tag-get
-;;;  :value-get :choice :void :menu-tag :on :off :on-type :off-type
-;;;  :notify :entry-format :button :children :buttons :insert-before
-;;;  :delete-at :format-handler :widget :value-pos :value-to-internal
-;;;  :indent :size :value-to-external :validate :error :directory
-;;;  :must-match :type-error :value-inline :inline :match-inline :greedy
-;;;  :button-face-get :button-face :value-face :keymap :entry-from
-;;;  :entry-to :help-echo :documentation-property :tab-order)
+;;(define-widget-keywords :documentation-indent
+;;  :complete-function :complete :button-overlay
+;;  :field-overlay
+;;  :documentation-shown :button-prefix
+;;  :button-suffix :mouse-down-action :glyph-up :glyph-down :glyph-inactive
+;;  :prompt-internal :prompt-history :prompt-match
+;;  :prompt-value  :deactivate :active
+;;  :inactive :activate :sibling-args :delete-button-args
+;;  :insert-button-args :append-button-args :button-args
+;;  :tag-glyph :off-glyph :on-glyph :valid-regexp
+;;  :secret :sample-face :sample-face-get :case-fold
+;;  :create :convert-widget :format :value-create :offset :extra-offset
+;;  :tag :doc :from :to :args :value :action
+;;  :value-set :value-delete :match :parent :delete :menu-tag-get
+;;  :value-get :choice :void :menu-tag :on :off :on-type :off-type
+;;  :notify :entry-format :button :children :buttons :insert-before
+;;  :delete-at :format-handler :widget :value-pos :value-to-internal
+;;  :indent :size :value-to-external :validate :error :directory
+;;  :must-match :type-error :value-inline :inline :match-inline :greedy
+;;  :button-face-get :button-face :value-face :keymap :entry-from
+;;  :entry-to :help-echo :documentation-property :tab-order)
 
 (defun define-widget (name class doc &rest args)
   "Define a new widget type named NAME from CLASS.
@@ -85,6 +85,7 @@ create identical widgets:
 * (apply 'widget-create CLASS ARGS)
 
 The third argument DOC is a documentation string for the widget."
+  (declare (doc-string 3))
   (put name 'widget-type (cons class args))
   (put name 'widget-documentation doc)
   name)
@@ -96,5 +97,5 @@ The third argument DOC is a documentation string for the widget."
 
 (provide 'widget)
 
-;;; arch-tag: 932c71a3-9aeb-4827-a293-8b88b26d5c58
+;; arch-tag: 932c71a3-9aeb-4827-a293-8b88b26d5c58
 ;;; widget.el ends here
diff --git a/lisp/window.el b/lisp/window.el
index a0820bb7cf6..48dd0f4b395 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -192,6 +192,18 @@ Anything else means restrict to the selected frame."
 
 (defalias 'some-window 'get-window-with-predicate)
 
+;; This should probably be written in C (i.e., without using `walk-windows').
+(defun get-buffer-window-list (buffer &optional minibuf frame)
+  "Return list of all windows displaying BUFFER, or nil if none.
+BUFFER can be a buffer or a buffer name.
+See `walk-windows' for the meaning of MINIBUF and FRAME."
+  (let ((buffer (if (bufferp buffer) buffer (get-buffer buffer))) windows)
+    (walk-windows (function (lambda (window)
+                              (if (eq (window-buffer window) buffer)
+                                  (setq windows (cons window windows)))))
+                  minibuf frame)
+    windows))
+
 (defun minibuffer-window-active-p (window)
   "Return t if WINDOW (a minibuffer window) is now active."
   (eq window (active-minibuffer-window)))