Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 343-356)

   - Update from CVS
   - Update for ERC 5.1.3.
   - Merge from gnus--rel--5.10

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

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

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

73 files changed, 3326 insertions, 2072 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb454f9a4db..d57587f2621 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,368 @@
+2006-07-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/sh-script.el (sh-font-lock-keywords-1):
+        Revert inadvertently installed patch hunk.
+
+        * progmodes/compile.el (compilation-find-file): Handle the
+        cases where the user selects a non-existent file.
+
+2006-07-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * bindings.el (minibuffer-local-map): Rebind TAB so it inserts a \t.
+
+2006-07-17  Chong Yidong  <cyd@stupidchicken.com>
+
+        * subr.el (sit-for): Just sleep-for if noninteractive.
+
+2006-07-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/autoload.el (make-autoload): Use new arg.
+
+        * custom.el (custom-autoload): Add `noset' argument.
+        (custom-push-theme): Don't autoload the variable, let callers do it.
+        (custom-theme-set-variables): Autoload the variable if necessary.
+
+        * cus-edit.el (custom-variable-state-set): If the variable was
+        originally set outside custom, but to the same value as the default,
+        consider it to be standard.
+
+        * Makefile.in (mh-loaddefs.el): Finish setting up the default empty
+        file *before* telling Emacs to add the autoloads, in case it fails.
+
+        * progmodes/sh-script.el (sh-quoted-subshell): Don't match escaped `.
+        Use `cond', push', and `dolist'.
+
+2006-07-17  Richard Stallman  <rms@gnu.org>
+
+        * image-mode.el (tar-superior-buffer, archive-superior-buffer):
+        Add defvars to silence warnings.
+
+2006-07-17  Chong Yidong  <cyd@stupidchicken.com>
+
+        * progmodes/compile.el (compilation-mode-font-lock-keywords):
+        Don't highlight "Compiling file" messages as error.
+
+        * dired-aux.el (dired-compress-file): Confirm again if gzipped
+        file already exists.
+
+2006-07-16  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * find-file.el (ff-special-constructs): Doc fix.  Also, for C/C++
+        entry, don't assign to free var; simply return the extracted filename.
+        (ff-treat-as-special): Incorporate common preamble from callers.
+        (ff-other-file-name, ff-find-the-other-file):
+        Update call to ff-treat-as-special.
+
+        * progmodes/ada-mode.el (ada-mode): Rewrite ff-special-constructs init.
+
+2006-07-16  Mathias Dahl  <mathias.dahl@gmail.com>
+
+        * tumme.el (tumme-get-comment): Fix bug.
+
+2006-07-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * files.el: Remove spurious * in docstrings.
+
+2006-07-14  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el (allout-run-unit-tests-on-load): Rectify docstring
+        grammar.
+        (allout-beginning-of-current-line): Beware beginning of buffer.
+        Also, a comment is simplified.
+        (allout-hotspot-key-handler): Only set allout-post-goto-bullet
+        when appropriate.  (This fix enables use for other than
+        bullet-hotspot operation.)
+        (allout-hide-current-subtree): While escalating to sibling-close,
+        make sure to situate on a topic.
+
+2006-07-14  Kim F. Storm  <storm@cua.dk>
+
+        * emulation/cua-base.el (cua-delete-selection)
+        (cua-toggle-set-mark): New defcustoms.
+        (cua-rectangle-modifier-key): Add `alt' modifier.
+        (cua-replace-region): Don't delete if cua-delete-selection is nil.
+        (cua-set-mark): Don't clear mark if cua-toggle-set-mark is nil.
+        Suggested by Klaus Zeitler <kzeitler@lucent.com>.
+
+        * emulation/cua-rect.el (cua-help-for-rectangle): Add `alt' modifier.
+
+2006-07-14  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el: Require 'cl during byte-compilation/interactive load,
+        for the `assert' macro.
+        (allout-mode-deactivate-hook): New hook, run when allout mode
+        deactivates.
+        (allout-developer): New allout customization subgroup.
+        (allout-run-unit-tests-on-load): New allout-developer
+        customization variable, when true allout unit tests are run towards
+        end of file load/eval.
+        (allout-inhibit-auto-fill): Disable auto-fill activity even during
+        auto-fill-mode.
+        (allout-resumptions): Remove, to be replaced by...
+        (allout-add-resumptions): Register variable settings to be
+        reinstated by `allout-do-resumptions'.  The settings are made
+        buffer-local, but the locality/globality of the suspended setting
+        is restored on resumption.
+        (allout-do-resumptions): Reinstate all settings suspended using
+        `allout-add-resumptions'.
+        (allout-test-resumptions): Unit tests (and intermediate variables)
+        for resumptions.
+        (allout-tests-globally-unbound, allout-tests-globally-true)
+        (allout-tests-locally-true): Intermediate variables for
+        resumptions unit tests.
+        (allout-overlay-preparations): Replaces `allout-set-overlay-category'.
+        (allout-exposure-category): Replaces 'allout-overlay-category variable.
+        (allout-mode): Use `allout-add-resumptions' and `allout-do-resumptions'
+        instead of retired `allout-resumptions'.  For hook functions, use
+        `local' parameter so hook settings are created and removed as
+        buffer-local settings.  Revise (resumptions) setting
+        auto-fill-function so it is set only if already active.  (The
+        related fill-function settings are all made in either case, so
+        that activating auto-fill-mode activity will have the custom
+        allout-mode behaviors (hanging indent on topics, if configured for it).
+        Remove all allout-exposure-category overlays on mode deactivation.
+        (allout-hotspot-key-handler): New function extracted from
+        `allout-pre-command-business', so the functionality can be used
+        for other purposes, eg as a binding in an overlay.
+        (allout-pre-command-business): Use new `allout-hotspot-key-handler'.
+        (allout-auto-fill): Respect new `allout-inhibit-auto-fill'
+        customization variable.
+        (allout-run-unit-tests): Run the (currently quite small)
+        repertoire of unit tests.  Called just before the provide iff user
+        has customized `allout-run-unit-tests-on-load' non-nil.
+
+2006-07-14  K,Aa(Broly L,Bu(Brentey  <lorentey@elte.hu>
+
+        * emacs-lisp/authors.el (authors-aliases): Update.
+
+2006-07-14  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-display-buffer): Check for
+        gdb-source-window.  Add dedicated argument.
+        (gdb-display-separate-io-buffer, gdb-append-to-inferior-io)
+        (gdb-display-breakpoints-buffer, gdb-display-stack-buffer)
+        (gdb-display-threads-buffer, gdb-display-memory-buffer)
+        (gdb-display-locals-buffer): Use it.
+
+        * progmodes/gud.el (gud-display-line): Use gdb-display-buffer.
+        Set gdb-source-window.
+
+2006-07-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/autoload.el (make-autoload): Remove special handling of
+        minor modes, redundant with the custom-autoload line above.
+
+2006-07-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * longlines.el (longlines-post-command-function): Handle open-line too.
+
+2006-07-12  Richard Stallman  <rms@gnu.org>
+
+        * progmodes/grep.el (grep-last-buffer): Doc fix.
+
+        * info.el (Info-try-follow-nearest-node): Doc fix.
+
+        * emacs-lisp/edebug.el (edebug-instrument-function):
+        Err if find-function-noselect gives no position.
+
+        * emacs-lisp/find-func.el (find-function-search-for-symbol):
+        If can't find definition, return nil for position.
+        (find-function-do-it): Handle new return value
+        of find-definition-noselect.
+        (find-definition-noselect, find-variable-noselect): Doc fix.
+        (find-function-noselect): Doc fix.
+
+        * help-mode.el (help-variable-def): Handle find-variable-noselect
+        returning no position.
+        (help-function-def): Likewise for find-function-search-for-symbol.
+        (help-face-def): Likewise.
+
+        * help-fns.el (describe-variable): Handle find-variable-noselect
+        returning no position.
+
+        * files.el (locate-file-completion): Avoid duplicates in result.
+
+        * cus-edit.el (custom-no-edit): New command.
+        (custom-mode-map): Remap to custom-no-edit instead of
+        using suppress-keymap.
+
+2006-07-12  Nick Roberts  <nickrob@snap.net.nz>
+
+        * tumme.el (tumme-create-thumb, tumme-thumbnail-display-external)
+        (tumme-display-image, tumme-rotate-thumbnail, tumme-rotate-original)
+        (tumme-set-exif-data, tumme-get-exif-data): Use shell-command-switch.
+
+        * thumbs.el (thumbs-call-convert): Use shell-command-switch.
+
+2006-07-11  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-copy-current-file-name): Use buffer-name if
+        buffer-file-name is nil.
+
+2006-07-11  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (undo-ask-before-discard): Set to nil.
+
+        * vc.el (vc-exec-after): Don't delete process manually.
+        (vc-print-log): Run log-view-mode in process sentinel inside
+        inhibit-read-only.  Don't shrink window due to timing issues.
+
+        * progmodes/ebrowse.el (ebrowse-display-member-buffer):
+        Avoid using with-output-to-temp-buffer, which clobbers local vars.
+
+2006-07-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/compile.el (compilation-error-regexp-alist-alist):
+        Fix ambiguity introduced by last change.
+        (compilation-find-file): Move save-excursion to where it may
+        make sense.  Fix a left over `find-file'.
+
+2006-07-11  Robert J. Chassell  <bob@rattlesnake.com>
+
+        * textmodes/texinfmt.el (texinfo-format-separate-node):
+        Insert a string before point, which fits documentation, not after.
+        (texinfo-multitable-item): In a multitable row, insert any
+        additional needed @tabs and spaces.
+
+2006-07-11  Nick Roberts  <nickrob@snap.net.nz>
+
+        * tumme.el (tumme-create-thumb, tumme-thumbnail-display-external)
+        (tumme-display-image, tumme-rotate-thumbnail, tumme-rotate-original)
+        (tumme-set-exif-data, tumme-get-exif-data): Use call-process
+        instead of shell-command.
+        (tumme-create-thumbnail-buffer, tumme-create-display-image-buffer)
+        (tumme-display-thumbs, tumme-modify-mark-on-thumb-original-file)
+        (tumme-display-image, tumme-get-exif-data): Use with-current-buffer.
+        (tumme-display-properties-format, tumme-dired-insert-marked-thumbs)
+        (tumme-thumbnail-set-image-description, tumme-gallery-generate)
+        (tumme-rotate-original, tumme-get-exif-file-name): Fit to 80 columns.
+
+2006-07-11  Kim F. Storm  <storm@cua.dk>
+
+        * subr.el (sit-for): Doc fix.  Specify normal arg list using fn-form.
+        Remove special case for seconds < 0.  Use (redisplay t) instead.
+
+2006-07-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * progmodes/cc-awk.el (defconst): Use eval-and-compile to avoid
+        compilation error.
+
+        * subr.el (sit-for): New function.
+
+        * play/hanoi.el (hanoi-sit-for): Check sit-for return value.
+
+2006-07-10  Richard Stallman  <rms@gnu.org>
+
+        * ldefs-boot.el (edebug): Update page.
+
+2006-07-10  Kim F. Storm  <storm@cua.dk>
+
+        * emacs-lisp/authors.el (authors-ignored-files): Ignore changes
+        to FOR-RELEASE and TODO.
+
+2006-07-10  Romain Francoise  <romain@orebokech.com>
+
+        * emacs-lisp/authors.el (authors-aliases): Update.
+
+2006-07-10  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-awk.el, cc-defs.el, cc-fonts.el, cc-langs.el:
+        * cc-mode.el: Changes to eradicate eval-after-load.
+
+2006-07-09  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs-lisp/helper.el (Helper-help-scroller): Don't signal error
+        on non-char events.
+
+2006-07-09  Romain Francoise  <romain@orebokech.com>
+
+        * progmodes/compile.el (compilation-mode-font-lock-keywords):
+        Don't highlight start/end markers as compilation messages.
+
+        * isearch.el (isearch-yank-line): Let-bind `inhibit-field-text-motion'
+        to t.
+
+2006-07-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/fill.el (fill-region-as-paragraph): Refine last change.
+
+2006-07-08  Richard Stallman  <rms@gnu.org>
+
+        * term/x-win.el (x-handle-display): Add doc string.
+
+        * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix.
+
+        * subr.el (def-edebug-spec): Move here.
+        * emacs-lisp/edebug.el (def-edebug-spec): Move to subr.el.
+
+        * imenu.el (imenu-choose-buffer-index): Doc fix.
+
+2006-07-08  Romain Francoise  <romain@orebokech.com>
+
+        * term/x-win.el (x-display-name): Fix typo.
+
+2006-07-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * hexl.el (hexl-find-file): Doc fix.
+
+        * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix.
+
+2006-07-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * term/x-win.el (x-display-name): Doc fix.
+
+2006-07-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/fill.el (fill-delete-prefix): Don't ignore excessively
+        long prefixes.
+        (fill-region-as-paragraph): Don't round up to a whole line.
+        (fill-comment-paragraph): Don't include the code-before-the-comment
+        when calling fill-region-as-paragraph.
+
+        * international/mule.el (make-char): Remove redundancy.
+
+        * emacs-lisp/bytecomp.el (byte-compile-form): The `byte-compile'
+        property may contain an anonymous function rather than a symbol.
+
+        * pcvs-defs.el (cvs-temp-buffer-name): Fix non-hiddenness.
+
+        * progmodes/compile.el (compilation-error-regexp-alist-alist) <gnu>:
+        Use shy regexp.  Fix incorrect backref to potentially unmatched group.
+
+        * dirtrack.el (dirtrack-default-directory-function): Remove.
+        (dirtrack-directory-function): Use file-name-as-directory.
+        (dirtrack-windows-directory-function): Simplify.
+        (dirtrack-forward-slash, dirtrack-backward-slash)
+        (dirtrack-replace-slash): Remove.
+        (dirtrack-toggle): Adjust comint-preoutput-filter-functions as well.
+        (dirtrack): Fix wrong parenthesizing; use match-string.
+
+        * progmodes/octave-inf.el: Remove spurious * in docstrings.
+        (inferior-octave-mode): Only change the buffer-local value of
+        comint-dynamic-complete-functions.
+        (inferior-octave-mode-map, inferior-octave-mode-syntax-table):
+        Move the initialization to the declaration.
+        (inferior-octave-complete): Remove unused var `filter'.
+
+        * shell.el (shell-mode): Only change the buffer-local value of
+        comint-dynamic-complete-functions.
+
+2006-07-07  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-agenda-get-todos): Skip subtree also if
+        entry is skipped because it has been scheduled.
+        (org-prepare-agenda-buffers): Don't mark buffers as modified when
+        changing `:org-archived' and `:org-comment' properties.
+
+2006-07-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * server.el (server-select-display): Don't make the temp frame
+        minibuffer-only, in case it's not a temp frame.
+        (server-process-filter): Don't delete the temp frame if it's the
+        only one we have on that display.
+
+        * files.el (find-alternate-file): Doc fix.
+
 2006-07-05  Richard Stallman  <rms@gnu.org>
 
         * files.el (abbreviate-file-name): Add save-match-data.
@@ -181,8 +546,8 @@
 2006-06-25  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/rcompile.el (remote-compile): Replace ange-ftp based
-        implementation by Tramp functions.  Based on a patch published by
-        Marc Abramowitz <msabramo@gmail.com>.
+        implementation by Tramp functions.
+        Suggested by Marc Abramowitz <msabramo@gmail.com>.
 
         * net/tramp.el (tramp-unload-tramp): Provide a doc string.
 
@@ -1857,8 +2222,6 @@
         to `ispell-local-dictionary'.
         (ispell-internal-change-dictionary): Check for a change in
         personal dictionary use too.
-        Cosmetic changes from Agustin Martin
-        <agustin.martin@hispalinux.es>.
 
 2006-05-05  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 196a4b5c0a2..ef9bf3cd180 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -249,12 +249,6 @@ $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
         echo ";;; Commentary:" >> $@
         echo ";;; Change Log:" >> $@
         echo ";;; Code:" >> $@
-        $(EMACS) $(EMACSOPT) \
-           -l autoload \
-           --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
-           --eval "(setq generated-autoload-file \"$(lisp)/mh-e/mh-loaddefs.el\")" \
-           --eval "(setq make-backup-files nil)" \
-           -f batch-update-autoloads $(lisp)/mh-e
         echo "" >> $@
         echo "(provide 'mh-loaddefs)" >> $@
         echo ";; Local Variables:" >> $@
@@ -263,6 +257,12 @@ $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
         echo ";; no-update-autoloads: t" >> $@
         echo ";; End:" >> $@
         echo ";;; mh-loaddefs.el ends here" >> $@
+        $(EMACS) $(EMACSOPT) \
+           -l autoload \
+           --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
+           --eval "(setq generated-autoload-file \"$(lisp)/mh-e/mh-loaddefs.el\")" \
+           --eval "(setq make-backup-files nil)" \
+           -f batch-update-autoloads $(lisp)/mh-e
 
 # Prepare a bootstrap in the lisp subdirectory.
 #
diff --git a/lisp/allout.el b/lisp/allout.el
index 2fbef5b2cd8..296777ee9d9 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -8,6 +8,7 @@
 ;; Created: Dec 1991 - first release to usenet
 ;; Version: 2.2.1
 ;; Keywords: outlines wp languages
+;; Website: http://myriadicity.net/Sundry/EmacsAllout
 
 ;; This file is part of GNU Emacs.
 
@@ -58,7 +59,9 @@
 ;; and more.
 ;;
 ;; See the `allout-mode' function's docstring for an introduction to the
-;; mode.  The development version and helpful notes are available at
+;; mode.
+;;
+;; The latest development version and helpful notes are available at
 ;; http://myriadicity.net/Sundry/EmacsAllout .
 ;;
 ;; The outline menubar additions provide quick reference to many of
@@ -80,10 +83,19 @@
 
 ;;;_* Dependency autoloads
 (require 'overlay)
-(eval-when-compile (progn (require 'pgg)
-                          (require 'pgg-gpg)
-                          (require 'overlay)
-                          ))
+(eval-when-compile
+  ;; Most of the requires here are for stuff covered by autoloads.
+  ;; Since just byte-compiling doesn't trigger autoloads, so that
+  ;; "function not found" warnings would occur without these requires.
+  (progn
+    (require 'pgg)
+    (require 'pgg-gpg)
+    (require 'overlay)
+    ;; `cl' is required for `assert'.  `assert' is not covered by a standard
+    ;; autoload, but it is a macro, so that eval-when-compile is sufficient
+    ;; to byte-compile it in, or to do the require when the buffer evalled.
+    (require 'cl)
+    ))
 
 ;;;_* USER CUSTOMIZATION VARIABLES:
 
@@ -556,6 +568,25 @@ disable auto-saves for that file."
   :group 'allout-encryption)
 (make-variable-buffer-local 'allout-encrypt-unencrypted-on-saves)
 
+;;;_ + Developer
+;;;_  = allout-developer group
+(defgroup allout-developer nil
+  "Settings for topic encryption features of allout outliner."
+  :group 'allout)
+;;;_  = allout-run-unit-tests-on-load
+(defcustom allout-run-unit-tests-on-load nil
+  "*When non-nil, unit tests will be run at end of loading the allout module.
+
+Generally, allout code developers are the only ones who'll want to set this.
+
+\(If set, this makes it an even better practice to exercise changes by
+doing byte-compilation with a repeat count, so the file is loaded after
+compilation.)
+
+See `allout-run-unit-tests' to see what's run."
+  :type 'boolean
+  :group 'allout-developer)
+
 ;;;_ + Miscellaneous customization
 
 ;;;_  = allout-command-prefix
@@ -615,6 +646,23 @@ unless optional third, non-nil element is present.")
         ("=t" allout-latexify-exposed)
         ("=p" allout-flatten-exposed-to-buffer)))
 
+;;;_  = allout-inhibit-auto-fill
+(defcustom allout-inhibit-auto-fill nil
+  "*If non-nil, auto-fill will be inhibited in the allout buffers.
+
+You can customize this setting to set it for all allout buffers, or set it
+in individual buffers if you want to inhibit auto-fill only in particular
+buffers.  \(You could use a function on `allout-mode-hook' to inhibit
+auto-fill according, eg, to the major mode.\)
+
+If you don't set this and auto-fill-mode is enabled, allout will use the
+value that `normal-auto-fill-function', if any, when allout mode starts, or
+else allout's special hanging-indent maintaining auto-fill function,
+`allout-auto-fill'."
+  :type 'boolean
+  :group 'allout)
+(make-variable-buffer-local 'allout-inhibit-auto-fill)
+
 ;;;_  = allout-use-hanging-indents
 (defcustom allout-use-hanging-indents t
   "*If non-nil, topic body text auto-indent defaults to indent of the header.
@@ -993,69 +1041,68 @@ activation.  Being deprecated.")
                       "----"
                       ["Set Header Lead" allout-reset-header-lead t]
                       ["Set New Exposure" allout-expose-topic t])))
-;;;_  : Mode-Specific Variable Maintenance Utilities
+;;;_  : Allout Modal-Variables Utilities
 ;;;_   = allout-mode-prior-settings
 (defvar allout-mode-prior-settings nil
-  "Internal `allout-mode' use; settings to be resumed on mode deactivation.")
-(make-variable-buffer-local 'allout-mode-prior-settings)
-;;;_   > allout-resumptions (name &optional value)
-(defun allout-resumptions (name &optional value)
-
-  "Registers or resumes settings over `allout-mode' activation/deactivation.
-
-First arg is NAME of variable affected.  Optional second arg is list
-containing allout-mode-specific VALUE to be imposed on named
-variable, and to be registered.  \(It's a list so you can specify
-registrations of null values.)  If no value is specified, the
-registered value is returned (encapsulated in the list, so the caller
-can distinguish nil vs no value), and the registration is popped
-from the list."
-
-  (let ((on-list (assq name allout-mode-prior-settings))
-        prior-capsule                   ; By `capsule' i mean a list
-                                        ; containing a value, so we can
-                                        ; distinguish nil from no value.
-        )
-
-    (if value
+  "Internal `allout-mode' use; settings to be resumed on mode deactivation.
 
-        ;; Registering:
-        (progn
-          (if on-list
-              nil       ; Already preserved prior value - don't mess with it.
-            ;; Register the old value, or nil if previously unbound:
-            (setq allout-mode-prior-settings
-                  (cons (list name
-                              (if (boundp name) (list (symbol-value name))))
-                        allout-mode-prior-settings)))
-                                        ; And impose the new value, locally:
-          (progn (make-local-variable name)
-                 (set name (car value))))
-
-      ;; Relinquishing:
-      (if (not on-list)
-
-          ;; Oops, not registered - leave it be:
-          nil
-
-        ;; Some registration:
-                                        ; reestablish it:
-        (setq prior-capsule (car (cdr on-list)))
-        (if prior-capsule
-            (set name (car prior-capsule)) ; Some prior value - reestablish it.
-          (makunbound name))            ; Previously unbound - demolish var.
-                                        ; Remove registration:
-        (let (rebuild)
-          (while allout-mode-prior-settings
-            (if (not (eq (car allout-mode-prior-settings)
-                         on-list))
-                (setq rebuild
-                      (cons (car allout-mode-prior-settings)
-                            rebuild)))
-            (setq allout-mode-prior-settings
-                  (cdr allout-mode-prior-settings)))
-          (setq allout-mode-prior-settings rebuild)))))
-  )
+See `allout-add-resumptions' and `allout-do-resumptions'.")
+(make-variable-buffer-local 'allout-mode-prior-settings)
+;;;_   > allout-add-resumptions (&rest pairs)
+(defun allout-add-resumptions (&rest pairs)
+  "Set name/value pairs.
+
+Old settings are preserved for later resumption using `allout-do-resumptions'.
+
+The pairs are lists whose car is the name of the variable and car of the
+cdr is the new value:  '(some-var some-value)'.
+
+The new value is set as a buffer local.
+
+If the variable was not previously buffer-local, then that is noted and the
+`allout-do-resumptions' will just `kill-local-variable' of that binding.
+
+If it previously was buffer-local, the old value is noted and resurrected
+by `allout-do-resumptions'.  \(If the local value was previously void, then
+it is left as nil on resumption.\)
+
+The settings are stored on `allout-mode-prior-settings'."
+  (while pairs
+    (let* ((pair (pop pairs))
+           (name (car pair))
+           (value (cadr pair)))
+      (if (not (symbolp name))
+          (error "Pair's name, %S, must be a symbol, not %s"
+                 name (type-of name)))
+      (when (not (assoc name allout-mode-prior-settings))
+        ;; Not already added as a resumption, create the prior setting entry.
+        (if (local-variable-p name)
+            ;; is already local variable - preserve the prior value:
+            (push (list name (condition-case err
+                                 (symbol-value name)
+                               (void-variable nil)))
+                  allout-mode-prior-settings)
+          ;; wasn't local variable, indicate so for resumption by killing
+          ;; local value, and make it local:
+          (push (list name) allout-mode-prior-settings)
+          (make-local-variable name)))
+      (set name value))))
+;;;_   > allout-do-resumptions ()
+(defun allout-do-resumptions ()
+  "Resume all name/value settings registered by `allout-add-resumptions'.
+
+This is used when concluding allout-mode, to resume selected variables to
+their settings before allout-mode was started."
+
+    (while allout-mode-prior-settings
+      (let* ((pair (pop allout-mode-prior-settings))
+             (name (car pair))
+             (value-cell (cdr pair)))
+        (if (not value-cell)
+            ;; Prior value was global:
+            (kill-local-variable name)
+          ;; Prior value was explicit:
+          (set name (car value-cell))))))
 ;;;_  : Mode-specific incidentals
 ;;;_   > allout-unprotected (expr)
 (defmacro allout-unprotected (expr)
@@ -1065,9 +1112,12 @@ from the list."
 ;;;_   = allout-mode-hook
 (defvar allout-mode-hook nil
   "*Hook that's run when allout mode starts.")
-;;;_   = allout-overlay-category
-(defvar allout-overlay-category nil
-  "Symbol for use in allout invisible-text overlays as the category.")
+;;;_   = allout-mode-deactivate-hook
+(defvar allout-mode-deactivate-hook nil
+  "*Hook that's run when allout mode ends.")
+;;;_   = allout-exposure-category
+(defvar allout-exposure-category nil
+  "Symbol for use as allout invisible-text overlay category.")
 ;;;_   x allout-view-change-hook
 (defvar allout-view-change-hook nil
   "*\(Deprecated\)  Hook that's run after allout outline exposure changes.
@@ -1293,30 +1343,26 @@ the following two lines in your Emacs init file:
       (setq cur (car menus)
             menus (cdr menus))
       (easy-menu-add cur))))
-;;;_  > allout-set-overlay-category
-(defun allout-set-overlay-category ()
-  "Set the properties of the allout invisible-text overlay."
-  (setplist 'allout-overlay-category nil)
-  (put 'allout-overlay-category 'invisible 'allout)
-  (put 'allout-overlay-category 'evaporate t)
+;;;_  > allout-overlay-preparations
+(defun allout-overlay-preparations ()
+  "Set the properties of the allout invisible-text overlay and others."
+  (setplist 'allout-exposure-category nil)
+  (put 'allout-exposure-category 'invisible 'allout)
+  (put 'allout-exposure-category 'evaporate t)
   ;; XXX We use isearch-open-invisible *and* isearch-mode-end-hook.  The
   ;; latter would be sufficient, but it seems that a separate behavior -
   ;; the _transient_ opening of invisible text during isearch - is keyed to
   ;; presence of the isearch-open-invisible property - even though this
   ;; property controls the isearch _arrival_ behavior.  This is the case at
   ;; least in emacs 21, 22.0, and xemacs 21.4.
-  (put 'allout-overlay-category 'isearch-open-invisible
+  (put 'allout-exposure-category 'isearch-open-invisible
        'allout-isearch-end-handler)
   (if (featurep 'xemacs)
-      (put 'allout-overlay-category 'start-open t)
-    (put 'allout-overlay-category 'insert-in-front-hooks
+      (put 'allout-exposure-category 'start-open t)
+    (put 'allout-exposure-category 'insert-in-front-hooks
          '(allout-overlay-insert-in-front-handler)))
-  (if (featurep 'xemacs)
-      (progn (make-variable-buffer-local 'before-change-functions)
-             (add-hook 'before-change-functions
-                       'allout-before-change-handler))
-    (put 'allout-overlay-category 'modification-hooks
-         '(allout-overlay-interior-modification-handler))))
+  (put 'allout-exposure-category 'modification-hooks
+       '(allout-overlay-interior-modification-handler)))
 ;;;_  > allout-mode (&optional toggle)
 ;;;_   : Defun:
 ;;;###autoload
@@ -1575,118 +1621,92 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
                                        ; active state or *de*activation
                                        ; specifically requested:
       (setq allout-explicitly-deactivated t)
-      (if (string-match "^18\." emacs-version)
-                                       ; Revoke those keys that remain
-                                       ; as we set them:
-          (let ((curr-loc (current-local-map)))
-           (mapcar (function
-                    (lambda (cell)
-                      (if (eq (lookup-key curr-loc (car cell))
-                              (car (cdr cell)))
-                          (define-key curr-loc (car cell)
-                            (assq (car cell) allout-prior-bindings)))))
-                   allout-added-bindings)
-           (allout-resumptions 'allout-added-bindings)
-           (allout-resumptions 'allout-prior-bindings)))
 
-      (if allout-old-style-prefixes
-          (progn
-           (allout-resumptions 'allout-primary-bullet)
-           (allout-resumptions 'allout-old-style-prefixes)))
-      ;;(allout-resumptions 'selective-display)
+      (allout-do-resumptions)
+
       (remove-from-invisibility-spec '(allout . t))
-      (set write-file-hook-var-name
-           (delq 'allout-write-file-hook-handler
-                 (symbol-value write-file-hook-var-name)))
-      (setq auto-save-hook
-           (delq 'allout-auto-save-hook-handler
-                 auto-save-hook))
-      (allout-resumptions 'paragraph-start)
-      (allout-resumptions 'paragraph-separate)
-      (allout-resumptions 'auto-fill-function)
-      (allout-resumptions 'normal-auto-fill-function)
-      (allout-resumptions 'allout-former-auto-filler)
+      (remove-hook 'pre-command-hook 'allout-pre-command-business t)
+      (remove-hook 'post-command-hook 'allout-post-command-business t)
+      (when (featurep 'xemacs)
+        (remove-hook 'before-change-functions 'allout-before-change-handler t))
+      (remove-hook 'isearch-mode-end-hook 'allout-isearch-end-handler t)
+      (remove-hook write-file-hook-var-name 'allout-write-file-hook-handler t)
+      (remove-hook 'auto-save-hook 'allout-auto-save-hook-handler t)
+
+      (remove-overlays (point-min) (point-max)
+                       'category 'allout-exposure-category)
+
+      (run-hooks 'allout-mode-deactivate-hook)
       (setq allout-mode nil))
 
      ;; Activation:
      ((not active)
       (setq allout-explicitly-deactivated nil)
       (if allout-old-style-prefixes
-          (progn                        ; Inhibit all the fancy formatting:
-           (allout-resumptions 'allout-primary-bullet '("*"))
-           (allout-resumptions 'allout-old-style-prefixes '(()))))
+          ;; Inhibit all the fancy formatting:
+          (allout-add-resumptions '((allout-primary-bullet "*")
+                                    (allout-old-style-prefixes ()))))
 
-      (allout-set-overlay-category)     ; Doesn't hurt to redo this.
+      (allout-overlay-preparations)     ; Doesn't hurt to redo this.
 
       (allout-infer-header-lead)
       (allout-infer-body-reindent)
 
       (set-allout-regexp)
 
-                                       ; Produce map from current version
-                                       ; of allout-keybindings-list:
-      (if (boundp 'minor-mode-map-alist)
-
-          (progn                        ; V19, and maybe lucid and
-                                       ; epoch, minor-mode key bindings:
-           (setq allout-mode-map
-                 (produce-allout-mode-map allout-keybindings-list))
-           (substitute-key-definition 'beginning-of-line
-                                      'move-beginning-of-line
-                                      allout-mode-map global-map)
-           (substitute-key-definition 'end-of-line
-                                      'move-end-of-line
-                                      allout-mode-map global-map)
-           (produce-allout-mode-menubar-entries)
-           (fset 'allout-mode-map allout-mode-map)
-                                       ; Include on minor-mode-map-alist,
-                                       ; if not already there:
-           (if (not (member '(allout-mode . allout-mode-map)
-                            minor-mode-map-alist))
-               (setq minor-mode-map-alist
-                     (cons '(allout-mode . allout-mode-map)
-                           minor-mode-map-alist))))
-
-                                       ; V18 minor-mode key bindings:
-                                       ; Stash record of added bindings
-                                       ; for later revocation:
-        (allout-resumptions 'allout-added-bindings
-                            (list allout-keybindings-list))
-        (allout-resumptions 'allout-prior-bindings
-                            (list (current-local-map)))
-                                       ; and add them:
-        (use-local-map (produce-allout-mode-map allout-keybindings-list
-                                                (current-local-map)))
-        )
+      ;; Produce map from current version of allout-keybindings-list:
+      (setq allout-mode-map
+            (produce-allout-mode-map allout-keybindings-list))
+      (substitute-key-definition 'beginning-of-line
+                                 'move-beginning-of-line
+                                 allout-mode-map global-map)
+      (substitute-key-definition 'end-of-line
+                                 'move-end-of-line
+                                 allout-mode-map global-map)
+      (produce-allout-mode-menubar-entries)
+      (fset 'allout-mode-map allout-mode-map)
+
+      ;; Include on minor-mode-map-alist, if not already there:
+      (if (not (member '(allout-mode . allout-mode-map)
+                       minor-mode-map-alist))
+          (setq minor-mode-map-alist
+                (cons '(allout-mode . allout-mode-map)
+                      minor-mode-map-alist)))
 
       (add-to-invisibility-spec '(allout . t))
-      (make-local-variable 'line-move-ignore-invisible)
-      (setq line-move-ignore-invisible t)
-      (add-hook 'pre-command-hook 'allout-pre-command-business)
-      (add-hook 'post-command-hook 'allout-post-command-business)
-      (add-hook 'isearch-mode-end-hook 'allout-isearch-end-handler)
-      (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,
-                                       ; hanging-indents, etc:
-      ;; Register prevailing fill func for use by allout-auto-fill:
-      (allout-resumptions 'allout-former-auto-filler (list auto-fill-function))
-      ;; Register allout-auto-fill to be used if filling is active:
-      (allout-resumptions 'auto-fill-function '(allout-auto-fill))
-      (allout-resumptions 'allout-outside-normal-auto-fill-function
-                          (list normal-auto-fill-function))
-      (allout-resumptions 'normal-auto-fill-function '(allout-auto-fill))
-      ;; Paragraphs are broken by topic headlines.
-      (make-local-variable 'paragraph-start)
-      (allout-resumptions 'paragraph-start
-                          (list (concat paragraph-start "\\|^\\("
-                                        allout-regexp "\\)")))
-      (make-local-variable 'paragraph-separate)
-      (allout-resumptions 'paragraph-separate
-                          (list (concat paragraph-separate "\\|^\\("
-                                        allout-regexp "\\)")))
-
+      (allout-add-resumptions '(line-move-ignore-invisible t))
+      (add-hook 'pre-command-hook 'allout-pre-command-business nil t)
+      (add-hook 'post-command-hook 'allout-post-command-business nil t)
+      (when (featurep 'xemacs)
+        (add-hook 'before-change-functions 'allout-before-change-handler
+                  nil t))
+      (add-hook 'isearch-mode-end-hook 'allout-isearch-end-handler nil t)
+      (add-hook write-file-hook-var-name 'allout-write-file-hook-handler
+                nil t)
+      (add-hook 'auto-save-hook 'allout-auto-save-hook-handler
+                nil t)
+
+      ;; Stash auto-fill settings and adjust so custom allout auto-fill
+      ;; func will be used if auto-fill is active or activated.  (The
+      ;; custom func respects topic headline, maintains hanging-indents,
+      ;; etc.)
+      (if (and auto-fill-function (not allout-inhibit-auto-fill))
+          ;; allout-auto-fill will use the stashed values and so forth.
+          (allout-add-resumptions '(auto-fill-function allout-auto-fill)))
+      (allout-add-resumptions (list 'allout-former-auto-filler
+                                    auto-fill-function)
+                              ;; Register allout-auto-fill to be used if
+                              ;; filling is active:
+                              (list 'allout-outside-normal-auto-fill-function
+                                    normal-auto-fill-function)
+                              '(normal-auto-fill-function allout-auto-fill)
+                              ;; Paragraphs are broken by topic headlines.
+                              (list 'paragraph-start
+                                    (concat paragraph-start "\\|^\\("
+                                            allout-regexp "\\)"))
+                              (list 'paragraph-separate
+                                    (concat paragraph-separate "\\|^\\("
+                                            allout-regexp "\\)")))
       (or (assq 'allout-mode minor-mode-alist)
           (setq minor-mode-alist
                (cons '(allout-mode " Allout") minor-mode-alist)))
@@ -1702,8 +1722,9 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
      ;; Reactivation:
      ((setq do-layout t)
       (allout-infer-body-reindent))
-     )                                  ; cond
+     ) ;; end of activation-mode cases.
 
+    ;; Do auto layout if warranted:
     (let ((use-layout (if (listp allout-layout)
                           allout-layout
                         allout-default-layout)))
@@ -1802,9 +1823,14 @@ See allout-overlay-interior-modification-handler for details.
 
 This before-change handler is used only where modification-hooks
 overlay property is not supported."
-  (if (not (allout-mode-p))
-      nil
-    (allout-overlay-interior-modification-handler nil nil beg end nil)))
+  ;; allout-overlay-interior-modification-handler on an overlay handles
+  ;; this in other emacs, via `allout-exposure-category's 'modification-hooks.
+  (when (and (featurep 'xemacs) (allout-mode-p))
+    ;; process all of the pending overlays:
+    (dolist (overlay (overlays-in beg end))
+      (if (eq (overlay-get ol 'invisible) 'allout)
+          (allout-overlay-interior-modification-handler
+             overlay nil beg end nil)))))
 ;;;_  > allout-isearch-end-handler (&optional overlay)
 (defun allout-isearch-end-handler (&optional overlay)
   "Reconcile allout outline exposure on arriving in hidden text after isearch.
@@ -1996,13 +2022,11 @@ Outermost is first."
 (defun allout-beginning-of-current-line ()
   "Like beginning of line, but to visible text."
 
-  ;; XXX We would use `(move-beginning-of-line 1)', but it gets
-  ;; stuck on some hidden newlines, eg at column 80, as of GNU Emacs 22.0.50.
-  ;; Conversely, `beginning-of-line' can make no progress in other
-  ;; situations.  Both are necessary, in the order used below.
+  ;; This combination of move-beginning-of-line and beginning-of-line is
+  ;; deliberate, but the (beginning-of-line) may now be superfluous.
   (move-beginning-of-line 1)
   (beginning-of-line)
-  (while (or (not (bolp)) (allout-hidden-p))
+  (while (and (not (bobp)) (or (not (bolp)) (allout-hidden-p)))
     (beginning-of-line)
     (if (or (allout-hidden-p) (not (bolp)))
         (forward-char -1))))
@@ -2018,12 +2042,12 @@ Outermost is first."
     (if (allout-hidden-p) (forward-char 1))))
 ;;;_   > allout-next-heading ()
 (defsubst allout-next-heading ()
-  "Move to the heading for the topic \(possibly invisible) before this one.
+  "Move to the heading for the topic \(possibly invisible) after this one.
 
 Returns the location of the heading, or nil if none found."
 
-  (if (and (bobp) (not (eobp)))
-       (forward-char 1))
+  (if (and (bobp) (not (eobp)) (looking-at allout-regexp))
+      (forward-char 1))
 
   (if (re-search-forward allout-line-boundary-regexp nil 0)
       (allout-prefix-data               ; Got valid location state - set vars:
@@ -2688,36 +2712,51 @@ return to regular interpretation of self-insert characters."
 
   (if (not (allout-mode-p))
       nil
-    ;; Hot-spot navigation provisions:
     (if (and (eq this-command 'self-insert-command)
              (eq (point)(allout-current-bullet-pos)))
-        (let* ((this-key-num (cond
-                              ((numberp last-command-char)
-                               last-command-char)
-                              ;; Only xemacs has characterp.
-                              ((and (fboundp 'characterp)
-                                    (apply 'characterp
-                                           (list last-command-char)))
-                               (apply 'char-to-int (list last-command-char)))
-                              (t 0)))
-               mapped-binding)
-          (if (zerop this-key-num)
-              nil
-                                        ; Map upper-register literals
-                                        ; to lower register:
-            (if (<= 96 this-key-num)
-                (setq this-key-num (- this-key-num 32)))
-                                        ; Check if we have a literal:
-            (if (and (<= 64 this-key-num)
-                     (>= 96 this-key-num))
-                (setq mapped-binding
-                      (lookup-key 'allout-mode-map
-                                  (concat allout-command-prefix
-                                          (char-to-string (- this-key-num
-                                                             64))))))
-            (if mapped-binding
-                (setq allout-post-goto-bullet t
-                      this-command mapped-binding)))))))
+        (allout-hotspot-key-handler))))
+;;;_   > allout-hotspot-key-handler ()
+(defun allout-hotspot-key-handler ()
+  "Catchall handling of key bindings in hot-spots.
+
+Translates unmodified keystrokes to corresponding allout commands, when
+they would qualify if prefixed with the allout-command-prefix, and sets
+this-command accordingly.
+
+Returns the qualifying command, if any, else nil."
+  (interactive)
+  (let* ((key-num (cond ((numberp last-command-char) last-command-char)
+                        ;; for XEmacs character type:
+                        ((and (fboundp 'characterp)
+                              (apply 'characterp (list last-command-char)))
+                         (apply 'char-to-int (list last-command-char)))
+                        (t 0)))
+         mapped-binding
+         (on-bullet (eq (point) (allout-current-bullet-pos))))
+
+    (if (zerop key-num)
+        nil
+
+      (if (and (<= 33 key-num)
+               (setq mapped-binding
+                     (key-binding (concat allout-command-prefix
+                                          (char-to-string
+                                           (if (and (<= 97 key-num) ; "a"
+                                                    (>= 122 key-num)) ; "z"
+                                               (- key-num 96) key-num)))
+                                  t)))
+          ;; Qualified with the allout prefix - do hot-spot operation.
+          (setq allout-post-goto-bullet t)
+        ;; accept-defaults nil, or else we'll get allout-item-icon-key-handler.
+        (setq mapped-binding (key-binding (char-to-string key-num))))
+
+      (while (keymapp mapped-binding)
+        (setq mapped-binding
+              (lookup-key mapped-binding (read-key-sequence-vector nil t))))
+
+      (if mapped-binding
+          (setq this-command mapped-binding)))))
+
 ;;;_   > allout-find-file-hook ()
 (defun allout-find-file-hook ()
   "Activate `allout-mode' on non-nil `allout-auto-activation', `allout-layout'.
@@ -3146,21 +3185,23 @@ topic prior to the current one."
 
 Maintains outline hanging topic indentation if
 `allout-use-hanging-indents' is set."
-  (let ((fill-prefix (if allout-use-hanging-indents
-                         ;; Check for topic header indentation:
-                         (save-excursion
-                           (beginning-of-line)
-                           (if (looking-at allout-regexp)
-                               ;; ... construct indentation to account for
-                               ;; length of topic prefix:
-                               (make-string (progn (allout-end-of-prefix)
-                                                   (current-column))
-                                            ?\ )))))
-        (use-auto-fill-function (or allout-outside-normal-auto-fill-function
-                                    auto-fill-function
-                                    'do-auto-fill)))
-    (if (or allout-former-auto-filler allout-use-hanging-indents)
-        (funcall use-auto-fill-function))))
+
+  (when (not allout-inhibit-auto-fill)
+    (let ((fill-prefix (if allout-use-hanging-indents
+                           ;; Check for topic header indentation:
+                           (save-excursion
+                             (beginning-of-line)
+                             (if (looking-at allout-regexp)
+                                 ;; ... construct indentation to account for
+                                 ;; length of topic prefix:
+                                 (make-string (progn (allout-end-of-prefix)
+                                                     (current-column))
+                                              ?\ )))))
+          (use-auto-fill-function (or allout-outside-normal-auto-fill-function
+                                      auto-fill-function
+                                      'do-auto-fill)))
+      (if (or allout-former-auto-filler allout-use-hanging-indents)
+          (funcall use-auto-fill-function)))))
 ;;;_    > allout-reindent-body (old-depth new-depth &optional number)
 (defun allout-reindent-body (old-depth new-depth &optional number)
   "Reindent body lines which were indented at OLD-DEPTH to NEW-DEPTH.
@@ -3601,8 +3642,10 @@ when yank with allout-yank into an outline as a heading."
             (forward-char 1)))
 
     (if collapsed
-        (put-text-property beg (1+ beg) 'allout-was-collapsed t)
-      (remove-text-properties beg (1+ beg) '(allout-was-collapsed t)))
+        (allout-unprotected
+         (put-text-property beg (1+ beg) 'allout-was-collapsed t))
+      (allout-unprotected
+       (remove-text-properties beg (1+ beg) '(allout-was-collapsed t))))
     (allout-unprotected (kill-region beg (point)))
     (sit-for 0)
     (save-excursion
@@ -3834,12 +3877,12 @@ by pops to non-distinctive yanks.  Bug..."
 
 Text is shown if flag is nil and hidden otherwise."
   ;; We use outline invisibility spec.
-  (remove-overlays from to 'category 'allout-overlay-category)
+  (remove-overlays from to 'category 'allout-exposure-category)
   (when flag
     (let ((o (make-overlay from to)))
-      (overlay-put o 'category 'allout-overlay-category)
+      (overlay-put o 'category 'allout-exposure-category)
       (when (featurep 'xemacs)
-        (let ((props (symbol-plist 'allout-overlay-category)))
+        (let ((props (symbol-plist 'allout-exposure-category)))
           (while props
             (overlay-put o (pop props) (pop props)))))))
   (run-hooks 'allout-view-change-hook)
@@ -3860,9 +3903,9 @@ Text is shown if flag is nil and hidden otherwise."
                         flag)))
 
 ;;;_  - Topic-specific
-;;;_   > allout-show-entry (&optional inclusive)
-(defun allout-show-entry (&optional inclusive)
-  "Like `allout-show-current-entry', reveals entries nested in hidden topics.
+;;;_   > allout-show-entry ()
+(defun allout-show-entry ()
+  "Like `allout-show-current-entry', but reveals entries in hidden topics.
 
 This is a way to give restricted peek at a concealed locality without the
 expense of exposing its context, but can leave the outline with aberrant
@@ -3977,7 +4020,6 @@ Useful for coherently exposing to a random point in a hidden region."
                         t)))
 ;;;_   > allout-show-current-entry (&optional arg)
 (defun allout-show-current-entry (&optional arg)
-
   "Show body following current heading, or hide entry with universal argument."
 
   (interactive "P")
@@ -4042,6 +4084,7 @@ siblings, even if the target topic is already closed."
           ((allout-up-current-level 1 t) (allout-hide-current-subtree))
           (t (goto-char 0)
              (message sibs-msg)
+             (allout-goto-prefix)
              (allout-expose-topic '(0 :))
              (message (concat sibs-msg "  Done."))))
     (goto-char from)))
@@ -5919,7 +5962,131 @@ To ignore intangibility, bind `inhibit-point-motion-hooks' to t."
     (isearch-repeat 'forward)
     (isearch-mode t)))
 
-;;;_ #11 Provide
+;;;_ #11 Unit tests - this should be last item before "Provide"
+;;;_  > allout-run-unit-tests ()
+(defun allout-run-unit-tests ()
+  "Run the various allout unit tests."
+  (message "Running allout tests...")
+  (allout-test-resumptions)
+  (message "Running allout tests...  Done.")
+  (sit-for .5))
+;;;_  : test resumptions:
+;;;_   > allout-tests-obliterate-variable (name)
+(defun allout-tests-obliterate-variable (name)
+  "Completely unbind variable with NAME."
+  (if (local-variable-p name) (kill-local-variable name))
+  (while (boundp name) (makunbound name)))
+;;;_   > allout-test-resumptions ()
+(defvar allout-tests-globally-unbound nil
+  "Fodder for allout resumptions tests - defvar just for byte compiler.")
+(defvar allout-tests-globally-true nil
+  "Fodder for allout resumptions tests - defvar just just for byte compiler.")
+(defvar allout-tests-locally-true nil
+  "Fodder for allout resumptions tests - defvar just for byte compiler.")
+(defun allout-test-resumptions ()
+  "Exercise allout resumptions."
+  ;; for each resumption case, we also test that the right local/global
+  ;; scopes are affected during resumption effects:
+
+  ;; ensure that previously unbound variables return to the unbound state.
+  (with-temp-buffer
+    (allout-tests-obliterate-variable 'allout-tests-globally-unbound)
+    (allout-add-resumptions '(allout-tests-globally-unbound t))
+    (assert (not (default-boundp 'allout-tests-globally-unbound)))
+    (assert (local-variable-p 'allout-tests-globally-unbound))
+    (assert (boundp 'allout-tests-globally-unbound))
+    (assert (equal allout-tests-globally-unbound t))
+    (allout-do-resumptions)
+    (assert (not (local-variable-p 'allout-tests-globally-unbound)))
+    (assert (not (boundp 'allout-tests-globally-unbound))))
+
+  ;; ensure that variable with prior global value is resumed
+  (with-temp-buffer
+    (allout-tests-obliterate-variable 'allout-tests-globally-true)
+    (setq allout-tests-globally-true t)
+    (allout-add-resumptions '(allout-tests-globally-true nil))
+    (assert (equal (default-value 'allout-tests-globally-true) t))
+    (assert (local-variable-p 'allout-tests-globally-true))
+    (assert (equal allout-tests-globally-true nil))
+    (allout-do-resumptions)
+    (assert (not (local-variable-p 'allout-tests-globally-true)))
+    (assert (boundp 'allout-tests-globally-true))
+    (assert (equal allout-tests-globally-true t)))
+
+  ;; ensure that prior local value is resumed
+  (with-temp-buffer
+    (allout-tests-obliterate-variable 'allout-tests-locally-true)
+    (set (make-local-variable 'allout-tests-locally-true) t)
+    (assert (not (default-boundp 'allout-tests-locally-true))
+            nil (concat "Test setup mistake - variable supposed to"
+                        " not have global binding, but it does."))
+    (assert (local-variable-p 'allout-tests-locally-true)
+            nil (concat "Test setup mistake - variable supposed to have"
+                        " local binding, but it lacks one."))
+    (allout-add-resumptions '(allout-tests-locally-true nil))
+    (assert (not (default-boundp 'allout-tests-locally-true)))
+    (assert (local-variable-p 'allout-tests-locally-true))
+    (assert (equal allout-tests-locally-true nil))
+    (allout-do-resumptions)
+    (assert (boundp 'allout-tests-locally-true))
+    (assert (local-variable-p 'allout-tests-locally-true))
+    (assert (equal allout-tests-locally-true t))
+    (assert (not (default-boundp 'allout-tests-locally-true))))
+
+  ;; ensure that last of multiple resumptions holds, for various scopes.
+  (with-temp-buffer
+    (allout-tests-obliterate-variable 'allout-tests-globally-unbound)
+    (allout-tests-obliterate-variable 'allout-tests-globally-true)
+    (setq allout-tests-globally-true t)
+    (allout-tests-obliterate-variable 'allout-tests-locally-true)
+    (set (make-local-variable 'allout-tests-locally-true) t)
+    (allout-add-resumptions '(allout-tests-globally-unbound t)
+                            '(allout-tests-globally-true nil)
+                            '(allout-tests-locally-true nil))
+    (allout-add-resumptions '(allout-tests-globally-unbound 2)
+                            '(allout-tests-globally-true 3)
+                            '(allout-tests-locally-true 4))
+    ;; reestablish many of the basic conditions are maintained after re-add:
+    (assert (not (default-boundp 'allout-tests-globally-unbound)))
+    (assert (local-variable-p 'allout-tests-globally-unbound))
+    (assert (equal allout-tests-globally-unbound 2))
+    (assert (default-boundp 'allout-tests-globally-true))
+    (assert (local-variable-p 'allout-tests-globally-true))
+    (assert (equal allout-tests-globally-true 3))
+    (assert (not (default-boundp 'allout-tests-locally-true)))
+    (assert (local-variable-p 'allout-tests-locally-true))
+    (assert (equal allout-tests-locally-true 4))
+    (allout-do-resumptions)
+    (assert (not (local-variable-p 'allout-tests-globally-unbound)))
+    (assert (not (boundp 'allout-tests-globally-unbound)))
+    (assert (not (local-variable-p 'allout-tests-globally-true)))
+    (assert (boundp 'allout-tests-globally-true))
+    (assert (equal allout-tests-globally-true t))
+    (assert (boundp 'allout-tests-locally-true))
+    (assert (local-variable-p 'allout-tests-locally-true))
+    (assert (equal allout-tests-locally-true t))
+    (assert (not (default-boundp 'allout-tests-locally-true))))
+
+  ;; ensure that deliberately unbinding registered variables doesn't foul things
+  (with-temp-buffer
+    (allout-tests-obliterate-variable 'allout-tests-globally-unbound)
+    (allout-tests-obliterate-variable 'allout-tests-globally-true)
+    (setq allout-tests-globally-true t)
+    (allout-tests-obliterate-variable 'allout-tests-locally-true)
+    (set (make-local-variable 'allout-tests-locally-true) t)
+    (allout-add-resumptions '(allout-tests-globally-unbound t)
+                            '(allout-tests-globally-true nil)
+                            '(allout-tests-locally-true nil))
+    (allout-tests-obliterate-variable 'allout-tests-globally-unbound)
+    (allout-tests-obliterate-variable 'allout-tests-globally-true)
+    (allout-tests-obliterate-variable 'allout-tests-locally-true)
+    (allout-do-resumptions))
+  )
+;;;_  % Run unit tests if `allout-run-unit-tests-after-load' is true:
+(when allout-run-unit-tests-on-load
+  (allout-run-unit-tests))
+
+;;;_ #12 Provide
 (provide 'allout)
 
 ;;;_* Local emacs vars.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index da039716507..77d4a76de0c 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -668,7 +668,11 @@ language you are using."
   (define-key map [prior] 'previous-history-element)
   (define-key map [up]    'previous-history-element)
   (define-key map "\es"   'next-matching-history-element)
-  (define-key map "\er"   'previous-matching-history-element))
+  (define-key map "\er"   'previous-matching-history-element)
+  ;; Override the global binding (which calls indent-relative via
+  ;; indent-for-tab-command).  The alignment that indent-relative tries to
+  ;; do doesn't make much sense here since the prompt messes it up.
+  (define-key map "\t"    'self-insert-command))
 
 (define-key global-map "\C-u" 'universal-argument)
 (let ((i ?0))
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index d7ffab4bc5b..0b578358f80 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -2668,7 +2668,18 @@ Otherwise, look up symbol in `custom-guess-type-alist'."
                              (error nil))
                            (cond
                             ((eq (caar tmp) 'user) 'saved)
-                            ((eq (caar tmp) 'changed) 'changed)
+                            ((eq (caar tmp) 'changed)
+                             (if (condition-case nil
+                                     (and (null comment)
+                                          (equal value
+                                                 (eval
+                                                  (car (get symbol 'standard-value)))))
+                                   (error nil))
+                                 ;; The value was originally set outside
+                                 ;; custom, but it was set to the standard
+                                 ;; value (probably an autoloaded defcustom).
+                                 'standard
+                               'changed))
                             (t 'themed))
                          'changed))
                       ((setq tmp (get symbol 'standard-value))
@@ -4419,7 +4430,9 @@ The format is suitable for use with `easy-menu-define'."
   ;; Actually, this misfeature of dense keymaps was fixed on 2001-11-26.
   (let ((map (make-keymap)))
     (set-keymap-parent map widget-keymap)
-    (suppress-keymap map)
+    (define-key map [remap self-insert-command]
+      'custom-no-edit)
+    (define-key map "\^m" 'custom-no-edit)
     (define-key map " " 'scroll-up)
     (define-key map "\177" 'scroll-down)
     (define-key map "\C-c\C-c" 'Custom-set)
@@ -4431,6 +4444,11 @@ The format is suitable for use with `easy-menu-define'."
     map)
   "Keymap for `custom-mode'.")
 
+(defun custom-no-edit ()
+  "Refuse to allow editing of Custom buffer."
+  (interactive)
+  (error "You can't edit this part of the Custom buffer"))
+
 (easy-menu-define Custom-mode-menu
     custom-mode-map
   "Menu used in customization buffers."
diff --git a/lisp/custom.el b/lisp/custom.el
index c0169812d36..2e5c0a59d9b 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -558,9 +558,10 @@ LOAD should be either a library file name, or a feature name."
     (unless (member load loads)
       (put symbol 'custom-loads (cons (purecopy load) loads)))))
 
-(defun custom-autoload (symbol load)
-  "Mark SYMBOL as autoloaded custom variable and add dependency LOAD."
-  (put symbol 'custom-autoload t)
+(defun custom-autoload (symbol load &optional noset)
+  "Mark SYMBOL as autoloaded custom variable and add dependency LOAD.
+If NOSET is non-nil, don't bother autoloading LOAD when setting the variable."
+  (put symbol 'custom-autoload (if noset 'noset t))
   (custom-add-load symbol load))
 
 ;; This test is also in the C code of `user-variable-p'.
@@ -699,10 +700,10 @@ Return non-nil iff the `customized-value' property actually changed."
          (customized (get symbol 'customized-value))
          (old (or (get symbol 'saved-value) (get symbol 'standard-value))))
     ;; Mark default value as set iff different from old value.
-    (if (or (null old)
-            (not (equal value (condition-case nil
-                                  (eval (car old))
-                                (error nil)))))
+    (if (not (and old
+                  (equal value (condition-case nil
+                                   (eval (car old))
+                                 (error nil)))))
         (progn (put symbol 'customized-value (list (custom-quote value)))
                (custom-push-theme 'theme-value symbol 'user 'set
                                   (custom-quote value)))
@@ -827,13 +828,9 @@ See `custom-known-themes' for a list of known themes."
             (if (and (eq prop 'theme-value)
                      (boundp symbol))
                 (let ((sv (get symbol 'standard-value)))
-                  (when (and (null sv) (custom-variable-p symbol))
-                    (custom-load-symbol symbol)
-                    (setq sv (get symbol 'standard-value)))
-                  (if (or (null sv)
-                          (not (equal (eval (car (get symbol 'standard-value)))
-                                      (symbol-value symbol))))
-                      (setq old (list (list 'changed (symbol-value symbol))))))
+                  (unless (and sv
+                               (equal (eval (car sv)) (symbol-value symbol)))
+                    (setq old (list (list 'changed (symbol-value symbol))))))
               (if (and (facep symbol)
                        (not (face-spec-match-p symbol (get symbol 'face-defface-spec))))
                   (setq old (list (list 'changed (list
@@ -907,6 +904,10 @@ in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
             (when requests
               (put symbol 'custom-requests requests)
               (mapc 'require requests))
+            (unless (or (get symbol 'standard-value)
+                        (memq (get symbol 'custom-autoload) '(nil noset)))
+              ;; This symbol needs to be autoloaded, even just for a `set'.
+              (custom-load-symbol symbol))
             (setq set (or (get symbol 'custom-set) 'custom-set-default))
             (put symbol 'saved-value (list value))
             (put symbol 'saved-variable-comment comment)
@@ -926,6 +927,8 @@ in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
             (setq args (cdr args))
             (and (or now (default-boundp symbol))
                  (put symbol 'variable-comment comment)))
+        ;; I believe this is dead-code, because the `sort' code above would
+        ;; have burped before we could get here.  --Stef
         ;; Old format, a plist of SYMBOL VALUE pairs.
         (message "Warning: old format `custom-set-variables'")
         (ding)
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index b4cb8933194..0942c6d1dff 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -745,19 +745,22 @@ Otherwise, the rule is a compression rule, and compression is done with gzip.")
            ;;; We don't recognize the file as compressed, so compress it.
            ;;; Try gzip; if we don't have that, use compress.
            (condition-case nil
-               (if (not (dired-check-process (concat "Compressing " file)
-                                             "gzip" "-f" file))
-                   (let ((out-name
-                          (if (file-exists-p (concat file ".gz"))
-                              (concat file ".gz")
-                            (concat file ".z"))))
-                     ;; Rename the compressed file to NEWNAME
-                     ;; if it hasn't got that name already.
-                     (if (and newname (not (equal newname out-name)))
-                         (progn
-                           (rename-file out-name newname t)
-                           newname)
-                       out-name)))
+               (let ((out-name (concat file ".gz")))
+                 (and (or (not (file-exists-p out-name))
+                          (y-or-n-p
+                           (format "File %s already exists.  Really compress? "
+                                   out-name)))
+                      (not (dired-check-process (concat "Compressing " file)
+                                                "gzip" "-f" file))
+                      (or (file-exists-p out-name)
+                          (setq out-name (concat file ".z")))
+                      ;; Rename the compressed file to NEWNAME
+                      ;; if it hasn't got that name already.
+                      (if (and newname (not (equal newname out-name)))
+                          (progn
+                            (rename-file out-name newname t)
+                            newname)
+                        out-name)))
              (file-error
               (if (not (dired-check-process (concat "Compressing " file)
                                             "compress" "-f" file))
diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el
index 30ef3570ad2..0744cc52964 100644
--- a/lisp/dirtrack.el
+++ b/lisp/dirtrack.el
@@ -29,12 +29,12 @@
 ;; Shell directory tracking by watching the prompt.
 ;;
 ;; This is yet another attempt at a directory-tracking package for
-;; Emacs shell-mode. However, this package makes one strong assumption:
+;; Emacs shell-mode.  However, this package makes one strong assumption:
 ;; that you can customize your shell's prompt to contain the
-;; current working directory. Most shells do support this, including
+;; current working directory.  Most shells do support this, including
 ;; almost every type of Bourne and C shell on Unix, the native shells on
 ;; Windows95 (COMMAND.COM) and Windows NT (CMD.EXE), and most 3rd party
-;; Windows shells. If you cannot do this, or do not wish to, this package
+;; Windows shells.  If you cannot do this, or do not wish to, this package
 ;; will be useless to you.
 ;;
 ;; Installation:
@@ -45,30 +45,27 @@
 ;;
 ;; Note that directory tracking is done by matching regular expressions,
 ;; therefore it is *VERY IMPORTANT* for your prompt to be easily
-;; distinguishable from other output. If your prompt regexp is too general,
+;; distinguishable from other output.  If your prompt regexp is too general,
 ;; you will see error messages from the dirtrack filter as it attempts to cd
 ;; to non-existent directories.
 ;;
-;; 2) Set the variable `dirtrack-list' to an appropriate value. This
+;; 2) Set the variable `dirtrack-list' to an appropriate value.  This
 ;; should be a list of two elements: the first is a regular expression
 ;; which matches your prompt up to and including the pathname part.
 ;; The second is a number which tells which regular expression group to
-;; match to extract only the pathname. If you use a multi-line prompt,
-;; add 't' as a third element. Note that some of the functions in
+;; match to extract only the pathname.  If you use a multi-line prompt,
+;; add 't' as a third element.  Note that some of the functions in
 ;; 'comint.el' assume a single-line prompt (eg, comint-bol).
 ;;
-;; Determining this information may take some experimentation. Setting
+;; Determining this information may take some experimentation.  Setting
 ;; the variable `dirtrack-debug' may help; it causes the directory-tracking
-;; filter to log messages to the buffer `dirtrack-debug-buffer'. You can easily
+;; filter to log messages to the buffer `dirtrack-debug-buffer'.  You can easily
 ;; toggle this setting with the `dirtrack-debug-toggle' function.
 ;;
 ;; 3) Add a hook to shell-mode to enable the directory tracking:
 ;;
 ;; (add-hook 'shell-mode-hook
-;;   (function (lambda ()
-;;            (setq comint-preoutput-filter-functions
-;;                  (append (list 'dirtrack)
-;;                          comint-preoutput-filter-functions)))))
+;;   (lambda () (add-hook 'comint-preoutput-filter-functions 'dirtrack nil t)))
 ;;
 ;; You may wish to turn ordinary shell tracking off by calling
 ;; `shell-dirtrack-toggle' or setting `shell-dirtrackp'.
@@ -107,13 +104,13 @@
 ;;   (eg, when logged in as myself, I'll run a root shell in the same Emacs).
 ;;   If you do this, and the shell prompt contains a ~, Emacs will interpret
 ;;   this relative to the user which owns the Emacs process, not the user
-;;   who owns the shell buffer. This may cause dirtrack to behave strangely
+;;   who owns the shell buffer.  This may cause dirtrack to behave strangely
 ;;   (typically it reports that it is unable to cd to a directory
 ;;   with a ~ in it).
 ;;
 ;;   The same behavior can occur if you use dirtrack with remote filesystems
 ;;   (using telnet, rlogin, etc) as Emacs will be checking the local
-;;   filesystem, not the remote one. This problem is not specific to dirtrack,
+;;   filesystem, not the remote one.  This problem is not specific to dirtrack,
 ;;   but also affects file completion, etc.
 
 ;;; Code:
@@ -132,7 +129,7 @@
   :group 'shell)
 
 (defcustom dirtrack-list (list "^emacs \\([a-zA-Z]:.*\\)>" 1)
-  "*List for directory tracking.
+  "List for directory tracking.
 First item is a regexp that describes where to find the path in a prompt.
 Second is a number, the regexp group to match.  Optional third item is
 whether the prompt is multi-line.  If nil or omitted, prompt is assumed to
@@ -140,77 +137,58 @@ be on a single line."
   :group 'dirtrack
   :type  '(sexp (regexp  :tag "Prompt Expression")
                 (integer :tag "Regexp Group")
-                (boolean :tag "Multiline Prompt")
-                )
-  )
+                (boolean :tag "Multiline Prompt")))
 
 (make-variable-buffer-local 'dirtrack-list)
 
 (defcustom dirtrack-debug nil
-  "*If non-nil, the function `dirtrack' will report debugging info."
+  "If non-nil, the function `dirtrack' will report debugging info."
   :group 'dirtrack
-  :type  'boolean
-  )
+  :type  'boolean)
 
 (defcustom dirtrack-debug-buffer "*Directory Tracking Log*"
   "Buffer to write directory tracking debug information."
   :group 'dirtrack
-  :type  'string
-  )
+  :type  'string)
 
 (defcustom dirtrackp t
-  "*If non-nil, directory tracking via `dirtrack' is enabled."
+  "If non-nil, directory tracking via `dirtrack' is enabled."
   :group 'dirtrack
-  :type  'boolean
-  )
+  :type  'boolean)
 
 (make-variable-buffer-local 'dirtrackp)
 
 (defcustom dirtrack-directory-function
   (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin))
       'dirtrack-windows-directory-function
-    'dirtrack-default-directory-function)
-  "*Function to apply to the prompt directory for comparison purposes."
+    'file-name-as-directory)
+  "Function to apply to the prompt directory for comparison purposes."
   :group 'dirtrack
-  :type  'function
-  )
+  :type  'function)
 
 (defcustom dirtrack-canonicalize-function
   (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin))
       'downcase 'identity)
-  "*Function to apply to the default directory for comparison purposes."
+  "Function to apply to the default directory for comparison purposes."
   :group 'dirtrack
-  :type  'function
-  )
+  :type  'function)
 
 (defcustom dirtrack-directory-change-hook nil
   "Hook that is called when a directory change is made."
   :group 'dirtrack
-  :type 'hook
-  )
+  :type 'hook)
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Functions
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defun dirtrack-default-directory-function (dir)
-  "Return a canonical directory for comparison purposes.
-Such a directory ends with a forward slash."
-  (let ((directory dir))
-    (if (not (char-equal ?/ (string-to-char (substring directory -1))))
-        (concat directory "/")
-      directory)))
 
 (defun dirtrack-windows-directory-function (dir)
   "Return a canonical directory for comparison purposes.
 Such a directory is all lowercase, has forward-slashes as delimiters,
 and ends with a forward slash."
-  (let ((directory dir))
-    (setq directory (downcase (dirtrack-replace-slash directory t)))
-    (if (not (char-equal ?/ (string-to-char (substring directory -1))))
-        (concat directory "/")
-      directory)))
+  (file-name-as-directory (downcase (subst-char-in-string ?\\ ?/ dir))))
 
 (defun dirtrack-cygwin-directory-function (dir)
   "Return a canonical directory taken from a Cygwin path for comparison purposes."
@@ -218,30 +196,13 @@ and ends with a forward slash."
       (concat (match-string 1 dir) ":" (match-string 2 dir))
     dir))
 
-(defconst dirtrack-forward-slash  (regexp-quote "/"))
-(defconst dirtrack-backward-slash (regexp-quote "\\"))
-
-(defun dirtrack-replace-slash (string &optional opposite)
-  "Replace forward slashes with backwards ones.
-If additional argument is non-nil, replace backwards slashes with
-forward ones."
-  (let ((orig     (if opposite
-                      dirtrack-backward-slash
-                    dirtrack-forward-slash))
-        (replace  (if opposite
-                      dirtrack-forward-slash
-                    dirtrack-backward-slash))
-        (newstring string)
-        )
-    (while (string-match orig newstring)
-      (setq newstring (replace-match replace nil t newstring)))
-  newstring))
-
 ;; Copied from shell.el
 (defun dirtrack-toggle ()
   "Enable or disable Dirtrack directory tracking in a shell buffer."
   (interactive)
-  (setq dirtrackp (not dirtrackp))
+  (if (setq dirtrackp (not dirtrackp))
+      (add-hook 'comint-preoutput-filter-functions 'dirtrack nil t)
+    (remove-hook 'comint-preoutput-filter-functions 'dirtrack t))
   (message "Directory tracking %s" (if dirtrackp "ON" "OFF")))
 
 (defun dirtrack-debug-toggle ()
@@ -273,67 +234,60 @@ If directory tracking does not seem to be working, you can use the
 function `dirtrack-debug-toggle' to turn on debugging output.
 
 You can enable directory tracking by adding this function to
-`comint-output-filter-functions'.
-"
-  (if (null dirtrackp)
+`comint-output-filter-functions'."
+  (if (or (null dirtrackp)
+          ;; No output?
+          (eq (point) (point-min)))
       nil
     (let (prompt-path
-          matched
           (current-dir default-directory)
           (dirtrack-regexp    (nth 0 dirtrack-list))
           (match-num          (nth 1 dirtrack-list))
-          (multi-line         (nth 2 dirtrack-list))
-          )
-      ;; No output?
-      (if (eq (point) (point-min))
-          nil
-        (save-excursion
-          (setq matched (string-match dirtrack-regexp input)))
-          ;; No match
-          (if (null matched)
-              (and dirtrack-debug
-                   (dirtrack-debug-message
-                    (format
-                     "Input `%s' failed to match regexp: %s"
-                    input dirtrack-regexp)))
-            (setq prompt-path
-                  (substring input
-                   (match-beginning match-num) (match-end match-num)))
-            ;; Empty string
-            (if (not (> (length prompt-path) 0))
-                (and dirtrack-debug
-                     (dirtrack-debug-message "Match is empty string"))
-              ;; Transform prompts into canonical forms
-              (setq prompt-path (funcall dirtrack-directory-function
-                                         prompt-path))
-              (setq current-dir (funcall dirtrack-canonicalize-function
-                                         current-dir))
-              (and dirtrack-debug
-                   (dirtrack-debug-message
-                    (format
-                     "Prompt is %s\nCurrent directory is %s"
-                     prompt-path current-dir)))
-              ;; Compare them
-              (if (or (string= current-dir prompt-path)
-                      (string= current-dir
-                               (abbreviate-file-name prompt-path)))
-                  (and dirtrack-debug
-                       (dirtrack-debug-message
-                        (format "Not changing directory")))
-                ;; It's possible that Emacs will think the directory
-                ;; won't exist (eg, rlogin buffers)
-                (if (file-accessible-directory-p prompt-path)
-                    ;; Change directory
-                    (and (shell-process-cd prompt-path)
-                         (run-hooks 'dirtrack-directory-change-hook)
-                         dirtrack-debug
-                         (dirtrack-debug-message
-                          (format "Changing directory to %s" prompt-path)))
-                  (error "Directory %s does not exist" prompt-path)))
-              )))))
+          ;; Currently unimplemented, it seems.  --Stef
+          (multi-line         (nth 2 dirtrack-list)))
+      (save-excursion
+        ;; No match
+        (if (null (string-match dirtrack-regexp input))
+            (and dirtrack-debug
+                 (dirtrack-debug-message
+                  (format
+                   "Input `%s' failed to match `dirtrack-regexp'" input)))
+          (setq prompt-path (match-string match-num input))
+          ;; Empty string
+          (if (not (> (length prompt-path) 0))
+              (and dirtrack-debug
+                   (dirtrack-debug-message "Match is empty string"))
+            ;; Transform prompts into canonical forms
+            (setq prompt-path (funcall dirtrack-directory-function
+                                       prompt-path))
+            (setq current-dir (funcall dirtrack-canonicalize-function
+                                       current-dir))
+            (and dirtrack-debug
+                 (dirtrack-debug-message
+                  (format
+                   "Prompt is %s\nCurrent directory is %s"
+                   prompt-path current-dir)))
+            ;; Compare them
+            (if (or (string= current-dir prompt-path)
+                    (string= current-dir
+                             (abbreviate-file-name prompt-path)))
+                (and dirtrack-debug
+                     (dirtrack-debug-message
+                      (format "Not changing directory")))
+              ;; It's possible that Emacs will think the directory
+              ;; won't exist (eg, rlogin buffers)
+              (if (file-accessible-directory-p prompt-path)
+                  ;; Change directory
+                  (and (shell-process-cd prompt-path)
+                       (run-hooks 'dirtrack-directory-change-hook)
+                       dirtrack-debug
+                       (dirtrack-debug-message
+                        (format "Changing directory to %s" prompt-path)))
+                (error "Directory %s does not exist" prompt-path)))
+            )))))
   input)
 
 (provide 'dirtrack)
 
-;;; arch-tag: 168de071-be88-4937-aff6-2aba9f328d5a
+;; arch-tag: 168de071-be88-4937-aff6-2aba9f328d5a
 ;;; dirtrack.el ends here
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index 7ab0101b2a5..d1710dba7a4 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -92,6 +92,7 @@ files.")
      "Kai.Grossjohann@Cs.Uni-Dortmund.De"
      "Kai.Grossjohann@Gmx.Net")
     ("Karl Berry" "K. Berry")
+    ("K,Aa(Broly L$,1 q(Brentey" "K,Aa(Broly L,Bu(Brentey" "L$,1 q(Brentey K,Aa(Broly")
     ("Kazushi Marukawa" "Kazushi")
     ("Ken Manheimer" "Kenneth Manheimer")
     ("Kenichi Handa" "Ken'ichi Handa" "Kenichi HANDA")
@@ -118,6 +119,7 @@ files.")
     ("Robert J. Chassell" "Bob Chassell")
     ("Roland B. Roberts" "Roland B Roberts" "Roland Roberts")
     ("Rui-Tao Dong" "Rui-Tao Dong ~{6-Hpln~}")
+    ("Sacha Chua" "Sandra Jean Chua")
     ("Sam Steingold" "Sam Shteingold")
     ("Satyaki Das" "Indexed search by Satyaki Das")
     ("Stefan Monnier" "Stefan")
@@ -168,7 +170,7 @@ listed.")
   '("external-lisp"
     "lock" "share-lib" "local-lisp"
     "noleim-Makefile.in"
-    "NEWS" "PROBLEMS" "FAQ" "AUTHORS")
+    "NEWS" "PROBLEMS" "FAQ" "AUTHORS" "FOR-RELEASE" "TODO")
   "List of files and directories to ignore.
 Changes to files in this list are not listed.")
 
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 76699f10df8..da85cbd817a 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -124,17 +124,10 @@ or macro definition or a defcustom)."
             )
         `(progn
            (defvar ,varname ,init ,doc)
-           (custom-autoload ',varname ,file)
-           ;; The use of :require in a defcustom can be annoying, especially
-           ;; when defcustoms are moved from one file to another between
-           ;; releases because the :require arg gets placed in the user's
-           ;; .emacs.  In order for autoloaded minor modes not to need the
-           ;; use of :require, we arrange to store their :setter.
-           ,(let ((setter (condition-case nil
-                              (cadr (memq :set form))
-                            (error nil))))
-              (if (equal setter ''custom-set-minor-mode)
-                  `(put ',varname 'custom-set 'custom-set-minor-mode))))))
+           (custom-autoload ',varname ,file
+                            ,(condition-case nil
+                                 (null (cadr (memq :set form)))
+                               (error nil))))))
 
      ((eq car 'defgroup)
       ;; In Emacs this is normally handled separately by cus-dep.el, but for
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 892ad0829a8..adff09ece2d 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2791,7 +2791,7 @@ That command is designed for interactive use only" fn))
                     ;; `cl-byte-compile-compiler-macro' but if CL isn't
                     ;; loaded, this function doesn't exist.
                     (or (not (memq handler '(cl-byte-compile-compiler-macro)))
-                        (fboundp handler))
+                        (functionp handler))
                     (not (and (byte-compile-version-cond
                                byte-compile-compatibility)
                               (get (get fn 'byte-opcode) 'emacs19-opcode))))
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 5475ed530d3..d4ba8d30623 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -101,9 +101,9 @@ Optional KEYMAP is the default (defvar) keymap bound to the mode keymap.
 The above three arguments can be skipped if keyword arguments are
 used (see below).
 
-BODY contains code that will be executed each time the mode is (dis)activated.
-  It will be executed after any toggling but before running the hook variable
-  `mode-HOOK'.
+BODY contains code to execute each time the mode is activated or deactivated.
+  It is executed after toggling the mode,
+  and before running the hook variable `mode-HOOK'.
   Before the actual body code, you can write keyword arguments (alternating
   keywords and values).  These following keyword arguments are supported (other
   keywords will be passed to `defcustom' if the minor mode is global):
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index d0be3a02f65..8645ec5a6ed 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -235,13 +235,6 @@ If the result is non-nil, then break.  Errors are ignored."
 
 ;;; Form spec utilities.
 
-;;;###autoload
-(defmacro def-edebug-spec (symbol spec)
-  "Set the `edebug-form-spec' property of SYMBOL according to SPEC.
-Both SYMBOL and SPEC are unevaluated. The SPEC can be 0, t, a symbol
-\(naming a function), or a list."
-  `(put (quote ,symbol) 'edebug-form-spec (quote ,spec)))
-
 (defmacro def-edebug-form-spec (symbol spec-form)
   "For compatibility with old version."
   (def-edebug-spec symbol (eval spec-form)))
@@ -3426,6 +3419,8 @@ go to the end of the last sexp, or if that is the same point, then step."
       func)
      (t
       (let ((loc (find-function-noselect func)))
+        (unless (cdr loc)
+          (error "Could not find the definition in its file"))
         (with-current-buffer (car loc)
           (goto-char (cdr loc))
           (edebug-eval-top-level-form)
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 5d504586323..41c940f1cec 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -205,6 +205,9 @@ TYPE should be nil to find a function, or `defvar' to find a variable."
 ;;;###autoload
 (defun find-function-search-for-symbol (symbol type library)
   "Search for SYMBOL's definition of type TYPE in LIBRARY.
+Visit the library in a buffer, and return a cons cell (BUFFER . POSITION),
+or just (BUFFER . nil) if the definition can't be found in the file.
+
 If TYPE is nil, look for a function definition.
 Otherwise, TYPE specifies the kind of definition,
 and it is interpreted via `find-function-regexp-alist'.
@@ -244,8 +247,7 @@ The search is done in the source for library LIBRARY."
                 (progn
                   (beginning-of-line)
                   (cons (current-buffer) (point)))
-              (error "Cannot find definition of `%s' in library `%s'"
-                     symbol library))))))))
+              (cons (current-buffer) nil))))))))
 
 ;;;###autoload
 (defun find-function-noselect (function)
@@ -253,7 +255,8 @@ The search is done in the source for library LIBRARY."
 
 Finds the source file containing the definition of FUNCTION
 in a buffer and the point of the definition.  The buffer is
-not selected.
+not selected.  If the function definition can't be found in
+the buffer, returns (BUFFER).
 
 If the file where FUNCTION is defined is not known, then it is
 searched for in `find-function-source-path' if non nil, otherwise
@@ -335,7 +338,7 @@ Set mark before moving, if the buffer already existed."
       (when (memq new-buf orig-buffers)
         (push-mark orig-point))
       (funcall switch-fn new-buf)
-      (goto-char new-point)
+      (when new-point (goto-char new-point))
       (recenter find-function-recenter-line)
       (run-hooks 'find-function-after-hook))))
 
@@ -376,6 +379,7 @@ See `find-function' for more details."
 
 Finds the library containing the definition of VARIABLE in a buffer and
 the point of the definition.  The buffer is not selected.
+If the variable's definition can't be found in the buffer, return (BUFFER).
 
 The library where VARIABLE is defined is searched for in FILE or
 `find-function-source-path', if non nil, otherwise in `load-path'."
@@ -421,6 +425,7 @@ See `find-variable' for more details."
 ;;;###autoload
 (defun find-definition-noselect (symbol type &optional file)
   "Return a pair `(BUFFER . POINT)' pointing to the definition of SYMBOL.
+If the definition can't be found in the buffer, return (BUFFER).
 TYPE says what type of definition: nil for a function, `defvar' for a
 variable, `defface' for a face.  This function does not switch to the
 buffer nor display it.
diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el
index 3b614be26f4..92eb86ce676 100644
--- a/lisp/emacs-lisp/helper.el
+++ b/lisp/emacs-lisp/helper.el
@@ -77,7 +77,7 @@
                    "Delete scrolls back. Other keys %s"
                    "Type anything to %s"))
             blurb)
-          (setq continue (read-char))
+          (setq continue (read-event))
           (cond ((and (memq continue '(?\s ?\C-v)) (< state 2))
                  (scroll-up))
                 ((= continue ?\C-l)
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 7a11d6318a9..e1e88ee4399 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -305,11 +305,23 @@ If the value is nil, use a shifted prefix key to inhibit the override."
                  (const :tag "No delay" nil))
   :group 'cua)
 
+(defcustom cua-delete-selection t
+  "*If non-nil, typed text replaces text in the active selection."
+  :type '(choice (const :tag "Disabled" nil)
+                 (other :tag "Enabled" t))
+  :group 'cua)
+
 (defcustom cua-keep-region-after-copy nil
   "If non-nil, don't deselect the region after copying."
   :type 'boolean
   :group 'cua)
 
+(defcustom cua-toggle-set-mark t
+  "*In non-nil, the `cua-set-mark' command toggles the mark."
+  :type '(choice (const :tag "Disabled" nil)
+                 (other :tag "Enabled" t))
+  :group 'cua)
+
 (defcustom cua-enable-register-prefix 'not-ctrl-u
   "*If non-nil, registers are supported via numeric prefix arg.
 If the value is t, any numeric prefix arg in the range 0 to 9 will be
@@ -391,7 +403,8 @@ and after the region marked by the rectangle to search."
 On non-window systems, always use the meta modifier.
 Must be set prior to enabling CUA."
   :type '(choice (const :tag "Meta key" meta)
-                 (const :tag "Hyper key" hyper )
+                 (const :tag "Alt key" alt)
+                 (const :tag "Hyper key" hyper)
                  (const :tag "Super key" super))
   :group 'cua)
 
@@ -783,7 +796,7 @@ Save a copy in register 0 if `cua-delete-copy-to-register-0' is non-nil."
 (defun cua-replace-region ()
   "Replace the active region with the character you type."
   (interactive)
-  (let ((not-empty (cua-delete-region)))
+  (let ((not-empty (and cua-delete-selection (cua-delete-region))))
     (unless (eq this-original-command this-command)
       (let ((overwrite-mode
              (and overwrite-mode
@@ -1001,7 +1014,7 @@ With a double \\[universal-argument] prefix argument, unconditionally set mark."
    (arg
     (setq this-command 'pop-to-mark-command)
     (pop-to-mark-command))
-   (mark-active
+   ((and cua-toggle-set-mark mark-active)
     (cua--deactivate)
     (message "Mark Cleared"))
    (t
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 43a66fd0e3e..7db3cca8fae 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -1361,6 +1361,7 @@ With prefix arg, indent to that column."
   (interactive)
   (let ((M (cond ((eq cua--rectangle-modifier-key 'hyper) " H-")
                  ((eq cua--rectangle-modifier-key 'super) " s-")
+                 ((eq cua--rectangle-modifier-key 'alt) " A-")
                  (t " M-"))))
     (message
      (concat (if help "C-?:help" "")
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 49b274b5149..216d14d0aa6 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,197 @@
+2006-07-12  Michael Olson  <mwolson@gnu.org>
+
+        * erc-match.el (erc-log-matches): Bind inhibit-read-only rather
+        than call toggle-read-only.
+
+        * erc.el (erc-handle-irc-url): Move here from erc-goodies.el and
+        add autoload cookie.
+
+2006-07-09  Michael Olson  <mwolson@gnu.org>
+
+        * erc.el (erc-version-string): Release ERC 5.1.3.
+
+        * erc.texi: Update for the 5.1.3 release.
+
+        * erc-autoaway.el (erc-autoaway-set-back): Fix bug after returning
+        from being set automatically away and current buffer is not an ERC
+        buffer.
+
+        * erc-identd.el: Fix compiler error.
+
+        * erc.texi (Development): Use @subheading instead of @subsection.
+        (Advanced Usage): Add menu.
+        (Connecting): Fully document how to connect to an IRC server.
+        (Options, Tips and Tricks, Sample Configuration): New unwritten
+        sections.
+
+        * erc.el (erc-server, erc-port, erc-nick, erc-nick-uniquifier)
+        (erc-user-full-name, erc-password): Docfixes and customization
+        interface tweaks.
+        (erc-try-new-nick-p): Rename from
+        `erc-manual-set-nick-on-bad-nick-p' and invert meaning.
+        (erc-nickname-in-use): Use `erc-try-new-nick-p'.  Check the length
+        of `erc-nick-uniquifier', in case someone wants multiple
+        characters.
+        (erc-compute-server, erc-compute-nick, erc-compute-full-name)
+        (erc-compute-port): Docfixes.
+
+        * erc-log.el (log): Move all add-hook calls here, rather than
+        executing them immediately, and also cause them to be un-hooked
+        when the module is removed.
+        (erc-save-buffer-on-part): Move next to
+        `erc-save-queries-on-quit'.
+        (erc-save-buffer-on-quit, erc-save-queries-on-quit): Default to t.
+        (erc-log-write-after-send, erc-log-write-after-insert): Default to
+        nil.  This makes things fast, but reasonably failsafe, by default.
+
+2006-07-08  Michael Olson  <mwolson@gnu.org>
+
+        * erc-log.el (erc-log-insert-log-on-open): Make this nil by
+        default, since most IRC clients don't do this.
+        (erc-log-write-after-send): New option that determines whether the
+        log file will be written to after every sent message.
+        (erc-log-write-after-insert): New option that determines whether
+        the log file will be written to when new text is added to a logged
+        ERC buffer.
+        (log): Use the aforementioned options.
+
+        * erc.texi (Modules): Document the "completion" module.
+
+        * erc-pcomplete.el (pcomplete-erc-nicks): Make sure that we don't
+        have a nil element in the list when ignore-self is non-nil.
+
+2006-07-05  Michael Olson  <mwolson@gnu.org>
+
+        * erc.el (erc-modules): Add the `page' module to the list.
+
+        * erc.texi (Modules): Add entries for `list' and `page' modules.
+        Change "spell" to "spelling".
+        (History): Use past tense throughout.
+
+2006-07-02  Michael Olson  <mwolson@gnu.org>
+
+        * erc-backend.el (erc-call-hooks): Fix (stringp nil) error that
+        can happen when doing /PART.
+
+        * erc.el (erc-quit-reason-various-alist)
+        (erc-part-reason-various-alist): In the example, use "^$" as an
+        example, since "" matches anything.
+        (erc-quit-reason-various, erc-part-reason-various): If no argument
+        is given, and no matches are found, use our default reason instead
+        of "nil".
+
+2006-06-30  Michael Olson  <mwolson@gnu.org>
+
+        * erc.texi (Modules): Mention identd.
+        (Releases): Update mailing list address and download location.
+        (Development): Refactor.  Provide updated directions for Arch.
+        Make URLs clickable.
+        (Keystroke Summary): Typo fix.  Use more Texinfo syntax.
+        (Getting Started): Give simpler example.  We do not need to
+        explicitly load every module.
+        (History): Update.
+
+        * erc.el (erc-version-modules): Remove, since we do not use this
+        function anymore.
+        (erc-latest-version, erc-ediff-latest-version): Remove, since this
+        was only useful back when ERC consisted of one file.
+        (erc-modules): Add line for identd.
+        (erc-get-channel-mode-from-keypress): Typo fix.
+
+        * erc-imenu.el: Remove unnecessary lines in header.
+
+        * erc-goodies.el (erc-handle-irc-url): Docfix.
+
+        * erc-identd.el: Define an ERC module for this.
+        (erc-identd-start): Don't create a process buffer if possible.
+        Otherwise, use conventional hidden names for process buffers.
+
+2006-06-29  Michael Olson  <mwolson@gnu.org>
+
+        * erc-backend.el (erc-coding-system-for-target): Match
+        case-insensitively.  Use a pattern match instead of `assoc', as
+        per the documentation for `erc-encoding-coding-alist'.
+
+        * erc-track.el (erc-track-shorten-aggressively): Fix typo.
+
+2006-06-27  Michael Olson  <mwolson@gnu.org>
+
+        * erc.el: Update maintainer information and URLs.
+
+2006-06-14  Michael Olson  <mwolson@gnu.org>
+
+        * erc.el (erc-active-buffer): If the active buffer has been
+        deleted, default to the server buffer.
+        (erc-toggle-flood-control): When the user hits C-c C-f, make flood
+        control really toggle, not unconditionally turn off.
+
+2006-06-12  Michael Olson  <mwolson@gnu.org>
+
+        * NEWS: Add items since the 5.1.2 release.
+
+        * erc-autoaway.el (erc-autoaway-caused-away): New variable that
+        indicates whether the current away status was caused by this
+        module.
+        (erc-autoaway-set-back): Only set back if this module set the user
+        away.
+        (erc-autoaway-set-away): Update `erc-autoaway-caused-away'.
+        (erc-autoaway-reset-indicators): New function that resets some
+        indicators when the user is no longer away.
+        (autoaway): Add the above function to the 305 hook.
+
+2006-06-05  Romain Francoise  <romain@orebokech.com>
+
+        * erc.texi (History): Fix various typos.
+
+2006-06-04  Michael Olson  <mwolson@gnu.org>
+
+        * erc-autoaway.el (erc-autoaway-idle-method): Move after the
+        definition of the autoaway module.
+        (autoaway): Don't do anything if erc-autoaway-idle-method is
+        unbound.  This prevents an error on startup.
+
+2006-06-03  Michael Olson  <mwolson@gnu.org>
+
+        * erc-autoaway.el: Thanks to Mark Plaksin for the ideas and patch.
+        (erc-autoaway-idle-method): Renamed from
+        `erc-autoaway-use-emacs-idle'.  We have more than two choices for
+        how to do this, so it's best to make this take symbol values.
+        Improve documentation.  Remove warning against Emacs idle-time;
+        the point is moot now that we get user idle time via a different
+        method.  Make sure we disable and re-enable the module when
+        changing this value.
+        (autoaway): Conditionalize on the above option.  If using the idle
+        timer or user idle methods, don't add anything to the
+        send-completed or server-001 hooks, since it is unnecessary.
+        (erc-autoaway-reestablish-idletimer, erc-autoaway-message):
+        Docfix.
+        (erc-autoaway-idle-seconds): Use erc-autoaway-idle-method.
+        (erc-autoaway-reset-idle-irc): Renamed from
+        `erc-autoaway-reset-idle'.  Don't pass line to
+        `erc-autoaway-set-away', since it is not used.
+        (erc-autoaway-reset-idle-user): New function that resets the idle
+        state for user idle time.
+        (erc-autoaway-set-back): Remove line argument, since it is not
+        used.
+
+2006-06-01  Michael Olson  <mwolson@gnu.org>
+
+        * erc.el (erc-buffer-filter): Make sure all buffers returned from
+        this are live.
+
+2006-05-01  Edward O'Connor  <ted@oconnor.cx>
+
+        * erc-goodies.el: (erc-handle-irc-url): New function, suitable as
+        a value for `url-irc-function'.
+
+2006-04-18  Diane Murray  <disumu@x3y2z1.net>
+
+        * erc-pcomplete.el (pcomplete-erc-nicks): Added new optional
+        argument IGNORE-SELF.  If this is non-nil, don't return the user's
+        current nickname.  Doc fix.
+        (pcomplete/erc-mode/complete-command): Don't complete the current
+        nickname.
+
 2006-04-05  Diane Murray  <disumu@x3y2z1.net>
 
         * erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el
index 56713cba8bf..4614bd70e27 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -40,19 +40,6 @@ yourself back when you type something."
   "The Emacs idletimer.
 This is only used when `erc-autoaway-use-emacs-idle' is non-nil.")
 
-(defcustom erc-autoaway-use-emacs-idle nil
-  "*If non-nil, the idle time refers to idletime in Emacs.
-If nil, the idle time refers to idletime on IRC only.
-The time itself is specified by `erc-autoaway-idle-seconds'.
-See `erc-autoaway-mode' for more information on the various
-definitions of being idle.
-
-Note that using Emacs idletime is currently broken for most versions,
-since process activity (as happens all the time on IRC) makes Emacs
-non-idle.  Emacs idle-time and user idle-time are just not the same."
-  :group 'erc-autoaway
-  :type 'boolean)
-
 ;;;###autoload (autoload 'erc-autoaway-mode "erc-autoaway")
 (define-erc-module autoaway nil
   "In ERC autoaway mode, you can be set away automatically.
@@ -61,35 +48,65 @@ the number of seconds specified in `erc-autoaway-idle-seconds'.
 
 There are several kinds of being idle:
 
-IRC idle time measures how long since you last sent something (see
-`erc-autoaway-last-sent-time').  This is the default.
+User idle time measures how long you have not been sending any
+commands to Emacs.  This is the default.
 
 Emacs idle time measures how long Emacs has been idle.  This is
 currently not useful, since Emacs is non-idle when it handles
-ping-pong with IRC servers.  See `erc-autoaway-use-emacs-idle' for
-more information.
+ping-pong with IRC servers.  See `erc-autoaway-idle-method'
+for more information.
 
-User idle time measures how long you have not been sending any
-commands to Emacs, or to your system.  Emacs currently provides no way
-to measure user idle time.
+IRC idle time measures how long since you last sent something (see
+`erc-autoaway-last-sent-time').
 
 If `erc-auto-discard-away' is set, then typing anything, will
 set you no longer away.
 
 Related variables: `erc-public-away-p' and `erc-away-nickname'."
   ;; Enable:
-  ((add-hook 'erc-send-completed-hook 'erc-autoaway-reset-idletime)
-   (add-hook 'erc-server-001-functions 'erc-autoaway-reset-idletime)
-   (add-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away)
-   (when erc-autoaway-use-emacs-idle
-     (erc-autoaway-reestablish-idletimer)))
+  ((when (boundp 'erc-autoaway-idle-method)
+     (cond
+      ((eq erc-autoaway-idle-method 'irc)
+       (add-hook 'erc-send-completed-hook 'erc-autoaway-reset-idle-irc)
+       (add-hook 'erc-server-001-functions 'erc-autoaway-reset-idle-irc))
+      ((eq erc-autoaway-idle-method 'user)
+       (add-hook 'post-command-hook 'erc-autoaway-reset-idle-user))
+      ((eq erc-autoaway-idle-method 'emacs)
+       (erc-autoaway-reestablish-idletimer)))
+     (add-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away)
+     (add-hook 'erc-server-305-functions 'erc-autoaway-reset-indicators)))
   ;; Disable:
-  ((remove-hook 'erc-send-completed-hook 'erc-autoaway-reset-idletime)
-   (remove-hook 'erc-server-001-functions 'erc-autoaway-reset-idletime)
-   (remove-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away)
-   (when erc-autoaway-idletimer
-     (erc-cancel-timer erc-autoaway-idletimer)
-     (setq erc-autoaway-idletimer nil))))
+  ((when (boundp 'erc-autoaway-idle-method)
+     (cond
+      ((eq erc-autoaway-idle-method 'irc)
+       (remove-hook 'erc-send-completed-hook 'erc-autoaway-reset-idle-irc)
+       (remove-hook 'erc-server-001-functions 'erc-autoaway-reset-idle-irc))
+      ((eq erc-autoaway-idle-method 'user)
+       (remove-hook 'post-command-hook 'erc-autoaway-reset-idle-user))
+      ((eq erc-autoaway-idle-method 'emacs)
+       (erc-cancel-timer erc-autoaway-idletimer)
+       (setq erc-autoaway-idletimer nil)))
+     (remove-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away)
+     (remove-hook 'erc-server-305-functions 'erc-autoaway-reset-indicators))))
+
+(defcustom erc-autoaway-idle-method 'user
+  "*The method used to determine how long you have been idle.
+If 'user, the time of the last command sent to Emacs is used.
+If 'emacs, the idle time in Emacs is used.
+If 'irc, the time of the last IRC command is used.
+
+The time itself is specified by `erc-autoaway-idle-seconds'.
+
+See `erc-autoaway-mode' for more information on the various
+definitions of being idle."
+  :group 'erc-autoaway
+  :type '(choice (const :tag "User idle time" user)
+                 (const :tag "Emacs idle time" emacs)
+                 (const :tag "Last IRC action" irc))
+  :set (lambda (sym val)
+         (erc-autoaway-disable)
+         (set-default sym val)
+         (erc-autoaway-enable)))
 
 (defcustom erc-auto-set-away t
   "*If non-nil, set away after `erc-autoaway-idle-seconds' seconds of idling.
@@ -120,8 +137,8 @@ See `erc-auto-discard-away'."
 
 (defun erc-autoaway-reestablish-idletimer ()
   "Reestablish the emacs idletimer.
-You have to call this function each time you change
-`erc-autoaway-idle-seconds', if `erc-autoaway-use-emacs-idle' is set."
+If `erc-autoaway-idle-method' is 'emacs, you must call this
+function each time you change `erc-autoaway-idle-seconds'."
   (interactive)
   (when erc-autoaway-idletimer
     (erc-cancel-timer erc-autoaway-idletimer))
@@ -138,36 +155,49 @@ you have to run `erc-autoaway-reestablish-idletimer' afterwards."
   :group 'erc-autoaway
   :set (lambda (sym val)
          (set-default sym val)
-         (when erc-autoaway-use-emacs-idle
+         (when (eq erc-autoaway-idle-method 'emacs)
            (erc-autoaway-reestablish-idletimer)))
   :type 'number)
 
 (defcustom erc-autoaway-message
   "I'm gone (autoaway after %i seconds of idletime)"
-  "*Message ERC will use when he sets you automatically away.
-It is used as a `format' string with the argument of the idletime in
-seconds."
+  "*Message ERC will use when setting you automatically away.
+It is used as a `format' string with the argument of the idletime
+in seconds."
   :group 'erc-autoaway
   :type 'string)
 
 (defvar erc-autoaway-last-sent-time (erc-current-time)
   "The last time the user sent something.")
 
-(defun erc-autoaway-reset-idletime (line &rest stuff)
-  "Reset the stored idletime for the user.
-This is one global variable since a user talking on one net can talk
-on another net too."
+(defvar erc-autoaway-caused-away nil
+  "Indicates whether this module was responsible for setting the
+user's away status.")
+
+(defun erc-autoaway-reset-idle-user (&rest stuff)
+  "Reset the stored user idle time.
+This is one global variable since a user talking on one net can
+talk on another net too."
+  (when erc-auto-discard-away
+    (erc-autoaway-set-back))
+  (setq erc-autoaway-last-sent-time (erc-current-time)))
+
+(defun erc-autoaway-reset-idle-irc (line &rest stuff)
+  "Reset the stored IRC idle time.
+This is one global variable since a user talking on one net can
+talk on another net too."
   (when (and erc-auto-discard-away
              (stringp line)
              (not (string-match erc-autoaway-no-auto-discard-regexp line)))
-    (erc-autoaway-set-back line))
+    (erc-autoaway-set-back))
   (setq erc-autoaway-last-sent-time (erc-current-time)))
 
-(defun erc-autoaway-set-back (line)
+(defun erc-autoaway-set-back ()
   "Discard the away state globally."
-  (when (erc-away-p)
-    (setq erc-autoaway-last-sent-time (erc-current-time))
-    (erc-cmd-GAWAY "")))
+  (let ((server-buffer (car (erc-buffer-list #'erc-server-buffer-p))))
+    (when (and erc-autoaway-caused-away
+               (with-current-buffer server-buffer (erc-away-p)))
+      (erc-cmd-GAWAY ""))))
 
 (defun erc-autoaway-possibly-set-away (current-time)
   "Set autoaway when `erc-auto-set-away' is true and the idletime is
@@ -193,8 +223,14 @@ exceeds `erc-autoaway-idle-seconds'."
   ;; existing process.
   (when (and (erc-server-process-alive)
              (not (erc-away-p)))
+    (setq erc-autoaway-caused-away t)
     (erc-cmd-GAWAY (format erc-autoaway-message idle-time))))
 
+(defun erc-autoaway-reset-indicators (&rest stuff)
+  "Reset indicators used by the erc-autoaway module."
+  (setq erc-autoaway-last-sent-time (erc-current-time))
+  (setq erc-autoaway-caused-away nil))
+
 (provide 'erc-autoaway)
 
 ;;; erc-autoaway.el ends here
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 3ea0f74eed7..7dce9e4bf01 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -563,7 +563,11 @@ action."
   "Return the coding system or cons cell appropriate for TARGET.
 This is determined via `erc-encoding-coding-alist' or
 `erc-server-coding-system'."
-  (or (cdr (assoc target erc-encoding-coding-alist))
+  (or (let ((case-fold-search t))
+        (catch 'match
+          (dolist (pat erc-encoding-coding-alist)
+            (when (string-match (car pat) target)
+              (throw 'match (cdr pat))))))
       (and (functionp erc-server-coding-system)
            (funcall erc-server-coding-system))
       erc-server-coding-system))
@@ -849,8 +853,10 @@ Finds hooks by looking in the `erc-server-responses' hashtable."
   (let ((hook (or (erc-get-hook (erc-response.command message))
                   'erc-default-server-functions)))
     (run-hook-with-args-until-success hook process message)
-    (with-current-buffer (erc-server-buffer)
-      (run-hook-with-args 'erc-timer-hook (erc-current-time)))))
+    (let ((server-buffer (erc-server-buffer)))
+      (when (buffer-live-p server-buffer)
+        (with-current-buffer server-buffer
+          (run-hook-with-args 'erc-timer-hook (erc-current-time)))))))
 
 (add-hook 'erc-default-server-functions 'erc-handle-unknown-server-response)
 
diff --git a/lisp/erc/erc-identd.el b/lisp/erc/erc-identd.el
index 0f70aab0fbd..f30c40d4792 100644
--- a/lisp/erc/erc-identd.el
+++ b/lisp/erc/erc-identd.el
@@ -24,16 +24,32 @@
 
 ;;; Commentary:
 
-;; You can have a local identd server (running on port 8113; I use DNAT
-;; to bind 113->8113) if you add this to .emacs.el:
+;; This module allows you to run a local identd server on port 8113.
+;; You will need to set up DNAT to bind 113->8113, or use a proxy.
 
-;;    (add-hook 'erc-connect-pre-hook 'erc-identd-start)
-;;    (add-hook 'erc-disconnected-hook 'erc-identd-stop)
+;; To use this module, add identd to `erc-modules' and run
+;; `erc-update-modules'.
+
+;; Here is an example /etc/inetd.conf rule that forwards identd
+;; traffic to port 8113.  You will need simpleproxy installed for it
+;; to work.
+
+;; 113 stream tcp nowait nobody /usr/sbin/tcpd /usr/bin/simpleproxy simpleproxy -i -R 127.0.0.1:8113
 
 ;;; Code:
 
+(require 'erc)
+
 (defvar erc-identd-process nil)
 
+;;;###autoload (autoload 'erc-identd-mode "erc-identd")
+(define-erc-module identd nil
+  "This mode launches an identd server on port 8113."
+  ((add-hook 'erc-connect-pre-hook 'erc-identd-start)
+   (add-hook 'erc-disconnected-hook 'erc-identd-stop))
+  ((remove-hook 'erc-connect-pre-hook 'erc-identd-start)
+   (remove-hook 'erc-disconnected-hook 'erc-identd-stop)))
+
 (defun erc-identd-filter (proc string)
   "This filter implements RFC1413 (identd authentication protocol)."
   (let ((erc-identd-process proc))
@@ -63,10 +79,11 @@ system."
       (delete-process erc-identd-process))
   (setq erc-identd-process
         (make-network-process :name "identd"
-                              :buffer (generate-new-buffer "identd")
+                              :buffer nil
                               :host 'local :service port
-                              :server t :noquery t
-                              :filter 'erc-identd-filter)))
+                              :server t :noquery t :nowait t
+                              :filter 'erc-identd-filter))
+  (set-process-query-on-exit-flag erc-identd-process nil))
 
 ;;;###autoload
 (defun erc-identd-stop (&rest ignore)
diff --git a/lisp/erc/erc-imenu.el b/lisp/erc/erc-imenu.el
index 88de1cedf6e..e897a9d8a0c 100644
--- a/lisp/erc/erc-imenu.el
+++ b/lisp/erc/erc-imenu.el
@@ -31,11 +31,6 @@
 
 ;;; Code:
 
-
-;; Author: Mario Lang <mlang@delysid.org>
-
-;; This file is not part of GNU Emacs. But the same license applies.
-
 ;;; Commentary:
 
 ;; This package defines the function `erc-create-imenu-index'.  ERC
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index db60e5629bf..b316a8588bd 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -115,11 +115,6 @@ SERVER and PORT are the parameters used to connect BUFFERs
                  (const erc-generate-log-file-name-with-date)
                  (symbol)))
 
-(defcustom erc-save-buffer-on-part nil
-  "*Save the channel buffer content using `erc-save-buffer-in-logs' on PART."
-  :group 'erc-log
-  :type 'boolean)
-
 (defcustom erc-truncate-buffer-on-save nil
   "Truncate any ERC (channel, query, server) buffer when it is saved."
   :group 'erc-log
@@ -150,14 +145,41 @@ directory should not end with a trailing slash."
   :type '(choice directory
                  (const nil)))
 
-(defcustom erc-log-insert-log-on-open t
+(defcustom erc-log-insert-log-on-open nil
   "*Insert log file contents into the buffer if a log file exists."
   :group 'erc-log
   :type 'boolean)
 
-(defcustom erc-save-queries-on-quit nil
-  "Save all query (also channel) buffers of the server on QUIT.
-See the variable `erc-save-buffer-on-part' for details."
+(defcustom erc-save-buffer-on-part t
+  "*Save the channel buffer content using `erc-save-buffer-in-logs' on PART.
+
+If you set this to nil, you may want to enable both
+`erc-log-write-after-send' and `erc-log-write-after-insert'."
+  :group 'erc-log
+  :type 'boolean)
+
+(defcustom erc-save-queries-on-quit t
+  "*Save all query (also channel) buffers of the server on QUIT.
+
+If you set this to nil, you may want to enable both
+`erc-log-write-after-send' and `erc-log-write-after-insert'."
+  :group 'erc-log
+  :type 'boolean)
+
+(defcustom erc-log-write-after-send nil
+  "*If non-nil, write to log file after every message you send.
+
+If you set this to nil, you may want to enable both
+`erc-save-buffer-on-part' and `erc-save-queries-on-quit'."
+  :group 'erc-log
+  :type 'boolean)
+
+(defcustom erc-log-write-after-insert nil
+  "*If non-nil, write to log file when new text is added to a
+logged ERC buffer.
+
+If you set this to nil, you may want to enable both
+`erc-save-buffer-on-part' and `erc-save-queries-on-quit'."
   :group 'erc-log
   :type 'boolean)
 
@@ -187,29 +209,28 @@ also be a predicate function. To only log when you are not set away, use:
         (with-current-buffer buffer
           (not erc-away))))"
   ;; enable
-  ((add-hook 'erc-insert-post-hook
-             'erc-save-buffer-in-logs)
-   (add-hook 'erc-send-post-hook
-             'erc-save-buffer-in-logs))
+  ((when erc-log-write-after-insert
+     (add-hook 'erc-insert-post-hook 'erc-save-buffer-in-logs))
+   (when erc-log-write-after-send
+     (add-hook 'erc-send-post-hook 'erc-save-buffer-in-logs))
+   (add-hook 'erc-kill-buffer-hook 'erc-save-buffer-in-logs)
+   (add-hook 'erc-kill-channel-hook 'erc-save-buffer-in-logs)
+   (add-hook 'erc-quit-hook 'erc-conditional-save-queries)
+   (add-hook 'erc-part-hook 'erc-conditional-save-buffer)
+   ;; append, so that 'erc-initialize-log-marker runs first
+   (add-hook 'erc-connect-pre-hook 'erc-log-setup-logging 'append))
   ;; disable
-  ((remove-hook 'erc-insert-post-hook
-                'erc-save-buffer-in-logs)
-   (remove-hook 'erc-send-post-hook
-                'erc-save-buffer-in-logs)))
-
-(when erc-enable-logging
-  (add-hook 'erc-kill-buffer-hook
-            'erc-save-buffer-in-logs)
-  (add-hook 'erc-kill-channel-hook
-            'erc-save-buffer-in-logs)
-  (add-hook 'erc-quit-hook
-            'erc-conditional-save-queries)
-  (add-hook 'erc-part-hook
-            'erc-conditional-save-buffer))
+  ((remove-hook 'erc-insert-post-hook 'erc-save-buffer-in-logs)
+   (remove-hook 'erc-send-post-hook 'erc-save-buffer-in-logs)
+   (remove-hook 'erc-kill-buffer-hook 'erc-save-buffer-in-logs)
+   (remove-hook 'erc-kill-channel-hook 'erc-save-buffer-in-logs)
+   (remove-hook 'erc-quit-hook 'erc-conditional-save-queries)
+   (remove-hook 'erc-part-hook 'erc-conditional-save-buffer)
+   (remove-hook 'erc-connect-pre-hook 'erc-log-setup-logging)))
 
 (define-key erc-mode-map "\C-c\C-l" 'erc-save-buffer-in-logs)
 
-;;;functionality referenced from erc.el
+;;; functionality referenced from erc.el
 (defun erc-log-setup-logging ()
   "Setup the buffer-local logging variables in the current buffer.
 This function is destined to be run from `erc-connect-pre-hook'."
@@ -224,9 +245,6 @@ This function is destined to be run from `erc-connect-pre-hook'."
                      (move-marker erc-last-saved-position
                                   (1- (point-max)))))))
 
-;;; Append, so that 'erc-initialize-log-marker keeps running first.
-(add-hook 'erc-connect-pre-hook 'erc-log-setup-logging 'append)
-
 (defun erc-log-all-but-server-buffers (buffer)
   "Returns t if logging should be enabled in BUFFER.
 Returns nil iff `erc-server-buffer-p' returns t."
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index 88c6d4c425d..ffbc7482aae 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -553,10 +553,9 @@ deactivate/activate match logging in the latter. See
                     ?m message
                     ?u nickuserhost))))
         (with-current-buffer (erc-log-matches-make-buffer match-buffer-name)
-          (toggle-read-only -1)
-          (point-max)
-          (insert line)
-          (toggle-read-only 1))))))
+          (let ((inhibit-read-only t))
+            (goto-char (point-max))
+            (insert line)))))))
 
 (defun erc-log-matches-make-buffer (name)
   "Create or get a log-matches buffer named NAME and return it."
diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el
index d6d4dfdd3b3..33231ee2590 100644
--- a/lisp/erc/erc-pcomplete.el
+++ b/lisp/erc/erc-pcomplete.el
@@ -106,7 +106,7 @@ the most recent speakers are listed first."
   (pcomplete-here
    (append
     (pcomplete-erc-commands)
-    (pcomplete-erc-nicks erc-pcomplete-nick-postfix))))
+    (pcomplete-erc-nicks erc-pcomplete-nick-postfix t))))
 
 (defvar erc-pcomplete-ctcp-commands
   '("ACTION" "CLIENTINFO" "ECHO" "FINGER" "PING" "TIME" "USERINFO" "VERSION"))
@@ -212,14 +212,23 @@ the most recent speakers are listed first."
     not-ops))
 
 
-(defun pcomplete-erc-nicks (&optional postfix)
-  "Returns a list of nicks in the current channel."
-  (let ((users (erc-get-channel-user-list)))
-    (if erc-pcomplete-order-nickname-completions
-        (setq users (erc-sort-channel-users-by-activity users)))
-  (mapcar (lambda (x)
-              (concat (erc-server-user-nickname (car x)) postfix))
-            users)))
+(defun pcomplete-erc-nicks (&optional postfix ignore-self)
+  "Returns a list of nicks in the current channel.
+Optional argument POSTFIX is something to append to the nickname.
+If optional argument IGNORE-SELF is non-nil, don't return the current nick."
+  (let ((users (if erc-pcomplete-order-nickname-completions
+                   (erc-sort-channel-users-by-activity
+                    (erc-get-channel-user-list))
+                 (erc-get-channel-user-list)))
+        (nicks nil))
+    (dolist (user users)
+      (unless (and ignore-self
+                   (string= (erc-server-user-nickname (car user))
+                            (erc-current-nick)))
+        (setq nicks (cons (concat (erc-server-user-nickname (car user))
+                                  postfix)
+                          nicks))))
+    (nreverse nicks)))
 
 (defun pcomplete-erc-all-nicks (&optional postfix)
   "Returns a list of all nicks on the current server."
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index 63005678613..b045fb24999 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -108,7 +108,7 @@ If this variable is set to `max', then channel names will be shortened
 to the max.  Usually, shortened channel names will remain unique for a
 given set of existing channels.  When shortening to the max, the shortened
 channel names will be unique for the set of active channels only.
-Example: If there are tow active channels #emacs and #vi, and two inactive
+Example: If there are two active channels #emacs and #vi, and two inactive
 channels #electronica and #folk, then usually the active channels are
 shortened to #em and #v.  When shortening to the max, however, #emacs is
 not compared to #electronica -- only to #vi, therefore it can be shortened
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 1baede01259..fd5a49eae4b 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -11,7 +11,7 @@
 ;;               Andreas Fuchs (afs@void.at)
 ;;               Gergely Nagy (algernon@midgard.debian.net)
 ;;               David Edmondson (dme@dme.org)
-;; Maintainer: Mario Lang (mlang@delysid.org)
+;; Maintainer: Michael Olson (mwolson@gnu.org)
 ;; Keywords: IRC, chat, client, Internet
 
 ;; This file is part of GNU Emacs.
@@ -36,12 +36,13 @@
 ;; ERC is an IRC client for Emacs.
 
 ;; For more information, see the following URLs:
-;; * http://sf.net/projects/erc/
+;; * http://sv.gnu.org/projects/erc/
 ;; * http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient
 
-;; Jul-26-2001. erc.el is now in CVS on SourceForge.  I invite everyone
-;; who wants to hack it to contact me <mlang@delysid.org> in order to
-;; get write access on the CVS.
+;; As of 2006-06-13, ERC development is now hosted on Savannah
+;; (http://sv.gnu.org/projects/erc).  I invite everyone who wants to
+;; hack on it to contact me <mwolson@gnu.org> in order to get write
+;; access to the shared Arch archive.
 
 ;; Installation:
 
@@ -66,7 +67,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.2"
+(defconst erc-version-string "Version 5.1.3"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
@@ -77,12 +78,12 @@
 (require 'erc-menu)
 
 (defvar erc-official-location
-  "http://erc.sf.net (comments mailto://mlang@delysid.org)"
+  "http://emacswiki.org/cgi-bin/wiki/ERC (mailing list: erc-discuss@gnu.org)"
   "Location of the ERC client on the Internet.")
 
 (defgroup erc nil
   "Emacs Internet Relay Chat client."
-  :link '(url-link "http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient")
+  :link '(url-link "http://www.emacswiki.org/cgi-bin/wiki/ERC")
   :prefix "erc-"
   :group 'applications)
 
@@ -143,57 +144,69 @@
 ;; tunable connection and authentication parameters
 
 (defcustom erc-server nil
-  "IRC server to use.
+  "IRC server to use if one is not provided.
 See function `erc-compute-server' for more details on connection
 parameters and authentication."
   :group 'erc
-  :type '(choice (const nil) string))
+  :type '(choice (const :tag "None" nil)
+                 (string :tag "Server")))
 
 (defcustom erc-port nil
-  "IRC port to use."
+  "IRC port to use if not specified.
+
+This can be either a string or a number."
   :group 'erc
-  :type '(choice (const nil) number string))
+  :type '(choice (const :tag "None" nil)
+                 (const :tag "Port number" number)
+                 (const :tag "Port string" string)))
 
 (defcustom erc-nick nil
-  "Nickname to use.
+  "Nickname to use if one is not provided.
 
-Can be either a string, or a list of strings.
+This can be either a string, or a list of strings.
 In the latter case, if the first nick in the list is already in use,
 other nicks are tried in the list order.
 
 See function `erc-compute-nick' for more details on connection
 parameters and authentication."
   :group 'erc
-  :type '(choice (const nil)
+  :type '(choice (const :tag "None" nil)
                  (string :tag "Nickname")
-                 (repeat string)))
+                 (repeat (string :tag "Nickname"))))
 
 (defcustom erc-nick-uniquifier "`"
-  "The character to append to the nick if it is already in use."
+  "The string to append to the nick if it is already in use."
   :group 'erc
   :type 'string)
 
-(defcustom erc-manual-set-nick-on-bad-nick-p nil
-  "If the nickname you chose isn't available, ERC should not automatically
-attempt to set another nickname.  You can manually set another nickname with
-the /NICK command."
+(defcustom erc-try-new-nick-p t
+  "If the nickname you chose isn't available, and this option is non-nil,
+ERC should automatically attempt to connect with another nickname.
+
+You can manually set another nickname with the /NICK command."
   :group 'erc
   :type 'boolean)
 
 (defcustom erc-user-full-name nil
   "User full name.
 
+This can be either a string or a function to call.
+
 See function `erc-compute-full-name' for more details on connection
 parameters and authentication."
   :group 'erc
-  :type '(choice (const nil) string function)
+  :type '(choice (const :tag "No name" nil)
+                 (string :tag "Name")
+                 (function :tag "Get from function"))
   :set (lambda (sym val)
          (if (functionp val)
              (set sym (funcall val))
            (set sym val))))
 
 (defvar erc-password nil
-  "ERC password to use in authentication (not necessary).")
+  "Password to use when authenticating to an IRC server.
+It is not strictly necessary to provide this, since ERC will
+prompt you for it.")
 
 (defcustom erc-user-mode nil
   "Initial user modes to be set after a connection is established."
@@ -871,7 +884,7 @@ As an example:
         (\"xmms\" dme:now-playing)
         (\"version\" erc-quit-reason-normal)
         (\"home\" \"Gone home !\")
-        (\"\" \"Default Reason\")))
+        (\"^$\" \"Default Reason\")))
 If the user types \"/quit zippy\", then a Zippy the Pinhead quotation
 will be used as the quit message."
   :group 'erc-quit-and-part
@@ -895,7 +908,7 @@ As an example:
         (\"xmms\" dme:now-playing)
         (\"version\" erc-part-reason-normal)
         (\"home\" \"Gone home !\")
-        (\"\" \"Default Reason\")))
+        (\"^$\" \"Default Reason\")))
 If the user types \"/part zippy\", then a Zippy the Pinhead quotation
 will be used as the part message."
   :group 'erc-quit-and-part
@@ -1373,7 +1386,10 @@ server buffer")
 (defun erc-active-buffer ()
   "Return the value of `erc-active-buffer' for the current server.
 Defaults to the server buffer."
-  (with-current-buffer (erc-server-buffer) erc-active-buffer))
+  (with-current-buffer (erc-server-buffer)
+    (if (buffer-live-p erc-active-buffer)
+        erc-active-buffer)
+    (setq erc-active-buffer (current-buffer))))
 
 (defun erc-set-active-buffer (buffer)
   "Set the value of `erc-active-buffer' to BUFFER."
@@ -1595,12 +1611,13 @@ server connection, or nil which means all open connections."
     (delq
      nil
      (mapcar (lambda (buf)
-               (with-current-buffer buf
-                 (and (eq major-mode 'erc-mode)
-                      (or (not proc)
-                          (eq proc erc-server-process))
-                      (funcall predicate)
-                      buf)))
+               (when (buffer-live-p buf)
+                 (with-current-buffer buf
+                   (and (eq major-mode 'erc-mode)
+                        (or (not proc)
+                            (eq proc erc-server-process))
+                        (funcall predicate)
+                        buf))))
              (buffer-list)))))
 
 (defun erc-buffer-list (&optional predicate proc)
@@ -1760,11 +1777,12 @@ removed from the list will be disabled."
     :greedy t
     (const :tag "Set away status automatically" autoaway)
     (const :tag "Join channels automatically" autojoin)
-    (const :tag "Integrate with Big Brother Database" bbdb)
     (const :tag "Buttonize URLs, nicknames, and other text" button)
     (const :tag "Wrap long lines" fill)
+    (const :tag "Launch an identd server on port 8113" identd)
     (const :tag "Highlight or remove IRC control characters"
            irccontrols)
+    (const :tag "List channels in a separate buffer" list)
     (const :tag "Save buffers in logs" log)
     (const :tag "Highlight pals, fools, and other keywords" match)
     (const :tag "Detect netsplits" netsplit)
@@ -1776,6 +1794,7 @@ removed from the list will be disabled."
     (const :tag "Complete nicknames and commands (programmable)"
            completion)
     (const :tag "Complete nicknames and commands (old)" hecomplete)
+    (const :tag "Process CTCP PAGE requests from IRC" page)
     (const :tag "Make displayed lines read-only" readonly)
     (const :tag "Replace text in messages" replace)
     (const :tag "Enable an input history" ring)
@@ -2063,10 +2082,12 @@ Non-interactively, it takes keyword arguments
    (full-name (erc-compute-full-name)))
 
 That is, if called with
+
    (erc-select :server \"irc.freenode.net\" :full-name \"Harry S Truman\")
+
 server and full-name will be set to those values, whereas
-erc-compute-port, erc-compute-nick and erc-compute-full-name will
-be invoked for those parameters' values"
+`erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will
+be invoked for the values of the other parameters."
   (interactive (erc-select-read-args))
 
   (run-hook-with-args 'erc-before-connect server port nick)
@@ -3047,8 +3068,8 @@ If S is non-nil, it will be used as the quit reason."
     (cond
      ((functionp res) (funcall res))
      ((stringp res) res)
-     ;; hopefully never reached
-     (s))))
+     (s s)
+     (t (erc-quit-reason-normal)))))
 
 (defun erc-part-reason-normal (&optional s)
   "Normal part message.
@@ -3074,7 +3095,8 @@ If S is non-nil, it will be used as the quit reason."
     (cond
      ((functionp res) (funcall res))
      ((stringp res) res)
-     (s))))
+     (s s)
+     (t (erc-part-reason-normal)))))
 
 (defun erc-cmd-QUIT (reason)
   "Disconnect from the current server.
@@ -3713,7 +3735,7 @@ E.g. \"Read error to Nick [user@some.host]: 110\" would be shortened to
   "If NICK is unavailable, tell the user the REASON.
 
 See also `erc-display-error-notice'."
-  (if (or erc-manual-set-nick-on-bad-nick-p
+  (if (or (not erc-try-new-nick-p)
           ;; how many default-nicks are left + one more try...
           (eq erc-nick-change-attempt-count
               (if (consp erc-nick)
@@ -3735,12 +3757,13 @@ See also `erc-display-error-notice'."
           (setq newnick (concat (truncate-string-to-width
                                  nick
                                  (if (and erc-server-connected nicklen)
-                                     (- (string-to-number nicklen) 1)
+                                     (- (string-to-number nicklen)
+                                        (length erc-nick-uniquifier))
                                    ;; rfc2812 max nick length = 9
                                    ;; we must assume this is the
                                    ;; server's setting if we haven't
                                    ;; established a connection yet
-                                   8))
+                                   (- 9 (length erc-nick-uniquifier))))
                                 erc-nick-uniquifier)))
       (erc-cmd-NICK newnick)
       (erc-display-error-notice
@@ -5098,13 +5121,16 @@ If ARG is non-nil and not positive, turns CTCP replies off."
 (defun erc-toggle-flood-control (&optional arg)
   "Toggle use of flood control on sent messages.
 
-If ARG is non-nil, use flood control.
-If ARG is nil, do not use flood control.
+If ARG is positive, use flood control.
+If ARG is non-nil and not positive, do not use flood control.
 
 See `erc-server-flood-margin' for an explanation of the available
 flood control parameters."
   (interactive "P")
-  (setq erc-flood-protect arg)
+  (cond ((and (numberp arg) (> arg 0))
+         (setq erc-flood-protect t))
+        (arg (setq erc-flood-protect nil))
+        (t (setq erc-flood-protect (not erc-flood-protect))))
   (message "ERC flood control is %s"
            (cond (erc-flood-protect "ON")
                  (t "OFF"))))
@@ -5130,10 +5156,10 @@ This command is sent even if excess flood is detected."
 
 (defun erc-get-channel-mode-from-keypress (key)
   "Read a key sequence and call the corresponding channel mode function.
-After doing C-c C-o type in a channel mode letter.
+After doing C-c C-o, type in a channel mode letter.
 
 C-g means quit.
-RET let's you type more than one mode at a time.
+RET lets you type more than one mode at a time.
 If \"l\" is pressed, `erc-set-channel-limit' gets called.
 If \"k\" is pressed, `erc-set-channel-key' gets called.
 Anything else will be sent to `erc-toggle-channel-mode'."
@@ -5384,28 +5410,28 @@ Sets the buffer local variables:
 (defun erc-compute-server (&optional server)
   "Return an IRC server name.
 
-Tries a number of increasingly more default methods until a non-nil value is
-found:
+This tries a number of increasingly more default methods until a
+non-nil value is found.
 
-- SERVER
-- `erc-server'
+- SERVER (the argument passwd to this function)
+- The `erc-server' option
 - The value of the IRCSERVER environment variable
-- `erc-default-server'."
+- The `erc-default-server' variable"
   (or server
       erc-server
       (getenv "IRCSERVER")
       erc-default-server))
 
 (defun erc-compute-nick (&optional nick)
-  "Return user's NICK.
+  "Return user's IRC nick.
 
-Tries a number of increasingly more default methods until a non-nil value is
-found:
+This tries a number of increasingly more default methods until a
+non-nil value is found.
 
-- NICK
-- `erc-nick'
+- NICK (the argument passed to this function)
+- The `erc-nick' option
 - The value of the IRCNICK environment variable
-- via the function `user-login-name'."
+- The result from the `user-login-name' function"
   (or nick
       (if (consp erc-nick) (car erc-nick) erc-nick)
       (getenv "IRCNICK")
@@ -5413,15 +5439,15 @@ found:
 
 
 (defun erc-compute-full-name (&optional full-name)
-  "Return user's FULL-NAME.
+  "Return user's full name.
 
-Tries a number of increasingly more default methods until a non-nil value is
-found:
+This tries a number of increasingly more default methods until a
+non-nil value is found.
 
-- FULL-NAME
-- `erc-user-full-name'
+- FULL-NAME (the argument passed to this function)
+- The `erc-user-full-name' option
 - The value of the IRCNAME environment variable
-- via the function `user-full-name'."
+- The result from the `user-full-name' function"
   (or full-name
       erc-user-full-name
       (getenv "IRCNAME")
@@ -5431,12 +5457,13 @@ found:
 (defun erc-compute-port (&optional port)
   "Return a port for an IRC server.
 
-Tries a number of increasingly more default methods until a non-nil
-value is found:
+This tries a number of increasingly more default methods until a
+non-nil value is found.
 
-- PORT
-- \"ircd\"."
-  (or port erc-port "ircd"))
+- PORT (the argument passed to this function)
+- The `erc-port' option
+- The `erc-default-port' variable"
+  (or port erc-port erc-default-port))
 
 ;; time routines
 
@@ -5818,26 +5845,6 @@ If optional argument HERE is non-nil, insert version number at point."
           (message "%s" version-string)
         version-string))))
 
-(defun erc-version-modules (&optional here)
-  "Show the version numbers of all loaded ERC modules in the minibuffer.
-If optional argument HERE is non-nil, insert version number at point."
-  (interactive "P")
-  (let ((version-string
-         (mapconcat 'identity
-                    (let (versions (case-fold-search nil))
-                      (dolist (var (apropos-internal "^erc-.*version$"))
-                        (when (and (boundp var)
-                                   (stringp (symbol-value var)))
-                          (setq versions (cons (format "%S: %s"
-                                                       var (symbol-value var))
-                                               versions))))
-                      versions) ", ")))
-    (if here
-        (insert version-string)
-      (if (interactive-p)
-          (message "%s" version-string)
-        version-string))))
-
 (defun erc-modes (&optional here)
   "Show the active ERC modes in the minibuffer.
 If optional argument HERE is non-nil, insert version number at point."
@@ -5858,32 +5865,6 @@ If optional argument HERE is non-nil, insert version number at point."
           (message "%s" string)
         string))))
 
-(defun erc-latest-version ()
-  "Retrieve the latest erc.el version from CVS."
-  (interactive)
-  (if (ignore-errors (require 'url))
-      (progn
-        (switch-to-buffer (get-buffer-create "*erc.el latest version*"))
-        (delete-region (point-min) (point-max))
-        (kill-all-local-variables)
-        (url-insert-file-contents (concat
-                                   "http://cvs.sourceforge.net/viewcvs.py/"
-                                   "*checkout*/erc/erc/erc.el?content-type"
-                                   "=text%2Fplain&rev=HEAD"))
-        (emacs-lisp-mode)
-        (current-buffer))
-    (error "URL needs to be installed")))
-
-(defun erc-ediff-latest-version ()
-  "Ediff your installed erc.el with the latest CVS version.
-See also `erc-latest-version'."
-  (interactive)
-  (let ((current (locate-library "erc.el")))
-    (if current
-        (ediff-buffers (find-file current)
-                       (erc-latest-version))
-      (error "You do not appear to have the uncompiled erc.el file"))))
-
 (defun erc-trim-string (s)
   "Trim leading and trailing spaces off S."
   (cond
@@ -6184,6 +6165,29 @@ This function should be on `erc-kill-channel-hook'."
   (and vect
        (erc-response.command vect)))
 
+;; Teach url.el how to open irc:// URLs with ERC.
+;; To activate, customize `url-irc-function' to `url-irc-erc'.
+
+;;;###autoload
+(defun erc-handle-irc-url (host port channel user password)
+  "Use ERC to IRC on HOST:PORT in CHANNEL as USER with PASSWORD.
+If ERC is already connected to HOST:PORT, simply /join CHANNEL.
+Otherwise, connect to HOST:PORT as USER and /join CHANNEL."
+  (let ((server-buffer
+         (car (erc-buffer-filter
+               (lambda ()
+                 (and (string-equal erc-session-server host)
+                      (= erc-session-port port)
+                      erc-server-connected
+                      (eq (erc-server-buffer) (current-buffer))))))))
+    (with-current-buffer (or server-buffer (current-buffer))
+      (if (and server-buffer channel)
+          (erc-cmd-JOIN channel)
+        (erc host port (or user (erc-compute-nick)) (erc-compute-full-name)
+             (not server-buffer) password nil channel
+             (when server-buffer
+               (get-buffer-process server-buffer)))))))
+
 (provide 'erc)
 
 ;;; Deprecated. We might eventually stop requiring the goodies automatically.
diff --git a/lisp/files.el b/lisp/files.el
index 750cb36068a..fdc4464da86 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -44,7 +44,7 @@
 
 
 (defcustom delete-auto-save-files t
-  "*Non-nil means delete auto-save file when a buffer is saved or killed.
+  "Non-nil means delete auto-save file when a buffer is saved or killed.
 
 Note that the auto-save file will not be deleted if the buffer is killed
 when it has unsaved changes."
@@ -53,7 +53,7 @@ when it has unsaved changes."
 
 (defcustom directory-abbrev-alist
   nil
-  "*Alist of abbreviations for file directories.
+  "Alist of abbreviations for file directories.
 A list of elements of the form (FROM . TO), each meaning to replace
 FROM with TO when it appears in a directory name.  This replacement is
 done when setting up the default directory of a newly visited file.
@@ -74,7 +74,7 @@ the name it is linked to."
 
 ;; Turn off backup files on VMS since it has version numbers.
 (defcustom make-backup-files (not (eq system-type 'vax-vms))
-  "*Non-nil means make a backup of a file the first time it is saved.
+  "Non-nil means make a backup of a file the first time it is saved.
 This can be done by renaming the file or by copying.
 
 Renaming means that Emacs renames the existing file so that it is a
@@ -103,20 +103,20 @@ But it is local only if you make it local.")
 (put 'backup-inhibited 'permanent-local t)
 
 (defcustom backup-by-copying nil
- "*Non-nil means always use copying to create backup files.
+ "Non-nil means always use copying to create backup files.
 See documentation of variable `make-backup-files'."
  :type 'boolean
  :group 'backup)
 
 (defcustom backup-by-copying-when-linked nil
- "*Non-nil means use copying to create backups for files with multiple names.
+ "Non-nil means use copying to create backups for files with multiple names.
 This causes the alternate names to refer to the latest version as edited.
 This variable is relevant only if `backup-by-copying' is nil."
  :type 'boolean
  :group 'backup)
 
 (defcustom backup-by-copying-when-mismatch nil
-  "*Non-nil means create backups by copying if this preserves owner or group.
+  "Non-nil means create backups by copying if this preserves owner or group.
 Renaming may still be used (subject to control of other variables)
 when it would not result in changing the owner or group of the file;
 that is, for files which are owned by you and whose group matches
@@ -126,7 +126,7 @@ This variable is relevant only if `backup-by-copying' is nil."
   :group 'backup)
 
 (defcustom backup-by-copying-when-privileged-mismatch 200
-  "*Non-nil means create backups by copying to preserve a privileged owner.
+  "Non-nil means create backups by copying to preserve a privileged owner.
 Renaming may still be used (subject to control of other variables)
 when it would not result in changing the owner of the file or if the owner
 has a user id greater than the value of this variable.  This is useful
@@ -142,7 +142,7 @@ This variable is relevant only if `backup-by-copying' and
 Called with an absolute file name as argument, it returns t to enable backup.")
 
 (defcustom buffer-offer-save nil
-  "*Non-nil in a buffer means always offer to save buffer on exit.
+  "Non-nil in a buffer means always offer to save buffer on exit.
 Do so even if the buffer is not visiting a file.
 Automatically local in all buffers."
   :type 'boolean
@@ -150,7 +150,7 @@ Automatically local in all buffers."
 (make-variable-buffer-local 'buffer-offer-save)
 
 (defcustom find-file-existing-other-name t
-  "*Non-nil means find a file under alternative names, in existing buffers.
+  "Non-nil means find a file under alternative names, in existing buffers.
 This means if any existing buffer is visiting the file you want
 under another name, you get the existing buffer instead of a new buffer."
   :type 'boolean
@@ -165,7 +165,7 @@ both at the file level and at the levels of the containing directories."
 (put 'find-file-visit-truename 'safe-local-variable 'boolean)
 
 (defcustom revert-without-query nil
-  "*Specify which files should be reverted without query.
+  "Specify which files should be reverted without query.
 The value is a list of regular expressions.
 If the file name matches one of these regular expressions,
 then `revert-buffer' reverts the file without querying
@@ -226,7 +226,7 @@ have fast storage with limited space, such as a RAM disk."
   "Regexp recognizing file names which aren't allowed by the filesystem.")
 
 (defcustom file-precious-flag nil
-  "*Non-nil means protect against I/O errors while saving files.
+  "Non-nil means protect against I/O errors while saving files.
 Some modes set this non-nil in particular buffers.
 
 This feature works by writing the new contents into a temporary file
@@ -241,7 +241,7 @@ breaks any hard links between it and other files."
   :group 'backup)
 
 (defcustom version-control nil
-  "*Control use of version numbers for backup files.
+  "Control use of version numbers for backup files.
 t means make numeric backup versions unconditionally.
 nil means make them for files that have some already.
 `never' means do not make them."
@@ -254,13 +254,13 @@ nil means make them for files that have some already.
      '(lambda (x) (or (booleanp x) (equal x 'never))))
 
 (defcustom dired-kept-versions 2
-  "*When cleaning directory, number of versions to keep."
+  "When cleaning directory, number of versions to keep."
   :type 'integer
   :group 'backup
   :group 'dired)
 
 (defcustom delete-old-versions nil
-  "*If t, delete excess backup versions silently.
+  "If t, delete excess backup versions silently.
 If nil, ask confirmation.  Any other value prevents any trimming."
   :type '(choice (const :tag "Delete" t)
                  (const :tag "Ask" nil)
@@ -268,20 +268,20 @@ If nil, ask confirmation.  Any other value prevents any trimming."
   :group 'backup)
 
 (defcustom kept-old-versions 2
-  "*Number of oldest versions to keep when a new numbered backup is made."
+  "Number of oldest versions to keep when a new numbered backup is made."
   :type 'integer
   :group 'backup)
 (put 'kept-old-versions 'safe-local-variable 'integerp)
 
 (defcustom kept-new-versions 2
-  "*Number of newest versions to keep when a new numbered backup is made.
+  "Number of newest versions to keep when a new numbered backup is made.
 Includes the new backup.  Must be > 0"
   :type 'integer
   :group 'backup)
 (put 'kept-new-versions 'safe-local-variable 'integerp)
 
 (defcustom require-final-newline nil
-  "*Whether to add a newline automatically at the end of the file.
+  "Whether to add a newline automatically at the end of the file.
 
 A value of t means do this only when the file is about to be saved.
 A value of `visit' means do this right after the file is visited.
@@ -299,7 +299,7 @@ from `mode-require-final-newline'."
   :group 'editing-basics)
 
 (defcustom mode-require-final-newline t
-  "*Whether to add a newline at end of file, in certain major modes.
+  "Whether to add a newline at end of file, in certain major modes.
 Those modes set `require-final-newline' to this value when you enable them.
 They do so because they are often used for files that are supposed
 to end in newlines, and the question is how to arrange that.
@@ -322,12 +322,12 @@ a final newline, whenever you save a file that really needs one."
   :version "22.1")
 
 (defcustom auto-save-default t
-  "*Non-nil says by default do auto-saving of every file-visiting buffer."
+  "Non-nil says by default do auto-saving of every file-visiting buffer."
   :type 'boolean
   :group 'auto-save)
 
 (defcustom auto-save-visited-file-name nil
-  "*Non-nil says auto-save a buffer in the file it is visiting, when practical.
+  "Non-nil says auto-save a buffer in the file it is visiting, when practical.
 Normally auto-save files are written under other names."
   :type 'boolean
   :group 'auto-save)
@@ -337,7 +337,7 @@ Normally auto-save files are written under other names."
      ;; Don't put "\\2" inside expand-file-name, since it will be
      ;; transformed to "/2" on DOS/Windows.
      ,(concat temporary-file-directory "\\2") t))
-  "*Transforms to apply to buffer file name before making auto-save file name.
+  "Transforms to apply to buffer file name before making auto-save file name.
 Each transform is a list (REGEXP REPLACEMENT UNIQUIFY):
 REGEXP is a regular expression to match against the file name.
 If it matches, `replace-match' is used to replace the
@@ -364,19 +364,19 @@ ignored."
   :version "21.1")
 
 (defcustom save-abbrevs t
-  "*Non-nil means save word abbrevs too when files are saved.
+  "Non-nil means save word abbrevs too when files are saved.
 If `silently', don't ask the user before saving."
   :type '(choice (const t) (const nil) (const silently))
   :group 'abbrev)
 
 (defcustom find-file-run-dired t
-  "*Non-nil means allow `find-file' to visit directories.
+  "Non-nil means allow `find-file' to visit directories.
 To visit the directory, `find-file' runs `find-directory-functions'."
   :type 'boolean
   :group 'find-file)
 
 (defcustom find-directory-functions '(cvs-dired-noselect dired-noselect)
-  "*List of functions to try in sequence to visit a directory.
+  "List of functions to try in sequence to visit a directory.
 Each function is called with the directory name as the sole argument
 and should return either a buffer or nil."
   :type '(hook :options (cvs-dired-noselect dired-noselect))
@@ -448,7 +448,7 @@ use `before-save-hook'.")
     'write-contents-functions "22.1")
 
 (defcustom enable-local-variables t
-  "*Control use of local variables in files you visit.
+  "Control use of local variables in files you visit.
 The value can be t, nil, :safe, or something else.
 
 A value of t means file local variables specifications are obeyed
@@ -506,7 +506,7 @@ nil means ignore them; anything else means query."
     (defalias 'file-locked-p 'ignore))
 
 (defcustom view-read-only nil
-  "*Non-nil means buffers visiting files read-only do so in view mode.
+  "Non-nil means buffers visiting files read-only do so in view mode.
 In fact, this means that all read-only buffers normally have
 View mode enabled, including buffers that are read-only because
 you visit a file you cannot alter, and buffers you make read-only
@@ -691,7 +691,7 @@ PATH-AND-SUFFIXES is a pair of lists, (DIRECTORIES . SUFFIXES)."
         (when (file-directory-p dir)
           (dolist (file (file-name-all-completions
                          (file-name-nondirectory string) dir))
-            (push (if string-dir (concat string-dir file) file) names)
+            (add-to-list 'names (if string-dir (concat string-dir file) file))
             (when (string-match suffix file)
               (setq file (substring file 0 (match-beginning 0)))
               (push (if string-dir (concat string-dir file) file) names)))))
@@ -1192,7 +1192,11 @@ If the current buffer now contains an empty file that you just visited
 \(presumably by mistake), use this command to visit the file you really want.
 
 Interactively, or if WILDCARDS is non-nil in a call from Lisp,
-expand wildcards (if any) and replace the file with multiple files."
+expand wildcards (if any) and replace the file with multiple files.
+
+If the current buffer is an indirect buffer, or the base buffer
+for one or more indirect buffers, the other buffer(s) are not
+killed."
   (interactive
    (let ((file buffer-file-name)
          (file-name nil)
@@ -1320,7 +1324,7 @@ removes automounter prefixes (see the variable `automount-dir-prefix')."
       filename)))
 
 (defcustom find-file-not-true-dirname-list nil
-  "*List of logical names for which visiting shouldn't save the true dirname.
+  "List of logical names for which visiting shouldn't save the true dirname.
 On VMS, when you visit a file using a logical name that searches a path,
 you may or may not want the visited file name to record the specific
 directory where the file was found.  If you *do not* want that, add the logical
@@ -1369,7 +1373,7 @@ If there is no such live buffer, return nil."
           found))))
 
 (defcustom find-file-wildcards t
-  "*Non-nil means file-visiting commands should handle wildcards.
+  "Non-nil means file-visiting commands should handle wildcards.
 For example, if you specify `*.c', that would visit all the files
 whose names match the pattern."
   :group 'files
@@ -1377,7 +1381,7 @@ whose names match the pattern."
   :type 'boolean)
 
 (defcustom find-file-suppress-same-file-warnings nil
-  "*Non-nil means suppress warning messages for symlinked files.
+  "Non-nil means suppress warning messages for symlinked files.
 When nil, Emacs prints a warning when visiting a file that is already
 visited, but with a different name.  Setting this option to t
 suppresses this warning."
@@ -2299,7 +2303,7 @@ symbol and VAL is a value that is considered safe."
   :type  'alist)
 
 (defcustom safe-local-eval-forms nil
-  "*Expressions that are considered safe in an `eval:' local variable.
+  "Expressions that are considered safe in an `eval:' local variable.
 Add expressions to this list if you want Emacs to evaluate them, when
 they appear in an `eval' local variable specification, without first
 asking you for confirmation."
@@ -2760,7 +2764,7 @@ It is dangerous if either of these conditions are met:
 
 
 (defcustom change-major-mode-with-file-name t
-  "*Non-nil means \\[write-file] should set the major mode from the file name.
+  "Non-nil means \\[write-file] should set the major mode from the file name.
 However, the mode will not be changed if
 \(1) a local variables list or the `-*-' line specifies a major mode, or
 \(2) the current major mode is a \"special\" mode,
@@ -4495,7 +4499,7 @@ by `sh' are supported."
 
 (defcustom list-directory-brief-switches
   (if (eq system-type 'vax-vms) "" "-CF")
-  "*Switches for `list-directory' to pass to `ls' for brief listing."
+  "Switches for `list-directory' to pass to `ls' for brief listing."
   :type 'string
   :group 'dired)
 
@@ -4503,7 +4507,7 @@ by `sh' are supported."
   (if (eq system-type 'vax-vms)
       "/PROTECTION/SIZE/DATE/OWNER/WIDTH=(OWNER:10)"
     "-l")
-  "*Switches for `list-directory' to pass to `ls' for verbose listing."
+  "Switches for `list-directory' to pass to `ls' for verbose listing."
   :type 'string
   :group 'dired)
 
@@ -4634,7 +4638,7 @@ PATTERN that already quotes some of the special characters."
   "Absolute or relative name of the `ls' program used by `insert-directory'.")
 
 (defcustom directory-free-space-program "df"
-  "*Program to get the amount of free space on a file system.
+  "Program to get the amount of free space on a file system.
 We assume the output has the format of `df'.
 The value of this variable must be just a command name or file name;
 if you want to specify options, use `directory-free-space-args'.
@@ -4648,7 +4652,7 @@ preference to the program given by this variable."
 
 (defcustom directory-free-space-args
   (if (eq system-type 'darwin) "-k" "-Pk")
-  "*Options to use when running `directory-free-space-program'."
+  "Options to use when running `directory-free-space-program'."
   :type 'string
   :group 'dired)
 
diff --git a/lisp/find-file.el b/lisp/find-file.el
index e15d6e62b0b..5618ba58dbe 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -189,12 +189,16 @@ To override this, give an argument to `ff-find-other-file'."
     ;; C/C++ include, for NeXTSTEP too
     ("^\#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]" .
      (lambda ()
-       (setq fname (buffer-substring (match-beginning 2) (match-end 2)))))
+       (buffer-substring (match-beginning 2) (match-end 2))))
     )
-  "*A list of regular expressions for `ff-find-file'.
-Specifies how to recognize special constructs such as include files
-etc. and an associated method for extracting the filename from that
-construct.")
+  ;; We include `ff-treat-as-special' documentation here so that autoload
+  ;; can make it available to be read prior to loading this file.
+  "*List of special constructs for `ff-treat-as-special' to recognize.
+Each element, tried in order, has the form (REGEXP . EXTRACT).
+If REGEXP matches the current line (from the beginning of the line),
+`ff-treat-as-special' calls function EXTRACT with no args.
+If EXTRACT returns nil, keep trying.  Otherwise, return the
+filename that EXTRACT returned.")
 
 (defvaralias 'ff-related-file-alist 'ff-other-file-alist)
 (defcustom ff-other-file-alist 'cc-other-file-alist
@@ -405,9 +409,7 @@ If optional IN-OTHER-WINDOW is non-nil, find the file in another window."
               (ff-list-replace-env-vars (symbol-value ff-search-directories))
             (ff-list-replace-env-vars ff-search-directories)))
 
-    (save-excursion
-      (beginning-of-line 1)
-      (setq fname (ff-treat-as-special)))
+    (setq fname (ff-treat-as-special))
 
     (cond
      ((and (not ff-ignore-include) fname)
@@ -540,9 +542,7 @@ the `ff-ignore-include' variable."
               (ff-list-replace-env-vars (symbol-value ff-search-directories))
             (ff-list-replace-env-vars ff-search-directories)))
 
-    (save-excursion
-      (beginning-of-line 1)
-      (setq fname (ff-treat-as-special)))
+    (setq fname (ff-treat-as-special))
 
     (cond
      ((and (not ff-ignore-include) fname)
@@ -771,20 +771,22 @@ The value used comes from `ff-case-fold-search'."
 
 (defun ff-treat-as-special ()
   "Return the file to look for if the construct was special, else nil.
-The construct is defined in the variable `ff-special-constructs'."
-  (let* (fname
-         (list ff-special-constructs)
-         (elem (car list))
-         (regexp (car elem))
-         (match (cdr elem)))
-    (while (and list (not fname))
-      (if (and (looking-at regexp) match)
-          (setq fname (funcall match)))
-      (setq list (cdr list))
-      (setq elem (car list))
-      (setq regexp (car elem))
-      (setq match (cdr elem)))
-    fname))
+See variable `ff-special-constructs'."
+  (save-excursion
+    (beginning-of-line 1)
+    (let* (fname
+           (list ff-special-constructs)
+           (elem (car list))
+           (regexp (car elem))
+           (match (cdr elem)))
+      (while (and list (not fname))
+        (if (and (looking-at regexp) match)
+            (setq fname (funcall match)))
+        (setq list (cdr list))
+        (setq elem (car list))
+        (setq regexp (car elem))
+        (setq match (cdr elem)))
+      fname)))
 
 (defun ff-basename (string)
   "Return the basename of pathname STRING."
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d1f63c63324..e443056e034 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-16  NAKAJI Hiroyuki  <nakaji@heimat.jp>  (tiny change)
+
+        * mm-util.el (mm-charset-synonym-alist): Map windows-31j to cp932.
+
+2006-07-14  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+        * gnus-start.el (gnus-subscribe-options-newsgroup-method): Doc fix.
+
 2006-06-26  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus-diary.el (gnus-user-format-function-d)
@@ -175,8 +183,8 @@
 
         * mml.el (mml-mode, mml-dnd-protocol-alist)
         (mml-dnd-attach-options, mml-dnd-attach-file)
-        (mml-attach-file, mml-attach-buffer, mml-attach-external): Sync
-        DND support and use of message-in-body-p from the trunk.
+        (mml-attach-file, mml-attach-buffer, mml-attach-external):
+        Sync DND support and use of message-in-body-p from the trunk.
 
 2006-04-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -192,8 +200,7 @@
 
 2006-04-25  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
-        * nnweb.el (nnweb-google-wash-article): Sync up to new Google
-        HTML.
+        * nnweb.el (nnweb-google-wash-article): Sync up to new Google HTML.
 
 2006-04-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -305,16 +312,14 @@
         * rfc2047.el (rfc2047-decode-encoded-words): Don't message about
         unknown charset.
 
-        * message.el (message-header-synonyms): Add Original-To to the
-        default.
+        * message.el (message-header-synonyms): Add Original-To to the default.
 
-        * gnus-sum.el (gnus-get-newsgroup-headers-xover): group is an
+        * gnus-sum.el (gnus-get-newsgroup-headers-xover): Group is an
         optional parameter.
 
 2006-04-07  Reiner Steib  <Reiner.Steib@gmx.de>
 
-        * pgg-gpg.el: Revert to revision 7.15 to allow the use of
-        gpg-agent.
+        * pgg-gpg.el: Revert to revision 7.15 to allow the use of gpg-agent.
 
 2006-04-06  Reiner Steib  <Reiner.Steib@gmx.de>
 
@@ -322,14 +327,13 @@
 
 2006-04-04  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
-        * nnweb.el (nnweb-google-create-mapping): Update regexp.  Some
-        whitespace was matched into the url, which broke browsing hits
+        * nnweb.el (nnweb-google-create-mapping): Update regexp.
+        Some whitespace was matched into the url, which broke browsing hits
         > 100 when mm-url-use-external was nil.
 
 2006-03-31  Reiner Steib  <Reiner.Steib@gmx.de>
 
-        * gnus-group.el (gnus-group-update-tool-bar): Add :initialize and
-        :set.
+        * gnus-group.el (gnus-group-update-tool-bar): Add :initialize and :set.
 
 2006-03-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -400,8 +404,8 @@
 
 2006-03-15  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
-        * gnus-art.el (gnus-article-only-boring-p): Bind
-        inhibit-point-motion-hooks to avoid infinite loop when entering
+        * gnus-art.el (gnus-article-only-boring-p):
+        Bind inhibit-point-motion-hooks to avoid infinite loop when entering
         intangible text.  Reported by Ralf Wachinger
         <rwnewsmampfer@geekmail.de>.
 
@@ -472,8 +476,7 @@
 
 2006-03-03  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-        * mm-decode.el (mm-get-part): Don't use
-        mm-with-unibyte-current-buffer.
+        * mm-decode.el (mm-get-part): Don't use mm-with-unibyte-current-buffer.
 
         * gnus-sum.el (gnus-summary-set-display-table): Don't nix out
         characters 160 through 255 in Emacs 23.
@@ -493,8 +496,8 @@
 
 2006-02-28  Reiner Steib  <Reiner.Steib@gmx.de>
 
-        * nnweb.el (nnweb-type-definition, nnweb-gmane-search): Use new
-        nov.php.
+        * nnweb.el (nnweb-type-definition, nnweb-gmane-search):
+        Use new nov.php.
 
 2006-02-28  Andreas Seltenreich  <uwi7@stud.uni-karlsruhe.de>
 
@@ -686,8 +689,8 @@
 
 2006-02-06  Reiner Steib  <Reiner.Steib@gmx.de>
 
-        * spam-report.el (spam-report-gmane-use-article-number): Improve
-        doc string.
+        * spam-report.el (spam-report-gmane-use-article-number):
+        Improve doc string.
         (spam-report-gmane-internal): Check if a suitable header was found
         in the article.
 
@@ -726,12 +729,10 @@
         * nnweb.el (nnweb-group-alist): Use defvar instead of defvoo,
         there's only one active file for all servers.
         (nnweb-request-scan): Make sure nnweb-articles is initialized on
-        solid groups.  Gnus might have used a FAST request to select the
-        group.
+        solid groups.  Gnus might have used a FAST request to select the group.
         (nnweb-request-group, nnweb-google-parse-1): Don't keep nnweb-type
         and nnweb-search redundantly in the active file.
-        (nnweb-request-list): Don't list bogus groups.  There can only be
-        one.
+        (nnweb-request-list): Don't list bogus groups.  There can only be one.
         (nnweb-request-create-group): Don't use ARGS.
         (nnweb-possibly-change-server, nnweb-request-group): Remove some
         initialisations.  Let nnoo do the work.
@@ -742,14 +743,13 @@
         (message-setup-1): Call `message-use-alternative-email-as-from'
         after `message-setup-hook' to give it precedence over posting
         styles, etc.
-        (message-use-alternative-email-as-from): Add docstring.  Remove
-        the original From header if present.
+        (message-use-alternative-email-as-from): Add docstring.
+        Remove the original From header if present.
 
 2006-01-31  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-        * mm-uu.el (mm-uu-emacs-sources-extract): Say the part has been
-        decoded.
-        (mm-uu-diff-extract): Ditto.
+        * mm-uu.el (mm-uu-emacs-sources-extract, mm-uu-diff-extract):
+        Say the part has been decoded.
 
 2006-01-31  Kevin Ryde  <user42@zip.com.au>
 
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 0f56e40ae15..d42247de1be 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -313,8 +313,8 @@ If, for instance, you want to subscribe to all newsgroups in the
 
 options -n no.all alt.all
 
-Gnus will the subscribe all new newsgroups in these hierarchies with
-the subscription method in this variable."
+Gnus will then subscribe all new newsgroups in these hierarchies
+with the subscription method in this variable."
   :group 'gnus-group-new
   :type '(radio (function-item gnus-subscribe-randomly)
                 (function-item gnus-subscribe-alphabetically)
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 5803df7d419..22bbecf7e39 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -204,19 +204,19 @@ the alias.  Else windows-NUMBER is used."
   `(
     ;; Not in XEmacs, but it's not a proper MIME charset anyhow.
     ,@(unless (mm-coding-system-p 'x-ctext)
-       '((x-ctext . ctext)))
+        '((x-ctext . ctext)))
     ;; ISO-8859-15 is very similar to ISO-8859-1.  But it's _different_!
     ,@(unless (mm-coding-system-p 'iso-8859-15)
-       '((iso-8859-15 . iso-8859-1)))
+        '((iso-8859-15 . iso-8859-1)))
     ;; BIG-5HKSCS is similar to, but different than, BIG-5.
     ,@(unless (mm-coding-system-p 'big5-hkscs)
         '((big5-hkscs . big5)))
     ;; Windows-1252 is actually a superset of Latin-1.  See also
     ;; `gnus-article-dumbquotes-map'.
     ,@(unless (mm-coding-system-p 'windows-1252)
-       (if (mm-coding-system-p 'cp1252)
-           '((windows-1252 . cp1252))
-         '((windows-1252 . iso-8859-1))))
+        (if (mm-coding-system-p 'cp1252)
+            '((windows-1252 . cp1252))
+          '((windows-1252 . iso-8859-1))))
     ;; Windows-1250 is a variant of Latin-2 heavily used by Microsoft
     ;; Outlook users in Czech republic. Use this to allow reading of their
     ;; e-mails. cp1250 should be defined by M-x codepage-setup.
@@ -232,6 +232,10 @@ the alias.  Else windows-NUMBER is used."
         (if (mm-coding-system-p 'cp949)
             '((ks_c_5601-1987 . cp949))
           '((ks_c_5601-1987 . euc-kr))))
+    ;; Windows-31J is Windows Codepage 932.
+    ,@(if (and (not (mm-coding-system-p 'windows-31j))
+               (mm-coding-system-p 'cp932))
+          '((windows-31j . cp932)))
     )
   "A mapping from unknown or invalid charset names to the real charset names.")
 
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 69555feb170..53e280fd1a7 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -534,7 +534,8 @@ it is displayed along with the global value."
                          (error nil))))
                   (when location
                     (with-current-buffer (car location)
-                      (goto-char (cdr location))
+                      (when (cdr location)
+                        (goto-char (cdr location)))
                       (when (re-search-backward
                              "^;;; Generated autoloads from \\(.*\\)" nil t)
                         (setq file-name (match-string 1)))))))
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index f4ab3de5a4a..7cdf78fbe13 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -157,7 +157,8 @@ The format is (FUNCTION ARGS...).")
                    (let ((location
                           (find-function-search-for-symbol fun nil file)))
                      (pop-to-buffer (car location))
-                     (goto-char (cdr location))))
+                     (when (cdr location)
+                       (goto-char (cdr location)))))
   'help-echo (purecopy "mouse-2, RET: find function's definition"))
 
 (define-button-type 'help-variable-def
@@ -167,8 +168,9 @@ The format is (FUNCTION ARGS...).")
                      (setq file (help-C-file-name var 'var)))
                    (let ((location (find-variable-noselect var file)))
                      (pop-to-buffer (car location))
-                     (goto-char (cdr location))))
-  'help-echo (purecopy"mouse-2, RET: find variable's definition"))
+                     (when (cdr location)
+                       (goto-char (cdr location)))))
+  'help-echo (purecopy "mouse-2, RET: find variable's definition"))
 
 (define-button-type 'help-face-def
   :supertype 'help-xref
@@ -179,7 +181,8 @@ The format is (FUNCTION ARGS...).")
                    (let ((location
                           (find-function-search-for-symbol fun 'defface file)))
                      (pop-to-buffer (car location))
-                     (goto-char (cdr location))))
+                     (when (cdr location)
+                       (goto-char (cdr location)))))
   'help-echo (purecopy "mouse-2, RET: find face's definition"))
 
 
diff --git a/lisp/hexl.el b/lisp/hexl.el
index e2078fceecb..d753fc83017 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -351,8 +351,9 @@ You can use \\[hexl-find-file] to visit a file in Hexl mode.
 
 ;;;###autoload
 (defun hexl-find-file (filename)
-  "Edit file FILENAME in `hexl-mode'.
-Switch to a buffer visiting file FILENAME, creating one in none exists."
+  "Edit file FILENAME as a binary file in hex dump format.
+Switch to a buffer visiting file FILENAME, creating one if none exists,
+and edit the file in `hexl-mode'."
   (interactive
    (list
     (let ((completion-ignored-extensions nil))
diff --git a/lisp/ido.el b/lisp/ido.el
index a4c26b52c98..be1cba62f27 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2895,7 +2895,8 @@ With \\[universal-argument], pop all element."
   "Insert file name of current buffer.
 If repeated, insert text from buffer instead."
   (interactive "P")
-  (let* ((bfname (buffer-file-name ido-entry-buffer))
+  (let* ((bfname (or (buffer-file-name ido-entry-buffer)
+                     (buffer-name ido-entry-buffer)))
          (name (and bfname (file-name-nondirectory bfname))))
     (when name
       (setq ido-text-init
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 66d7fb6c16a..523ef3f73a8 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -118,6 +118,9 @@ information on these modes."
   (if (get-text-property (point-min) 'display)
       (image-toggle-display)))
 
+(defvar archive-superior-buffer)
+(defvar tar-superior-buffer)
+
 (defun image-toggle-display ()
   "Start or stop displaying an image file as the actual image.
 This command toggles between showing the text of the image file
diff --git a/lisp/imenu.el b/lisp/imenu.el
index a609bcbadf9..d9c75c5fdd4 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -910,9 +910,8 @@ select from ALIST.
 With no index alist ALIST, it calls `imenu--make-index-alist' to
 create the index alist.
 
-If `imenu-use-popup-menu' is non-nil, then the
-completion buffer is always used, no matter if the mouse was used or
-not.
+If `imenu-use-popup-menu' is nil, then the completion buffer
+is always used, no matter if the mouse was used or not.
 
 The returned value is of the form (INDEX-NAME . INDEX-POSITION)."
   (let (index-alist
diff --git a/lisp/info.el b/lisp/info.el
index 21d4bbc238d..def9a12ab0f 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3077,7 +3077,8 @@ If FORK is a string, it is the name to use for the new buffer."
 
 ;; Common subroutine.
 (defun Info-try-follow-nearest-node (&optional fork)
-  "Follow a node reference near point.  Return non-nil if successful."
+  "Follow a node reference near point.  Return non-nil if successful.
+If FORK is non-nil, it i spassed to `Info-goto-node'."
   (let (node)
     (cond
      ((Info-get-token (point) "[hf]t?tp://" "[hf]t?tp://\\([^ \t\n\"`({<>})']+\\)")
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index ae3301e24a9..06c863916db 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1,6 +1,6 @@
 ;;; mule.el --- basic commands for multilingual environment
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -2294,5 +2294,5 @@ This function is intended to be added to `auto-coding-functions'."
 ;;;
 (provide 'mule)
 
-;;; arch-tag: 9aebaa6e-0e8a-40a9-b857-cb5d04a39e7c
+;; arch-tag: 9aebaa6e-0e8a-40a9-b857-cb5d04a39e7c
 ;;; mule.el ends here
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 356f6e9fbb1..b3455b13ab8 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1353,7 +1353,8 @@ might return the position of the end of the line."
   "Pull rest of line from buffer into search string."
   (interactive)
   (isearch-yank-internal
-   (lambda () (line-end-position (if (eolp) 2 1)))))
+   (lambda () (let ((inhibit-field-text-motion t))
+                (line-end-position (if (eolp) 2 1))))))
 
 (defun isearch-search-and-update ()
   ;; Do the search and update the display.
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index da95c93bb08..25f6d6ee39d 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" (17382 1892))
+;;;;;;  "play/5x5.el" (17383 32181))
 ;;; Generated autoloads from play/5x5.el
 
 (autoload (quote 5x5) "5x5" "\
@@ -63,8 +63,14 @@ should return a grid vector array that is the new solution.
 
 ;;;***
 
+;;;### (autoloads nil "abbrev" "abbrev.el" (17494 22057))
+;;; Generated autoloads from abbrev.el
+(put 'abbrev-mode 'safe-local-variable 'booleanp)
+
+;;;***
+
 ;;;### (autoloads (list-one-abbrev-table) "abbrevlist" "abbrevlist.el"
-;;;;;;  (17403 28587))
+;;;;;;  (17404 53184))
 ;;; Generated autoloads from abbrevlist.el
 
 (autoload (quote list-one-abbrev-table) "abbrevlist" "\
@@ -75,7 +81,7 @@ Display alphabetical listing of ABBREV-TABLE in buffer OUTPUT-BUFFER.
 ;;;***
 
 ;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el"
-;;;;;;  (17388 18084))
+;;;;;;  (17578 34778))
 ;;; Generated autoloads from progmodes/ada-mode.el
 
 (autoload (quote ada-add-extensions) "ada-mode" "\
@@ -136,7 +142,7 @@ If you use ada-xref.el:
 ;;;***
 
 ;;;### (autoloads (ada-header) "ada-stmt" "progmodes/ada-stmt.el"
-;;;;;;  (17388 22063))
+;;;;;;  (17397 61560))
 ;;; Generated autoloads from progmodes/ada-stmt.el
 
 (autoload (quote ada-header) "ada-stmt" "\
@@ -147,7 +153,7 @@ Insert a descriptive header at the top of the file.
 ;;;***
 
 ;;;### (autoloads (ada-find-file) "ada-xref" "progmodes/ada-xref.el"
-;;;;;;  (17388 22063))
+;;;;;;  (17397 61560))
 ;;; Generated autoloads from progmodes/ada-xref.el
 
 (autoload (quote ada-find-file) "ada-xref" "\
@@ -162,7 +168,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" (17352 9346))
+;;;;;;  "add-log.el" (17515 39525))
 ;;; Generated autoloads from add-log.el
 
 (defvar add-log-current-defun-function nil "\
@@ -179,7 +185,7 @@ This defaults to the value returned by the function `user-full-name'.")
 (custom-autoload (quote add-log-full-name) "add-log")
 
 (defvar add-log-mailing-address nil "\
-*Email addresses of user, for inclusion in ChangeLog headers.
+Email addresses of user, for inclusion in ChangeLog headers.
 This defaults to the value of `user-mail-address'.  In addition to
 being a simple string, this value can also be a list.  All elements
 will be recognized as referring to the same user; when creating a new
@@ -232,7 +238,7 @@ The change log file can start with a copyright notice and a copying
 permission notice.  The first blank line indicates the end of these
 notices.
 
-Today's date is calculated according to `change-log-time-zone-rule' if
+Today's date is calculated according to `add-log-time-zone-rule' if
 non-nil, otherwise in local time.
 
 \(fn &optional WHOAMI FILE-NAME OTHER-WINDOW NEW-ENTRY)" t nil)
@@ -298,9 +304,9 @@ 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" (17383
-;;;;;;  16118))
+;;;### (autoloads (defadvice ad-activate ad-add-advice ad-disable-advice
+;;;;;;  ad-enable-advice ad-default-compilation-action ad-redefinition-action)
+;;;;;;  "advice" "emacs-lisp/advice.el" (17578 34774))
 ;;; Generated autoloads from emacs-lisp/advice.el
 
 (defvar ad-redefinition-action (quote warn) "\
@@ -327,6 +333,16 @@ COMPILE argument of `ad-activate' was supplied as nil.")
 
 (custom-autoload (quote ad-default-compilation-action) "advice")
 
+(autoload (quote ad-enable-advice) "advice" "\
+Enables the advice of FUNCTION with CLASS and NAME.
+
+\(fn FUNCTION CLASS NAME)" t nil)
+
+(autoload (quote ad-disable-advice) "advice" "\
+Disable the advice of FUNCTION with CLASS and NAME.
+
+\(fn FUNCTION CLASS NAME)" t nil)
+
 (autoload (quote ad-add-advice) "advice" "\
 Add a piece of ADVICE to FUNCTION's list of advices in CLASS.
 If FUNCTION already has one or more pieces of advice of the specified
@@ -342,6 +358,25 @@ will clear the cache.
 
 \(fn FUNCTION ADVICE CLASS POSITION)" nil nil)
 
+(autoload (quote ad-activate) "advice" "\
+Activate all the advice information of an advised FUNCTION.
+If FUNCTION has a proper original definition then an advised
+definition will be generated from FUNCTION's advice info and the
+definition of FUNCTION will be replaced with it.  If a previously
+cached advised definition was available, it will be used.
+The optional COMPILE argument determines whether the resulting function
+or a compilable cached definition will be compiled.  If it is negative
+no compilation will be performed, if it is positive or otherwise non-nil
+the resulting function will be compiled, if it is nil the behavior depends
+on the value of `ad-default-compilation-action' (which see).
+Activation of an advised function that has an advice info but no actual
+pieces of advice is equivalent to a call to `ad-unadvise'.  Activation of
+an advised function that has actual pieces of advice but none of them are
+enabled is equivalent to a call to `ad-deactivate'.  The current advised
+definition will always be cached for later usage.
+
+\(fn FUNCTION &optional COMPILE)" t nil)
+
 (autoload (quote defadvice) "advice" "\
 Define a piece of advice for FUNCTION (a symbol).
 The syntax of `defadvice' is as follows:
@@ -399,7 +434,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" (17383 24123))
+;;;;;;  align) "align" "align.el" (17383 32089))
 ;;; Generated autoloads from align.el
 
 (autoload (quote align) "align" "\
@@ -489,9 +524,41 @@ A replacement function for `newline-and-indent', aligning as it goes.
 ;;;***
 
 ;;;### (autoloads (outlineify-sticky allout-mode) "allout" "allout.el"
-;;;;;;  (17431 34439))
+;;;;;;  (17582 28845))
 ;;; Generated autoloads from allout.el
 
+(put (quote allout-show-bodies) (quote safe-local-variable) (if (fboundp (quote booleanp)) (quote booleanp) (quote (lambda (x) (member x (quote (t nil)))))))
+
+(put (quote allout-header-prefix) (quote safe-local-variable) (quote stringp))
+
+(put (quote allout-primary-bullet) (quote safe-local-variable) (quote stringp))
+
+(put (quote allout-plain-bullets-string) (quote safe-local-variable) (quote stringp))
+
+(put (quote allout-distinctive-bullets-string) (quote safe-local-variable) (quote stringp))
+
+(put (quote allout-use-mode-specific-leader) (quote safe-local-variable) (quote (lambda (x) (or (memq x (quote (t nil allout-mode-leaders comment-start))) (stringp x)))))
+
+(put (quote allout-old-style-prefixes) (quote safe-local-variable) (if (fboundp (quote booleanp)) (quote booleanp) (quote (lambda (x) (member x (quote (t nil)))))))
+
+(put (quote allout-stylish-prefixes) (quote safe-local-variable) (if (fboundp (quote booleanp)) (quote booleanp) (quote (lambda (x) (member x (quote (t nil)))))))
+
+(put (quote allout-numbered-bullet) (quote safe-local-variable) (if (fboundp (quote string-or-null-p)) (quote string-or-null-p) (quote (lambda (x) (or (stringp x) (null x))))))
+
+(put (quote allout-file-xref-bullet) (quote safe-local-variable) (if (fboundp (quote string-or-null-p)) (quote string-or-null-p) (quote (lambda (x) (or (stringp x) (null x))))))
+
+(put (quote allout-presentation-padding) (quote safe-local-variable) (quote integerp))
+
+(put (quote allout-use-hanging-indents) (quote safe-local-variable) (if (fboundp (quote booleanp)) (quote booleanp) (quote (lambda (x) (member x (quote (t nil)))))))
+
+(put (quote allout-reindent-bodies) (quote safe-local-variable) (quote (lambda (x) (memq x (quote (nil t text force))))))
+
+(put (quote allout-layout) (quote safe-local-variable) (quote (lambda (x) (or (numberp x) (listp x) (memq x (quote (: * + -)))))))
+
+(put (quote allout-passphrase-verifier-string) (quote safe-local-variable) (quote stringp))
+
+(put (quote allout-passphrase-hint-string) (quote safe-local-variable) (quote stringp))
+
 (autoload (quote allout-mode) "allout" "\
 Toggle minor mode for controlling exposure and editing of text outlines.
 \\<allout-mode-map>
@@ -711,7 +778,7 @@ setup for auto-startup.
 ;;;***
 
 ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp"
-;;;;;;  "net/ange-ftp.el" (17383 13296))
+;;;;;;  "net/ange-ftp.el" (17383 32174))
 ;;; Generated autoloads from net/ange-ftp.el
 
 (defalias (quote ange-ftp-re-read-dir) (quote ange-ftp-reread-dir))
@@ -733,7 +800,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (animate-birthday-present animate-sequence animate-string)
-;;;;;;  "animate" "play/animate.el" (17382 1892))
+;;;;;;  "animate" "play/animate.el" (17383 32181))
 ;;; Generated autoloads from play/animate.el
 
 (autoload (quote animate-string) "animate" "\
@@ -761,7 +828,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" (17383 24123))
+;;;;;;  "ansi-color" "ansi-color.el" (17383 32090))
 ;;; Generated autoloads from ansi-color.el
 
 (autoload (quote ansi-color-for-comint-mode-on) "ansi-color" "\
@@ -787,7 +854,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" (17388 22063))
+;;;;;;  "antlr-mode" "progmodes/antlr-mode.el" (17484 52436))
 ;;; Generated autoloads from progmodes/antlr-mode.el
 
 (autoload (quote antlr-show-makefile-rules) "antlr-mode" "\
@@ -826,7 +893,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" (17403 28563))
+;;;;;;  appt-issue-message) "appt" "calendar/appt.el" (17578 34774))
 ;;; Generated autoloads from calendar/appt.el
 
 (defvar appt-issue-message t "\
@@ -892,7 +959,7 @@ Update the appointments list from today's diary buffer.
 The time must be at the beginning of a line for it to be
 put in the appointments list (see examples in documentation of
 the function `appt-check').  We assume that the variables DATE and
-NUMBER hold the arguments that `list-diary-entries' received.
+NUMBER hold the arguments that `diary-list-entries' received.
 They specify the range of dates that the diary is being processed for.
 
 Any appointments made with `appt-add' are not affected by this
@@ -914,7 +981,7 @@ ARG is positive, otherwise off.
 
 ;;;### (autoloads (apropos-documentation apropos-value apropos apropos-documentation-property
 ;;;;;;  apropos-command apropos-variable apropos-read-pattern) "apropos"
-;;;;;;  "apropos.el" (17443 62455))
+;;;;;;  "apropos.el" (17484 52422))
 ;;; Generated autoloads from apropos.el
 
 (autoload (quote apropos-read-pattern) "apropos" "\
@@ -1010,8 +1077,8 @@ Returns list of symbols and documentation found.
 
 ;;;***
 
-;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17422
-;;;;;;  14887))
+;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17578
+;;;;;;  34770))
 ;;; Generated autoloads from arc-mode.el
 
 (autoload (quote archive-mode) "arc-mode" "\
@@ -1031,7 +1098,7 @@ archive.
 
 ;;;***
 
-;;;### (autoloads (array-mode) "array" "array.el" (17358 48216))
+;;;### (autoloads (array-mode) "array" "array.el" (17358 42654))
 ;;; Generated autoloads from array.el
 
 (autoload (quote array-mode) "array" "\
@@ -1102,8 +1169,8 @@ Entering array mode calls the function `array-mode-hook'.
 
 ;;;***
 
-;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (17383
-;;;;;;  15658))
+;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (17521
+;;;;;;  64539))
 ;;; Generated autoloads from textmodes/artist.el
 
 (autoload (quote artist-mode) "artist" "\
@@ -1308,8 +1375,8 @@ Keymap summary
 
 ;;;***
 
-;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (17388
-;;;;;;  22063))
+;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (17487
+;;;;;;  53546))
 ;;; Generated autoloads from progmodes/asm-mode.el
 
 (autoload (quote asm-mode) "asm-mode" "\
@@ -1337,7 +1404,7 @@ Special commands:
 ;;;***
 
 ;;;### (autoloads (auto-show-mode auto-show-mode) "auto-show" "obsolete/auto-show.el"
-;;;;;;  (17075 55468))
+;;;;;;  (16221 3779))
 ;;; Generated autoloads from obsolete/auto-show.el
 
 (defvar auto-show-mode nil "\
@@ -1353,7 +1420,7 @@ This command is obsolete.
 ;;;***
 
 ;;;### (autoloads (autoarg-kp-mode autoarg-mode) "autoarg" "autoarg.el"
-;;;;;;  (17383 24124))
+;;;;;;  (17383 32090))
 ;;; Generated autoloads from autoarg.el
 
 (defvar autoarg-mode nil "\
@@ -1362,8 +1429,6 @@ See the command `autoarg-mode' for a description of this minor-mode.")
 
 (custom-autoload (quote autoarg-mode) "autoarg")
 
-(put (quote autoarg-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote autoarg-mode) "autoarg" "\
 Toggle Autoarg minor mode globally.
 With ARG, turn Autoarg mode on if ARG is positive, off otherwise.
@@ -1394,8 +1459,6 @@ use either \\[customize] or the function `autoarg-kp-mode'.")
 
 (custom-autoload (quote autoarg-kp-mode) "autoarg")
 
-(put (quote autoarg-kp-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote autoarg-kp-mode) "autoarg" "\
 Toggle Autoarg-KP minor mode globally.
 With ARG, turn Autoarg mode on if ARG is positive, off otherwise.
@@ -1410,7 +1473,7 @@ This is similar to \\[autoarg-mode] but rebinds the keypad keys `kp-1'
 ;;;***
 
 ;;;### (autoloads (autoconf-mode) "autoconf" "progmodes/autoconf.el"
-;;;;;;  (17388 22063))
+;;;;;;  (17397 61561))
 ;;; Generated autoloads from progmodes/autoconf.el
 
 (autoload (quote autoconf-mode) "autoconf" "\
@@ -1421,7 +1484,7 @@ Major mode for editing Autoconf configure.in files.
 ;;;***
 
 ;;;### (autoloads (auto-insert-mode define-auto-insert auto-insert)
-;;;;;;  "autoinsert" "autoinsert.el" (17383 24124))
+;;;;;;  "autoinsert" "autoinsert.el" (17383 32090))
 ;;; Generated autoloads from autoinsert.el
 
 (autoload (quote auto-insert) "autoinsert" "\
@@ -1445,8 +1508,6 @@ use either \\[customize] or the function `auto-insert-mode'.")
 
 (custom-autoload (quote auto-insert-mode) "autoinsert")
 
-(put (quote auto-insert-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote auto-insert-mode) "autoinsert" "\
 Toggle Auto-insert mode.
 With prefix ARG, turn Auto-insert mode on if and only if ARG is positive.
@@ -1461,7 +1522,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"
-;;;;;;  (17410 23724))
+;;;;;;  (17590 36007))
 ;;; Generated autoloads from emacs-lisp/autoload.el
 
 (autoload (quote update-file-autoloads) "autoload" "\
@@ -1496,7 +1557,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" (17383 24124))
+;;;;;;  "autorevert" "autorevert.el" (17503 24305))
 ;;; Generated autoloads from autorevert.el
 
 (autoload (quote auto-revert-mode) "autorevert" "\
@@ -1552,8 +1613,6 @@ use either \\[customize] or the function `global-auto-revert-mode'.")
 
 (custom-autoload (quote global-auto-revert-mode) "autorevert")
 
-(put (quote global-auto-revert-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote global-auto-revert-mode) "autorevert" "\
 Revert any buffer when file on disk changes.
 
@@ -1566,7 +1625,7 @@ Use `auto-revert-mode' to revert a particular buffer.
 ;;;***
 
 ;;;### (autoloads (mouse-avoidance-mode mouse-avoidance-mode) "avoid"
-;;;;;;  "avoid.el" (17383 24124))
+;;;;;;  "avoid.el" (17503 24305))
 ;;; Generated autoloads from avoid.el
 
 (defvar mouse-avoidance-mode nil "\
@@ -1607,7 +1666,7 @@ definition of \"random distance\".)
 ;;;***
 
 ;;;### (autoloads (backquote) "backquote" "emacs-lisp/backquote.el"
-;;;;;;  (17383 16118))
+;;;;;;  (17383 32135))
 ;;; Generated autoloads from emacs-lisp/backquote.el
 
 (autoload (quote backquote) "backquote" "\
@@ -1632,7 +1691,7 @@ Vectors work just like lists.  Nested backquotes are permitted.
 ;;;***
 
 ;;;### (autoloads (display-battery-mode battery) "battery" "battery.el"
-;;;;;;  (17427 20614))
+;;;;;;  (17515 39525))
 ;;; Generated autoloads from battery.el
  (put 'battery-mode-line-string 'risky-local-variable t)
 
@@ -1651,8 +1710,6 @@ use either \\[customize] or the function `display-battery-mode'.")
 
 (custom-autoload (quote display-battery-mode) "battery")
 
-(put (quote display-battery-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote display-battery-mode) "battery" "\
 Display battery status information in the mode line.
 The text being displayed in the mode line is controlled by the variables
@@ -1665,7 +1722,7 @@ seconds.
 ;;;***
 
 ;;;### (autoloads (benchmark benchmark-run-compiled benchmark-run)
-;;;;;;  "benchmark" "emacs-lisp/benchmark.el" (17383 16118))
+;;;;;;  "benchmark" "emacs-lisp/benchmark.el" (17383 32135))
 ;;; Generated autoloads from emacs-lisp/benchmark.el
 
 (autoload (quote benchmark-run) "benchmark" "\
@@ -1697,8 +1754,8 @@ non-interactive use see also `benchmark-run' and
 
 ;;;***
 
-;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17437
-;;;;;;  53997))
+;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17578
+;;;;;;  34779))
 ;;; Generated autoloads from textmodes/bibtex.el
 
 (autoload (quote bibtex-mode) "bibtex" "\
@@ -1760,7 +1817,7 @@ if that value is non-nil.
 
 ;;;### (autoloads (binhex-decode-region binhex-decode-region-external
 ;;;;;;  binhex-decode-region-internal) "binhex" "gnus/binhex.el"
-;;;;;;  (17382 1052))
+;;;;;;  (17383 32153))
 ;;; Generated autoloads from gnus/binhex.el
 
 (defconst binhex-begin-line "^:...............................................................$")
@@ -1783,8 +1840,8 @@ Binhex decode region between START and END.
 
 ;;;***
 
-;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (17382
-;;;;;;  1892))
+;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (17383
+;;;;;;  32181))
 ;;; Generated autoloads from play/blackbox.el
 
 (autoload (quote blackbox) "blackbox" "\
@@ -1906,7 +1963,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" (17383 24124))
+;;;;;;  bookmark-set) "bookmark" "bookmark.el" (17383 32091))
 ;;; Generated autoloads from bookmark.el
  (define-key ctl-x-map "rb" 'bookmark-jump)
  (define-key ctl-x-map "rm" 'bookmark-set)
@@ -2096,7 +2153,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" (17383 13296))
+;;;;;;  "browse-url" "net/browse-url.el" (17521 64538))
 ;;; 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))) "\
@@ -2427,8 +2484,8 @@ Default to the URL around or before point.
 
 ;;;***
 
-;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (17382
-;;;;;;  1892))
+;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (17383
+;;;;;;  32181))
 ;;; Generated autoloads from play/bruce.el
 
 (autoload (quote bruce) "bruce" "\
@@ -2444,7 +2501,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" (17395 3136))
+;;;;;;  "bs" "bs.el" (17397 61539))
 ;;; Generated autoloads from bs.el
 
 (autoload (quote bs-cycle-next) "bs" "\
@@ -2486,7 +2543,7 @@ name of buffer configuration.
 
 ;;;### (autoloads (insert-text-button make-text-button insert-button
 ;;;;;;  make-button define-button-type) "button" "button.el" (17383
-;;;;;;  24124))
+;;;;;;  32092))
 ;;; 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) "\
@@ -2573,9 +2630,16 @@ Also see `make-text-button'.
 ;;;### (autoloads (batch-byte-recompile-directory batch-byte-compile
 ;;;;;;  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"
-;;;;;;  (17351 57359))
+;;;;;;  byte-force-recompile byte-compile-warnings-safe-p) "bytecomp"
+;;;;;;  "emacs-lisp/bytecomp.el" (17582 35542))
 ;;; Generated autoloads from emacs-lisp/bytecomp.el
+(put 'byte-compile-dynamic 'safe-local-variable 'booleanp)
+(put 'byte-compile-dynamic-docstrings 'safe-local-variable 'booleanp)
+
+(autoload (quote byte-compile-warnings-safe-p) "bytecomp" "\
+Not documented
+
+\(fn X)" nil nil)
 
 (autoload (quote byte-force-recompile) "bytecomp" "\
 Recompile every `.el' file in DIRECTORY that already has a `.elc' file.
@@ -2600,6 +2664,7 @@ If the third argument FORCE is non-nil,
 recompile every `.el' file that already has a `.elc' file.
 
 \(fn DIRECTORY &optional ARG FORCE)" t nil)
+(put 'no-byte-compile 'safe-local-variable 'booleanp)
 
 (autoload (quote byte-compile-file) "bytecomp" "\
 Compile a file of Lisp code named FILENAME into a file of byte code.
@@ -2670,7 +2735,7 @@ and corresponding effects.
 
 ;;;***
 
-;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17385 41891))
+;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17397 61545))
 ;;; Generated autoloads from calendar/cal-dst.el
 
 (put (quote calendar-daylight-savings-starts) (quote risky-local-variable) t)
@@ -2680,7 +2745,7 @@ and corresponding effects.
 ;;;***
 
 ;;;### (autoloads (list-yahrzeit-dates) "cal-hebrew" "calendar/cal-hebrew.el"
-;;;;;;  (17385 41891))
+;;;;;;  (17397 61545))
 ;;; Generated autoloads from calendar/cal-hebrew.el
 
 (autoload (quote list-yahrzeit-dates) "cal-hebrew" "\
@@ -2695,7 +2760,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"
-;;;;;;  (17382 10215))
+;;;;;;  (17383 32134))
 ;;; Generated autoloads from calc/calc.el
 
 (defvar calc-settings-file (convert-standard-filename "~/.calc.el") "\
@@ -2774,7 +2839,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (calculator) "calculator" "calculator.el" (17383
-;;;;;;  24124))
+;;;;;;  32092))
 ;;; Generated autoloads from calculator.el
 
 (autoload (quote calculator) "calculator" "\
@@ -2802,7 +2867,7 @@ See the documentation for `calculator-mode' for more information.
 ;;;;;;  mark-holidays-in-calendar view-calendar-holidays-initially
 ;;;;;;  calendar-remove-frame-by-deleting mark-diary-entries-in-calendar
 ;;;;;;  view-diary-entries-initially calendar-offset) "calendar"
-;;;;;;  "calendar/calendar.el" (17425 13433))
+;;;;;;  "calendar/calendar.el" (17578 34774))
 ;;; Generated autoloads from calendar/calendar.el
 
 (defvar calendar-offset 0 "\
@@ -3373,7 +3438,7 @@ movement commands will not work correctly.")
 ;;;***
 
 ;;;### (autoloads (canlock-verify canlock-insert-header) "canlock"
-;;;;;;  "gnus/canlock.el" (17382 1052))
+;;;;;;  "gnus/canlock.el" (17383 32153))
 ;;; Generated autoloads from gnus/canlock.el
 
 (autoload (quote canlock-insert-header) "canlock" "\
@@ -3390,8 +3455,15 @@ it fails.
 
 ;;;***
 
+;;;### (autoloads nil "cc-compat" "progmodes/cc-compat.el" (17515
+;;;;;;  39528))
+;;; Generated autoloads from progmodes/cc-compat.el
+(put 'c-indent-level 'safe-local-variable 'integerp)
+
+;;;***
+
 ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el"
-;;;;;;  (17407 10030))
+;;;;;;  (17420 36089))
 ;;; Generated autoloads from progmodes/cc-engine.el
 
 (autoload (quote c-guess-basic-syntax) "cc-engine" "\
@@ -3403,7 +3475,7 @@ Return the syntactic context of the current line.
 
 ;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode
 ;;;;;;  c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el"
-;;;;;;  (17407 10030))
+;;;;;;  (17590 36100))
 ;;; Generated autoloads from progmodes/cc-mode.el
 
 (autoload (quote c-initialize-cc-mode) "cc-mode" "\
@@ -3561,7 +3633,7 @@ Key bindings:
 ;;;***
 
 ;;;### (autoloads (c-set-offset c-add-style c-set-style) "cc-styles"
-;;;;;;  "progmodes/cc-styles.el" (17407 10030))
+;;;;;;  "progmodes/cc-styles.el" (17521 64538))
 ;;; Generated autoloads from progmodes/cc-styles.el
 
 (autoload (quote c-set-style) "cc-styles" "\
@@ -3612,16 +3684,24 @@ and exists only for compatibility reasons.
 
 ;;;***
 
-;;;### (autoloads nil "cc-subword" "progmodes/cc-subword.el" (17388
-;;;;;;  22063))
+;;;### (autoloads nil "cc-subword" "progmodes/cc-subword.el" (17515
+;;;;;;  39528))
 ;;; Generated autoloads from progmodes/cc-subword.el
  (autoload 'c-subword-mode "cc-subword" "Mode enabling subword movement and editing keys." t)
 
 ;;;***
 
+;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (17521 64538))
+;;; Generated autoloads from progmodes/cc-vars.el
+(put 'c-basic-offset 'safe-local-variable 'integerp)
+(put 'c-backslash-column 'safe-local-variable 'integerp)
+(put 'c-file-style 'safe-local-variable 'string-or-null-p)
+
+;;;***
+
 ;;;### (autoloads (ccl-execute-with-args check-ccl-program define-ccl-program
 ;;;;;;  declare-ccl-program ccl-dump ccl-compile) "ccl" "international/ccl.el"
-;;;;;;  (17102 18708))
+;;;;;;  (17097 33519))
 ;;; Generated autoloads from international/ccl.el
 
 (autoload (quote ccl-compile) "ccl" "\
@@ -3880,7 +3960,7 @@ See the documentation of `define-ccl-program' for the detail of CCL program.
 ;;;***
 
 ;;;### (autoloads (cfengine-mode) "cfengine" "progmodes/cfengine.el"
-;;;;;;  (17388 22063))
+;;;;;;  (17397 61564))
 ;;; Generated autoloads from progmodes/cfengine.el
 
 (autoload (quote cfengine-mode) "cfengine" "\
@@ -3902,7 +3982,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"
-;;;;;;  (17383 16118))
+;;;;;;  (17383 32136))
 ;;; Generated autoloads from emacs-lisp/checkdoc.el
 
 (autoload (quote checkdoc) "checkdoc" "\
@@ -4085,8 +4165,8 @@ checking of documentation strings.
 ;;;***
 
 ;;;### (autoloads (encode-hz-buffer encode-hz-region decode-hz-buffer
-;;;;;;  decode-hz-region) "china-util" "language/china-util.el" (17246
-;;;;;;  40257))
+;;;;;;  decode-hz-region) "china-util" "language/china-util.el" (17097
+;;;;;;  33524))
 ;;; Generated autoloads from language/china-util.el
 
 (autoload (quote decode-hz-region) "china-util" "\
@@ -4114,7 +4194,7 @@ Encode the text in the current buffer to HZ.
 ;;;***
 
 ;;;### (autoloads (command-history list-command-history repeat-matching-complex-command)
-;;;;;;  "chistory" "chistory.el" (17383 24124))
+;;;;;;  "chistory" "chistory.el" (17383 32092))
 ;;; Generated autoloads from chistory.el
 
 (autoload (quote repeat-matching-complex-command) "chistory" "\
@@ -4153,7 +4233,7 @@ and runs the normal hook `command-history-hook'.
 
 ;;;***
 
-;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (17383 16118))
+;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (17383 32137))
 ;;; Generated autoloads from emacs-lisp/cl.el
 
 (defvar custom-print-functions nil "\
@@ -4169,7 +4249,7 @@ a future Emacs interpreter will be able to use it.")
 ;;;***
 
 ;;;### (autoloads (common-lisp-indent-function) "cl-indent" "emacs-lisp/cl-indent.el"
-;;;;;;  (17383 16118))
+;;;;;;  (17383 32136))
 ;;; Generated autoloads from emacs-lisp/cl-indent.el
 
 (autoload (quote common-lisp-indent-function) "cl-indent" "\
@@ -4180,7 +4260,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (c-macro-expand) "cmacexp" "progmodes/cmacexp.el"
-;;;;;;  (17388 22063))
+;;;;;;  (17397 61564))
 ;;; Generated autoloads from progmodes/cmacexp.el
 
 (autoload (quote c-macro-expand) "cmacexp" "\
@@ -4201,7 +4281,7 @@ For use inside Lisp programs, see also `c-macro-expansion'.
 ;;;***
 
 ;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (17383
-;;;;;;  24124))
+;;;;;;  32092))
 ;;; Generated autoloads from cmuscheme.el
 
 (autoload (quote run-scheme) "cmuscheme" "\
@@ -4223,7 +4303,7 @@ is run).
 
 ;;;### (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" (17239 32321))
+;;;;;;  "codepage" "international/codepage.el" (17210 47738))
 ;;; Generated autoloads from international/codepage.el
 
 (autoload (quote cp-make-coding-systems-for-codepage) "codepage" "\
@@ -4282,7 +4362,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"
-;;;;;;  (17447 42828))
+;;;;;;  (17578 34770))
 ;;; Generated autoloads from comint.el
 
 (defvar comint-output-filter-functions (quote (comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt)) "\
@@ -4372,8 +4452,8 @@ REGEXP-GROUP is the regular expression group in REGEXP to use.
 
 ;;;***
 
-;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17406
-;;;;;;  11270))
+;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17420
+;;;;;;  36076))
 ;;; Generated autoloads from compare-w.el
 
 (autoload (quote compare-windows) "compare-w" "\
@@ -4410,7 +4490,7 @@ on third call it again advances points to the next difference and so on.
 ;;;;;;  compilation-shell-minor-mode compilation-mode compilation-start
 ;;;;;;  compile compilation-disable-input compile-command compilation-search-path
 ;;;;;;  compilation-ask-about-save compilation-window-height compilation-mode-hook)
-;;;;;;  "compile" "progmodes/compile.el" (17388 22062))
+;;;;;;  "compile" "progmodes/compile.el" (17590 36100))
 ;;; Generated autoloads from progmodes/compile.el
 
 (defvar compilation-mode-hook nil "\
@@ -4475,6 +4555,7 @@ You might also use mode hooks to specify it in certain modes, like this:
                         (file-name-sans-extension buffer-file-name))))))")
 
 (custom-autoload (quote compile-command) "compile")
+(put 'compile-command 'safe-local-variable 'stringp)
 
 (defvar compilation-disable-input nil "\
 *If non-nil, send end-of-file as compilation process input.
@@ -4571,7 +4652,7 @@ This is the value of `next-error-function' in Compilation buffers.
 ;;;***
 
 ;;;### (autoloads (partial-completion-mode) "complete" "complete.el"
-;;;;;;  (17420 38637))
+;;;;;;  (17578 34770))
 ;;; Generated autoloads from complete.el
 
 (defvar partial-completion-mode nil "\
@@ -4582,8 +4663,6 @@ use either \\[customize] or the function `partial-completion-mode'.")
 
 (custom-autoload (quote partial-completion-mode) "complete")
 
-(put (quote partial-completion-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote partial-completion-mode) "complete" "\
 Toggle Partial Completion mode.
 With prefix ARG, turn Partial Completion mode on if ARG is positive.
@@ -4596,7 +4675,7 @@ as much as possible and `*' characters are treated likewise in file names.
 For example, M-x p-c-m expands to M-x partial-completion-mode since no other
 command begins with that sequence of characters, and
 \\[find-file] f_b.c TAB might complete to foo_bar.c if that file existed and no
-other file in that directory begin with that sequence of characters.
+other file in that directory begins with that sequence of characters.
 
 Unless `PC-disable-includes' is non-nil, the `<...>' sequence is interpreted
 specially in \\[find-file].  For example,
@@ -4614,7 +4693,7 @@ second TAB brings up the `*Completions*' buffer.
 ;;;***
 
 ;;;### (autoloads (dynamic-completion-mode) "completion" "completion.el"
-;;;;;;  (17383 24124))
+;;;;;;  (17383 32093))
 ;;; Generated autoloads from completion.el
 
 (defvar dynamic-completion-mode nil "\
@@ -4625,8 +4704,6 @@ use either \\[customize] or the function `dynamic-completion-mode'.")
 
 (custom-autoload (quote dynamic-completion-mode) "completion")
 
-(put (quote dynamic-completion-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote dynamic-completion-mode) "completion" "\
 Enable dynamic word-completion.
 
@@ -4637,7 +4714,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" (17318 56743))
+;;;;;;  "composite" "composite.el" (17318 53825))
 ;;; 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))) "\
@@ -4858,7 +4935,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" (17383 15658))
+;;;;;;  conf-mode) "conf-mode" "textmodes/conf-mode.el" (17383 32186))
 ;;; Generated autoloads from textmodes/conf-mode.el
 
 (autoload (quote conf-mode) "conf-mode" "\
@@ -5007,7 +5084,7 @@ For details see `conf-mode'.  Example:
 ;;;***
 
 ;;;### (autoloads (shuffle-vector cookie-snarf cookie-insert cookie)
-;;;;;;  "cookie1" "play/cookie1.el" (17382 1892))
+;;;;;;  "cookie1" "play/cookie1.el" (17578 34778))
 ;;; Generated autoloads from play/cookie1.el
 
 (autoload (quote cookie) "cookie1" "\
@@ -5039,7 +5116,7 @@ Randomly permute the elements of VECTOR (all permutations equally likely).
 ;;;***
 
 ;;;### (autoloads (copyright copyright-fix-years copyright-update)
-;;;;;;  "copyright" "emacs-lisp/copyright.el" (17383 16118))
+;;;;;;  "copyright" "emacs-lisp/copyright.el" (17383 32137))
 ;;; Generated autoloads from emacs-lisp/copyright.el
 
 (autoload (quote copyright-update) "copyright" "\
@@ -5067,7 +5144,7 @@ Insert a copyright by $ORGANIZATION notice at cursor.
 ;;;***
 
 ;;;### (autoloads (cperl-mode) "cperl-mode" "progmodes/cperl-mode.el"
-;;;;;;  (17388 22062))
+;;;;;;  (17578 34778))
 ;;; Generated autoloads from progmodes/cperl-mode.el
 
 (autoload (quote cperl-mode) "cperl-mode" "\
@@ -5240,7 +5317,7 @@ or as help on variables `cperl-tips', `cperl-problems',
 ;;;***
 
 ;;;### (autoloads (cpp-parse-edit cpp-highlight-buffer) "cpp" "progmodes/cpp.el"
-;;;;;;  (17388 22062))
+;;;;;;  (17397 61565))
 ;;; Generated autoloads from progmodes/cpp.el
 
 (autoload (quote cpp-highlight-buffer) "cpp" "\
@@ -5259,7 +5336,7 @@ Edit display information for cpp conditionals.
 ;;;***
 
 ;;;### (autoloads (crisp-mode crisp-mode) "crisp" "emulation/crisp.el"
-;;;;;;  (17383 13536))
+;;;;;;  (17383 32142))
 ;;; Generated autoloads from emulation/crisp.el
 
 (defvar crisp-mode nil "\
@@ -5283,7 +5360,7 @@ With ARG, turn CRiSP mode on if ARG is positive, off otherwise.
 ;;;***
 
 ;;;### (autoloads (completing-read-multiple) "crm" "emacs-lisp/crm.el"
-;;;;;;  (17383 16118))
+;;;;;;  (17515 39527))
 ;;; Generated autoloads from emacs-lisp/crm.el
 
 (autoload (quote completing-read-multiple) "crm" "\
@@ -5319,7 +5396,7 @@ INHERIT-INPUT-METHOD.
 ;;;***
 
 ;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el"
-;;;;;;  (17444 38116))
+;;;;;;  (17521 64537))
 ;;; Generated autoloads from emulation/cua-base.el
 
 (defvar cua-mode nil "\
@@ -5330,8 +5407,6 @@ use either \\[customize] or the function `cua-mode'.")
 
 (custom-autoload (quote cua-mode) "cua-base")
 
-(put (quote cua-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote cua-mode) "cua-base" "\
 Toggle CUA key-binding mode.
 When enabled, using shifted movement keys will activate the
@@ -5368,8 +5443,8 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings.
 \(fn ARG)" t nil)
  (eval-after-load 'CUA-mode
  '(error (concat "\n\n"
- "CUA-mode is now part of the standard GNU Emacs distribution,\n"
- "so you may now enable and customize CUA via the Options menu.\n\n"
+ "CUA-mode is now part of the standard GNU Emacs distribution, so you may\n"
+ "now enable CUA via the Options menu or by customizing option `cua-mode'.\n\n"
  "You have loaded an older version of CUA-mode which does\n"
  "not work correctly with this version of GNU Emacs.\n\n"
  (if user-init-file (concat
@@ -5386,7 +5461,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" (17440 11610))
+;;;;;;  customize-set-value) "cus-edit" "cus-edit.el" (17590 36098))
 ;;; Generated autoloads from cus-edit.el
  (add-hook 'same-window-regexps "\\`\\*Customiz.*\\*\\'")
 
@@ -5483,6 +5558,31 @@ Show the buffer in another window, but don't select it.
 
 \(fn SYMBOL)" t nil)
 
+(defvar customize-package-emacs-version-alist nil "\
+Alist mapping versions of Emacs to versions of a package.
+These package versions are listed in the :package-version
+keyword used in `defcustom', `defgroup', and `defface'. Its
+elements look like this:
+
+     (PACKAGE (PVERSION . EVERSION)...)
+
+For each PACKAGE, which is a symbol, there are one or more
+elements that contain a package version PVERSION with an
+associated Emacs version EVERSION.  These versions are strings.
+For example, the MH-E package updates this alist with the
+following:
+
+     (add-to-list 'customize-package-emacs-version-alist
+                  '(MH-E (\"6.0\" . \"22.1\") (\"6.1\" . \"22.1\")
+                         (\"7.0\" . \"22.1\") (\"7.1\" . \"22.1\")
+                         (\"7.2\" . \"22.1\") (\"7.3\" . \"22.1\")
+                         (\"7.4\" . \"22.1\") (\"8.0\" . \"22.1\")))
+
+The value of PACKAGE needs to be unique and it needs to match the
+PACKAGE value appearing in the :package-version keyword.  Since
+the user might see the value in a error message, a good choice is
+the official name of the package, such as MH-E or Gnus.")
+
 (defalias (quote customize-changed) (quote customize-changed-options))
 
 (autoload (quote customize-changed-options) "cus-edit" "\
@@ -5644,7 +5744,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" (17383 24124))
+;;;;;;  custom-declare-face) "cus-face" "cus-face.el" (17383 32094))
 ;;; Generated autoloads from cus-face.el
 
 (autoload (quote custom-declare-face) "cus-face" "\
@@ -5714,7 +5814,7 @@ This means reset FACE to its value in FROM-THEME.
 ;;;***
 
 ;;;### (autoloads (customize-create-theme) "cus-theme" "cus-theme.el"
-;;;;;;  (17394 38146))
+;;;;;;  (17397 61539))
 ;;; Generated autoloads from cus-theme.el
 
 (autoload (quote customize-create-theme) "cus-theme" "\
@@ -5725,7 +5825,7 @@ Create a custom theme.
 ;;;***
 
 ;;;### (autoloads (cvs-status-mode) "cvs-status" "cvs-status.el"
-;;;;;;  (17383 24124))
+;;;;;;  (17582 35146))
 ;;; Generated autoloads from cvs-status.el
 
 (autoload (quote cvs-status-mode) "cvs-status" "\
@@ -5736,7 +5836,7 @@ Mode used for cvs status output.
 ;;;***
 
 ;;;### (autoloads (global-cwarn-mode turn-on-cwarn-mode cwarn-mode)
-;;;;;;  "cwarn" "progmodes/cwarn.el" (17388 22062))
+;;;;;;  "cwarn" "progmodes/cwarn.el" (17397 61565))
 ;;; Generated autoloads from progmodes/cwarn.el
 
 (autoload (quote cwarn-mode) "cwarn" "\
@@ -5766,8 +5866,6 @@ use either \\[customize] or the function `global-cwarn-mode'.")
 
 (custom-autoload (quote global-cwarn-mode) "cwarn")
 
-(put (quote global-cwarn-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote global-cwarn-mode) "cwarn" "\
 Toggle Cwarn mode in every buffer.
 With prefix ARG, turn Global-Cwarn mode on if and only if ARG is positive.
@@ -5780,7 +5878,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"
-;;;;;;  (17102 18767))
+;;;;;;  (17097 33524))
 ;;; Generated autoloads from language/cyril-util.el
 
 (autoload (quote cyrillic-encode-koi8-r-char) "cyril-util" "\
@@ -5809,7 +5907,7 @@ If the argument is nil, we return the display table to its standard state.
 ;;;***
 
 ;;;### (autoloads (dabbrev-expand dabbrev-completion) "dabbrev" "dabbrev.el"
-;;;;;;  (17383 24124))
+;;;;;;  (17383 32095))
 ;;; Generated autoloads from dabbrev.el
  (define-key esc-map "/" 'dabbrev-expand)
  (define-key esc-map [?\C-/] 'dabbrev-completion)
@@ -5853,8 +5951,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion].
 
 ;;;***
 
-;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (17388
-;;;;;;  22062))
+;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (17397
+;;;;;;  61565))
 ;;; Generated autoloads from progmodes/dcl-mode.el
 
 (autoload (quote dcl-mode) "dcl-mode" "\
@@ -5981,7 +6079,7 @@ There is some minimal font-lock support (see vars
 ;;;***
 
 ;;;### (autoloads (cancel-debug-on-entry debug-on-entry debug) "debug"
-;;;;;;  "emacs-lisp/debug.el" (17438 13119))
+;;;;;;  "emacs-lisp/debug.el" (17438 58633))
 ;;; Generated autoloads from emacs-lisp/debug.el
 
 (setq debugger (quote debug))
@@ -6025,7 +6123,7 @@ To specify a nil argument interactively, exit with an empty minibuffer.
 ;;;***
 
 ;;;### (autoloads (decipher-mode decipher) "decipher" "play/decipher.el"
-;;;;;;  (17382 1892))
+;;;;;;  (17383 32181))
 ;;; Generated autoloads from play/decipher.el
 
 (autoload (quote decipher) "decipher" "\
@@ -6055,7 +6153,7 @@ The most useful commands are:
 
 ;;;### (autoloads (delimit-columns-rectangle delimit-columns-region
 ;;;;;;  delimit-columns-customize) "delim-col" "delim-col.el" (17383
-;;;;;;  24124))
+;;;;;;  32095))
 ;;; Generated autoloads from delim-col.el
 
 (autoload (quote delimit-columns-customize) "delim-col" "\
@@ -6079,8 +6177,8 @@ START and END delimits the corners of text rectangle.
 
 ;;;***
 
-;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (17388
-;;;;;;  22062))
+;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (17397
+;;;;;;  61565))
 ;;; Generated autoloads from progmodes/delphi.el
 
 (autoload (quote delphi-mode) "delphi" "\
@@ -6131,7 +6229,7 @@ no args, if that value is non-nil.
 ;;;***
 
 ;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (17383
-;;;;;;  24124))
+;;;;;;  32095))
 ;;; Generated autoloads from delsel.el
 
 (defalias (quote pending-delete-mode) (quote delete-selection-mode))
@@ -6144,8 +6242,6 @@ use either \\[customize] or the function `delete-selection-mode'.")
 
 (custom-autoload (quote delete-selection-mode) "delsel")
 
-(put (quote delete-selection-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote delete-selection-mode) "delsel" "\
 Toggle Delete Selection mode.
 With prefix ARG, turn Delete Selection mode on if and only if ARG is
@@ -6161,7 +6257,7 @@ any selection.
 ;;;***
 
 ;;;### (autoloads (derived-mode-init-mode-variables define-derived-mode)
-;;;;;;  "derived" "emacs-lisp/derived.el" (17383 16118))
+;;;;;;  "derived" "emacs-lisp/derived.el" (17383 32137))
 ;;; Generated autoloads from emacs-lisp/derived.el
 
 (autoload (quote define-derived-mode) "derived" "\
@@ -6226,7 +6322,7 @@ the first time the mode is used.
 ;;;***
 
 ;;;### (autoloads (describe-char describe-text-properties) "descr-text"
-;;;;;;  "descr-text.el" (17383 24124))
+;;;;;;  "descr-text.el" (17383 32095))
 ;;; Generated autoloads from descr-text.el
 
 (autoload (quote describe-text-properties) "descr-text" "\
@@ -6250,8 +6346,9 @@ 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" (17388 29562))
+;;;;;;  desktop-load-default desktop-read desktop-remove desktop-save
+;;;;;;  desktop-clear desktop-locals-to-save desktop-save-mode) "desktop"
+;;;;;;  "desktop.el" (17578 34771))
 ;;; Generated autoloads from desktop.el
 
 (defvar desktop-save-mode nil "\
@@ -6260,17 +6357,16 @@ See the command `desktop-save-mode' for a description of this minor-mode.")
 
 (custom-autoload (quote desktop-save-mode) "desktop")
 
-(put (quote desktop-save-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote desktop-save-mode) "desktop" "\
 Toggle desktop saving mode.
 With numeric ARG, turn desktop saving on if ARG is positive, off
-otherwise.  See variable `desktop-save' for a description of when the
-desktop is saved.
+otherwise.  If desktop saving is turned on, the state of Emacs is
+saved from one session to another.  See variable `desktop-save'
+and function `desktop-read' for details.
 
 \(fn &optional ARG)" t nil)
 
-(defvar desktop-locals-to-save (quote (desktop-locals-to-save truncate-lines case-fold-search case-replace fill-column overwrite-mode change-log-default-name line-number-mode column-number-mode size-indication-mode buffer-file-coding-system indent-tabs-mode indicate-buffer-boundaries indicate-empty-lines show-trailing-whitespace)) "\
+(defvar desktop-locals-to-save (quote (desktop-locals-to-save truncate-lines case-fold-search case-replace fill-column overwrite-mode change-log-default-name line-number-mode column-number-mode size-indication-mode buffer-file-coding-system indent-tabs-mode tab-width indicate-buffer-boundaries indicate-empty-lines show-trailing-whitespace)) "\
 List of local variables to save for each buffer.
 The variables are saved only when they really are local.  Conventional minor
 modes are restored automatically; they should not be listed here.")
@@ -6375,6 +6471,27 @@ See also `desktop-minor-mode-table'.")
 
 (put (quote desktop-minor-mode-handlers) (quote risky-local-variable) t)
 
+(autoload (quote desktop-clear) "desktop" "\
+Empty the Desktop.
+This kills all buffers except for internal ones and those with names matched by
+a regular expression in the list `desktop-clear-preserve-buffers'.
+Furthermore, it clears the variables listed in `desktop-globals-to-clear'.
+
+\(fn)" t nil)
+
+(autoload (quote desktop-save) "desktop" "\
+Save the desktop in a desktop file.
+Parameter DIRNAME specifies where to save the desktop file.
+See also `desktop-base-file-name'.
+
+\(fn DIRNAME)" t nil)
+
+(autoload (quote desktop-remove) "desktop" "\
+Delete desktop file in `desktop-dirname'.
+This function also sets `desktop-dirname' to nil.
+
+\(fn)" t nil)
+
 (autoload (quote desktop-read) "desktop" "\
 Read and process the desktop file in directory DIRNAME.
 Look for a desktop file in DIRNAME, or if DIRNAME is omitted, look in
@@ -6413,28 +6530,10 @@ Revert to the last loaded desktop.
 ;;;***
 
 ;;;### (autoloads (gnus-article-outlook-deuglify-article gnus-outlook-deuglify-article
-;;;;;;  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"
-;;;;;;  (17382 1052))
+;;;;;;  gnus-article-outlook-repair-attribution gnus-article-outlook-unwrap-lines)
+;;;;;;  "deuglify" "gnus/deuglify.el" (17494 22065))
 ;;; Generated autoloads from gnus/deuglify.el
 
-(defvar gnus-outlook-deuglify-unwrap-min 45 "\
-Minimum length of the cited line above the (possibly) wrapped line.")
-
-(custom-autoload (quote gnus-outlook-deuglify-unwrap-min) "deuglify")
-
-(defvar gnus-outlook-deuglify-unwrap-max 95 "\
-Maximum length of the cited line after unwrapping.")
-
-(custom-autoload (quote gnus-outlook-deuglify-unwrap-max) "deuglify")
-
-(defvar gnus-outlook-display-hook nil "\
-A hook called after an deuglified article has been prepared.
-It is run after `gnus-article-prepare-hook'.")
-
-(custom-autoload (quote gnus-outlook-display-hook) "deuglify")
-
 (autoload (quote gnus-article-outlook-unwrap-lines) "deuglify" "\
 Unwrap lines that appear to be wrapped citation lines.
 You can control what lines will be unwrapped by frobbing
@@ -6465,7 +6564,7 @@ Deuglify broken Outlook (Express) articles and redisplay.
 ;;;***
 
 ;;;### (autoloads (devanagari-post-read-conversion devanagari-compose-region)
-;;;;;;  "devan-util" "language/devan-util.el" (17102 18768))
+;;;;;;  "devan-util" "language/devan-util.el" (17097 33525))
 ;;; Generated autoloads from language/devan-util.el
 
 (defconst devanagari-consonant "[\x51ad5-\x51af9\x51b38-\x51b3f]")
@@ -6483,7 +6582,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib"
-;;;;;;  "calendar/diary-lib.el" (17385 41891))
+;;;;;;  "calendar/diary-lib.el" (17521 64537))
 ;;; Generated autoloads from calendar/diary-lib.el
 
 (autoload (quote diary) "diary-lib" "\
@@ -6529,7 +6628,7 @@ Major mode for editing the diary file.
 ;;;***
 
 ;;;### (autoloads (diff-backup diff diff-command diff-switches) "diff"
-;;;;;;  "diff.el" (17383 24124))
+;;;;;;  "diff.el" (17578 34771))
 ;;; Generated autoloads from diff.el
 
 (defvar diff-switches "-c" "\
@@ -6563,7 +6662,7 @@ With prefix arg, prompt for diff switches.
 ;;;***
 
 ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "diff-mode.el"
-;;;;;;  (17439 53835))
+;;;;;;  (17578 34771))
 ;;; Generated autoloads from diff-mode.el
 
 (autoload (quote diff-mode) "diff-mode" "\
@@ -6577,6 +6676,7 @@ 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 reverse the direction of
 a diff with \\[diff-reverse-direction].
+\\{diff-mode-map}
 
 \(fn)" t nil)
 
@@ -6592,7 +6692,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" (17391 29732))
+;;;;;;  "dired" "dired.el" (17578 34771))
 ;;; Generated autoloads from dired.el
 
 (defvar dired-listing-switches "-al" "\
@@ -6797,7 +6897,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" (17383 24124))
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" (17521 64535))
 ;;; Generated autoloads from dired-aux.el
 
 (autoload (quote dired-diff) "dired-aux" "\
@@ -6919,7 +7019,8 @@ the Dired buffer, so output files usually are created there instead of
 in a subdir.
 
 In a noninteractive call (from Lisp code), you must specify
-the list of file names explicitly with the FILE-LIST argument.
+the list of file names explicitly with the FILE-LIST argument, which
+can be produced by `dired-get-marked-files', for example.
 
 \(fn COMMAND &optional ARG FILE-LIST)" t nil)
 
@@ -7205,7 +7306,7 @@ true then the type of the file linked to by FILE is printed instead.
 
 ;;;***
 
-;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (17387 38414))
+;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (17521 64536))
 ;;; Generated autoloads from dired-x.el
 
 (autoload (quote dired-jump) "dired-x" "\
@@ -7219,7 +7320,7 @@ buffer and try again.
 
 ;;;***
 
-;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (17383 24124))
+;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (17582 31039))
 ;;; Generated autoloads from dirtrack.el
 
 (autoload (quote dirtrack) "dirtrack" "\
@@ -7239,7 +7340,7 @@ You can enable directory tracking by adding this function to
 ;;;***
 
 ;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (17383
-;;;;;;  16118))
+;;;;;;  32137))
 ;;; Generated autoloads from emacs-lisp/disass.el
 
 (autoload (quote disassemble) "disass" "\
@@ -7257,7 +7358,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" (17383 24124))
+;;;;;;  make-display-table) "disp-table" "disp-table.el" (17383 32097))
 ;;; Generated autoloads from disp-table.el
 
 (autoload (quote make-display-table) "disp-table" "\
@@ -7358,7 +7459,7 @@ for users who call this function in `.emacs'.
 ;;;***
 
 ;;;### (autoloads (dissociated-press) "dissociate" "play/dissociate.el"
-;;;;;;  (17382 1892))
+;;;;;;  (17383 32181))
 ;;; Generated autoloads from play/dissociate.el
 
 (autoload (quote dissociated-press) "dissociate" "\
@@ -7374,7 +7475,7 @@ Default is 2.
 
 ;;;***
 
-;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (17383 24124))
+;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (17521 64536))
 ;;; Generated autoloads from dnd.el
 
 (defvar dnd-protocol-alist (quote (("^file:///" . dnd-open-local-file) ("^file://" . dnd-open-file) ("^file:" . dnd-open-local-file))) "\
@@ -7395,7 +7496,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" (17383 15658))
+;;;;;;  "textmodes/dns-mode.el" (17383 32186))
 ;;; Generated autoloads from textmodes/dns-mode.el
 
 (autoload (quote dns-mode) "dns-mode" "\
@@ -7418,7 +7519,7 @@ Locate SOA record and increment the serial field.
 
 ;;;***
 
-;;;### (autoloads (doctor) "doctor" "play/doctor.el" (17364 14033))
+;;;### (autoloads (doctor) "doctor" "play/doctor.el" (17365 2741))
 ;;; Generated autoloads from play/doctor.el
 
 (autoload (quote doctor) "doctor" "\
@@ -7429,7 +7530,7 @@ Switch to *doctor* buffer and start giving psychotherapy.
 ;;;***
 
 ;;;### (autoloads (double-mode double-mode) "double" "double.el"
-;;;;;;  (17383 24125))
+;;;;;;  (17383 32097))
 ;;; Generated autoloads from double.el
 
 (defvar double-mode nil "\
@@ -7450,7 +7551,7 @@ when pressed twice.  See variable `double-map' for details.
 
 ;;;***
 
-;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (17382 1892))
+;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (17582 28846))
 ;;; Generated autoloads from play/dunnet.el
 
 (autoload (quote dunnet) "dunnet" "\
@@ -7461,7 +7562,7 @@ Switch to *dungeon* buffer and start game.
 ;;;***
 
 ;;;### (autoloads (gnus-earcon-display) "earcon" "gnus/earcon.el"
-;;;;;;  (17382 1052))
+;;;;;;  (17383 32154))
 ;;; Generated autoloads from gnus/earcon.el
 
 (autoload (quote gnus-earcon-display) "earcon" "\
@@ -7473,7 +7574,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" (17383 16118))
+;;;;;;  "emacs-lisp/easy-mmode.el" (17585 4275))
 ;;; Generated autoloads from emacs-lisp/easy-mmode.el
 
 (defalias (quote easy-mmode-define-minor-mode) (quote define-minor-mode))
@@ -7493,9 +7594,9 @@ Optional KEYMAP is the default (defvar) keymap bound to the mode keymap.
 The above three arguments can be skipped if keyword arguments are
 used (see below).
 
-BODY contains code that will be executed each time the mode is (dis)activated.
-  It will be executed after any toggling but before running the hook variable
-  `mode-HOOK'.
+BODY contains code to execute each time the mode is activated or deactivated.
+  It is executed after toggling the mode,
+  and before running the hook variable `mode-HOOK'.
   Before the actual body code, you can write keyword arguments (alternating
   keywords and values).  These following keyword arguments are supported (other
   keywords will be passed to `defcustom' if the minor mode is global):
@@ -7566,7 +7667,7 @@ 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" (17383
-;;;;;;  16118))
+;;;;;;  32138))
 ;;; Generated autoloads from emacs-lisp/easymenu.el
 
 (put (quote easy-menu-define) (quote lisp-indent-function) (quote defun))
@@ -7711,7 +7812,7 @@ To implement dynamic menus, either call this from
 ;;;;;;  ebnf-eps-directory ebnf-spool-region ebnf-spool-buffer ebnf-spool-file
 ;;;;;;  ebnf-spool-directory ebnf-print-region ebnf-print-buffer
 ;;;;;;  ebnf-print-file ebnf-print-directory ebnf-customize) "ebnf2ps"
-;;;;;;  "progmodes/ebnf2ps.el" (17388 22062))
+;;;;;;  "progmodes/ebnf2ps.el" (17397 61566))
 ;;; Generated autoloads from progmodes/ebnf2ps.el
 
 (autoload (quote ebnf-customize) "ebnf2ps" "\
@@ -7970,8 +8071,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" (17391
-;;;;;;  39495))
+;;;;;;  ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (17590
+;;;;;;  36100))
 ;;; Generated autoloads from progmodes/ebrowse.el
 
 (autoload (quote ebrowse-tree-mode) "ebrowse" "\
@@ -8122,7 +8223,7 @@ Display statistics for a class tree.
 ;;;***
 
 ;;;### (autoloads (electric-buffer-list) "ebuff-menu" "ebuff-menu.el"
-;;;;;;  (17383 24125))
+;;;;;;  (17383 32098))
 ;;; Generated autoloads from ebuff-menu.el
 
 (autoload (quote electric-buffer-list) "ebuff-menu" "\
@@ -8147,7 +8248,7 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry.
 ;;;***
 
 ;;;### (autoloads (Electric-command-history-redo-expression) "echistory"
-;;;;;;  "echistory.el" (17383 24125))
+;;;;;;  "echistory.el" (17383 32098))
 ;;; Generated autoloads from echistory.el
 
 (autoload (quote Electric-command-history-redo-expression) "echistory" "\
@@ -8159,8 +8260,8 @@ With prefix arg NOCONFIRM, execute current line as-is without editing.
 ;;;***
 
 ;;;### (autoloads (edebug-all-forms edebug-all-defs edebug-eval-top-level-form
-;;;;;;  def-edebug-spec edebug-all-forms edebug-all-defs) "edebug"
-;;;;;;  "emacs-lisp/edebug.el" (17416 11967))
+;;;;;;  edebug-basic-spec edebug-all-forms edebug-all-defs) "edebug"
+;;;;;;  "emacs-lisp/edebug.el" (17590 36099))
 ;;; Generated autoloads from emacs-lisp/edebug.el
 
 (defvar edebug-all-defs nil "\
@@ -8183,12 +8284,12 @@ Use the command `edebug-all-forms' to toggle the value of this option.")
 
 (custom-autoload (quote edebug-all-forms) "edebug")
 
-(autoload (quote def-edebug-spec) "edebug" "\
-Set the `edebug-form-spec' property of SYMBOL according to SPEC.
-Both SYMBOL and SPEC are unevaluated. The SPEC can be 0, t, a symbol
-\(naming a function), or a list.
+(autoload (quote edebug-basic-spec) "edebug" "\
+Return t if SPEC uses only extant spec symbols.
+An extant spec symbol is a symbol that is not a function and has a
+`edebug-form-spec' property.
 
-\(fn SYMBOL SPEC)" nil (quote macro))
+\(fn SPEC)" nil nil)
 
 (defalias (quote edebug-defun) (quote edebug-eval-top-level-form))
 
@@ -8233,7 +8334,7 @@ Toggle edebugging of all forms.
 ;;;;;;  ediff-merge-directory-revisions ediff-merge-directories-with-ancestor
 ;;;;;;  ediff-merge-directories ediff-directories3 ediff-directory-revisions
 ;;;;;;  ediff-directories ediff-buffers3 ediff-buffers ediff-backup
-;;;;;;  ediff-files3 ediff-files) "ediff" "ediff.el" (17399 58140))
+;;;;;;  ediff-files3 ediff-files) "ediff" "ediff.el" (17578 34771))
 ;;; Generated autoloads from ediff.el
 
 (autoload (quote ediff-files) "ediff" "\
@@ -8471,7 +8572,7 @@ With optional NODE, goes to that node.
 ;;;***
 
 ;;;### (autoloads (ediff-customize) "ediff-help" "ediff-help.el"
-;;;;;;  (17399 58140))
+;;;;;;  (17401 56225))
 ;;; Generated autoloads from ediff-help.el
 
 (autoload (quote ediff-customize) "ediff-help" "\
@@ -8481,7 +8582,7 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads nil "ediff-hook" "ediff-hook.el" (17399 58140))
+;;;### (autoloads nil "ediff-hook" "ediff-hook.el" (17401 56225))
 ;;; Generated autoloads from ediff-hook.el
 
 (defvar ediff-window-setup-function)
@@ -8494,7 +8595,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (ediff-show-registry) "ediff-mult" "ediff-mult.el"
-;;;;;;  (17399 58140))
+;;;;;;  (17578 34771))
 ;;; Generated autoloads from ediff-mult.el
 
 (autoload (quote ediff-show-registry) "ediff-mult" "\
@@ -8507,7 +8608,7 @@ Display Ediff's registry.
 ;;;***
 
 ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe)
-;;;;;;  "ediff-util" "ediff-util.el" (17399 58140))
+;;;;;;  "ediff-util" "ediff-util.el" (17401 56227))
 ;;; Generated autoloads from ediff-util.el
 
 (autoload (quote ediff-toggle-multiframe) "ediff-util" "\
@@ -8528,7 +8629,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"
-;;;;;;  (17383 24125))
+;;;;;;  (17383 32100))
 ;;; Generated autoloads from edmacro.el
 
 (defvar edmacro-eight-bits nil "\
@@ -8581,7 +8682,7 @@ or nil, use a compact 80-column format.
 ;;;***
 
 ;;;### (autoloads (edt-emulation-on edt-set-scroll-margins) "edt"
-;;;;;;  "emulation/edt.el" (17383 13537))
+;;;;;;  "emulation/edt.el" (17383 32143))
 ;;; Generated autoloads from emulation/edt.el
 
 (autoload (quote edt-set-scroll-margins) "edt" "\
@@ -8599,7 +8700,7 @@ Turn on EDT Emulation.
 ;;;***
 
 ;;;### (autoloads (electric-helpify with-electric-help) "ehelp" "ehelp.el"
-;;;;;;  (17383 24125))
+;;;;;;  (17383 32100))
 ;;; Generated autoloads from ehelp.el
 
 (autoload (quote with-electric-help) "ehelp" "\
@@ -8637,7 +8738,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (turn-on-eldoc-mode eldoc-mode eldoc-minor-mode-string)
-;;;;;;  "eldoc" "emacs-lisp/eldoc.el" (17383 16118))
+;;;;;;  "eldoc" "emacs-lisp/eldoc.el" (17383 32138))
 ;;; Generated autoloads from emacs-lisp/eldoc.el
 
 (defvar eldoc-minor-mode-string " ElDoc" "\
@@ -8676,7 +8777,7 @@ Emacs Lisp mode) that support Eldoc.")
 ;;;***
 
 ;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (17383
-;;;;;;  24125))
+;;;;;;  32100))
 ;;; Generated autoloads from elide-head.el
 
 (autoload (quote elide-head) "elide-head" "\
@@ -8692,7 +8793,7 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks.
 ;;;***
 
 ;;;### (autoloads (elint-initialize) "elint" "emacs-lisp/elint.el"
-;;;;;;  (17383 16118))
+;;;;;;  (17383 32138))
 ;;; Generated autoloads from emacs-lisp/elint.el
 
 (autoload (quote elint-initialize) "elint" "\
@@ -8704,7 +8805,7 @@ Initialize elint.
 
 ;;;### (autoloads (elp-results elp-instrument-package elp-instrument-list
 ;;;;;;  elp-instrument-function) "elp" "emacs-lisp/elp.el" (17383
-;;;;;;  16118))
+;;;;;;  32138))
 ;;; Generated autoloads from emacs-lisp/elp.el
 
 (autoload (quote elp-instrument-function) "elp" "\
@@ -8738,7 +8839,7 @@ displayed.
 ;;;***
 
 ;;;### (autoloads (report-emacs-bug) "emacsbug" "mail/emacsbug.el"
-;;;;;;  (17383 16812))
+;;;;;;  (17383 32168))
 ;;; Generated autoloads from mail/emacsbug.el
 
 (autoload (quote report-emacs-bug) "emacsbug" "\
@@ -8753,7 +8854,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" (17167 2962))
+;;;;;;  "emerge.el" (17167 12307))
 ;;; Generated autoloads from emerge.el
 
 (defvar menu-bar-emerge-menu (make-sparse-keymap "Emerge"))
@@ -8831,7 +8932,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (encoded-kbd-mode) "encoded-kb" "international/encoded-kb.el"
-;;;;;;  (17102 18713))
+;;;;;;  (17097 33520))
 ;;; Generated autoloads from international/encoded-kb.el
 
 (defvar encoded-kbd-mode nil "\
@@ -8842,8 +8943,6 @@ use either \\[customize] or the function `encoded-kbd-mode'.")
 
 (custom-autoload (quote encoded-kbd-mode) "encoded-kb")
 
-(put (quote encoded-kbd-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote encoded-kbd-mode) "encoded-kb" "\
 Toggle Encoded-kbd minor mode.
 With arg, turn Encoded-kbd mode on if and only if arg is positive.
@@ -8861,7 +8960,7 @@ as a multilingual text encoded in a coding system set by
 ;;;***
 
 ;;;### (autoloads (enriched-decode enriched-encode enriched-mode)
-;;;;;;  "enriched" "textmodes/enriched.el" (17383 15658))
+;;;;;;  "enriched" "textmodes/enriched.el" (17383 32186))
 ;;; Generated autoloads from textmodes/enriched.el
 
 (autoload (quote enriched-mode) "enriched" "\
@@ -8892,7 +8991,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (erc-select erc-select-read-args) "erc" "erc/erc.el"
-;;;;;;  (17447 52274))
+;;;;;;  (17484 52428))
 ;;; Generated autoloads from erc/erc.el
 
 (autoload (quote erc-select-read-args) "erc" "\
@@ -8919,14 +9018,14 @@ be invoked for those parameters' values
 
 ;;;***
 
-;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (17391
-;;;;;;  39324))
+;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (17397
+;;;;;;  61550))
 ;;; Generated autoloads from erc/erc-autoaway.el
  (autoload 'erc-autoaway-mode "erc-autoaway")
 
 ;;;***
 
-;;;### (autoloads nil "erc-button" "erc/erc-button.el" (17447 52274))
+;;;### (autoloads nil "erc-button" "erc/erc-button.el" (17457 37501))
 ;;; Generated autoloads from erc/erc-button.el
  (autoload 'erc-button-mode "erc-button" nil t)
 
@@ -8939,7 +9038,7 @@ be invoked for those parameters' values
 ;;;***
 
 ;;;### (autoloads (erc-ctcp-query-DCC pcomplete/erc-mode/DCC erc-cmd-DCC)
-;;;;;;  "erc-dcc" "erc/erc-dcc.el" (17393 3826))
+;;;;;;  "erc-dcc" "erc/erc-dcc.el" (17397 61550))
 ;;; Generated autoloads from erc/erc-dcc.el
 
 (autoload (quote erc-cmd-DCC) "erc-dcc" "\
@@ -8971,7 +9070,7 @@ that subcommand.
 ;;;;;;  erc-ezb-add-session erc-ezb-end-of-session-list erc-ezb-init-session-list
 ;;;;;;  erc-ezb-identify erc-ezb-notice-autodetect erc-ezb-lookup-action
 ;;;;;;  erc-ezb-get-login erc-cmd-ezb) "erc-ezbounce" "erc/erc-ezbounce.el"
-;;;;;;  (17391 39324))
+;;;;;;  (17484 52428))
 ;;; Generated autoloads from erc/erc-ezbounce.el
 
 (autoload (quote erc-cmd-ezb) "erc-ezbounce" "\
@@ -9033,8 +9132,8 @@ Add EZBouncer convenience functions to ERC.
 
 ;;;***
 
-;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (17391
-;;;;;;  39324))
+;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (17397
+;;;;;;  61550))
 ;;; Generated autoloads from erc/erc-fill.el
  (autoload 'erc-fill-mode "erc-fill" nil t)
 
@@ -9054,7 +9153,7 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'.
 ;;;***
 
 ;;;### (autoloads (erc-identd-stop erc-identd-start) "erc-identd"
-;;;;;;  "erc/erc-identd.el" (17447 52274))
+;;;;;;  "erc/erc-identd.el" (17457 37501))
 ;;; Generated autoloads from erc/erc-identd.el
 
 (autoload (quote erc-identd-start) "erc-identd" "\
@@ -9075,7 +9174,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (erc-create-imenu-index) "erc-imenu" "erc/erc-imenu.el"
-;;;;;;  (17391 39324))
+;;;;;;  (17397 61551))
 ;;; Generated autoloads from erc/erc-imenu.el
 
 (autoload (quote erc-create-imenu-index) "erc-imenu" "\
@@ -9085,14 +9184,14 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads nil "erc-join" "erc/erc-join.el" (17391 39324))
+;;;### (autoloads nil "erc-join" "erc/erc-join.el" (17484 52428))
 ;;; Generated autoloads from erc/erc-join.el
  (autoload 'erc-autojoin-mode "erc-join" nil t)
 
 ;;;***
 
 ;;;### (autoloads (erc-chanlist erc-list-channels) "erc-list" "erc/erc-list.el"
-;;;;;;  (17391 39324))
+;;;;;;  (17397 61551))
 ;;; Generated autoloads from erc/erc-list.el
  (autoload 'erc-list-mode "erc-list")
 
@@ -9113,7 +9212,7 @@ to RFC and send the LIST header (#321) at start of list transmission.
 ;;;***
 
 ;;;### (autoloads (erc-save-buffer-in-logs erc-logging-enabled) "erc-log"
-;;;;;;  "erc/erc-log.el" (17391 39324))
+;;;;;;  "erc/erc-log.el" (17397 61551))
 ;;; Generated autoloads from erc/erc-log.el
  (autoload 'erc-log-mode "erc-log" nil t)
 
@@ -9145,7 +9244,7 @@ You can save every individual message by putting this function on
 ;;;### (autoloads (erc-delete-dangerous-host erc-add-dangerous-host
 ;;;;;;  erc-delete-keyword erc-add-keyword erc-delete-fool erc-add-fool
 ;;;;;;  erc-delete-pal erc-add-pal) "erc-match" "erc/erc-match.el"
-;;;;;;  (17391 39324))
+;;;;;;  (17397 61551))
 ;;; Generated autoloads from erc/erc-match.el
  (autoload 'erc-match-mode "erc-match")
 
@@ -9192,7 +9291,7 @@ Delete dangerous-host interactively to `erc-dangerous-hosts'.
 ;;;***
 
 ;;;### (autoloads (erc-cmd-WHOLEFT) "erc-netsplit" "erc/erc-netsplit.el"
-;;;;;;  (17391 39324))
+;;;;;;  (17484 52428))
 ;;; Generated autoloads from erc/erc-netsplit.el
  (autoload 'erc-netsplit-mode "erc-netsplit")
 
@@ -9222,7 +9321,7 @@ Interactively select a server to connect to using `erc-server-alist'.
 ;;;***
 
 ;;;### (autoloads (pcomplete/erc-mode/NOTIFY erc-cmd-NOTIFY) "erc-notify"
-;;;;;;  "erc/erc-notify.el" (17391 39324))
+;;;;;;  "erc/erc-notify.el" (17397 61552))
 ;;; Generated autoloads from erc/erc-notify.el
  (autoload 'erc-notify-mode "erc-notify" nil t)
 
@@ -9240,26 +9339,26 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads nil "erc-page" "erc/erc-page.el" (17391 39324))
+;;;### (autoloads nil "erc-page" "erc/erc-page.el" (17397 61552))
 ;;; Generated autoloads from erc/erc-page.el
  (autoload 'erc-page-mode "erc-page")
 
 ;;;***
 
-;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (17391
-;;;;;;  39324))
+;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (17397
+;;;;;;  61552))
 ;;; Generated autoloads from erc/erc-pcomplete.el
  (autoload 'erc-completion-mode "erc-pcomplete" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (17391 39324))
+;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (17397 61552))
 ;;; Generated autoloads from erc/erc-replace.el
  (autoload 'erc-replace-mode "erc-replace")
 
 ;;;***
 
-;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (17391 39324))
+;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (17397 61552))
 ;;; Generated autoloads from erc/erc-ring.el
  (autoload 'erc-ring-mode "erc-ring" nil t)
 
@@ -9283,14 +9382,14 @@ When called interactively, read the password using `read-passwd'.
 
 ;;;***
 
-;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (17391 39324))
+;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (17397 61552))
 ;;; Generated autoloads from erc/erc-sound.el
  (autoload 'erc-sound-mode "erc-sound")
 
 ;;;***
 
 ;;;### (autoloads (erc-speedbar-browser) "erc-speedbar" "erc/erc-speedbar.el"
-;;;;;;  (17391 39324))
+;;;;;;  (17397 61552))
 ;;; Generated autoloads from erc/erc-speedbar.el
 
 (autoload (quote erc-speedbar-browser) "erc-speedbar" "\
@@ -9301,20 +9400,20 @@ This will add a speedbar major display mode.
 
 ;;;***
 
-;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (17391
-;;;;;;  39324))
+;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (17397
+;;;;;;  61552))
 ;;; Generated autoloads from erc/erc-spelling.el
  (autoload 'erc-spelling-mode "erc-spelling" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (17395 55370))
+;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (17397 61552))
 ;;; Generated autoloads from erc/erc-stamp.el
  (autoload 'erc-timestamp-mode "erc-stamp" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "erc-track" "erc/erc-track.el" (17391 39324))
+;;;### (autoloads nil "erc-track" "erc/erc-track.el" (17397 61552))
 ;;; Generated autoloads from erc/erc-track.el
  (autoload 'erc-track-mode "erc-track" nil t)
  (autoload 'erc-track-when-inactive-mode "erc-track" nil t)
@@ -9322,7 +9421,7 @@ This will add a speedbar major display mode.
 ;;;***
 
 ;;;### (autoloads (erc-truncate-buffer erc-truncate-buffer-to-size)
-;;;;;;  "erc-truncate" "erc/erc-truncate.el" (17391 39324))
+;;;;;;  "erc-truncate" "erc/erc-truncate.el" (17397 61552))
 ;;; Generated autoloads from erc/erc-truncate.el
  (autoload 'erc-truncate-mode "erc-truncate" nil t)
 
@@ -9342,7 +9441,7 @@ Meant to be used in hooks, like `erc-insert-post-hook'.
 ;;;***
 
 ;;;### (autoloads (erc-xdcc-add-file) "erc-xdcc" "erc/erc-xdcc.el"
-;;;;;;  (17391 39324))
+;;;;;;  (17397 61553))
 ;;; Generated autoloads from erc/erc-xdcc.el
 
 (autoload (quote erc-xdcc-add-file) "erc-xdcc" "\
@@ -9353,7 +9452,7 @@ Add a file to `erc-xdcc-files'.
 ;;;***
 
 ;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (17383
-;;;;;;  14789))
+;;;;;;  32152))
 ;;; Generated autoloads from eshell/esh-mode.el
 
 (autoload (quote eshell-mode) "esh-mode" "\
@@ -9366,7 +9465,7 @@ Emacs shell interactive mode.
 ;;;***
 
 ;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (17383
-;;;;;;  14789))
+;;;;;;  32152))
 ;;; Generated autoloads from eshell/esh-test.el
 
 (autoload (quote eshell-test) "esh-test" "\
@@ -9377,7 +9476,7 @@ Test Eshell to verify that it works as expected.
 ;;;***
 
 ;;;### (autoloads (eshell-report-bug eshell-command-result eshell-command
-;;;;;;  eshell) "eshell" "eshell/eshell.el" (17426 59663))
+;;;;;;  eshell) "eshell" "eshell/eshell.el" (17432 37360))
 ;;; Generated autoloads from eshell/eshell.el
 
 (autoload (quote eshell) "eshell" "\
@@ -9423,7 +9522,7 @@ Please include any configuration details that might be involved.
 ;;;;;;  visit-tags-table tags-table-mode find-tag-default-function
 ;;;;;;  find-tag-hook tags-add-tables tags-compression-info-list
 ;;;;;;  tags-table-list tags-case-fold-search) "etags" "progmodes/etags.el"
-;;;;;;  (17407 46937))
+;;;;;;  (17420 36090))
 ;;; Generated autoloads from progmodes/etags.el
 
 (defvar tags-file-name nil "\
@@ -9725,7 +9824,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" (17316 61871))
+;;;;;;  "ethio-util" "language/ethio-util.el" (17578 34777))
 ;;; Generated autoloads from language/ethio-util.el
 
 (autoload (quote setup-ethiopic-environment-internal) "ethio-util" "\
@@ -9893,7 +9992,7 @@ Convert fidel-tex commands in the current buffer into fidel chars.
 (autoload (quote ethio-fidel-to-java-buffer) "ethio-util" "\
 Convert Ethiopic characters into the Java escape sequences.
 
-Each escape sequence is of the form uXXXX, where XXXX is the
+Each escape sequence is of the form \\uXXXX, where XXXX is the
 character's codepoint (in hex) in Unicode.
 
 If `ethio-java-save-lowercase' is non-nil, use [0-9a-f].
@@ -9920,7 +10019,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"
-;;;;;;  (17383 13296))
+;;;;;;  (17383 32175))
 ;;; Generated autoloads from net/eudc.el
 
 (autoload (quote eudc-set-server) "eudc" "\
@@ -9976,7 +10075,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" (17383 13296))
+;;;;;;  "eudc-bob" "net/eudc-bob.el" (17383 32175))
 ;;; Generated autoloads from net/eudc-bob.el
 
 (autoload (quote eudc-display-generic-binary) "eudc-bob" "\
@@ -10012,7 +10111,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" (17383 13296))
+;;;;;;  "eudc-export" "net/eudc-export.el" (17383 32175))
 ;;; Generated autoloads from net/eudc-export.el
 
 (autoload (quote eudc-insert-record-at-point-into-bbdb) "eudc-export" "\
@@ -10029,7 +10128,7 @@ Call `eudc-insert-record-at-point-into-bbdb' if on a record.
 ;;;***
 
 ;;;### (autoloads (eudc-edit-hotlist) "eudc-hotlist" "net/eudc-hotlist.el"
-;;;;;;  (17383 13296))
+;;;;;;  (17383 32175))
 ;;; Generated autoloads from net/eudc-hotlist.el
 
 (autoload (quote eudc-edit-hotlist) "eudc-hotlist" "\
@@ -10039,10 +10138,37 @@ Edit the hotlist of directory servers in a specialized buffer.
 
 ;;;***
 
+;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (17578
+;;;;;;  34775))
+;;; Generated autoloads from emacs-lisp/ewoc.el
+
+(autoload (quote ewoc-create) "ewoc" "\
+Create an empty ewoc.
+
+The ewoc will be inserted in the current buffer at the current position.
+
+PRETTY-PRINTER should be a function that takes one argument, an
+element, and inserts a string representing it in the buffer (at
+point).  The string PRETTY-PRINTER inserts may be empty or span
+several lines.  The PRETTY-PRINTER should use `insert', and not
+`insert-before-markers'.
+
+Optional second and third arguments HEADER and FOOTER are strings,
+possibly empty, that will always be present at the top and bottom,
+respectively, of the ewoc.
+
+Normally, a newline is automatically inserted after the header,
+the footer and every node's printed representation.  Optional
+fourth arg NOSEP non-nil inhibits this.
+
+\(fn PRETTY-PRINTER &optional HEADER FOOTER NOSEP)" nil nil)
+
+;;;***
+
 ;;;### (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"
-;;;;;;  (17388 22062))
+;;;;;;  (17397 61567))
 ;;; Generated autoloads from progmodes/executable.el
 
 (autoload (quote executable-command-find-posix-p) "executable" "\
@@ -10084,7 +10210,7 @@ file modes.
 ;;;***
 
 ;;;### (autoloads (expand-jump-to-next-slot expand-jump-to-previous-slot
-;;;;;;  expand-add-abbrevs) "expand" "expand.el" (17383 24125))
+;;;;;;  expand-add-abbrevs) "expand" "expand.el" (17383 32101))
 ;;; Generated autoloads from expand.el
 
 (autoload (quote expand-add-abbrevs) "expand" "\
@@ -10127,7 +10253,7 @@ This is used only in conjunction with `expand-add-abbrevs'.
 
 ;;;***
 
-;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17385 42553))
+;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17397 61567))
 ;;; Generated autoloads from progmodes/f90.el
 
 (autoload (quote f90-mode) "f90" "\
@@ -10194,7 +10320,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" (17383 24125))
+;;;;;;  "facemenu" "facemenu.el" (17578 34771))
 ;;; Generated autoloads from facemenu.el
  (define-key global-map "\M-o" 'facemenu-keymap)
  (autoload 'facemenu-keymap "facemenu" "Keymap for face-changing commands." t 'keymap)
@@ -10357,7 +10483,7 @@ argument BUFFER-NAME is nil, it defaults to *Colors*.
 ;;;***
 
 ;;;### (autoloads (turn-on-fast-lock fast-lock-mode) "fast-lock"
-;;;;;;  "obsolete/fast-lock.el" (17382 34311))
+;;;;;;  "obsolete/fast-lock.el" (17383 32179))
 ;;; Generated autoloads from obsolete/fast-lock.el
 
 (autoload (quote fast-lock-mode) "fast-lock" "\
@@ -10398,7 +10524,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" (17258 33756))
+;;;;;;  feedmail-send-it) "feedmail" "mail/feedmail.el" (17259 50162))
 ;;; Generated autoloads from mail/feedmail.el
 
 (autoload (quote feedmail-send-it) "feedmail" "\
@@ -10452,7 +10578,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" (17400 65127))
+;;;;;;  find-file-at-point ffap-next) "ffap" "ffap.el" (17401 56228))
 ;;; Generated autoloads from ffap.el
 
 (autoload (quote ffap-next) "ffap" "\
@@ -10509,7 +10635,7 @@ Evaluate the forms in variable `ffap-bindings'.
 ;;;***
 
 ;;;### (autoloads (file-cache-minibuffer-complete) "filecache" "filecache.el"
-;;;;;;  (17383 24125))
+;;;;;;  (17383 32101))
 ;;; Generated autoloads from filecache.el
 
 (autoload (quote file-cache-minibuffer-complete) "filecache" "\
@@ -10528,7 +10654,7 @@ the name is considered already unique; only the second substitution
 ;;;***
 
 ;;;### (autoloads (filesets-init) "filesets" "filesets.el" (17383
-;;;;;;  24125))
+;;;;;;  32102))
 ;;; Generated autoloads from filesets.el
 
 (autoload (quote filesets-init) "filesets" "\
@@ -10539,9 +10665,15 @@ Set up hooks, load the cache file -- if existing -- and build the menu.
 
 ;;;***
 
+;;;### (autoloads nil "fill" "textmodes/fill.el" (17585 4276))
+;;; Generated autoloads from textmodes/fill.el
+(put 'colon-double-space 'safe-local-variable 'booleanp)
+
+;;;***
+
 ;;;### (autoloads (find-grep-dired find-name-dired find-dired find-grep-options
 ;;;;;;  find-ls-subdir-switches find-ls-option) "find-dired" "find-dired.el"
-;;;;;;  (17383 24125))
+;;;;;;  (17383 32102))
 ;;; 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"))) "\
@@ -10602,7 +10734,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"
-;;;;;;  (17383 24125))
+;;;;;;  (17383 32102))
 ;;; 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)))))) "\
@@ -10694,7 +10826,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" (17410 24020))
+;;;;;;  "emacs-lisp/find-func.el" (17590 36099))
 ;;; Generated autoloads from emacs-lisp/find-func.el
 
 (autoload (quote find-library) "find-func" "\
@@ -10704,6 +10836,9 @@ Find the elisp source of LIBRARY.
 
 (autoload (quote find-function-search-for-symbol) "find-func" "\
 Search for SYMBOL's definition of type TYPE in LIBRARY.
+Visit the library in a buffer, and return a cons cell (BUFFER . POSITION),
+or just (BUFFER . nil) if the definition can't be found in the file.
+
 If TYPE is nil, look for a function definition.
 Otherwise, TYPE specifies the kind of definition,
 and it is interpreted via `find-function-regexp-alist'.
@@ -10716,7 +10851,8 @@ Return a pair (BUFFER . POINT) pointing to the definition of FUNCTION.
 
 Finds the source file containing the definition of FUNCTION
 in a buffer and the point of the definition.  The buffer is
-not selected.
+not selected.  If the function definition can't be found in
+the buffer, returns (BUFFER).
 
 If the file where FUNCTION is defined is not known, then it is
 searched for in `find-function-source-path' if non nil, otherwise
@@ -10757,6 +10893,7 @@ Return a pair `(BUFFER . POINT)' pointing to the definition of VARIABLE.
 
 Finds the library containing the definition of VARIABLE in a buffer and
 the point of the definition.  The buffer is not selected.
+If the variable's definition can't be found in the buffer, return (BUFFER).
 
 The library where VARIABLE is defined is searched for in FILE or
 `find-function-source-path', if non nil, otherwise in `load-path'.
@@ -10794,6 +10931,7 @@ See `find-variable' for more details.
 
 (autoload (quote find-definition-noselect) "find-func" "\
 Return a pair `(BUFFER . POINT)' pointing to the definition of SYMBOL.
+If the definition can't be found in the buffer, return (BUFFER).
 TYPE says what type of definition: nil for a function, `defvar' for a
 variable, `defface' for a face.  This function does not switch to the
 buffer nor display it.
@@ -10842,7 +10980,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" (17393 12443))
+;;;;;;  find-lisp-find-dired) "find-lisp" "find-lisp.el" (17397 61540))
 ;;; Generated autoloads from find-lisp.el
 
 (autoload (quote find-lisp-find-dired) "find-lisp" "\
@@ -10863,7 +11001,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" (17383 24125))
+;;;;;;  "finder" "finder.el" (17466 42705))
 ;;; Generated autoloads from finder.el
 
 (autoload (quote finder-list-keywords) "finder" "\
@@ -10885,7 +11023,7 @@ Find packages matching a given keyword.
 ;;;***
 
 ;;;### (autoloads (enable-flow-control-on enable-flow-control) "flow-ctrl"
-;;;;;;  "flow-ctrl.el" (17383 24125))
+;;;;;;  "flow-ctrl.el" (17383 32103))
 ;;; Generated autoloads from flow-ctrl.el
 
 (autoload (quote enable-flow-control) "flow-ctrl" "\
@@ -10907,7 +11045,7 @@ to get the effect of a C-q.
 ;;;***
 
 ;;;### (autoloads (fill-flowed fill-flowed-encode) "flow-fill" "gnus/flow-fill.el"
-;;;;;;  (17411 39818))
+;;;;;;  (17484 52429))
 ;;; Generated autoloads from gnus/flow-fill.el
 
 (autoload (quote fill-flowed-encode) "flow-fill" "\
@@ -10923,7 +11061,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (flymake-mode-off flymake-mode-on flymake-mode)
-;;;;;;  "flymake" "progmodes/flymake.el" (17396 25795))
+;;;;;;  "flymake" "progmodes/flymake.el" (17397 61567))
 ;;; Generated autoloads from progmodes/flymake.el
 
 (autoload (quote flymake-mode) "flymake" "\
@@ -10946,8 +11084,8 @@ Turn flymake mode off.
 ;;;***
 
 ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off
-;;;;;;  flyspell-mode flyspell-prog-mode) "flyspell" "textmodes/flyspell.el"
-;;;;;;  (17426 59268))
+;;;;;;  turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode)
+;;;;;;  "flyspell" "textmodes/flyspell.el" (17578 34779))
 ;;; Generated autoloads from textmodes/flyspell.el
 
 (autoload (quote flyspell-prog-mode) "flyspell" "\
@@ -10987,6 +11125,16 @@ in your .emacs file.
 
 \(fn &optional ARG)" t nil)
 
+(autoload (quote turn-on-flyspell) "flyspell" "\
+Unconditionally turn on Flyspell mode.
+
+\(fn)" nil nil)
+
+(autoload (quote turn-off-flyspell) "flyspell" "\
+Unconditionally turn off Flyspell mode.
+
+\(fn)" nil nil)
+
 (autoload (quote flyspell-mode-off) "flyspell" "\
 Turn Flyspell mode off.
 
@@ -11006,16 +11154,16 @@ Flyspell whole buffer.
 
 ;;;### (autoloads (follow-delete-other-windows-and-split follow-mode
 ;;;;;;  turn-off-follow-mode turn-on-follow-mode) "follow" "follow.el"
-;;;;;;  (17383 24125))
+;;;;;;  (17487 53545))
 ;;; Generated autoloads from follow.el
 
 (autoload (quote turn-on-follow-mode) "follow" "\
-Turn on Follow mode. Please see the function `follow-mode'.
+Turn on Follow mode.  Please see the function `follow-mode'.
 
 \(fn)" t nil)
 
 (autoload (quote turn-off-follow-mode) "follow" "\
-Turn off Follow mode. Please see the function `follow-mode'.
+Turn off Follow mode.  Please see the function `follow-mode'.
 
 \(fn)" t nil)
 
@@ -11056,7 +11204,7 @@ is called.  When turned off, `follow-mode-off-hook' is called.
 Keys specific to Follow mode:
 \\{follow-mode-map}
 
-\(fn ARG)" t nil)
+\(fn &optional ARG)" t nil)
 
 (autoload (quote follow-delete-other-windows-and-split) "follow" "\
 Create two side by side windows and enter Follow Mode.
@@ -11081,7 +11229,7 @@ in your `~/.emacs' file, replacing [f7] by your favourite key:
 ;;;***
 
 ;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (17383
-;;;;;;  16812))
+;;;;;;  32168))
 ;;; Generated autoloads from mail/footnote.el
 
 (autoload (quote footnote-mode) "footnote" "\
@@ -11102,7 +11250,7 @@ key		binding
 ;;;***
 
 ;;;### (autoloads (forms-find-file-other-window forms-find-file forms-mode)
-;;;;;;  "forms" "forms.el" (17383 24125))
+;;;;;;  "forms" "forms.el" (17383 32104))
 ;;; Generated autoloads from forms.el
 
 (autoload (quote forms-mode) "forms" "\
@@ -11139,7 +11287,7 @@ Visit a file in Forms mode in other window.
 ;;;***
 
 ;;;### (autoloads (fortran-mode fortran-tab-mode-default) "fortran"
-;;;;;;  "progmodes/fortran.el" (17358 30049))
+;;;;;;  "progmodes/fortran.el" (17358 25800))
 ;;; Generated autoloads from progmodes/fortran.el
 
 (defvar fortran-tab-mode-default nil "\
@@ -11225,7 +11373,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" (17382 1892))
+;;;;;;  fortune-add-fortune) "fortune" "play/fortune.el" (17383 32182))
 ;;; Generated autoloads from play/fortune.el
 
 (autoload (quote fortune-add-fortune) "fortune" "\
@@ -11275,7 +11423,7 @@ and choose the directory as the fortune-file.
 ;;;***
 
 ;;;### (autoloads (gdb-enable-debug gdba) "gdb-ui" "progmodes/gdb-ui.el"
-;;;;;;  (17444 35371))
+;;;;;;  (17578 34779))
 ;;; Generated autoloads from progmodes/gdb-ui.el
 
 (autoload (quote gdba) "gdb-ui" "\
@@ -11339,7 +11487,7 @@ Non-nil means record the process input and output in `gdb-debug-ring'.")
 
 ;;;### (autoloads (generic-make-keywords-list generic-mode generic-mode-internal
 ;;;;;;  define-generic-mode) "generic" "emacs-lisp/generic.el" (17383
-;;;;;;  16118))
+;;;;;;  32139))
 ;;; Generated autoloads from emacs-lisp/generic.el
 
 (defvar generic-mode-list nil "\
@@ -11414,7 +11562,7 @@ regular expression that can be used as an element of
 ;;;***
 
 ;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el"
-;;;;;;  (17405 58461))
+;;;;;;  (17420 36091))
 ;;; Generated autoloads from progmodes/glasses.el
 
 (autoload (quote glasses-mode) "glasses" "\
@@ -11426,8 +11574,55 @@ at places they belong to.
 
 ;;;***
 
+;;;### (autoloads (gmm-tool-bar-from-list gmm-widget-p gmm-error
+;;;;;;  gmm-message) "gmm-utils" "gnus/gmm-utils.el" (17521 64537))
+;;; Generated autoloads from gnus/gmm-utils.el
+
+(autoload (quote gmm-message) "gmm-utils" "\
+If LEVEL is lower than `gmm-verbose' print ARGS using `message'.
+
+Guideline for numbers:
+1 - error messages, 3 - non-serious error messages, 5 - messages for things
+that take a long time, 7 - not very important messages on stuff, 9 - messages
+inside loops.
+
+\(fn LEVEL &rest ARGS)" nil nil)
+
+(autoload (quote gmm-error) "gmm-utils" "\
+Beep an error if LEVEL is equal to or less than `gmm-verbose'.
+ARGS are passed to `message'.
+
+\(fn LEVEL &rest ARGS)" nil nil)
+
+(autoload (quote gmm-widget-p) "gmm-utils" "\
+Non-nil iff SYMBOL is a widget.
+
+\(fn SYMBOL)" nil nil)
+
+(autoload (quote gmm-tool-bar-from-list) "gmm-utils" "\
+Make a tool bar from ICON-LIST.
+
+Within each entry of ICON-LIST, the first element is a menu
+command, the second element is an icon file name and the third
+element is a test function.  You can use \\[describe-key]
+<menu-entry> to find out the name of a menu command.  The fourth
+and all following elements are passed a the PROPS argument to the
+function `tool-bar-local-item'.
+
+If ZAP-LIST is a list, remove those item from the default
+`tool-bar-map'.  If it is t, start with a new sparse map.  You
+can use \\[describe-key] <icon> to find out the name of an icon
+item.  When \\[describe-key] <icon> shows \"<tool-bar> <new-file>
+runs the command find-file\", then use `new-file' in ZAP-LIST.
+
+DEFAULT-MAP specifies the default key map for ICON-LIST.
+
+\(fn ICON-LIST ZAP-LIST DEFAULT-MAP)" nil nil)
+
+;;;***
+
 ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server
-;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (17426 3898))
+;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (17432 37362))
 ;;; Generated autoloads from gnus/gnus.el
 
 (autoload (quote gnus-slave-no-server) "gnus" "\
@@ -11478,7 +11673,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" (17440 25582))
+;;;;;;  "gnus/gnus-agent.el" (17578 34776))
 ;;; Generated autoloads from gnus/gnus-agent.el
 
 (autoload (quote gnus-unplugged) "gnus-agent" "\
@@ -11569,7 +11764,7 @@ If CLEAN, obsolete (ignore).
 ;;;***
 
 ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el"
-;;;;;;  (17437 45961))
+;;;;;;  (17578 34776))
 ;;; Generated autoloads from gnus/gnus-art.el
 
 (autoload (quote gnus-article-prepare-display) "gnus-art" "\
@@ -11580,7 +11775,7 @@ Make the current buffer look like a nice article.
 ;;;***
 
 ;;;### (autoloads (gnus-audio-play) "gnus-audio" "gnus/gnus-audio.el"
-;;;;;;  (17382 1052))
+;;;;;;  (17383 32155))
 ;;; Generated autoloads from gnus/gnus-audio.el
 
 (autoload (quote gnus-audio-play) "gnus-audio" "\
@@ -11592,8 +11787,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" (17382
-;;;;;;  1052))
+;;;;;;  gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (17383
+;;;;;;  32155))
 ;;; Generated autoloads from gnus/gnus-cache.el
 
 (autoload (quote gnus-jog-cache) "gnus-cache" "\
@@ -11635,7 +11830,7 @@ supported.
 ;;;***
 
 ;;;### (autoloads (gnus-delay-initialize gnus-delay-send-queue gnus-delay-article)
-;;;;;;  "gnus-delay" "gnus/gnus-delay.el" (17382 1052))
+;;;;;;  "gnus-delay" "gnus/gnus-delay.el" (17383 32155))
 ;;; Generated autoloads from gnus/gnus-delay.el
 
 (autoload (quote gnus-delay-article) "gnus-delay" "\
@@ -11670,8 +11865,24 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil.
 
 ;;;***
 
+;;;### (autoloads (gnus-user-format-function-D gnus-user-format-function-d)
+;;;;;;  "gnus-diary" "gnus/gnus-diary.el" (17578 34776))
+;;; Generated autoloads from gnus/gnus-diary.el
+
+(autoload (quote gnus-user-format-function-d) "gnus-diary" "\
+Not documented
+
+\(fn HEADER)" nil nil)
+
+(autoload (quote gnus-user-format-function-D) "gnus-diary" "\
+Not documented
+
+\(fn HEADER)" nil nil)
+
+;;;***
+
 ;;;### (autoloads (turn-on-gnus-dired-mode) "gnus-dired" "gnus/gnus-dired.el"
-;;;;;;  (17382 1052))
+;;;;;;  (17383 32155))
 ;;; Generated autoloads from gnus/gnus-dired.el
 
 (autoload (quote turn-on-gnus-dired-mode) "gnus-dired" "\
@@ -11682,7 +11893,7 @@ Convenience method to turn on gnus-dired-mode.
 ;;;***
 
 ;;;### (autoloads (gnus-draft-reminder) "gnus-draft" "gnus/gnus-draft.el"
-;;;;;;  (17415 62487))
+;;;;;;  (17420 36082))
 ;;; Generated autoloads from gnus/gnus-draft.el
 
 (autoload (quote gnus-draft-reminder) "gnus-draft" "\
@@ -11694,8 +11905,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" (17382
-;;;;;;  1052))
+;;;;;;  gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (17466
+;;;;;;  42710))
 ;;; Generated autoloads from gnus/gnus-fun.el
 
 (autoload (quote gnus-random-x-face) "gnus-fun" "\
@@ -11734,7 +11945,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" (17426 3898))
+;;;;;;  "gnus-group" "gnus/gnus-group.el" (17578 34776))
 ;;; Generated autoloads from gnus/gnus-group.el
 
 (autoload (quote gnus-fetch-group) "gnus-group" "\
@@ -11751,7 +11962,7 @@ Pop up a frame and enter GROUP.
 ;;;***
 
 ;;;### (autoloads (gnus-batch-score) "gnus-kill" "gnus/gnus-kill.el"
-;;;;;;  (17382 1052))
+;;;;;;  (17383 32156))
 ;;; Generated autoloads from gnus/gnus-kill.el
 
 (defalias (quote gnus-batch-kill) (quote gnus-batch-score))
@@ -11766,7 +11977,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"
-;;;;;;  (17382 1052))
+;;;;;;  (17578 34776))
 ;;; Generated autoloads from gnus/gnus-ml.el
 
 (autoload (quote turn-on-gnus-mailing-list-mode) "gnus-ml" "\
@@ -11791,7 +12002,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"
-;;;;;;  (17382 1052))
+;;;;;;  (17383 32157))
 ;;; Generated autoloads from gnus/gnus-mlspl.el
 
 (autoload (quote gnus-group-split-setup) "gnus-mlspl" "\
@@ -11892,7 +12103,7 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns:
 ;;;***
 
 ;;;### (autoloads (gnus-change-server) "gnus-move" "gnus/gnus-move.el"
-;;;;;;  (17382 1052))
+;;;;;;  (17383 32157))
 ;;; Generated autoloads from gnus/gnus-move.el
 
 (autoload (quote gnus-change-server) "gnus-move" "\
@@ -11904,7 +12115,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" (17382 1052))
+;;;;;;  "gnus-msg" "gnus/gnus-msg.el" (17383 32157))
 ;;; Generated autoloads from gnus/gnus-msg.el
 
 (autoload (quote gnus-msg-mail) "gnus-msg" "\
@@ -11929,7 +12140,7 @@ Like `message-reply'.
 ;;;***
 
 ;;;### (autoloads (gnus-nocem-load-cache gnus-nocem-scan-groups)
-;;;;;;  "gnus-nocem" "gnus/gnus-nocem.el" (17426 3898))
+;;;;;;  "gnus-nocem" "gnus/gnus-nocem.el" (17432 37361))
 ;;; Generated autoloads from gnus/gnus-nocem.el
 
 (autoload (quote gnus-nocem-scan-groups) "gnus-nocem" "\
@@ -11946,7 +12157,7 @@ Load the NoCeM cache.
 
 ;;;### (autoloads (gnus-treat-newsgroups-picon gnus-treat-mail-picon
 ;;;;;;  gnus-treat-from-picon) "gnus-picon" "gnus/gnus-picon.el"
-;;;;;;  (17382 1052))
+;;;;;;  (17383 32157))
 ;;; Generated autoloads from gnus/gnus-picon.el
 
 (autoload (quote gnus-treat-from-picon) "gnus-picon" "\
@@ -11973,7 +12184,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" (17382 1052))
+;;;;;;  "gnus/gnus-range.el" (17383 32157))
 ;;; Generated autoloads from gnus/gnus-range.el
 
 (autoload (quote gnus-sorted-difference) "gnus-range" "\
@@ -12041,7 +12252,7 @@ Add NUM into sorted LIST by side effect.
 ;;;***
 
 ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize)
-;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (17382 1052))
+;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (17383 32157))
 ;;; Generated autoloads from gnus/gnus-registry.el
 
 (autoload (quote gnus-registry-initialize) "gnus-registry" "\
@@ -12057,8 +12268,8 @@ Install the registry hooks.
 ;;;***
 
 ;;;### (autoloads (gnus-sieve-article-add-rule gnus-sieve-generate
-;;;;;;  gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (17382
-;;;;;;  1052))
+;;;;;;  gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (17484
+;;;;;;  52430))
 ;;; Generated autoloads from gnus/gnus-sieve.el
 
 (autoload (quote gnus-sieve-update) "gnus-sieve" "\
@@ -12086,7 +12297,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (gnus-batch-brew-soup) "gnus-soup" "gnus/gnus-soup.el"
-;;;;;;  (17382 1052))
+;;;;;;  (17383 32158))
 ;;; Generated autoloads from gnus/gnus-soup.el
 
 (autoload (quote gnus-batch-brew-soup) "gnus-soup" "\
@@ -12106,7 +12317,7 @@ Note -- this function hasn't been implemented yet.
 ;;;***
 
 ;;;### (autoloads (gnus-update-format) "gnus-spec" "gnus/gnus-spec.el"
-;;;;;;  (17382 1052))
+;;;;;;  (17383 32158))
 ;;; Generated autoloads from gnus/gnus-spec.el
 
 (autoload (quote gnus-update-format) "gnus-spec" "\
@@ -12117,8 +12328,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" (17426
-;;;;;;  3898))
+;;;;;;  gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (17432
+;;;;;;  37361))
 ;;; Generated autoloads from gnus/gnus-start.el
 
 (autoload (quote gnus-declare-backend) "gnus-start" "\
@@ -12134,7 +12345,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (gnus-add-configuration) "gnus-win" "gnus/gnus-win.el"
-;;;;;;  (17382 1052))
+;;;;;;  (17383 32159))
 ;;; Generated autoloads from gnus/gnus-win.el
 
 (autoload (quote gnus-add-configuration) "gnus-win" "\
@@ -12144,7 +12355,7 @@ Add the window configuration CONF to `gnus-buffer-configuration'.
 
 ;;;***
 
-;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (17382 1892))
+;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (17383 32182))
 ;;; Generated autoloads from play/gomoku.el
 
 (autoload (quote gomoku) "gomoku" "\
@@ -12171,7 +12382,7 @@ Use \\[describe-mode] for more info.
 ;;;***
 
 ;;;### (autoloads (goto-address goto-address-at-point) "goto-addr"
-;;;;;;  "net/goto-addr.el" (17383 13296))
+;;;;;;  "net/goto-addr.el" (17582 28846))
 ;;; Generated autoloads from net/goto-addr.el
 
 (define-obsolete-function-alias (quote goto-address-at-mouse) (quote goto-address-at-point) "22.1")
@@ -12195,12 +12406,13 @@ Also fontifies the buffer appropriately (see `goto-address-fontify-p' and
 `goto-address-highlight-p' for more information).
 
 \(fn)" t nil)
+(put 'goto-address 'safe-local-eval-function t)
 
 ;;;***
 
-;;;### (autoloads (grep-tree grep-find grep-mode grep grep-compute-defaults
+;;;### (autoloads (rgrep lgrep grep-find grep grep-mode grep-compute-defaults
 ;;;;;;  grep-process-setup grep-setup-hook grep-find-command grep-command
-;;;;;;  grep-window-height) "grep" "progmodes/grep.el" (17432 38016))
+;;;;;;  grep-window-height) "grep" "progmodes/grep.el" (17590 36100))
 ;;; Generated autoloads from progmodes/grep.el
 
 (defvar grep-window-height nil "\
@@ -12265,6 +12477,11 @@ Not documented
 
 \(fn)" nil nil)
 
+(autoload (quote grep-mode) "grep" "\
+Sets `grep-last-buffer' and `compilation-window-height'.
+
+\(fn)" nil nil)
+
 (autoload (quote grep) "grep" "\
 Run grep, with user-specified args, and collect output in a buffer.
 While grep runs asynchronously, you can use \\[next-error] (M-x next-error),
@@ -12279,15 +12496,7 @@ tag the cursor is over, substituting it into the last grep command
 in the grep command history (or into `grep-command'
 if that history list is empty).
 
-If specified, optional second arg HIGHLIGHT-REGEXP is the regexp to
-temporarily highlight in visited source lines.
-
-\(fn COMMAND-ARGS &optional HIGHLIGHT-REGEXP)" t nil)
-
-(autoload (quote grep-mode) "grep" "\
-Sets `grep-last-buffer' and `compilation-window-height'.
-
-\(fn)" nil nil)
+\(fn COMMAND-ARGS)" t nil)
 
 (autoload (quote grep-find) "grep" "\
 Run grep via find, with user-specified args COMMAND-ARGS.
@@ -12302,29 +12511,45 @@ easily repeat a find command.
 
 (defalias (quote find-grep) (quote grep-find))
 
-(autoload (quote grep-tree) "grep" "\
-Grep for REGEXP in FILES in directory tree rooted at DIR.
-Collect output in a buffer.
-Interactively, prompt separately for each search parameter.
-With prefix arg, reuse previous REGEXP.
+(autoload (quote lgrep) "grep" "\
+Run grep, searching for REGEXP in FILES in current directory.
 The search is limited to file names matching shell pattern FILES.
-FILES may use abbreviations defined in `grep-tree-files-aliases', e.g.
+FILES may use abbreviations defined in `grep-files-aliases', e.g.
 entering `ch' is equivalent to `*.[ch]'.
 
-While find runs asynchronously, you can use the \\[next-error] command
-to find the text that grep hits refer to.
+With \\[universal-argument] prefix, you can edit the constructed shell command line
+before it is executed.
+With two \\[universal-argument] prefixes, directly edit and run `grep-command'.
 
-This command uses a special history list for its arguments, so you can
-easily repeat a find command.
+Collect output in a buffer.  While grep runs asynchronously, you
+can use \\[next-error] (M-x next-error), or \\<grep-mode-map>\\[compile-goto-error]
+in the grep output buffer, to go to the lines where grep found matches.
+
+This command shares argument histories with \\[rgrep] and \\[grep].
+
+\(fn REGEXP &optional FILES)" t nil)
 
-When used non-interactively, optional arg SUBDIRS limits the search to
-those sub directories of DIR.
+(autoload (quote rgrep) "grep" "\
+Recursively grep for REGEXP in FILES in directory tree rooted at DIR.
+The search is limited to file names matching shell pattern FILES.
+FILES may use abbreviations defined in `grep-files-aliases', e.g.
+entering `ch' is equivalent to `*.[ch]'.
+
+With \\[universal-argument] prefix, you can edit the constructed shell command line
+before it is executed.
+With two \\[universal-argument] prefixes, directly edit and run `grep-find-command'.
+
+Collect output in a buffer.  While find runs asynchronously, you
+can use \\[next-error] (M-x next-error), or \\<grep-mode-map>\\[compile-goto-error]
+in the grep output buffer, to go to the lines where grep found matches.
 
-\(fn REGEXP FILES DIR &optional SUBDIRS)" t nil)
+This command shares argument histories with \\[lgrep] and \\[grep-find].
+
+\(fn REGEXP &optional FILES DIR)" t nil)
 
 ;;;***
 
-;;;### (autoloads (gs-load-image) "gs" "gs.el" (17383 24126))
+;;;### (autoloads (gs-load-image) "gs" "gs.el" (17383 32104))
 ;;; Generated autoloads from gs.el
 
 (autoload (quote gs-load-image) "gs" "\
@@ -12338,7 +12563,7 @@ the form \"WINDOW-ID PIXMAP-ID\".  Value is non-nil if successful.
 ;;;***
 
 ;;;### (autoloads (gdb-script-mode bashdb jdb pdb perldb xdb dbx
-;;;;;;  sdb gdb) "gud" "progmodes/gud.el" (17446 52773))
+;;;;;;  sdb gdb) "gud" "progmodes/gud.el" (17578 34779))
 ;;; Generated autoloads from progmodes/gud.el
 
 (autoload (quote gdb) "gud" "\
@@ -12424,8 +12649,8 @@ Major mode for editing GDB scripts
 
 ;;;***
 
-;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (17382
-;;;;;;  1892))
+;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (17383
+;;;;;;  32182))
 ;;; Generated autoloads from play/handwrite.el
 
 (autoload (quote handwrite) "handwrite" "\
@@ -12443,7 +12668,7 @@ Variables: handwrite-linespace     (default 12)
 ;;;***
 
 ;;;### (autoloads (hanoi-unix-64 hanoi-unix hanoi) "hanoi" "play/hanoi.el"
-;;;;;;  (17075 55477))
+;;;;;;  (17590 36100))
 ;;; Generated autoloads from play/hanoi.el
 
 (autoload (quote hanoi) "hanoi" "\
@@ -12473,7 +12698,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" (17383 24126))
+;;;;;;  help-at-pt-string) "help-at-pt" "help-at-pt.el" (17383 32104))
 ;;; Generated autoloads from help-at-pt.el
 
 (autoload (quote help-at-pt-string) "help-at-pt" "\
@@ -12603,7 +12828,7 @@ different regions.  With numeric argument ARG, behaves like
 ;;;### (autoloads (describe-categories describe-syntax describe-variable
 ;;;;;;  variable-at-point describe-function-1 describe-simplify-lib-file-name
 ;;;;;;  help-C-file-name describe-function help-with-tutorial) "help-fns"
-;;;;;;  "help-fns.el" (17399 44613))
+;;;;;;  "help-fns.el" (17590 36098))
 ;;; Generated autoloads from help-fns.el
 
 (autoload (quote help-with-tutorial) "help-fns" "\
@@ -12669,7 +12894,7 @@ BUFFER should be a buffer or a buffer name.
 ;;;***
 
 ;;;### (autoloads (three-step-help) "help-macro" "help-macro.el"
-;;;;;;  (17383 24126))
+;;;;;;  (17383 32105))
 ;;; Generated autoloads from help-macro.el
 
 (defvar three-step-help nil "\
@@ -12685,7 +12910,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" (17437 64109))
+;;;;;;  help-mode) "help-mode" "help-mode.el" (17590 36098))
 ;;; Generated autoloads from help-mode.el
 
 (autoload (quote help-mode) "help-mode" "\
@@ -12768,7 +12993,7 @@ Add xrefs for symbols in `pp's output between FROM and TO.
 ;;;***
 
 ;;;### (autoloads (Helper-help Helper-describe-bindings) "helper"
-;;;;;;  "emacs-lisp/helper.el" (17383 16118))
+;;;;;;  "emacs-lisp/helper.el" (17590 36099))
 ;;; Generated autoloads from emacs-lisp/helper.el
 
 (autoload (quote Helper-describe-bindings) "helper" "\
@@ -12784,7 +13009,7 @@ Provide help for current mode.
 ;;;***
 
 ;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl"
-;;;;;;  "hexl.el" (17383 24126))
+;;;;;;  "hexl.el" (17585 4275))
 ;;; Generated autoloads from hexl.el
 
 (autoload (quote hexl-mode) "hexl" "\
@@ -12864,8 +13089,9 @@ You can use \\[hexl-find-file] to visit a file in Hexl mode.
 \(fn &optional ARG)" t nil)
 
 (autoload (quote hexl-find-file) "hexl" "\
-Edit file FILENAME in hexl-mode.
-Switch to a buffer visiting file FILENAME, creating one in none exists.
+Edit file FILENAME as a binary file in hex dump format.
+Switch to a buffer visiting file FILENAME, creating one if none exists,
+and edit the file in `hexl-mode'.
 
 \(fn FILENAME)" t nil)
 
@@ -12880,7 +13106,7 @@ This discards the buffer's undo information.
 ;;;### (autoloads (hi-lock-write-interactive-patterns hi-lock-unface-buffer
 ;;;;;;  hi-lock-face-phrase-buffer hi-lock-face-buffer hi-lock-line-face-buffer
 ;;;;;;  global-hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el"
-;;;;;;  (17383 24126))
+;;;;;;  (17383 32105))
 ;;; Generated autoloads from hi-lock.el
 
 (autoload (quote hi-lock-mode) "hi-lock" "\
@@ -12937,8 +13163,6 @@ use either \\[customize] or the function `global-hi-lock-mode'.")
 
 (custom-autoload (quote global-hi-lock-mode) "hi-lock")
 
-(put (quote global-hi-lock-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote global-hi-lock-mode) "hi-lock" "\
 Toggle Hi-Lock mode in every buffer.
 With prefix ARG, turn Global-Hi-Lock mode on if and only if ARG is positive.
@@ -13006,7 +13230,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" (17388 22062))
+;;;;;;  hide-ifdef-mode) "hideif" "progmodes/hideif.el" (17521 64539))
 ;;; Generated autoloads from progmodes/hideif.el
 
 (autoload (quote hide-ifdef-mode) "hideif" "\
@@ -13061,7 +13285,7 @@ how the hiding is done:
 ;;;***
 
 ;;;### (autoloads (hs-minor-mode) "hideshow" "progmodes/hideshow.el"
-;;;;;;  (17388 22062))
+;;;;;;  (17397 61568))
 ;;; Generated autoloads from progmodes/hideshow.el
 
 (defvar hs-special-modes-alist (quote ((c-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning) (c++-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning) (bibtex-mode ("^@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning))) "\
@@ -13119,7 +13343,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" (17387 44422))
+;;;;;;  "hilit-chg" "hilit-chg.el" (17397 61541))
 ;;; Generated autoloads from hilit-chg.el
 
 (autoload (quote highlight-changes-remove-highlight) "hilit-chg" "\
@@ -13249,7 +13473,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" (17383 24126))
+;;;;;;  "hippie-exp.el" (17383 32106))
 ;;; 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)) "\
@@ -13322,7 +13546,7 @@ argument VERBOSE non-nil makes the function verbose.
 ;;;***
 
 ;;;### (autoloads (global-hl-line-mode hl-line-mode) "hl-line" "hl-line.el"
-;;;;;;  (17363 41687))
+;;;;;;  (17365 2729))
 ;;; Generated autoloads from hl-line.el
 
 (autoload (quote hl-line-mode) "hl-line" "\
@@ -13350,8 +13574,6 @@ use either \\[customize] or the function `global-hl-line-mode'.")
 
 (custom-autoload (quote global-hl-line-mode) "hl-line")
 
-(put (quote global-hl-line-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote global-hl-line-mode) "hl-line" "\
 Global minor mode to highlight the line about point in the current window.
 With ARG, turn Global-Hl-Line mode on if ARG is positive, off otherwise.
@@ -13364,7 +13586,7 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and
 ;;;***
 
 ;;;### (autoloads (list-holidays holidays) "holidays" "calendar/holidays.el"
-;;;;;;  (17426 49056))
+;;;;;;  (17432 37359))
 ;;; Generated autoloads from calendar/holidays.el
 
 (autoload (quote holidays) "holidays" "\
@@ -13401,7 +13623,7 @@ The optional LABEL is used to label the buffer created.
 ;;;***
 
 ;;;### (autoloads (hscroll-global-mode hscroll-mode turn-on-hscroll)
-;;;;;;  "hscroll" "obsolete/hscroll.el" (17382 34311))
+;;;;;;  "hscroll" "obsolete/hscroll.el" (17383 32179))
 ;;; Generated autoloads from obsolete/hscroll.el
 
 (autoload (quote turn-on-hscroll) "hscroll" "\
@@ -13427,8 +13649,8 @@ Also see `automatic-hscrolling'.
 
 ;;;***
 
-;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (17396
-;;;;;;  25556))
+;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (17397
+;;;;;;  61555))
 ;;; Generated autoloads from gnus/html2text.el
 
 (autoload (quote html2text) "html2text" "\
@@ -13460,7 +13682,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" (17442 18621))
+;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" (17457 37498))
 ;;; Generated autoloads from ibuf-ext.el
 
 (autoload (quote ibuffer-auto-mode) "ibuf-ext" "\
@@ -13826,8 +14048,8 @@ defaults to one.
 ;;;***
 
 ;;;### (autoloads (define-ibuffer-filter define-ibuffer-op define-ibuffer-sorter
-;;;;;;  define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (17383
-;;;;;;  24126))
+;;;;;;  define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (17457
+;;;;;;  37498))
 ;;; Generated autoloads from ibuf-macs.el
 
 (autoload (quote define-ibuffer-column) "ibuf-macs" "\
@@ -13844,6 +14066,9 @@ the text, such as `mouse-face'.  And SUMMARIZER, if given, is a
 function which will be passed a list of all the strings in its column;
 it should return a string to display at the bottom.
 
+If HEADER-MOUSE-MAP is given, it will be used as a keymap for the
+title of the column.
+
 Note that this macro expands into a `defun' for a function named
 ibuffer-make-column-NAME.  If INLINE is non-nil, then the form will be
 inlined into the compiled format versions.  This means that if you
@@ -13913,7 +14138,7 @@ bound to the current value of the filter.
 ;;;***
 
 ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers)
-;;;;;;  "ibuffer" "ibuffer.el" (17378 33493))
+;;;;;;  "ibuffer" "ibuffer.el" (17578 34772))
 ;;; Generated autoloads from ibuffer.el
 
 (autoload (quote ibuffer-list-buffers) "ibuffer" "\
@@ -13954,7 +14179,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" (17397 11797))
+;;;;;;  "calendar/icalendar.el" (17397 61548))
 ;;; Generated autoloads from calendar/icalendar.el
 
 (autoload (quote icalendar-export-file) "icalendar" "\
@@ -14006,8 +14231,8 @@ buffer `*icalendar-errors*'.
 
 ;;;***
 
-;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (17398
-;;;;;;  17947))
+;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (17401
+;;;;;;  56228))
 ;;; Generated autoloads from icomplete.el
 
 (defvar icomplete-mode nil "\
@@ -14018,8 +14243,6 @@ use either \\[customize] or the function `icomplete-mode'.")
 
 (custom-autoload (quote icomplete-mode) "icomplete")
 
-(put (quote icomplete-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote icomplete-mode) "icomplete" "\
 Toggle incremental minibuffer completion for this Emacs session.
 With a numeric argument, turn Icomplete mode on iff ARG is positive.
@@ -14028,7 +14251,7 @@ With a numeric argument, turn Icomplete mode on iff ARG is positive.
 
 ;;;***
 
-;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (17388 22062))
+;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (17397 61568))
 ;;; Generated autoloads from progmodes/icon.el
 
 (autoload (quote icon-mode) "icon" "\
@@ -14069,7 +14292,7 @@ with no args, if that value is non-nil.
 ;;;***
 
 ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el"
-;;;;;;  (17388 22062))
+;;;;;;  (17515 39529))
 ;;; Generated autoloads from progmodes/idlw-shell.el
 
 (autoload (quote idlwave-shell) "idlw-shell" "\
@@ -14095,11 +14318,11 @@ See also the variable `idlwave-shell-prompt-pattern'.
 ;;;***
 
 ;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el"
-;;;;;;  (17388 22062))
+;;;;;;  (17515 39529))
 ;;; Generated autoloads from progmodes/idlwave.el
 
 (autoload (quote idlwave-mode) "idlwave" "\
-Major mode for editing IDL source files (version 5.7_22).
+Major mode for editing IDL source files (version 6.0_em22).
 
 The main features of this mode are
 
@@ -14148,11 +14371,10 @@ The main features of this mode are
 
 3. Online IDL Help
    ---------------
+
    \\[idlwave-context-help] displays the IDL documentation relevant
-   for the system variable, keyword, or routine at point.  A single
-   key stroke gets you directly to the right place in the docs.  The
-   HTML help files package must be installed for this to work -- check
-   the IDLWAVE webpage for the correct package for your version.  See
+   for the system variable, keyword, or routines at point.  A single
+   key stroke gets you directly to the right place in the docs.  See
    the manual to configure where and how the HTML help is displayed.
 
 4. Completion
@@ -14179,7 +14401,7 @@ The main features of this mode are
    \\i         IF statement template
    \\elif      IF-ELSE statement template
    \\b         BEGIN
-
+   
    For a full list, use \\[idlwave-list-abbrevs].  Some templates also
    have direct keybindings - see the list of keybindings below.
 
@@ -14220,7 +14442,7 @@ The main features of this mode are
 \\{idlwave-mode-map}
 
 \(fn)" t nil)
-(add-to-list 'auto-mode-alist '("\\.[Pp][Rr][Oo]\\'" . idlwave-mode))
+ (add-to-list 'auto-mode-alist '("\\.[Pp][Rr][Oo]\\'" . idlwave-mode))
 
 ;;;***
 
@@ -14231,8 +14453,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" (17435
-;;;;;;  26372))
+;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17590
+;;;;;;  36098))
 ;;; Generated autoloads from ido.el
 
 (defvar ido-mode nil "\
@@ -14268,7 +14490,7 @@ default is to show it in the same window, unless it is already visible
 in another frame.
 
 As you type in a string, all of the buffers matching the string are
-displayed if substring-matching is used (default). Look at
+displayed if substring-matching is used (default).  Look at
 `ido-enable-prefix' and `ido-toggle-prefix'.  When you have found the
 buffer you want, it can then be selected.  As you type, most keys have
 their normal keybindings, except for the following: \\<ido-buffer-completion-map>
@@ -14291,7 +14513,7 @@ in a separate window.
 \\[ido-toggle-prefix] Toggle between substring and prefix matching.
 \\[ido-toggle-case] Toggle case-sensitive searching of buffer names.
 \\[ido-completion-help] Show list of matching buffers in separate window.
-\\[ido-enter-find-file] Drop into ido-find-file.
+\\[ido-enter-find-file] Drop into `ido-find-file'.
 \\[ido-kill-buffer-at-head] Kill buffer at head of buffer list.
 \\[ido-toggle-ignore] Toggle ignoring buffers listed in `ido-ignore-buffers'.
 
@@ -14493,7 +14715,7 @@ DEF, if non-nil, is the default value.
 
 ;;;***
 
-;;;### (autoloads (ielm) "ielm" "ielm.el" (17383 24126))
+;;;### (autoloads (ielm) "ielm" "ielm.el" (17383 32107))
 ;;; Generated autoloads from ielm.el
  (add-hook 'same-window-buffer-names "*ielm*")
 
@@ -14506,7 +14728,7 @@ Switches to the buffer `*ielm*', or creates it if it does not exist.
 ;;;***
 
 ;;;### (autoloads (iimage-mode turn-on-iimage-mode) "iimage" "iimage.el"
-;;;;;;  (17383 24126))
+;;;;;;  (17383 32107))
 ;;; Generated autoloads from iimage.el
 
 (autoload (quote turn-on-iimage-mode) "iimage" "\
@@ -14523,8 +14745,9 @@ Toggle inline image minor mode.
 
 ;;;### (autoloads (defimage find-image remove-images insert-sliced-image
 ;;;;;;  insert-image put-image create-image image-type-available-p
-;;;;;;  image-type-from-file-name image-type-from-file-header image-type-from-buffer
-;;;;;;  image-type-from-data) "image" "image.el" (17437 41119))
+;;;;;;  image-type image-type-from-file-name image-type-from-file-header
+;;;;;;  image-type-from-buffer image-type-from-data) "image" "image.el"
+;;;;;;  (17484 52424))
 ;;; Generated autoloads from image.el
 
 (autoload (quote image-type-from-data) "image" "\
@@ -14555,6 +14778,17 @@ be determined.
 
 \(fn FILE)" nil nil)
 
+(autoload (quote image-type) "image" "\
+Determine and return image type.
+FILE-OR-DATA is an image file name or image data.
+Optional TYPE is a symbol describing the image type.  If TYPE is omitted
+or nil, try to determine the image type from its first few bytes
+of image data.  If that doesn't work, and FILE-OR-DATA is a file name,
+use its file extension as image type.
+Optional DATA-P non-nil means FILE-OR-DATA is a string containing image data.
+
+\(fn FILE-OR-DATA &optional TYPE DATA-P)" 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'.
@@ -14675,7 +14909,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" (17383 24126))
+;;;;;;  "image-file.el" (17383 32107))
 ;;; Generated autoloads from image-file.el
 
 (defvar image-file-name-extensions (quote ("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm")) "\
@@ -14722,8 +14956,6 @@ use either \\[customize] or the function `auto-image-file-mode'.")
 
 (custom-autoload (quote auto-image-file-mode) "image-file")
 
-(put (quote auto-image-file-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote auto-image-file-mode) "image-file" "\
 Toggle visiting of image files as images.
 With prefix argument ARG, turn on if positive, otherwise off.
@@ -14738,7 +14970,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" (17387 39216))
+;;;;;;  "image-mode" "image-mode.el" (17578 34772))
 ;;; Generated autoloads from image-mode.el
  (push '("\\.jpe?g\\'"    . image-mode) auto-mode-alist)
  (push '("\\.png\\'"      . image-mode) auto-mode-alist)
@@ -14776,7 +15008,7 @@ information on these modes.
 ;;;***
 
 ;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar
-;;;;;;  imenu-sort-function) "imenu" "imenu.el" (17383 24126))
+;;;;;;  imenu-sort-function) "imenu" "imenu.el" (17585 4275))
 ;;; Generated autoloads from imenu.el
 
 (defvar imenu-sort-function nil "\
@@ -14811,18 +15043,13 @@ during matching.")
 (make-variable-buffer-local (quote imenu-generic-expression))
 
 (defvar imenu-create-index-function (quote imenu-default-create-index-function) "\
-The function to use for creating a buffer index.
-
-It should be a function that takes no arguments and returns an index
-of the current buffer as an alist.
+The function to use for creating an index alist of the current buffer.
 
-Simple elements in the alist look like (INDEX-NAME . INDEX-POSITION).
-Special elements look like (INDEX-NAME INDEX-POSITION FUNCTION ARGUMENTS...).
-A nested sub-alist element looks like (INDEX-NAME SUB-ALIST).
-The function `imenu--subalist-p' tests an element and returns t
-if it is a sub-alist.
+It should be a function that takes no arguments and returns
+an index alist of the current buffer.  The function is
+called within a `save-excursion'.
 
-This function is called within a `save-excursion'.")
+See `imenu--index-alist' for the format of the buffer index alist.")
 
 (make-variable-buffer-local (quote imenu-create-index-function))
 
@@ -14896,7 +15123,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" (17339 56590))
+;;;;;;  "ind-util" "language/ind-util.el" (17346 38886))
 ;;; Generated autoloads from language/ind-util.el
 
 (autoload (quote indian-compose-region) "ind-util" "\
@@ -14939,7 +15166,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" (17388 22062))
+;;;;;;  "progmodes/inf-lisp.el" (17578 34779))
 ;;; Generated autoloads from progmodes/inf-lisp.el
 
 (defvar inferior-lisp-filter-regexp "\\`\\s *\\(:\\(\\w\\|\\s_\\)\\)?\\s *\\'" "\
@@ -15006,7 +15233,7 @@ of `inferior-lisp-program').  Runs the hooks from
 ;;;### (autoloads (Info-speedbar-browser Info-goto-emacs-key-command-node
 ;;;;;;  Info-goto-emacs-command-node Info-mode info-apropos Info-index
 ;;;;;;  Info-directory Info-on-current-buffer info-standalone info-emacs-manual
-;;;;;;  info info-other-window) "info" "info.el" (17427 20646))
+;;;;;;  info info-other-window) "info" "info.el" (17590 36099))
 ;;; Generated autoloads from info.el
 
 (autoload (quote info-other-window) "info" "\
@@ -15172,7 +15399,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"
-;;;;;;  (17383 24126))
+;;;;;;  (17383 32108))
 ;;; Generated autoloads from info-look.el
 
 (autoload (quote info-lookup-reset) "info-look" "\
@@ -15220,7 +15447,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" (17383 24126))
+;;;;;;  info-xref-check) "info-xref" "info-xref.el" (17521 64536))
 ;;; Generated autoloads from info-xref.el
 
 (autoload (quote info-xref-check) "info-xref" "\
@@ -15247,7 +15474,7 @@ quite a while.
 ;;;***
 
 ;;;### (autoloads (batch-info-validate Info-validate Info-split Info-tagify)
-;;;;;;  "informat" "informat.el" (17383 24126))
+;;;;;;  "informat" "informat.el" (17383 32108))
 ;;; Generated autoloads from informat.el
 
 (autoload (quote Info-tagify) "informat" "\
@@ -15288,7 +15515,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"
-;;;;;;  (17120 44797))
+;;;;;;  (17116 6720))
 ;;; Generated autoloads from international/isearch-x.el
 
 (autoload (quote isearch-toggle-specified-input-method) "isearch-x" "\
@@ -15309,7 +15536,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (17383
-;;;;;;  24126))
+;;;;;;  32108))
 ;;; Generated autoloads from isearchb.el
 
 (autoload (quote isearchb-activate) "isearchb" "\
@@ -15323,7 +15550,7 @@ accessed via isearchb.
 ;;;***
 
 ;;;### (autoloads (iso-accents-mode) "iso-acc" "obsolete/iso-acc.el"
-;;;;;;  (17382 34311))
+;;;;;;  (17383 32179))
 ;;; Generated autoloads from obsolete/iso-acc.el
 
 (autoload (quote iso-accents-mode) "iso-acc" "\
@@ -15356,7 +15583,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" (17102 18714))
+;;;;;;  "international/iso-cvt.el" (17097 33520))
 ;;; Generated autoloads from international/iso-cvt.el
 
 (autoload (quote iso-spanish) "iso-cvt" "\
@@ -15440,7 +15667,7 @@ Add submenus to the File menu, to convert to and from various formats.
 ;;;***
 
 ;;;### (autoloads nil "iso-transl" "international/iso-transl.el"
-;;;;;;  (17102 18715))
+;;;;;;  (17097 33521))
 ;;; 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)
@@ -15453,8 +15680,9 @@ 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"
-;;;;;;  (17436 5419))
+;;;;;;  (17578 34779))
 ;;; Generated autoloads from textmodes/ispell.el
+(put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive))))
 
 (defvar ispell-personal-dictionary nil "\
 *File name of your personal spelling dictionary, or nil.
@@ -15462,6 +15690,7 @@ If nil, the default personal dictionary, \"~/.ispell_DICTNAME\" is used,
 where DICTNAME is the name of your default dictionary.")
 
 (custom-autoload (quote ispell-personal-dictionary) "ispell")
+(put 'ispell-local-dictionary 'safe-local-variable 'string-or-null-p)
 
 (defvar ispell-local-dictionary-alist nil "\
 *List of local or customized dictionary definitions.
@@ -15739,8 +15968,8 @@ You can bind this to the key C-c i in GNUS or mail by adding to
 
 ;;;***
 
-;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (17435
-;;;;;;  10813))
+;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (17438
+;;;;;;  58632))
 ;;; Generated autoloads from iswitchb.el
 
 (defvar iswitchb-mode nil "\
@@ -15751,8 +15980,6 @@ use either \\[customize] or the function `iswitchb-mode'.")
 
 (custom-autoload (quote iswitchb-mode) "iswitchb")
 
-(put (quote iswitchb-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote iswitchb-mode) "iswitchb" "\
 Toggle Iswitchb global minor mode.
 With arg, turn Iswitchb mode on if and only iff ARG is positive.
@@ -15766,7 +15993,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" (17102 18773))
+;;;;;;  "japan-util" "language/japan-util.el" (17097 33526))
 ;;; Generated autoloads from language/japan-util.el
 
 (autoload (quote setup-japanese-environment-internal) "japan-util" "\
@@ -15844,7 +16071,7 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading.
 ;;;***
 
 ;;;### (autoloads (jka-compr-uninstall jka-compr-handler) "jka-compr"
-;;;;;;  "jka-compr.el" (17410 23317))
+;;;;;;  "jka-compr.el" (17420 36078))
 ;;; Generated autoloads from jka-compr.el
 
 (defvar jka-compr-inhibit nil "\
@@ -15869,7 +16096,7 @@ by `jka-compr-installed'.
 
 ;;;### (autoloads (keypad-setup keypad-numlock-shifted-setup keypad-shifted-setup
 ;;;;;;  keypad-numlock-setup keypad-setup) "keypad" "emulation/keypad.el"
-;;;;;;  (17383 13537))
+;;;;;;  (17383 32143))
 ;;; Generated autoloads from emulation/keypad.el
 
 (defvar keypad-setup nil "\
@@ -15925,7 +16152,7 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.'
 ;;;***
 
 ;;;### (autoloads (kinsoku) "kinsoku" "international/kinsoku.el"
-;;;;;;  (17301 53989))
+;;;;;;  (17301 45595))
 ;;; Generated autoloads from international/kinsoku.el
 
 (autoload (quote kinsoku) "kinsoku" "\
@@ -15946,8 +16173,8 @@ the context of text formatting.
 
 ;;;***
 
-;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (17102
-;;;;;;  18717))
+;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (17097
+;;;;;;  33521))
 ;;; Generated autoloads from international/kkc.el
 
 (defvar kkc-after-update-conversion-functions nil "\
@@ -15972,7 +16199,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" (17383 24126))
+;;;;;;  "kmacro.el" (17503 24306))
 ;;; Generated autoloads from kmacro.el
  (global-set-key "\C-x(" 'kmacro-start-macro)
  (global-set-key "\C-x)" 'kmacro-end-macro)
@@ -16079,7 +16306,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"
-;;;;;;  (17102 18774))
+;;;;;;  (17097 33526))
 ;;; Generated autoloads from language/knd-util.el
 
 (defconst kannada-consonant "[\x51f75-\x51fb9]")
@@ -16102,7 +16329,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (setup-korean-environment-internal) "korea-util"
-;;;;;;  "language/korea-util.el" (17102 18775))
+;;;;;;  "language/korea-util.el" (17097 33526))
 ;;; Generated autoloads from language/korea-util.el
 
 (defvar default-korean-keyboard (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "") "\
@@ -16117,7 +16344,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (lm lm-test-run) "landmark" "play/landmark.el"
-;;;;;;  (17393 12443))
+;;;;;;  (17582 28846))
 ;;; Generated autoloads from play/landmark.el
 
 (defalias (quote landmark-repeat) (quote lm-test-run))
@@ -16151,8 +16378,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" (17102
-;;;;;;  18775))
+;;;;;;  lao-compose-string) "lao-util" "language/lao-util.el" (17097
+;;;;;;  33526))
 ;;; Generated autoloads from language/lao-util.el
 
 (autoload (quote lao-compose-string) "lao-util" "\
@@ -16201,7 +16428,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" (17370 39824))
+;;;;;;  "latexenc" "international/latexenc.el" (17383 32167))
 ;;; 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))) "\
@@ -16233,7 +16460,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" (17102 18720))
+;;;;;;  "latin1-disp" "international/latin1-disp.el" (17097 33522))
 ;;; Generated autoloads from international/latin1-disp.el
 
 (defvar latin1-display nil "\
@@ -16277,7 +16504,7 @@ use either \\[customize] or the function `latin1-display'.")
 ;;;***
 
 ;;;### (autoloads (turn-on-lazy-lock lazy-lock-mode) "lazy-lock"
-;;;;;;  "obsolete/lazy-lock.el" (17382 34311))
+;;;;;;  "obsolete/lazy-lock.el" (17383 32179))
 ;;; Generated autoloads from obsolete/lazy-lock.el
 
 (autoload (quote lazy-lock-mode) "lazy-lock" "\
@@ -16345,7 +16572,7 @@ Unconditionally turn on Lazy Lock mode.
 ;;;***
 
 ;;;### (autoloads (ld-script-mode) "ld-script" "progmodes/ld-script.el"
-;;;;;;  (17388 22062))
+;;;;;;  (17397 61570))
 ;;; Generated autoloads from progmodes/ld-script.el
 
 (add-to-list (quote auto-mode-alist) (quote ("\\.ld[si]?\\>" . ld-script-mode)))
@@ -16360,7 +16587,7 @@ A major mode to edit GNU ld script files
 ;;;***
 
 ;;;### (autoloads (ledit-from-lisp-mode ledit-mode) "ledit" "ledit.el"
-;;;;;;  (17383 24126))
+;;;;;;  (17383 32110))
 ;;; Generated autoloads from ledit.el
 
 (defconst ledit-save-files t "\
@@ -16394,7 +16621,7 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (life) "life" "play/life.el" (17382 1892))
+;;;### (autoloads (life) "life" "play/life.el" (17383 32182))
 ;;; Generated autoloads from play/life.el
 
 (autoload (quote life) "life" "\
@@ -16407,8 +16634,8 @@ generations (this defaults to 1).
 
 ;;;***
 
-;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (17410
-;;;;;;  23522))
+;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (17484
+;;;;;;  52424))
 ;;; Generated autoloads from loadhist.el
 
 (autoload (quote unload-feature) "loadhist" "\
@@ -16431,7 +16658,7 @@ such as redefining an Emacs function.
 ;;;***
 
 ;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches)
-;;;;;;  "locate" "locate.el" (17432 49887))
+;;;;;;  "locate" "locate.el" (17578 34772))
 ;;; Generated autoloads from locate.el
 
 (defvar locate-ls-subdir-switches "-al" "\
@@ -16478,7 +16705,7 @@ except that FILTER is not optional.
 
 ;;;***
 
-;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (17383 24126))
+;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (17494 22059))
 ;;; Generated autoloads from log-edit.el
 
 (autoload (quote log-edit) "log-edit" "\
@@ -16499,8 +16726,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" (17383
-;;;;;;  24126))
+;;;### (autoloads (log-view-mode) "log-view" "log-view.el" (17494
+;;;;;;  22059))
 ;;; Generated autoloads from log-view.el
 
 (autoload (quote log-view-mode) "log-view" "\
@@ -16510,8 +16737,8 @@ Major mode for browsing CVS log output.
 
 ;;;***
 
-;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (17383
-;;;;;;  24126))
+;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (17590
+;;;;;;  36099))
 ;;; Generated autoloads from longlines.el
 
 (autoload (quote longlines-mode) "longlines" "\
@@ -16533,7 +16760,7 @@ are indicated with a symbol.
 
 ;;;### (autoloads (print-region lpr-region print-buffer lpr-buffer
 ;;;;;;  lpr-command lpr-switches printer-name) "lpr" "lpr.el" (17383
-;;;;;;  24126))
+;;;;;;  32111))
 ;;; Generated autoloads from lpr.el
 
 (defvar lpr-windows-system (memq system-type (quote (emx win32 w32 mswindows ms-dos windows-nt))))
@@ -16627,7 +16854,7 @@ for further customization of the printer command.
 ;;;***
 
 ;;;### (autoloads (ls-lisp-support-shell-wildcards) "ls-lisp" "ls-lisp.el"
-;;;;;;  (17383 24126))
+;;;;;;  (17383 32111))
 ;;; Generated autoloads from ls-lisp.el
 
 (defvar ls-lisp-support-shell-wildcards t "\
@@ -16638,8 +16865,8 @@ Otherwise they are treated as Emacs regexps (for backward compatibility).")
 
 ;;;***
 
-;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17385
-;;;;;;  41891))
+;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17397
+;;;;;;  61548))
 ;;; Generated autoloads from calendar/lunar.el
 
 (autoload (quote phases-of-moon) "lunar" "\
@@ -16652,8 +16879,8 @@ This function is suitable for execution in a .emacs file.
 
 ;;;***
 
-;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17388
-;;;;;;  22062))
+;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17397
+;;;;;;  61570))
 ;;; Generated autoloads from progmodes/m4-mode.el
 
 (autoload (quote m4-mode) "m4-mode" "\
@@ -16665,7 +16892,7 @@ A major mode to edit m4 macro files.
 ;;;***
 
 ;;;### (autoloads (macroexpand-all) "macroexp" "emacs-lisp/macroexp.el"
-;;;;;;  (17383 16118))
+;;;;;;  (17383 32140))
 ;;; Generated autoloads from emacs-lisp/macroexp.el
 
 (autoload (quote macroexpand-all) "macroexp" "\
@@ -16679,7 +16906,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" (17383 24126))
+;;;;;;  name-last-kbd-macro) "macros" "macros.el" (17383 32112))
 ;;; Generated autoloads from macros.el
 
 (autoload (quote name-last-kbd-macro) "macros" "\
@@ -16768,7 +16995,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" (17383 16812))
+;;;;;;  "mail/mail-extr.el" (17383 32168))
 ;;; Generated autoloads from mail/mail-extr.el
 
 (autoload (quote mail-extract-address-components) "mail-extr" "\
@@ -16800,7 +17027,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"
-;;;;;;  (17383 16812))
+;;;;;;  (17383 32168))
 ;;; Generated autoloads from mail/mail-hist.el
 
 (autoload (quote mail-hist-define-keys) "mail-hist" "\
@@ -16832,7 +17059,7 @@ 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" (17383
-;;;;;;  16812))
+;;;;;;  32168))
 ;;; Generated autoloads from mail/mail-utils.el
 
 (defvar mail-use-rfc822 nil "\
@@ -16884,7 +17111,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" (17383 16812))
+;;;;;;  "mailabbrev" "mail/mailabbrev.el" (17383 32168))
 ;;; Generated autoloads from mail/mailabbrev.el
 
 (autoload (quote mail-abbrevs-setup) "mailabbrev" "\
@@ -16908,7 +17135,7 @@ 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" (17383
-;;;;;;  16812))
+;;;;;;  32169))
 ;;; Generated autoloads from mail/mailalias.el
 
 (defvar mail-complete-style (quote angles) "\
@@ -16954,7 +17181,7 @@ current header, calls `mail-complete-function' and passes prefix arg if any.
 ;;;***
 
 ;;;### (autoloads (mailclient-send-it) "mailclient" "mail/mailclient.el"
-;;;;;;  (17383 16812))
+;;;;;;  (17383 32169))
 ;;; Generated autoloads from mail/mailclient.el
 
 (autoload (quote mailclient-send-it) "mailclient" "\
@@ -16968,7 +17195,7 @@ The mail client is taken to be the handler of mailto URLs.
 
 ;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode
 ;;;;;;  makefile-gmake-mode makefile-automake-mode makefile-mode)
-;;;;;;  "make-mode" "progmodes/make-mode.el" (17388 22062))
+;;;;;;  "make-mode" "progmodes/make-mode.el" (17578 34779))
 ;;; Generated autoloads from progmodes/make-mode.el
 
 (autoload (quote makefile-mode) "make-mode" "\
@@ -16976,11 +17203,10 @@ Major mode for editing standard Makefiles.
 
 If you are editing a file for a different make, try one of the
 variants `makefile-automake-mode', `makefile-gmake-mode',
-`makefile-makepp-mode', `makefile-bsdmake-mode' or, 
-`makefile-imake-mode'All but the
-last should be correctly chosen based on the file name, except if
-it is *.mk.  This function ends by invoking the function(s)
-`makefile-mode-hook'.
+`makefile-makepp-mode', `makefile-bsdmake-mode' or,
+`makefile-imake-mode'.  All but the last should be correctly
+chosen based on the file name, except if it is *.mk.  This
+function ends by invoking the function(s) `makefile-mode-hook'.
 
 It is strongly recommended to use `font-lock-mode', because that
 provides additional parsing information.  This is used for
@@ -17087,7 +17313,7 @@ An adapted `makefile-mode' that knows about imake.
 ;;;***
 
 ;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (17383
-;;;;;;  24126))
+;;;;;;  32112))
 ;;; Generated autoloads from makesum.el
 
 (autoload (quote make-command-summary) "makesum" "\
@@ -17098,7 +17324,7 @@ Previous contents of that buffer are killed first.
 
 ;;;***
 
-;;;### (autoloads (man-follow man) "man" "man.el" (17383 24126))
+;;;### (autoloads (man-follow man) "man" "man.el" (17466 42706))
 ;;; Generated autoloads from man.el
 
 (defalias (quote manual-entry) (quote man))
@@ -17125,7 +17351,7 @@ Get a Un*x manual page of the item under point and put it in a buffer.
 
 ;;;***
 
-;;;### (autoloads (master-mode) "master" "master.el" (17148 25016))
+;;;### (autoloads (master-mode) "master" "master.el" (17161 57259))
 ;;; Generated autoloads from master.el
 
 (autoload (quote master-mode) "master" "\
@@ -17147,8 +17373,8 @@ yourself the value of `master-of' by calling `master-show-slave'.
 
 ;;;***
 
-;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17390
-;;;;;;  3585))
+;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17578
+;;;;;;  34772))
 ;;; Generated autoloads from menu-bar.el
 
 (put (quote menu-bar-mode) (quote standard-value) (quote (t)))
@@ -17161,8 +17387,6 @@ use either \\[customize] or the function `menu-bar-mode'.")
 
 (custom-autoload (quote menu-bar-mode) "menu-bar")
 
-(put (quote menu-bar-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote menu-bar-mode) "menu-bar" "\
 Toggle display of a menu bar on each frame.
 This command applies to all frames that exist and frames to be
@@ -17184,7 +17408,7 @@ turn on menu bars; otherwise, turn off menu bars.
 ;;;;;;  message-cite-function message-yank-prefix message-citation-line-function
 ;;;;;;  message-send-mail-function message-user-organization-file
 ;;;;;;  message-signature-separator message-from-style) "message"
-;;;;;;  "gnus/message.el" (17437 45960))
+;;;;;;  "gnus/message.el" (17578 34776))
 ;;; Generated autoloads from gnus/message.el
 
 (defvar message-from-style (quote default) "\
@@ -17438,7 +17662,7 @@ which specify the range to operate on.
 ;;;***
 
 ;;;### (autoloads (metapost-mode metafont-mode) "meta-mode" "progmodes/meta-mode.el"
-;;;;;;  (17388 22062))
+;;;;;;  (17397 61570))
 ;;; Generated autoloads from progmodes/meta-mode.el
 
 (autoload (quote metafont-mode) "meta-mode" "\
@@ -17465,7 +17689,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"
-;;;;;;  (17383 16812))
+;;;;;;  (17383 32169))
 ;;; Generated autoloads from mail/metamail.el
 
 (autoload (quote metamail-interpret-header) "metamail" "\
@@ -17510,7 +17734,7 @@ redisplayed as output is inserted.
 
 ;;;### (autoloads (mh-fully-kill-draft mh-send-letter mh-user-agent-compose
 ;;;;;;  mh-smail-batch mh-smail-other-window mh-smail) "mh-comp"
-;;;;;;  "mh-e/mh-comp.el" (17437 48486))
+;;;;;;  "mh-e/mh-comp.el" (17578 34777))
 ;;; Generated autoloads from mh-e/mh-comp.el
 
 (autoload (quote mh-smail) "mh-comp" "\
@@ -17597,7 +17821,7 @@ delete the draft message.
 
 ;;;***
 
-;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (17448 13451))
+;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (17578 34777))
 ;;; Generated autoloads from mh-e/mh-e.el
 
 (put (quote mh-progs) (quote risky-local-variable) t)
@@ -17614,7 +17838,7 @@ Display version information about MH-E and the MH mail handling system.
 ;;;***
 
 ;;;### (autoloads (mh-folder-mode mh-nmail mh-rmail) "mh-folder"
-;;;;;;  "mh-e/mh-folder.el" (17432 18686))
+;;;;;;  "mh-e/mh-folder.el" (17484 52433))
 ;;; Generated autoloads from mh-e/mh-folder.el
 
 (autoload (quote mh-rmail) "mh-folder" "\
@@ -17696,7 +17920,7 @@ perform the operation on all messages in that region.
 ;;;***
 
 ;;;### (autoloads (midnight-delay-set clean-buffer-list) "midnight"
-;;;;;;  "midnight.el" (17416 12817))
+;;;;;;  "midnight.el" (17420 36079))
 ;;; Generated autoloads from midnight.el
 
 (autoload (quote clean-buffer-list) "midnight" "\
@@ -17723,7 +17947,7 @@ to its second argument TM.
 ;;;***
 
 ;;;### (autoloads (minibuffer-electric-default-mode) "minibuf-eldef"
-;;;;;;  "minibuf-eldef.el" (17383 24126))
+;;;;;;  "minibuf-eldef.el" (17383 32112))
 ;;; Generated autoloads from minibuf-eldef.el
 
 (defvar minibuffer-electric-default-mode nil "\
@@ -17734,8 +17958,6 @@ use either \\[customize] or the function `minibuffer-electric-default-mode'.")
 
 (custom-autoload (quote minibuffer-electric-default-mode) "minibuf-eldef")
 
-(put (quote minibuffer-electric-default-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote minibuffer-electric-default-mode) "minibuf-eldef" "\
 Toggle Minibuffer Electric Default mode.
 When active, minibuffer prompts that show a default value only show the
@@ -17752,7 +17974,7 @@ Returns non-nil if the new state is enabled.
 ;;;***
 
 ;;;### (autoloads (mixal-mode) "mixal-mode" "progmodes/mixal-mode.el"
-;;;;;;  (17388 22062))
+;;;;;;  (17397 61570))
 ;;; Generated autoloads from progmodes/mixal-mode.el
 
 (autoload (quote mixal-mode) "mixal-mode" "\
@@ -17767,7 +17989,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"
-;;;;;;  (17339 56590))
+;;;;;;  (17346 38886))
 ;;; Generated autoloads from language/mlm-util.el
 
 (autoload (quote malayalam-compose-region) "mlm-util" "\
@@ -17790,7 +18012,7 @@ PATTERN regexp.
 ;;;***
 
 ;;;### (autoloads (mm-inline-external-body mm-extern-cache-contents)
-;;;;;;  "mm-extern" "gnus/mm-extern.el" (17437 45960))
+;;;;;;  "mm-extern" "gnus/mm-extern.el" (17484 52431))
 ;;; Generated autoloads from gnus/mm-extern.el
 
 (autoload (quote mm-extern-cache-contents) "mm-extern" "\
@@ -17809,7 +18031,7 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing.
 ;;;***
 
 ;;;### (autoloads (mm-inline-partial) "mm-partial" "gnus/mm-partial.el"
-;;;;;;  (17382 1052))
+;;;;;;  (17383 32161))
 ;;; Generated autoloads from gnus/mm-partial.el
 
 (autoload (quote mm-inline-partial) "mm-partial" "\
@@ -17823,7 +18045,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" (17382 1052))
+;;;;;;  "mm-url" "gnus/mm-url.el" (17383 32161))
 ;;; Generated autoloads from gnus/mm-url.el
 
 (autoload (quote mm-url-insert-file-contents) "mm-url" "\
@@ -17840,7 +18062,7 @@ Insert file contents of URL using `mm-url-program'.
 ;;;***
 
 ;;;### (autoloads (mm-uu-dissect-text-parts mm-uu-dissect) "mm-uu"
-;;;;;;  "gnus/mm-uu.el" (17437 45961))
+;;;;;;  "gnus/mm-uu.el" (17498 30595))
 ;;; Generated autoloads from gnus/mm-uu.el
 
 (autoload (quote mm-uu-dissect) "mm-uu" "\
@@ -17860,7 +18082,7 @@ Assume text has been decoded if DECODED is non-nil.
 ;;;***
 
 ;;;### (autoloads (mml1991-sign mml1991-encrypt) "mml1991" "gnus/mml1991.el"
-;;;;;;  (17388 8140))
+;;;;;;  (17494 22066))
 ;;; Generated autoloads from gnus/mml1991.el
 
 (autoload (quote mml1991-encrypt) "mml1991" "\
@@ -17877,7 +18099,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" (17388 8140))
+;;;;;;  "mml2015" "gnus/mml2015.el" (17498 30595))
 ;;; Generated autoloads from gnus/mml2015.el
 
 (autoload (quote mml2015-decrypt) "mml2015" "\
@@ -17918,7 +18140,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (modula-2-mode) "modula2" "progmodes/modula2.el"
-;;;;;;  (17276 44726))
+;;;;;;  (17281 61308))
 ;;; Generated autoloads from progmodes/modula2.el
 
 (autoload (quote modula-2-mode) "modula2" "\
@@ -17950,7 +18172,7 @@ followed by the first character of the construct.
 ;;;***
 
 ;;;### (autoloads (unmorse-region morse-region) "morse" "play/morse.el"
-;;;;;;  (17382 1892))
+;;;;;;  (17383 32182))
 ;;; Generated autoloads from play/morse.el
 
 (autoload (quote morse-region) "morse" "\
@@ -17966,7 +18188,7 @@ Convert morse coded text in region to ordinary ASCII text.
 ;;;***
 
 ;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (17383
-;;;;;;  24126))
+;;;;;;  32113))
 ;;; Generated autoloads from mouse-sel.el
 
 (defvar mouse-sel-mode nil "\
@@ -17977,8 +18199,6 @@ use either \\[customize] or the function `mouse-sel-mode'.")
 
 (custom-autoload (quote mouse-sel-mode) "mouse-sel")
 
-(put (quote mouse-sel-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote mouse-sel-mode) "mouse-sel" "\
 Toggle Mouse Sel mode.
 With prefix ARG, turn Mouse Sel mode on if and only if ARG is positive.
@@ -18019,7 +18239,7 @@ primary selection and region.
 
 ;;;***
 
-;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (17382 1892))
+;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (17383 32183))
 ;;; Generated autoloads from play/mpuz.el
 
 (autoload (quote mpuz) "mpuz" "\
@@ -18029,7 +18249,7 @@ Multiplication puzzle with GNU Emacs.
 
 ;;;***
 
-;;;### (autoloads (msb-mode) "msb" "msb.el" (17383 24126))
+;;;### (autoloads (msb-mode) "msb" "msb.el" (17578 34773))
 ;;; Generated autoloads from msb.el
 
 (defvar msb-mode nil "\
@@ -18040,8 +18260,6 @@ use either \\[customize] or the function `msb-mode'.")
 
 (custom-autoload (quote msb-mode) "msb")
 
-(put (quote msb-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote msb-mode) "msb" "\
 Toggle Msb mode.
 With arg, turn Msb mode on if and only if arg is positive.
@@ -18057,7 +18275,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"
-;;;;;;  (17239 32324))
+;;;;;;  (17210 47738))
 ;;; 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))))) "\
@@ -18230,7 +18448,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" (17102 18726))
+;;;;;;  "mule-util" "international/mule-util.el" (17097 33522))
 ;;; Generated autoloads from international/mule-util.el
 
 (autoload (quote string-to-sequence) "mule-util" "\
@@ -18359,7 +18577,7 @@ basis, this may not be accurate.
 ;;;***
 
 ;;;### (autoloads (mwheel-install mouse-wheel-mode) "mwheel" "mwheel.el"
-;;;;;;  (17393 49300))
+;;;;;;  (17494 22018))
 ;;; Generated autoloads from mwheel.el
 
 (defvar mouse-wheel-mode nil "\
@@ -18370,8 +18588,6 @@ use either \\[customize] or the function `mouse-wheel-mode'.")
 
 (custom-autoload (quote mouse-wheel-mode) "mwheel")
 
-(put (quote mouse-wheel-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote mouse-wheel-mode) "mwheel" "\
 Toggle mouse wheel support.
 With prefix argument ARG, turn on if positive, otherwise off.
@@ -18389,7 +18605,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" (17383 13296))
+;;;;;;  "net-utils" "net/net-utils.el" (17383 32176))
 ;;; Generated autoloads from net/net-utils.el
 
 (autoload (quote traceroute) "net-utils" "\
@@ -18485,7 +18701,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"
-;;;;;;  (17379 35991))
+;;;;;;  (17515 39526))
 ;;; Generated autoloads from newcomment.el
 
 (defalias (quote indent-for-comment) (quote comment-indent))
@@ -18511,21 +18727,26 @@ Comments might be indented to a value smaller than this in order
 not to go beyond `comment-fill-column'.")
 
 (custom-autoload (quote comment-column) "newcomment")
+(put 'comment-column 'safe-local-variable 'integerp)
 
 (defvar comment-start nil "\
 *String to insert to start a new comment, or nil if no comment syntax.")
+(put 'comment-start 'safe-local-variable 'string-or-null-p)
 
 (defvar comment-start-skip nil "\
 *Regexp to match the start of a comment plus everything up to its body.
 If there are any \\(...\\) pairs, the comment delimiter text is held to begin
 at the place matched by the close of the first pair.")
+(put 'comment-start-skip 'safe-local-variable 'string-or-null-p)
 
 (defvar comment-end-skip nil "\
 Regexp to match the end of a comment plus everything up to its body.")
+(put 'comment-end-skip 'safe-local-variable 'string-or-null-p)
 
 (defvar comment-end "" "\
 *String to insert to end a new comment.
 Should be an empty string if comments are terminated by end-of-line.")
+(put 'comment-end 'safe-local-variable 'string-or-null-p)
 
 (defvar comment-indent-function (quote comment-indent-default) "\
 Function to compute desired indentation for a comment.
@@ -18669,7 +18890,7 @@ unless optional argument SOFT is non-nil.
 
 ;;;### (autoloads (newsticker-show-news newsticker-start-ticker newsticker-start
 ;;;;;;  newsticker-ticker-running-p newsticker-running-p) "newsticker"
-;;;;;;  "net/newsticker.el" (17383 13296))
+;;;;;;  "net/newsticker.el" (17383 32176))
 ;;; Generated autoloads from net/newsticker.el
 
 (autoload (quote newsticker-running-p) "newsticker" "\
@@ -18711,7 +18932,7 @@ Switch to newsticker buffer.  You may want to bind this to a key.
 ;;;***
 
 ;;;### (autoloads (nndiary-generate-nov-databases) "nndiary" "gnus/nndiary.el"
-;;;;;;  (17382 1052))
+;;;;;;  (17383 32162))
 ;;; Generated autoloads from gnus/nndiary.el
 
 (autoload (quote nndiary-generate-nov-databases) "nndiary" "\
@@ -18721,8 +18942,8 @@ Generate NOV databases in all nndiary directories.
 
 ;;;***
 
-;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (17382
-;;;;;;  1052))
+;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (17383
+;;;;;;  32162))
 ;;; Generated autoloads from gnus/nndoc.el
 
 (autoload (quote nndoc-add-type) "nndoc" "\
@@ -18737,7 +18958,7 @@ symbol in the alist.
 ;;;***
 
 ;;;### (autoloads (nnfolder-generate-active-file) "nnfolder" "gnus/nnfolder.el"
-;;;;;;  (17388 8140))
+;;;;;;  (17397 61556))
 ;;; Generated autoloads from gnus/nnfolder.el
 
 (autoload (quote nnfolder-generate-active-file) "nnfolder" "\
@@ -18749,7 +18970,7 @@ This command does not work if you use short group names.
 ;;;***
 
 ;;;### (autoloads (nnkiboze-generate-groups) "nnkiboze" "gnus/nnkiboze.el"
-;;;;;;  (17382 1052))
+;;;;;;  (17383 32163))
 ;;; Generated autoloads from gnus/nnkiboze.el
 
 (autoload (quote nnkiboze-generate-groups) "nnkiboze" "\
@@ -18761,7 +18982,7 @@ Finds out what articles are to be part of the nnkiboze groups.
 ;;;***
 
 ;;;### (autoloads (nnml-generate-nov-databases) "nnml" "gnus/nnml.el"
-;;;;;;  (17382 1052))
+;;;;;;  (17383 32164))
 ;;; Generated autoloads from gnus/nnml.el
 
 (autoload (quote nnml-generate-nov-databases) "nnml" "\
@@ -18772,7 +18993,7 @@ Generate NOV databases in all nnml directories.
 ;;;***
 
 ;;;### (autoloads (nnsoup-revert-variables nnsoup-set-variables nnsoup-pack-replies)
-;;;;;;  "nnsoup" "gnus/nnsoup.el" (17382 1052))
+;;;;;;  "nnsoup" "gnus/nnsoup.el" (17383 32164))
 ;;; Generated autoloads from gnus/nnsoup.el
 
 (autoload (quote nnsoup-pack-replies) "nnsoup" "\
@@ -18793,7 +19014,7 @@ Revert posting and mailing methods to the standard Emacs methods.
 ;;;***
 
 ;;;### (autoloads (disable-command enable-command disabled-command-function)
-;;;;;;  "novice" "novice.el" (17383 24126))
+;;;;;;  "novice" "novice.el" (17383 32114))
 ;;; Generated autoloads from novice.el
 
 (defvar disabled-command-function (quote disabled-command-function) "\
@@ -18826,7 +19047,7 @@ to future sessions.
 ;;;***
 
 ;;;### (autoloads (nroff-mode) "nroff-mode" "textmodes/nroff-mode.el"
-;;;;;;  (17383 55314))
+;;;;;;  (17383 55266))
 ;;; Generated autoloads from textmodes/nroff-mode.el
 
 (autoload (quote nroff-mode) "nroff-mode" "\
@@ -18841,7 +19062,7 @@ closing requests for requests that are used in matched pairs.
 ;;;***
 
 ;;;### (autoloads (octave-help) "octave-hlp" "progmodes/octave-hlp.el"
-;;;;;;  (17388 22062))
+;;;;;;  (17397 61570))
 ;;; Generated autoloads from progmodes/octave-hlp.el
 
 (autoload (quote octave-help) "octave-hlp" "\
@@ -18855,7 +19076,7 @@ If KEY is not a string, prompt for it with completion.
 ;;;***
 
 ;;;### (autoloads (inferior-octave) "octave-inf" "progmodes/octave-inf.el"
-;;;;;;  (17388 22062))
+;;;;;;  (17582 29242))
 ;;; Generated autoloads from progmodes/octave-inf.el
 
 (autoload (quote inferior-octave) "octave-inf" "\
@@ -18878,7 +19099,7 @@ startup file, `~/.emacs-octave'.
 ;;;***
 
 ;;;### (autoloads (octave-mode) "octave-mod" "progmodes/octave-mod.el"
-;;;;;;  (17426 59496))
+;;;;;;  (17432 37364))
 ;;; Generated autoloads from progmodes/octave-mod.el
 
 (autoload (quote octave-mode) "octave-mod" "\
@@ -18977,7 +19198,7 @@ including a reproducible test case and send the message.
 ;;;***
 
 ;;;### (autoloads (edit-options list-options) "options" "obsolete/options.el"
-;;;;;;  (17382 34311))
+;;;;;;  (17578 34778))
 ;;; Generated autoloads from obsolete/options.el
 
 (autoload (quote list-options) "options" "\
@@ -18999,10 +19220,11 @@ The Custom feature is intended to make this obsolete.
 ;;;***
 
 ;;;### (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-export-icalendar-this-file orgtbl-mode turn-on-orgtbl
+;;;;;;  org-remember-handler org-remember-apply-template org-remember-annotation
 ;;;;;;  org-store-link org-tags-view org-diary org-todo-list org-agenda-list
-;;;;;;  org-agenda org-agenda-mode org-mode) "org" "textmodes/org.el"
-;;;;;;  (17447 40021))
+;;;;;;  org-agenda org-global-cycle org-cycle org-mode) "org" "textmodes/org.el"
+;;;;;;  (17582 28847))
 ;;; Generated autoloads from textmodes/org.el
 
 (autoload (quote org-mode) "org" "\
@@ -19026,14 +19248,40 @@ The following commands are available:
 
 \(fn)" t nil)
 
-(autoload (quote org-agenda-mode) "org" "\
-Mode for time-sorted view on action items in Org-mode files.
+(autoload (quote org-cycle) "org" "\
+Visibility cycling for Org-mode.
 
-The following commands are available:
+- When this function is called with a prefix argument, rotate the entire
+  buffer through 3 states (global cycling)
+  1. OVERVIEW: Show only top-level headlines.
+  2. CONTENTS: Show all headlines of all levels, but no body text.
+  3. SHOW ALL: Show everything.
 
-\\{org-agenda-mode-map}
+- When point is at the beginning of a headline, rotate the subtree started
+  by this line through 3 different states (local cycling)
+  1. FOLDED:   Only the main headline is shown.
+  2. CHILDREN: The main headline and the direct children are shown.
+               From this state, you can move to one of the children
+               and zoom in further.
+  3. SUBTREE:  Show the entire subtree, including body text.
 
-\(fn)" t nil)
+- When there is a numeric prefix, go up to a heading with level ARG, do
+  a `show-subtree' and return to the previous cursor position.  If ARG
+  is negative, go up that many levels.
+
+- When point is not at the beginning of a headline, execute
+  `indent-relative', like TAB normally does.  See the option
+  `org-cycle-emulate-tab' for details.
+
+- Special case: if point is the the beginning of the buffer and there is
+  no headline in line 1, this function will act as if called with prefix arg.
+
+\(fn &optional ARG)" t nil)
+
+(autoload (quote org-global-cycle) "org" "\
+Cycle the global visibility.  For details see `org-cycle'.
+
+\(fn &optional ARG)" t nil)
 
 (autoload (quote org-agenda) "org" "\
 Dispatch agenda commands to collect entries to the agenda buffer.
@@ -19152,6 +19400,13 @@ conventions in Org-mode.  This function returns such a link.
 
 \(fn)" nil nil)
 
+(autoload (quote org-remember-apply-template) "org" "\
+Initialize *remember* buffer with template, invoke `org-mode'.
+This function should be placed into `remember-mode-hook' and in fact requires
+to be run from that hook to fucntion properly.
+
+\(fn)" nil nil)
+
 (autoload (quote org-remember-handler) "org" "\
 Store stuff from remember.el into an org file.
 First prompts for an org file.  If the user just presses return, the value
@@ -19198,6 +19453,13 @@ The `org-mode' table editor as a minor mode for use in other modes.
 
 \(fn &optional ARG)" t nil)
 
+(autoload (quote org-export-icalendar-this-file) "org" "\
+Export current file as an iCalendar file.
+The 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-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
@@ -19214,8 +19476,9 @@ The file is stored under the name `org-combined-agenda-icalendar-file'.
 ;;;***
 
 ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el"
-;;;;;;  (17419 48998))
+;;;;;;  (17515 39526))
 ;;; Generated autoloads from outline.el
+(put 'outline-regexp 'safe-local-variable 'string-or-null-p)
 
 (autoload (quote outline-mode) "outline" "\
 Set major mode for editing outlines with selective display.
@@ -19269,7 +19532,22 @@ See the command `outline-mode' for more information on this mode.
 
 ;;;***
 
-;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17383 24126))
+;;;### (autoloads nil "paragraphs" "textmodes/paragraphs.el" (17494
+;;;;;;  22070))
+;;; Generated autoloads from textmodes/paragraphs.el
+(put 'paragraph-start 'safe-local-variable 'stringp)
+(put 'paragraph-separate 'safe-local-variable 'stringp)
+(put 'sentence-end-double-space 'safe-local-variable 'booleanp)
+(put 'sentence-end-without-period 'safe-local-variable 'booleanp)
+(put 'sentence-end-without-space 'safe-local-variable 'stringp)
+(put 'sentence-end 'safe-local-variable 'string-or-null-p)
+(put 'sentence-end-base 'safe-local-variable 'stringp)
+(put 'page-delimiter 'safe-local-variable 'stringp)
+(put 'paragraph-ignore-fill-prefix 'safe-local-variable 'booleanp)
+
+;;;***
+
+;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17383 32114))
 ;;; Generated autoloads from paren.el
 
 (defvar show-paren-mode nil "\
@@ -19280,8 +19558,6 @@ use either \\[customize] or the function `show-paren-mode'.")
 
 (custom-autoload (quote show-paren-mode) "paren")
 
-(put (quote show-paren-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote show-paren-mode) "paren" "\
 Toggle Show Paren mode.
 With prefix ARG, turn Show Paren mode on if and only if ARG is positive.
@@ -19295,7 +19571,7 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time.
 ;;;***
 
 ;;;### (autoloads (parse-time-string) "parse-time" "calendar/parse-time.el"
-;;;;;;  (17385 41891))
+;;;;;;  (17397 61548))
 ;;; Generated autoloads from calendar/parse-time.el
 
 (autoload (quote parse-time-string) "parse-time" "\
@@ -19307,8 +19583,8 @@ unknown are returned as nil.
 
 ;;;***
 
-;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (17388
-;;;;;;  22062))
+;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (17397
+;;;;;;  61571))
 ;;; Generated autoloads from progmodes/pascal.el
 
 (autoload (quote pascal-mode) "pascal" "\
@@ -19361,7 +19637,7 @@ no args, if that value is non-nil.
 ;;;***
 
 ;;;### (autoloads (pc-bindings-mode) "pc-mode" "emulation/pc-mode.el"
-;;;;;;  (17383 13537))
+;;;;;;  (17383 32143))
 ;;; Generated autoloads from emulation/pc-mode.el
 
 (autoload (quote pc-bindings-mode) "pc-mode" "\
@@ -19379,7 +19655,7 @@ C-Escape does list-buffers.
 ;;;***
 
 ;;;### (autoloads (pc-selection-mode pc-selection-mode) "pc-select"
-;;;;;;  "emulation/pc-select.el" (17383 13537))
+;;;;;;  "emulation/pc-select.el" (17383 32143))
 ;;; Generated autoloads from emulation/pc-select.el
 
 (defvar pc-selection-mode nil "\
@@ -19390,8 +19666,6 @@ use either \\[customize] or the function `pc-selection-mode'.")
 
 (custom-autoload (quote pc-selection-mode) "pc-select")
 
-(put (quote pc-selection-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote pc-selection-mode) "pc-select" "\
 Change mark behavior to emulate Motif, MAC or MS-Windows cut and paste style.
 
@@ -19457,7 +19731,7 @@ you must modify it using \\[customize] or \\[pc-selection-mode].")
 ;;;***
 
 ;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (17383
-;;;;;;  24126))
+;;;;;;  32114))
 ;;; Generated autoloads from pcmpl-cvs.el
 
 (autoload (quote pcomplete/cvs) "pcmpl-cvs" "\
@@ -19468,7 +19742,7 @@ Completion rules for the `cvs' command.
 ;;;***
 
 ;;;### (autoloads (pcomplete/tar pcomplete/make pcomplete/bzip2 pcomplete/gzip)
-;;;;;;  "pcmpl-gnu" "pcmpl-gnu.el" (17383 24126))
+;;;;;;  "pcmpl-gnu" "pcmpl-gnu.el" (17383 32115))
 ;;; Generated autoloads from pcmpl-gnu.el
 
 (autoload (quote pcomplete/gzip) "pcmpl-gnu" "\
@@ -19496,7 +19770,7 @@ Completion for the GNU tar utility.
 ;;;***
 
 ;;;### (autoloads (pcomplete/mount pcomplete/umount pcomplete/kill)
-;;;;;;  "pcmpl-linux" "pcmpl-linux.el" (17383 24126))
+;;;;;;  "pcmpl-linux" "pcmpl-linux.el" (17383 32115))
 ;;; Generated autoloads from pcmpl-linux.el
 
 (autoload (quote pcomplete/kill) "pcmpl-linux" "\
@@ -19517,7 +19791,7 @@ Completion for GNU/Linux `mount'.
 ;;;***
 
 ;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (17383
-;;;;;;  24126))
+;;;;;;  32115))
 ;;; Generated autoloads from pcmpl-rpm.el
 
 (autoload (quote pcomplete/rpm) "pcmpl-rpm" "\
@@ -19533,7 +19807,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" (17383 24126))
+;;;;;;  "pcmpl-unix" "pcmpl-unix.el" (17383 32115))
 ;;; Generated autoloads from pcmpl-unix.el
 
 (autoload (quote pcomplete/cd) "pcmpl-unix" "\
@@ -19579,8 +19853,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" (17383
-;;;;;;  24126))
+;;;;;;  pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (17457
+;;;;;;  37500))
 ;;; Generated autoloads from pcomplete.el
 
 (autoload (quote pcomplete) "pcomplete" "\
@@ -19639,7 +19913,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" (17383 24126))
+;;;;;;  "pcvs.el" (17578 34773))
 ;;; Generated autoloads from pcvs.el
 
 (autoload (quote cvs-checkout) "pcvs" "\
@@ -19716,7 +19990,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d
 
 ;;;***
 
-;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (17383 24126))
+;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (17582 32791))
 ;;; 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)))
@@ -19724,7 +19998,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d
 ;;;***
 
 ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el"
-;;;;;;  (17388 22062))
+;;;;;;  (17498 30499))
 ;;; Generated autoloads from progmodes/perl-mode.el
 
 (autoload (quote perl-mode) "perl-mode" "\
@@ -19782,7 +20056,7 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'.
 ;;;### (autoloads (pgg-snarf-keys pgg-snarf-keys-region pgg-insert-key
 ;;;;;;  pgg-verify pgg-verify-region pgg-sign pgg-sign-region pgg-decrypt
 ;;;;;;  pgg-decrypt-region pgg-encrypt pgg-encrypt-symmetric pgg-encrypt-symmetric-region
-;;;;;;  pgg-encrypt-region) "pgg" "pgg.el" (17383 24126))
+;;;;;;  pgg-encrypt-region) "pgg" "pgg.el" (17383 32117))
 ;;; Generated autoloads from pgg.el
 
 (autoload (quote pgg-encrypt-region) "pgg" "\
@@ -19915,8 +20189,19 @@ Import public keys in the current buffer.
 
 ;;;***
 
+;;;### (autoloads (pgg-gpg-symmetric-key-p) "pgg-gpg" "pgg-gpg.el"
+;;;;;;  (17466 42707))
+;;; Generated autoloads from pgg-gpg.el
+
+(autoload (quote pgg-gpg-symmetric-key-p) "pgg-gpg" "\
+True if decoded armor MESSAGE-KEYS has symmetric encryption indicator.
+
+\(fn MESSAGE-KEYS)" nil nil)
+
+;;;***
+
 ;;;### (autoloads (picture-mode) "picture" "textmodes/picture.el"
-;;;;;;  (17383 15658))
+;;;;;;  (17466 42716))
 ;;; Generated autoloads from textmodes/picture.el
 
 (autoload (quote picture-mode) "picture" "\
@@ -19997,7 +20282,7 @@ they are not defaultly assigned to keys.
 ;;;***
 
 ;;;### (autoloads (po-find-file-coding-system) "po" "textmodes/po.el"
-;;;;;;  (17383 15658))
+;;;;;;  (17578 34780))
 ;;; Generated autoloads from textmodes/po.el
 
 (autoload (quote po-find-file-coding-system) "po" "\
@@ -20008,7 +20293,7 @@ Called through `file-coding-system-alist', before the file is visited for real.
 
 ;;;***
 
-;;;### (autoloads (pong) "pong" "play/pong.el" (17382 1892))
+;;;### (autoloads (pong) "pong" "play/pong.el" (17578 34778))
 ;;; Generated autoloads from play/pong.el
 
 (autoload (quote pong) "pong" "\
@@ -20025,7 +20310,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" (17383 16118))
+;;;;;;  pp-to-string) "pp" "emacs-lisp/pp.el" (17383 32140))
 ;;; Generated autoloads from emacs-lisp/pp.el
 
 (autoload (quote pp-to-string) "pp" "\
@@ -20083,7 +20368,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"
-;;;;;;  (17383 24126))
+;;;;;;  (17383 32117))
 ;;; Generated autoloads from printing.el
 
 (autoload (quote pr-interface) "printing" "\
@@ -20671,7 +20956,7 @@ are both set to t.
 ;;;***
 
 ;;;### (autoloads (run-prolog prolog-mode) "prolog" "progmodes/prolog.el"
-;;;;;;  (17388 22062))
+;;;;;;  (17397 61571))
 ;;; Generated autoloads from progmodes/prolog.el
 
 (autoload (quote prolog-mode) "prolog" "\
@@ -20691,7 +20976,7 @@ Run an inferior Prolog process, input and output via buffer *prolog*.
 
 ;;;***
 
-;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17383 24126))
+;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17383 32117))
 ;;; 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"))) "\
@@ -20700,8 +20985,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").")
 
 ;;;***
 
-;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (17388
-;;;;;;  22062))
+;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (17397
+;;;;;;  61571))
 ;;; Generated autoloads from progmodes/ps-mode.el
 
 (autoload (quote ps-mode) "ps-mode" "\
@@ -20750,7 +21035,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" (17383 24126))
+;;;;;;  "ps-mule" "ps-mule.el" (17383 32117))
 ;;; Generated autoloads from ps-mule.el
 
 (defvar ps-multibyte-buffer nil "\
@@ -20872,7 +21157,7 @@ Not documented
 ;;;;;;  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" (17383
-;;;;;;  24126))
+;;;;;;  32118))
 ;;; 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")) "\
@@ -21069,7 +21354,7 @@ If EXTENSION is any other symbol, it is ignored.
 ;;;***
 
 ;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el"
-;;;;;;  (17388 22062))
+;;;;;;  (17487 53546))
 ;;; Generated autoloads from progmodes/python.el
 
 (add-to-list (quote interpreter-mode-alist) (quote ("jython" . jython-mode)))
@@ -21133,7 +21418,7 @@ Runs `jython-mode-hook' after `python-mode-hook'.
 ;;;***
 
 ;;;### (autoloads (quoted-printable-decode-region) "qp" "gnus/qp.el"
-;;;;;;  (17406 37716))
+;;;;;;  (17420 36085))
 ;;; Generated autoloads from gnus/qp.el
 
 (autoload (quote quoted-printable-decode-region) "qp" "\
@@ -21156,7 +21441,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" (17250 28362))
+;;;;;;  "international/quail.el" (17304 24770))
 ;;; Generated autoloads from international/quail.el
 
 (autoload (quote quail-title) "quail" "\
@@ -21388,7 +21673,7 @@ 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" (17383
-;;;;;;  13296))
+;;;;;;  32176))
 ;;; 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" "\
@@ -21460,7 +21745,7 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'.
 ;;;***
 
 ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc"
-;;;;;;  "net/rcirc.el" (17448 18873))
+;;;;;;  "net/rcirc.el" (17578 34778))
 ;;; Generated autoloads from net/rcirc.el
 
 (autoload (quote rcirc) "rcirc" "\
@@ -21484,8 +21769,6 @@ use either \\[customize] or the function `rcirc-track-minor-mode'.")
 
 (custom-autoload (quote rcirc-track-minor-mode) "rcirc")
 
-(put (quote rcirc-track-minor-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote rcirc-track-minor-mode) "rcirc" "\
 Global minor mode for tracking activity in rcirc buffers.
 
@@ -21493,8 +21776,8 @@ Global minor mode for tracking activity in rcirc buffers.
 
 ;;;***
 
-;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (17383
-;;;;;;  13296))
+;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (17578
+;;;;;;  34778))
 ;;; Generated autoloads from net/rcompile.el
 
 (autoload (quote remote-compile) "rcompile" "\
@@ -21506,7 +21789,7 @@ See \\[compile].
 ;;;***
 
 ;;;### (autoloads (re-builder) "re-builder" "emacs-lisp/re-builder.el"
-;;;;;;  (17383 16118))
+;;;;;;  (17503 24307))
 ;;; Generated autoloads from emacs-lisp/re-builder.el
 
 (defalias (quote regexp-builder) (quote re-builder))
@@ -21518,7 +21801,7 @@ Construct a regexp interactively.
 
 ;;;***
 
-;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17383 24126))
+;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17457 37500))
 ;;; Generated autoloads from recentf.el
 
 (defvar recentf-mode nil "\
@@ -21529,8 +21812,6 @@ use either \\[customize] or the function `recentf-mode'.")
 
 (custom-autoload (quote recentf-mode) "recentf")
 
-(put (quote recentf-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote recentf-mode) "recentf" "\
 Toggle recentf mode.
 With prefix argument ARG, turn on if positive, otherwise off.
@@ -21548,8 +21829,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" (17383
-;;;;;;  24127))
+;;;;;;  delete-rectangle move-to-column-force) "rect" "rect.el" (17466
+;;;;;;  42707))
 ;;; Generated autoloads from rect.el
 
 (autoload (quote move-to-column-force) "rect" "\
@@ -21598,6 +21879,12 @@ You might prefer to use `delete-extract-rectangle' from a program.
 With a prefix (or a FILL) argument, also fill lines where nothing has to be
 deleted.
 
+If the buffer is read-only, Emacs will beep and refrain from deleting
+the rectangle, but put it in the kill ring anyway.  This means that
+you can use this command to copy text from a read-only buffer.
+\(If the variable `kill-read-only-ok' is non-nil, then this won't
+even beep.)
+
 \(fn START END &optional FILL)" t nil)
 
 (autoload (quote yank-rectangle) "rect" "\
@@ -21672,7 +21959,7 @@ rectangle which were empty.
 ;;;***
 
 ;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (17383
-;;;;;;  15658))
+;;;;;;  32188))
 ;;; Generated autoloads from textmodes/refill.el
 
 (autoload (quote refill-mode) "refill" "\
@@ -21688,7 +21975,7 @@ refilling if they would cause auto-filling.
 ;;;***
 
 ;;;### (autoloads (reftex-reset-scanning-information reftex-mode
-;;;;;;  turn-on-reftex) "reftex" "textmodes/reftex.el" (17404 10043))
+;;;;;;  turn-on-reftex) "reftex" "textmodes/reftex.el" (17404 53188))
 ;;; Generated autoloads from textmodes/reftex.el
 
 (autoload (quote turn-on-reftex) "reftex" "\
@@ -21738,7 +22025,7 @@ This enforces rescanning the buffer on next use.
 ;;;***
 
 ;;;### (autoloads (reftex-citation) "reftex-cite" "textmodes/reftex-cite.el"
-;;;;;;  (17404 4365))
+;;;;;;  (17404 53187))
 ;;; Generated autoloads from textmodes/reftex-cite.el
 
 (autoload (quote reftex-citation) "reftex-cite" "\
@@ -21768,7 +22055,7 @@ While entering the regexp, completion on knows citation keys is possible.
 ;;;***
 
 ;;;### (autoloads (reftex-isearch-minor-mode) "reftex-global" "textmodes/reftex-global.el"
-;;;;;;  (17404 4365))
+;;;;;;  (17404 53187))
 ;;; Generated autoloads from textmodes/reftex-global.el
 
 (autoload (quote reftex-isearch-minor-mode) "reftex-global" "\
@@ -21785,7 +22072,7 @@ With no argument, this command toggles
 ;;;***
 
 ;;;### (autoloads (reftex-index-phrases-mode) "reftex-index" "textmodes/reftex-index.el"
-;;;;;;  (17413 18835))
+;;;;;;  (17420 36092))
 ;;; Generated autoloads from textmodes/reftex-index.el
 
 (autoload (quote reftex-index-phrases-mode) "reftex-index" "\
@@ -21818,7 +22105,7 @@ Here are all local bindings.
 ;;;***
 
 ;;;### (autoloads (reftex-all-document-files) "reftex-parse" "textmodes/reftex-parse.el"
-;;;;;;  (17404 4365))
+;;;;;;  (17404 53187))
 ;;; Generated autoloads from textmodes/reftex-parse.el
 
 (autoload (quote reftex-all-document-files) "reftex-parse" "\
@@ -21830,8 +22117,18 @@ of master file.
 
 ;;;***
 
+;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (17494
+;;;;;;  22070))
+;;; Generated autoloads from textmodes/reftex-vars.el
+(put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x))))
+(put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x))))
+(put 'reftex-level-indent 'safe-local-variable 'integerp)
+(put 'reftex-guess-label-type 'safe-local-variable (lambda (x) (memq x '(nil t))))
+
+;;;***
+
 ;;;### (autoloads (regexp-opt-depth regexp-opt) "regexp-opt" "emacs-lisp/regexp-opt.el"
-;;;;;;  (17383 16119))
+;;;;;;  (17383 32141))
 ;;; Generated autoloads from emacs-lisp/regexp-opt.el
 
 (autoload (quote regexp-opt) "regexp-opt" "\
@@ -21858,7 +22155,7 @@ This means the number of non-shy regexp grouping constructs
 
 ;;;***
 
-;;;### (autoloads (repeat) "repeat" "repeat.el" (17383 24127))
+;;;### (autoloads (repeat) "repeat" "repeat.el" (17383 32118))
 ;;; Generated autoloads from repeat.el
 
 (autoload (quote repeat) "repeat" "\
@@ -21876,7 +22173,7 @@ can be modified by the global variable `repeat-on-final-keystroke'.
 ;;;***
 
 ;;;### (autoloads (reporter-submit-bug-report) "reporter" "mail/reporter.el"
-;;;;;;  (17383 16812))
+;;;;;;  (17383 32169))
 ;;; Generated autoloads from mail/reporter.el
 
 (autoload (quote reporter-submit-bug-report) "reporter" "\
@@ -21908,7 +22205,7 @@ mail-sending package is used for editing and sending the message.
 ;;;***
 
 ;;;### (autoloads (reposition-window) "reposition" "reposition.el"
-;;;;;;  (17383 24127))
+;;;;;;  (17383 32119))
 ;;; Generated autoloads from reposition.el
 
 (autoload (quote reposition-window) "reposition" "\
@@ -21936,7 +22233,7 @@ first comment line visible (if point is in a comment).
 ;;;***
 
 ;;;### (autoloads (resume-suspend-hook) "resume" "resume.el" (17383
-;;;;;;  24127))
+;;;;;;  32119))
 ;;; Generated autoloads from resume.el
 
 (autoload (quote resume-suspend-hook) "resume" "\
@@ -21947,7 +22244,7 @@ Clear out the file used for transmitting args when Emacs resumes.
 ;;;***
 
 ;;;### (autoloads (global-reveal-mode reveal-mode) "reveal" "reveal.el"
-;;;;;;  (17349 36484))
+;;;;;;  (17494 22060))
 ;;; Generated autoloads from reveal.el
 
 (autoload (quote reveal-mode) "reveal" "\
@@ -21968,8 +22265,6 @@ use either \\[customize] or the function `global-reveal-mode'.")
 
 (custom-autoload (quote global-reveal-mode) "reveal")
 
-(put (quote global-reveal-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote global-reveal-mode) "reveal" "\
 Toggle Reveal mode in all buffers on or off.
 Reveal mode renders invisible text around point visible again.
@@ -21983,7 +22278,7 @@ With zero or negative ARG turn mode off.
 ;;;***
 
 ;;;### (autoloads (make-ring ring-p) "ring" "emacs-lisp/ring.el"
-;;;;;;  (17383 16119))
+;;;;;;  (17383 32141))
 ;;; Generated autoloads from emacs-lisp/ring.el
 
 (autoload (quote ring-p) "ring" "\
@@ -21998,7 +22293,7 @@ Make a ring that can contain SIZE elements.
 
 ;;;***
 
-;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (17383 13296))
+;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (17383 32177))
 ;;; Generated autoloads from net/rlogin.el
  (add-hook 'same-window-regexps "^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)")
 
@@ -22049,8 +22344,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" (17445
-;;;;;;  10908))
+;;;;;;  rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17521
+;;;;;;  64538))
 ;;; Generated autoloads from mail/rmail.el
 
 (autoload (quote rmail-movemail-variant-p) "rmail" "\
@@ -22231,7 +22526,7 @@ If the variable `rmail-enable-mime' is non-nil, this variables is
 ignored, and all the decoding work is done by a feature specified by
 the variable `rmail-mime-feature'.")
 
-(defvar rmail-mime-charset-pattern "^content-type:[ ]*text/plain;[      \n]*charset=\"?\\([^    \n\";]+\\)\"?" "\
+(defvar rmail-mime-charset-pattern (concat "^content-type:[ ]*text/plain;" "\\(?:[      \n]*\\(?:format\\|delsp\\)=\"?[-a-z0-9]+\"?;\\)*" "[    \n]*charset=\"?\\([^    \n\";]+\\)\"?") "\
 Regexp to match MIME-charset specification in a header of message.
 The first parenthesized expression should match the MIME-charset name.")
 
@@ -22315,7 +22610,7 @@ Set PASSWORD to be used for retrieving mail from a POP or IMAP server.
 ;;;***
 
 ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "mail/rmailedit.el"
-;;;;;;  (17383 16812))
+;;;;;;  (17383 32170))
 ;;; Generated autoloads from mail/rmailedit.el
 
 (autoload (quote rmail-edit-current-message) "rmailedit" "\
@@ -22327,7 +22622,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" (17383 16812))
+;;;;;;  "mail/rmailkwd.el" (17383 32170))
 ;;; Generated autoloads from mail/rmailkwd.el
 
 (autoload (quote rmail-add-label) "rmailkwd" "\
@@ -22366,7 +22661,7 @@ With prefix argument N moves forward N messages with these labels.
 ;;;***
 
 ;;;### (autoloads (set-rmail-inbox-list) "rmailmsc" "mail/rmailmsc.el"
-;;;;;;  (17383 16812))
+;;;;;;  (17383 32170))
 ;;; Generated autoloads from mail/rmailmsc.el
 
 (autoload (quote set-rmail-inbox-list) "rmailmsc" "\
@@ -22380,7 +22675,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" (17383 16812))
+;;;;;;  "mail/rmailout.el" (17383 32170))
 ;;; Generated autoloads from mail/rmailout.el
 
 (defvar rmail-output-file-alist nil "\
@@ -22448,7 +22743,7 @@ 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" (17383
-;;;;;;  16812))
+;;;;;;  32170))
 ;;; Generated autoloads from mail/rmailsort.el
 
 (autoload (quote rmail-sort-by-date) "rmailsort" "\
@@ -22500,7 +22795,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" (17426 63564))
+;;;;;;  "rmailsum" "mail/rmailsum.el" (17432 37362))
 ;;; Generated autoloads from mail/rmailsum.el
 
 (defvar rmail-summary-scroll-between-messages t "\
@@ -22582,7 +22877,7 @@ Setting this variable has an effect only before reading a mail.")
 ;;;***
 
 ;;;### (autoloads (news-post-news) "rnewspost" "obsolete/rnewspost.el"
-;;;;;;  (17382 34311))
+;;;;;;  (17383 32180))
 ;;; Generated autoloads from obsolete/rnewspost.el
 
 (autoload (quote news-post-news) "rnewspost" "\
@@ -22595,7 +22890,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" (17383 24127))
+;;;;;;  rot13-string rot13) "rot13" "rot13.el" (17383 32119))
 ;;; Generated autoloads from rot13.el
 
 (autoload (quote rot13) "rot13" "\
@@ -22636,7 +22931,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"
-;;;;;;  (17382 34311))
+;;;;;;  (17383 32180))
 ;;; Generated autoloads from obsolete/rsz-mini.el
 
 (defvar resize-minibuffer-mode nil "\
@@ -22677,7 +22972,7 @@ This function is obsolete.
 ;;;***
 
 ;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (17383
-;;;;;;  24127))
+;;;;;;  32119))
 ;;; Generated autoloads from ruler-mode.el
 
 (autoload (quote ruler-mode) "ruler-mode" "\
@@ -22687,8 +22982,8 @@ Display a ruler in the header line if ARG > 0.
 
 ;;;***
 
-;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (17416
-;;;;;;  13385))
+;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (17420
+;;;;;;  36082))
 ;;; Generated autoloads from emacs-lisp/rx.el
 
 (autoload (quote rx-to-string) "rx" "\
@@ -22996,7 +23291,7 @@ enclosed in `(and ...)'.
 ;;;***
 
 ;;;### (autoloads (savehist-mode savehist-mode) "savehist" "savehist.el"
-;;;;;;  (17383 24127))
+;;;;;;  (17457 37500))
 ;;; Generated autoloads from savehist.el
 
 (defvar savehist-mode nil "\
@@ -23022,7 +23317,7 @@ which is probably undesirable.
 ;;;***
 
 ;;;### (autoloads (dsssl-mode scheme-mode) "scheme" "progmodes/scheme.el"
-;;;;;;  (17388 22062))
+;;;;;;  (17397 61572))
 ;;; Generated autoloads from progmodes/scheme.el
 
 (autoload (quote scheme-mode) "scheme" "\
@@ -23064,7 +23359,7 @@ that variable's value is a string.
 ;;;***
 
 ;;;### (autoloads (gnus-score-mode) "score-mode" "gnus/score-mode.el"
-;;;;;;  (17382 1051))
+;;;;;;  (17383 32165))
 ;;; Generated autoloads from gnus/score-mode.el
 
 (autoload (quote gnus-score-mode) "score-mode" "\
@@ -23077,8 +23372,8 @@ This mode is an extended emacs-lisp mode.
 
 ;;;***
 
-;;;### (autoloads (scribe-mode) "scribe" "obsolete/scribe.el" (17382
-;;;;;;  34311))
+;;;### (autoloads (scribe-mode) "scribe" "obsolete/scribe.el" (17383
+;;;;;;  32180))
 ;;; Generated autoloads from obsolete/scribe.el
 
 (autoload (quote scribe-mode) "scribe" "\
@@ -23103,7 +23398,7 @@ Interesting variables:
 ;;;***
 
 ;;;### (autoloads (scroll-all-mode) "scroll-all" "scroll-all.el"
-;;;;;;  (17383 24127))
+;;;;;;  (17383 32120))
 ;;; Generated autoloads from scroll-all.el
 
 (defvar scroll-all-mode nil "\
@@ -23114,8 +23409,6 @@ use either \\[customize] or the function `scroll-all-mode'.")
 
 (custom-autoload (quote scroll-all-mode) "scroll-all")
 
-(put (quote scroll-all-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote scroll-all-mode) "scroll-all" "\
 Toggle Scroll-All minor mode.
 With ARG, turn Scroll-All minor mode on if ARG is positive, off otherwise.
@@ -23127,7 +23420,7 @@ apply to all visible windows in the same frame.
 ;;;***
 
 ;;;### (autoloads (scroll-lock-mode) "scroll-lock" "scroll-lock.el"
-;;;;;;  (17383 24127))
+;;;;;;  (17383 32120))
 ;;; Generated autoloads from scroll-lock.el
 
 (autoload (quote scroll-lock-mode) "scroll-lock" "\
@@ -23149,7 +23442,7 @@ during scrolling.
 ;;;;;;  mail-alias-file mail-default-reply-to mail-archive-file-name
 ;;;;;;  mail-header-separator send-mail-function mail-interactive
 ;;;;;;  mail-self-blind mail-specify-envelope-from mail-from-style)
-;;;;;;  "sendmail" "mail/sendmail.el" (17383 16812))
+;;;;;;  "sendmail" "mail/sendmail.el" (17578 34777))
 ;;; Generated autoloads from mail/sendmail.el
 
 (defvar mail-from-style (quote angles) "\
@@ -23450,7 +23743,7 @@ Like `mail' command, but display mail buffer in another frame.
 ;;;***
 
 ;;;### (autoloads (server-mode server-start) "server" "server.el"
-;;;;;;  (17417 47894))
+;;;;;;  (17582 28846))
 ;;; Generated autoloads from server.el
 
 (autoload (quote server-start) "server" "\
@@ -23472,8 +23765,6 @@ use either \\[customize] or the function `server-mode'.")
 
 (custom-autoload (quote server-mode) "server")
 
-(put (quote server-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote server-mode) "server" "\
 Toggle Server mode.
 With ARG, turn Server mode on if ARG is positive, off otherwise.
@@ -23484,7 +23775,7 @@ Server mode runs a process that accepts commands from the
 
 ;;;***
 
-;;;### (autoloads (ses-mode) "ses" "ses.el" (17365 22702))
+;;;### (autoloads (ses-mode) "ses" "ses.el" (17578 34773))
 ;;; Generated autoloads from ses.el
 
 (autoload (quote ses-mode) "ses" "\
@@ -23503,7 +23794,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"
-;;;;;;  (17383 15659))
+;;;;;;  (17521 64540))
 ;;; Generated autoloads from textmodes/sgml-mode.el
 
 (autoload (quote sgml-mode) "sgml-mode" "\
@@ -23516,8 +23807,8 @@ An argument of N to a tag-inserting command means to wrap it around
 the next N words.  In Transient Mark mode, when the mark is active,
 N defaults to -1, which means to wrap it around the current region.
 
-If you like upcased tags, put (setq sgml-transformation 'upcase) in
-your `.emacs' file.
+If you like upcased tags, put (setq sgml-transformation-function 'upcase)
+in your `.emacs' file.
 
 Use \\[sgml-validate] to validate your document with an SGML parser.
 
@@ -23571,8 +23862,9 @@ To work around that, do:
 ;;;***
 
 ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el"
-;;;;;;  (17408 15904))
+;;;;;;  (17590 26287))
 ;;; Generated autoloads from progmodes/sh-script.el
+(put 'sh-shell 'safe-local-variable 'symbolp)
 
 (autoload (quote sh-mode) "sh-script" "\
 Major mode for editing shell scripts.
@@ -23634,7 +23926,7 @@ with your script for an edit-interpret-debug cycle.
 
 ;;;***
 
-;;;### (autoloads (sha1) "sha1" "gnus/sha1.el" (17382 1051))
+;;;### (autoloads (sha1) "sha1" "gnus/sha1.el" (17383 32165))
 ;;; Generated autoloads from gnus/sha1.el
 
 (autoload (quote sha1) "sha1" "\
@@ -23649,7 +23941,7 @@ If BINARY is non-nil, return a string in binary form.
 ;;;***
 
 ;;;### (autoloads (list-load-path-shadows) "shadow" "emacs-lisp/shadow.el"
-;;;;;;  (17383 16119))
+;;;;;;  (17383 32141))
 ;;; Generated autoloads from emacs-lisp/shadow.el
 
 (autoload (quote list-load-path-shadows) "shadow" "\
@@ -23697,7 +23989,7 @@ 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" (17383
-;;;;;;  24127))
+;;;;;;  32120))
 ;;; Generated autoloads from shadowfile.el
 
 (autoload (quote shadow-define-cluster) "shadowfile" "\
@@ -23736,7 +24028,7 @@ Set up file shadowing.
 ;;;***
 
 ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el"
-;;;;;;  (17383 24127))
+;;;;;;  (17582 28833))
 ;;; Generated autoloads from shell.el
 
 (defvar shell-dumb-shell-regexp "cmd\\(proxy\\)?\\.exe" "\
@@ -23783,7 +24075,7 @@ Otherwise, one argument `-i' is passed to the shell.
 ;;;***
 
 ;;;### (autoloads (sieve-upload-and-bury sieve-upload sieve-manage)
-;;;;;;  "sieve" "gnus/sieve.el" (17382 1051))
+;;;;;;  "sieve" "gnus/sieve.el" (17383 32166))
 ;;; Generated autoloads from gnus/sieve.el
 
 (autoload (quote sieve-manage) "sieve" "\
@@ -23804,7 +24096,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (sieve-mode) "sieve-mode" "gnus/sieve-mode.el"
-;;;;;;  (17382 1051))
+;;;;;;  (17383 32166))
 ;;; Generated autoloads from gnus/sieve-mode.el
 
 (autoload (quote sieve-mode) "sieve-mode" "\
@@ -23819,8 +24111,14 @@ Turning on Sieve mode runs `sieve-mode-hook'.
 
 ;;;***
 
-;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17388
-;;;;;;  22062))
+;;;### (autoloads nil "simple" "simple.el" (17590 36099))
+;;; Generated autoloads from simple.el
+(put 'fill-prefix 'safe-local-variable 'string-or-null-p)
+
+;;;***
+
+;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17397
+;;;;;;  61572))
 ;;; Generated autoloads from progmodes/simula.el
 
 (autoload (quote simula-mode) "simula" "\
@@ -23869,10 +24167,10 @@ with no arguments, if that value is non-nil.
 ;;;***
 
 ;;;### (autoloads (skeleton-pair-insert-maybe skeleton-insert skeleton-proxy-new
-;;;;;;  define-skeleton) "skeleton" "skeleton.el" (17383 24127))
+;;;;;;  define-skeleton) "skeleton" "skeleton.el" (17521 64537))
 ;;; Generated autoloads from skeleton.el
 
-(defvar skeleton-filter (quote identity) "\
+(defvar skeleton-filter-function (quote identity) "\
 Function for transforming a skeleton proxy's aliases' variable value.")
 
 (autoload (quote define-skeleton) "skeleton" "\
@@ -23916,7 +24214,7 @@ SKELETON is made up as (INTERACTOR ELEMENT ...).  INTERACTOR may be nil if
 not needed, a prompt-string or an expression for complex read functions.
 
 If ELEMENT is a string or a character it gets inserted (see also
-`skeleton-transformation').  Other possibilities are:
+`skeleton-transformation-function').  Other possibilities are:
 
         \\n     go to next line and indent according to mode
         _       interesting point, interregion here
@@ -23966,7 +24264,7 @@ Insert the character you type ARG times.
 With no ARG, if `skeleton-pair' is non-nil, pairing can occur.  If the region
 is visible the pair is wrapped around it depending on `skeleton-autowrap'.
 Else, if `skeleton-pair-on-word' is non-nil or we are not before or inside a
-word, and if `skeleton-pair-filter' returns nil, pairing is performed.
+word, and if `skeleton-pair-filter-function' returns nil, pairing is performed.
 Pairing is also prohibited if we are right after a quoting character
 such as backslash.
 
@@ -23979,7 +24277,7 @@ symmetrical ones, and the same character twice for the others.
 ;;;***
 
 ;;;### (autoloads (smerge-mode smerge-ediff) "smerge-mode" "smerge-mode.el"
-;;;;;;  (17383 24127))
+;;;;;;  (17494 22060))
 ;;; Generated autoloads from smerge-mode.el
 
 (autoload (quote smerge-ediff) "smerge-mode" "\
@@ -23998,7 +24296,7 @@ Minor mode to simplify editing output from the diff3 program.
 ;;;***
 
 ;;;### (autoloads (smiley-buffer smiley-region) "smiley" "gnus/smiley.el"
-;;;;;;  (17440 25582))
+;;;;;;  (17457 37503))
 ;;; Generated autoloads from gnus/smiley.el
 
 (autoload (quote smiley-region) "smiley" "\
@@ -24016,7 +24314,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" (17383 16812))
+;;;;;;  "mail/smtpmail.el" (17383 32170))
 ;;; Generated autoloads from mail/smtpmail.el
 
 (autoload (quote smtpmail-send-it) "smtpmail" "\
@@ -24031,7 +24329,7 @@ Send mail that was queued as a result of setting `smtpmail-queue-mail'.
 
 ;;;***
 
-;;;### (autoloads (snake) "snake" "play/snake.el" (17382 1892))
+;;;### (autoloads (snake) "snake" "play/snake.el" (17383 32183))
 ;;; Generated autoloads from play/snake.el
 
 (autoload (quote snake) "snake" "\
@@ -24055,7 +24353,7 @@ Snake mode keybindings:
 ;;;***
 
 ;;;### (autoloads (snmpv2-mode snmp-mode) "snmp-mode" "net/snmp-mode.el"
-;;;;;;  (17383 13296))
+;;;;;;  (17383 32177))
 ;;; Generated autoloads from net/snmp-mode.el
 
 (autoload (quote snmp-mode) "snmp-mode" "\
@@ -24086,7 +24384,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" (17385 41891))
+;;;;;;  "solar" "calendar/solar.el" (17397 61548))
 ;;; 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 ")"))) "\
@@ -24157,8 +24455,8 @@ Requires floating point.
 
 ;;;***
 
-;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (17382
-;;;;;;  1892))
+;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (17383
+;;;;;;  32183))
 ;;; Generated autoloads from play/solitaire.el
 
 (autoload (quote solitaire) "solitaire" "\
@@ -24235,7 +24533,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" (17434 1454))
+;;;;;;  sort-lines sort-subr) "sort" "sort.el" (17466 42707))
 ;;; Generated autoloads from sort.el
 
 (autoload (quote sort-subr) "sort" "\
@@ -24377,8 +24675,8 @@ From a program takes two point or marker arguments, BEG and END.
 
 ;;;***
 
-;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17440
-;;;;;;  25582))
+;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17457
+;;;;;;  37503))
 ;;; Generated autoloads from gnus/spam.el
 
 (autoload (quote spam-initialize) "spam" "\
@@ -24390,7 +24688,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" (17385 29998))
+;;;;;;  "gnus/spam-report.el" (17397 61557))
 ;;; Generated autoloads from gnus/spam-report.el
 
 (autoload (quote spam-report-process-queue) "spam-report" "\
@@ -24433,7 +24731,7 @@ Spam reports will be queued with the method used when
 ;;;***
 
 ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar"
-;;;;;;  "speedbar.el" (17412 50667))
+;;;;;;  "speedbar.el" (17578 34773))
 ;;; Generated autoloads from speedbar.el
 
 (defalias (quote speedbar) (quote speedbar-frame-mode))
@@ -24458,7 +24756,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" (17383 15659))
+;;;;;;  "spell" "textmodes/spell.el" (17383 32189))
 ;;; Generated autoloads from textmodes/spell.el
 
 (put (quote spell-filter) (quote risky-local-variable) t)
@@ -24494,8 +24792,8 @@ Check spelling of string supplied as argument.
 
 ;;;***
 
-;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (17382
-;;;;;;  1892))
+;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (17383
+;;;;;;  32183))
 ;;; Generated autoloads from play/spook.el
 
 (autoload (quote spook) "spook" "\
@@ -24513,8 +24811,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" (17388
-;;;;;;  22062))
+;;;;;;  sql-add-product-keywords) "sql" "progmodes/sql.el" (17397
+;;;;;;  61572))
 ;;; Generated autoloads from progmodes/sql.el
 
 (autoload (quote sql-add-product-keywords) "sql" "\
@@ -24946,7 +25244,7 @@ input.  See `sql-interactive-mode'.
 ;;;;;;  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" (17383
-;;;;;;  24127))
+;;;;;;  32122))
 ;;; Generated autoloads from strokes.el
 
 (autoload (quote strokes-global-set-stroke) "strokes" "\
@@ -25023,8 +25321,6 @@ use either \\[customize] or the function `strokes-mode'.")
 
 (custom-autoload (quote strokes-mode) "strokes")
 
-(put (quote strokes-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote strokes-mode) "strokes" "\
 Toggle Strokes global minor mode.\\<strokes-mode-map>
 With ARG, turn strokes on if and only if ARG is positive.
@@ -25057,7 +25353,7 @@ Read a complex stroke and insert its glyph into the current buffer.
 ;;;***
 
 ;;;### (autoloads (studlify-buffer studlify-word studlify-region)
-;;;;;;  "studly" "play/studly.el" (17075 55479))
+;;;;;;  "studly" "play/studly.el" (16221 3781))
 ;;; Generated autoloads from play/studly.el
 
 (autoload (quote studlify-region) "studly" "\
@@ -25077,7 +25373,7 @@ Studlify-case the current buffer.
 
 ;;;***
 
-;;;### (autoloads (locate-library) "subr" "subr.el" (17410 23908))
+;;;### (autoloads (locate-library) "subr" "subr.el" (17590 36099))
 ;;; Generated autoloads from subr.el
 
 (autoload (quote locate-library) "subr" "\
@@ -25099,7 +25395,7 @@ and the file name is displayed in the echo area.
 ;;;***
 
 ;;;### (autoloads (sc-cite-original) "supercite" "mail/supercite.el"
-;;;;;;  (17383 16812))
+;;;;;;  (17383 32170))
 ;;; Generated autoloads from mail/supercite.el
 
 (autoload (quote sc-cite-original) "supercite" "\
@@ -25142,8 +25438,6 @@ use either \\[customize] or the function `t-mouse-mode'.")
 
 (custom-autoload (quote t-mouse-mode) "t-mouse")
 
-(put (quote t-mouse-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote t-mouse-mode) "t-mouse" "\
 Toggle t-mouse mode.
 With prefix arg, turn t-mouse mode on iff arg is positive.
@@ -25154,7 +25448,7 @@ Turn it on to use emacs mouse commands, and off to use t-mouse commands.
 
 ;;;***
 
-;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (17383 24127))
+;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (17383 32122))
 ;;; Generated autoloads from tabify.el
 
 (autoload (quote untabify) "tabify" "\
@@ -25189,7 +25483,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" (17378 11759))
+;;;;;;  "table" "textmodes/table.el" (17578 34780))
 ;;; Generated autoloads from textmodes/table.el
 
 (defvar table-cell-map-hook nil "\
@@ -25777,7 +26071,7 @@ converts a table into plain text without frames.  It is a companion to
 
 ;;;***
 
-;;;### (autoloads (talk-connect) "talk" "talk.el" (17383 24127))
+;;;### (autoloads (talk-connect) "talk" "talk.el" (17383 32122))
 ;;; Generated autoloads from talk.el
 
 (autoload (quote talk-connect) "talk" "\
@@ -25787,7 +26081,7 @@ Connect to display DISPLAY for the Emacs talk group.
 
 ;;;***
 
-;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (17383 24127))
+;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (17578 34774))
 ;;; Generated autoloads from tar-mode.el
 
 (autoload (quote tar-mode) "tar-mode" "\
@@ -25811,7 +26105,7 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'.
 ;;;***
 
 ;;;### (autoloads (tcl-help-on-word inferior-tcl tcl-mode) "tcl"
-;;;;;;  "progmodes/tcl.el" (17348 7449))
+;;;;;;  "progmodes/tcl.el" (17484 52437))
 ;;; Generated autoloads from progmodes/tcl.el
 
 (autoload (quote tcl-mode) "tcl" "\
@@ -25862,7 +26156,7 @@ Prefix argument means invert sense of `tcl-use-smart-word-finder'.
 
 ;;;***
 
-;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (17383 13296))
+;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (17383 32177))
 ;;; Generated autoloads from net/telnet.el
  (add-hook 'same-window-regexps "\\*telnet-.*\\*\\(\\|<[0-9]+>\\)")
 
@@ -25889,8 +26183,8 @@ Normally input is edited in Emacs and sent a line at a time.
 
 ;;;***
 
-;;;### (autoloads (ansi-term term make-term) "term" "term.el" (17354
-;;;;;;  44750))
+;;;### (autoloads (ansi-term term make-term) "term" "term.el" (17578
+;;;;;;  34774))
 ;;; Generated autoloads from term.el
 
 (autoload (quote make-term) "term" "\
@@ -25919,7 +26213,7 @@ Start a terminal-emulator in a new buffer.
 ;;;***
 
 ;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (17383
-;;;;;;  24127))
+;;;;;;  32123))
 ;;; Generated autoloads from terminal.el
 
 (autoload (quote terminal-emulator) "terminal" "\
@@ -25956,7 +26250,7 @@ subprocess started.
 ;;;***
 
 ;;;### (autoloads (testcover-this-defun) "testcover" "emacs-lisp/testcover.el"
-;;;;;;  (17383 16119))
+;;;;;;  (17383 32141))
 ;;; Generated autoloads from emacs-lisp/testcover.el
 
 (autoload (quote testcover-this-defun) "testcover" "\
@@ -25966,7 +26260,7 @@ Start coverage on function under point.
 
 ;;;***
 
-;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17382 1892))
+;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17383 32183))
 ;;; Generated autoloads from play/tetris.el
 
 (autoload (quote tetris) "tetris" "\
@@ -25997,7 +26291,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"
-;;;;;;  (17383 15659))
+;;;;;;  (17578 34780))
 ;;; Generated autoloads from textmodes/tex-mode.el
 
 (defvar tex-shell-file-name nil "\
@@ -26299,7 +26593,7 @@ Major mode to edit DocTeX files.
 ;;;***
 
 ;;;### (autoloads (texi2info texinfo-format-region texinfo-format-buffer)
-;;;;;;  "texinfmt" "textmodes/texinfmt.el" (17383 15659))
+;;;;;;  "texinfmt" "textmodes/texinfmt.el" (17590 36100))
 ;;; Generated autoloads from textmodes/texinfmt.el
 
 (autoload (quote texinfo-format-buffer) "texinfmt" "\
@@ -26339,7 +26633,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" (17383 15659))
+;;;;;;  "texinfo" "textmodes/texinfo.el" (17383 32190))
 ;;; Generated autoloads from textmodes/texinfo.el
 
 (defvar texinfo-open-quote "``" "\
@@ -26426,7 +26720,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"
-;;;;;;  (17185 27569))
+;;;;;;  (17171 19474))
 ;;; Generated autoloads from language/thai-util.el
 
 (autoload (quote thai-compose-region) "thai-util" "\
@@ -26470,11 +26764,11 @@ 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" (17383 24127))
+;;;;;;  "thingatpt" "thingatpt.el" (17582 28846))
 ;;; Generated autoloads from thingatpt.el
 
 (autoload (quote forward-thing) "thingatpt" "\
-Move forward to the end of the next THING.
+Move forward to the end of the Nth next THING.
 
 \(fn THING &optional N)" nil nil)
 
@@ -26527,7 +26821,7 @@ Not documented
 
 ;;;### (autoloads (thumbs-dired-setroot thumbs-dired-show thumbs-dired-show-marked
 ;;;;;;  thumbs-show-from-dir thumbs-find-thumb) "thumbs" "thumbs.el"
-;;;;;;  (17383 24127))
+;;;;;;  (17590 36099))
 ;;; Generated autoloads from thumbs.el
 
 (autoload (quote thumbs-find-thumb) "thumbs" "\
@@ -26566,7 +26860,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" (17102 18781))
+;;;;;;  "language/tibet-util.el" (17097 33527))
 ;;; Generated autoloads from language/tibet-util.el
 
 (autoload (quote tibetan-char-p) "tibet-util" "\
@@ -26645,7 +26939,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (tildify-buffer tildify-region) "tildify" "textmodes/tildify.el"
-;;;;;;  (17383 15659))
+;;;;;;  (17383 32190))
 ;;; Generated autoloads from textmodes/tildify.el
 
 (autoload (quote tildify-region) "tildify" "\
@@ -26669,7 +26963,7 @@ This function performs no refilling of the changed text.
 ;;;***
 
 ;;;### (autoloads (display-time-mode display-time display-time-day-and-date)
-;;;;;;  "time" "time.el" (17383 24127))
+;;;;;;  "time" "time.el" (17383 32124))
 ;;; Generated autoloads from time.el
 
 (defvar display-time-day-and-date nil "\
@@ -26694,8 +26988,6 @@ use either \\[customize] or the function `display-time-mode'.")
 
 (custom-autoload (quote display-time-mode) "time")
 
-(put (quote display-time-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote display-time-mode) "time" "\
 Toggle display of time, load level, and mail flag in mode lines.
 With a numeric arg, enable this display if arg is positive.
@@ -26712,8 +27004,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" (17385
-;;;;;;  41891))
+;;;;;;  date-to-time) "time-date" "calendar/time-date.el" (17397
+;;;;;;  61548))
 ;;; Generated autoloads from calendar/time-date.el
 
 (autoload (quote date-to-time) "time-date" "\
@@ -26799,8 +27091,15 @@ If DATE is malformed, return a time value of zeros.
 ;;;***
 
 ;;;### (autoloads (time-stamp-toggle-active time-stamp) "time-stamp"
-;;;;;;  "time-stamp.el" (17383 24127))
+;;;;;;  "time-stamp.el" (17487 53545))
 ;;; Generated autoloads from time-stamp.el
+(put 'time-stamp-format 'safe-local-variable 'stringp)
+(put 'time-stamp-line-limit 'safe-local-variable 'integerp)
+(put 'time-stamp-start 'safe-local-variable 'stringp)
+(put 'time-stamp-end 'safe-local-variable 'stringp)
+(put 'time-stamp-inserts-lines 'safe-local-variable 'symbolp)
+(put 'time-stamp-count 'safe-local-variable 'integerp)
+(put 'time-stamp-pattern 'safe-local-variable 'stringp)
 
 (autoload (quote time-stamp) "time-stamp" "\
 Update the time stamp string(s) in the buffer.
@@ -26835,7 +27134,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"
-;;;;;;  (17385 41891))
+;;;;;;  (17397 61548))
 ;;; Generated autoloads from calendar/timeclock.el
 
 (autoload (quote timeclock-modeline-display) "timeclock" "\
@@ -26936,7 +27235,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" (17383 16119))
+;;;;;;  "emacs-lisp/timer.el" (17383 32142))
 ;;; Generated autoloads from emacs-lisp/timer.el
 
 (defalias (quote disable-timeout) (quote cancel-timer))
@@ -27007,7 +27306,7 @@ be detected.
 ;;;***
 
 ;;;### (autoloads (batch-titdic-convert titdic-convert) "titdic-cnv"
-;;;;;;  "international/titdic-cnv.el" (17102 18762))
+;;;;;;  "international/titdic-cnv.el" (17106 41306))
 ;;; Generated autoloads from international/titdic-cnv.el
 
 (autoload (quote titdic-convert) "titdic-cnv" "\
@@ -27030,8 +27329,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" (17102
-;;;;;;  18782))
+;;;;;;  tamil-compose-region) "tml-util" "language/tml-util.el" (17097
+;;;;;;  33527))
 ;;; Generated autoloads from language/tml-util.el
 
 (autoload (quote tamil-compose-region) "tml-util" "\
@@ -27054,7 +27353,7 @@ PATTERN regexp.
 ;;;***
 
 ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm"
-;;;;;;  "tmm.el" (17383 24127))
+;;;;;;  "tmm.el" (17383 32124))
 ;;; Generated autoloads from tmm.el
  (define-key global-map "\M-`" 'tmm-menubar)
  (define-key global-map [f10] 'tmm-menubar)
@@ -27095,7 +27394,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" (17385 41891))
+;;;;;;  "todo-mode" "calendar/todo-mode.el" (17397 61548))
 ;;; Generated autoloads from calendar/todo-mode.el
 
 (autoload (quote todo-add-category) "todo-mode" "\
@@ -27156,7 +27455,7 @@ Show TODO list.
 
 ;;;### (autoloads (tool-bar-local-item-from-menu tool-bar-add-item-from-menu
 ;;;;;;  tool-bar-local-item tool-bar-add-item) "tool-bar" "tool-bar.el"
-;;;;;;  (17383 24127))
+;;;;;;  (17498 30594))
 ;;; Generated autoloads from tool-bar.el
 
 (put (quote tool-bar-mode) (quote standard-value) (quote (t)))
@@ -27223,7 +27522,7 @@ holds a keymap.
 ;;;***
 
 ;;;### (autoloads (tpu-edt-on tpu-edt-mode) "tpu-edt" "emulation/tpu-edt.el"
-;;;;;;  (17383 13537))
+;;;;;;  (17383 32144))
 ;;; Generated autoloads from emulation/tpu-edt.el
 
 (defvar tpu-edt-mode nil "\
@@ -27234,8 +27533,6 @@ use either \\[customize] or the function `tpu-edt-mode'.")
 
 (custom-autoload (quote tpu-edt-mode) "tpu-edt")
 
-(put (quote tpu-edt-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote tpu-edt-mode) "tpu-edt" "\
 TPU/edt emulation.
 
@@ -27251,7 +27548,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" (17383 13537))
+;;;;;;  "tpu-extras" "emulation/tpu-extras.el" (17383 32144))
 ;;; Generated autoloads from emulation/tpu-extras.el
 
 (autoload (quote tpu-set-scroll-margins) "tpu-extras" "\
@@ -27271,7 +27568,7 @@ Constrain the cursor to the flow of the text.
 
 ;;;***
 
-;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (17383 16119))
+;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (17484 52427))
 ;;; Generated autoloads from emacs-lisp/tq.el
 
 (autoload (quote tq-create) "tq" "\
@@ -27285,7 +27582,7 @@ to a tcp server on another machine.
 ;;;***
 
 ;;;### (autoloads (trace-function-background trace-function trace-buffer)
-;;;;;;  "trace" "emacs-lisp/trace.el" (17383 16119))
+;;;;;;  "trace" "emacs-lisp/trace.el" (17383 32142))
 ;;; Generated autoloads from emacs-lisp/trace.el
 
 (defvar trace-buffer "*trace-output*" "\
@@ -27316,10 +27613,10 @@ the window or buffer configuration at all.
 
 ;;;***
 
-;;;### (autoloads (tramp-unload-tramp tramp-unload-file-name-handler-alist
-;;;;;;  tramp-completion-file-name-handler tramp-file-name-handler
-;;;;;;  tramp-completion-file-name-regexp tramp-file-name-regexp)
-;;;;;;  "tramp" "net/tramp.el" (17391 39172))
+;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion
+;;;;;;  tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers
+;;;;;;  tramp-file-name-handler tramp-completion-file-name-regexp
+;;;;;;  tramp-file-name-regexp) "tramp" "net/tramp.el" (17578 34778))
 ;;; Generated autoloads from net/tramp.el
 
 (defvar tramp-unified-filenames (not (featurep (quote xemacs))) "\
@@ -27377,36 +27674,62 @@ Also see `tramp-file-name-structure'.")
 
 (custom-autoload (quote tramp-completion-file-name-regexp) "tramp")
 
+(defconst tramp-completion-file-name-handler-alist (quote ((file-name-all-completions . tramp-completion-handle-file-name-all-completions) (file-name-completion . tramp-completion-handle-file-name-completion))) "\
+Alist of completion handler functions.
+Used for file names matching `tramp-file-name-regexp'. Operations not
+mentioned here will be handled by `tramp-file-name-handler-alist' or the
+normal Emacs functions.")
+
+(defun tramp-run-real-handler (operation args) "\
+Invoke normal file name handler for OPERATION.
+First arg specifies the OPERATION, second arg is a list of arguments to
+pass to the OPERATION." (let* ((inhibit-file-name-handlers (\` (tramp-file-name-handler tramp-completion-file-name-handler cygwin-mount-name-hook-function cygwin-mount-map-drive-hook-function \, (and (eq inhibit-file-name-operation operation) inhibit-file-name-handlers)))) (inhibit-file-name-operation operation)) (apply operation args)))
+
+(defun tramp-completion-run-real-handler (operation args) "\
+Invoke `tramp-file-name-handler' for OPERATION.
+First arg specifies the OPERATION, second arg is a list of arguments to
+pass to the OPERATION." (let* ((inhibit-file-name-handlers (\` (tramp-completion-file-name-handler cygwin-mount-name-hook-function cygwin-mount-map-drive-hook-function \, (and (eq inhibit-file-name-operation operation) inhibit-file-name-handlers)))) (inhibit-file-name-operation operation)) (apply operation args)))
+
 (autoload (quote tramp-file-name-handler) "tramp" "\
 Invoke Tramp file name handler.
 Falls back to normal file name handler if no tramp file name handler exists.
 
 \(fn OPERATION &rest ARGS)" nil nil)
 
-(autoload (quote tramp-completion-file-name-handler) "tramp" "\
+(defun tramp-completion-file-name-handler (operation &rest args) "\
 Invoke tramp file name completion handler.
-Falls back to normal file name handler if no tramp file name handler exists.
+Falls back to normal file name handler if no tramp file name handler exists." (let ((fn (assoc operation tramp-completion-file-name-handler-alist))) (if fn (save-match-data (apply (cdr fn) args)) (tramp-completion-run-real-handler operation args))))
 
-\(fn OPERATION &rest ARGS)" nil nil)
+(defsubst tramp-register-file-name-handlers nil "\
+Add tramp file name handlers to `file-name-handler-alist'." (add-to-list (quote file-name-handler-alist) (cons tramp-file-name-regexp (quote tramp-file-name-handler))) (when (or partial-completion-mode (featurep (quote ido))) (add-to-list (quote file-name-handler-alist) (cons tramp-completion-file-name-regexp (quote tramp-completion-file-name-handler))) (put (quote tramp-completion-file-name-handler) (quote safe-magic) t)) (let ((jka (rassoc (quote jka-compr-handler) file-name-handler-alist))) (when jka (setq file-name-handler-alist (cons jka (delete jka file-name-handler-alist))))))
+(add-hook
+ 'after-init-hook
+ '(lambda () (tramp-register-file-name-handlers)))
 
-(put (quote tramp-completion-file-name-handler) (quote safe-magic) t)
-
-(add-to-list (quote file-name-handler-alist) (cons tramp-file-name-regexp (quote tramp-file-name-handler)))
-
-(autoload (quote tramp-unload-file-name-handler-alist) "tramp" "\
+(autoload (quote tramp-unload-file-name-handlers) "tramp" "\
 Not documented
 
 \(fn)" nil nil)
 
+(autoload (quote tramp-completion-handle-file-name-all-completions) "tramp" "\
+Like `file-name-all-completions' for partial tramp files.
+
+\(fn FILENAME DIRECTORY)" nil nil)
+
+(autoload (quote tramp-completion-handle-file-name-completion) "tramp" "\
+Like `file-name-completion' for tramp files.
+
+\(fn FILENAME DIRECTORY)" nil nil)
+
 (autoload (quote tramp-unload-tramp) "tramp" "\
-Not documented
+Discard Tramp from loading remote files.
 
 \(fn)" t nil)
 
 ;;;***
 
 ;;;### (autoloads (tramp-ftp-enable-ange-ftp) "tramp-ftp" "net/tramp-ftp.el"
-;;;;;;  (17364 3828))
+;;;;;;  (17365 2740))
 ;;; Generated autoloads from net/tramp-ftp.el
 
 (autoload (quote tramp-ftp-enable-ange-ftp) "tramp-ftp" "\
@@ -27417,12 +27740,12 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (tumme-mark-tagged-files tumme-dired-comment-files
-;;;;;;  tumme-display-dired-image tumme-dired-display-external tumme-display-thumb
+;;;;;;  tumme-dired-display-image tumme-dired-display-external tumme-display-thumb
 ;;;;;;  tumme-display-thumbs-append tumme-setup-dired-keybindings
-;;;;;;  tumme-jump-thumbnail-buffer tumme-tag-remove tumme-tag-files
-;;;;;;  tumme-display-thumbs tumme-dired-with-window-configuration
-;;;;;;  tumme-dired-insert-marked-thumbs) "tumme" "tumme.el" (17418
-;;;;;;  58118))
+;;;;;;  tumme-jump-thumbnail-buffer tumme-delete-tag tumme-tag-files
+;;;;;;  tumme-show-all-from-dir tumme-display-thumbs tumme-dired-with-window-configuration
+;;;;;;  tumme-dired-insert-marked-thumbs) "tumme" "tumme.el" (17590
+;;;;;;  36099))
 ;;; Generated autoloads from tumme.el
 
 (autoload (quote tumme-dired-insert-marked-thumbs) "tumme" "\
@@ -27464,7 +27787,22 @@ you have the dired buffer in the left window and the
 With optional argument APPEND, append thumbnail to thumbnail buffer
 instead of erasing it first.
 
-\(fn &optional ARG APPEND)" t nil)
+Option argument DO-NOT-POP controls if `pop-to-buffer' should be
+used or not.  If non-nil, use `display-buffer' instead of
+`pop-to-buffer'.  This is used from functions like
+`tumme-next-line-and-display' and
+`tumme-previous-line-and-display' where we do not want the
+thumbnail buffer to be selected.
+
+\(fn &optional ARG APPEND DO-NOT-POP)" t nil)
+
+(autoload (quote tumme-show-all-from-dir) "tumme" "\
+Make a preview buffer for all images in DIR and display it.
+If the number of files in DIR matching `image-file-name-regexp'
+exceeds `tumme-show-all-from-dir-max-files', a warning will be
+displayed.
+
+\(fn DIR)" t nil)
 
 (defalias (quote tumme) (quote tumme-show-all-from-dir))
 
@@ -27473,7 +27811,7 @@ Tag marked file(s) in dired.  With prefix ARG, tag file at point.
 
 \(fn ARG)" t nil)
 
-(autoload (quote tumme-tag-remove) "tumme" "\
+(autoload (quote tumme-delete-tag) "tumme" "\
 Remove tag for selected file(s).
 With prefix argument ARG, remove tag from file at point.
 
@@ -27506,7 +27844,7 @@ Display file at point using an external viewer.
 
 \(fn)" t nil)
 
-(autoload (quote tumme-display-dired-image) "tumme" "\
+(autoload (quote tumme-dired-display-image) "tumme" "\
 Display current image file.
 See documentation for `tumme-display-image' for more information.
 With prefix argument ARG, display image in its original size.
@@ -27531,7 +27869,7 @@ matching tags will be marked in the dired buffer.
 ;;;***
 
 ;;;### (autoloads (2C-split 2C-associate-buffer 2C-two-columns) "two-column"
-;;;;;;  "textmodes/two-column.el" (17383 15659))
+;;;;;;  "textmodes/two-column.el" (17383 32190))
 ;;; Generated autoloads from textmodes/two-column.el
  (autoload '2C-command "two-column" () t 'keymap)
  (global-set-key "\C-x6" '2C-command)
@@ -27582,7 +27920,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"
-;;;;;;  (17383 24127))
+;;;;;;  (17383 32124))
 ;;; Generated autoloads from type-break.el
 
 (defvar type-break-mode nil "\
@@ -27765,7 +28103,7 @@ FRAC should be the inverse of the fractional value; for example, a value of
 ;;;***
 
 ;;;### (autoloads (ununderline-region underline-region) "underline"
-;;;;;;  "textmodes/underline.el" (17383 15659))
+;;;;;;  "textmodes/underline.el" (17383 32191))
 ;;; Generated autoloads from textmodes/underline.el
 
 (autoload (quote underline-region) "underline" "\
@@ -27786,7 +28124,7 @@ which specify the range to operate on.
 ;;;***
 
 ;;;### (autoloads (unforward-rmail-message undigestify-rmail-message)
-;;;;;;  "undigest" "mail/undigest.el" (17383 16812))
+;;;;;;  "undigest" "mail/undigest.el" (17383 32171))
 ;;; Generated autoloads from mail/undigest.el
 
 (autoload (quote undigestify-rmail-message) "undigest" "\
@@ -27805,7 +28143,7 @@ following the containing message.
 ;;;***
 
 ;;;### (autoloads (unrmail batch-unrmail) "unrmail" "mail/unrmail.el"
-;;;;;;  (17383 16812))
+;;;;;;  (17383 32171))
 ;;; Generated autoloads from mail/unrmail.el
 
 (autoload (quote batch-unrmail) "unrmail" "\
@@ -27824,8 +28162,8 @@ Convert Rmail file FILE to system inbox format file TO-FILE.
 
 ;;;***
 
-;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (17403
-;;;;;;  28668))
+;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (17404
+;;;;;;  53185))
 ;;; Generated autoloads from emacs-lisp/unsafep.el
 
 (autoload (quote unsafep) "unsafep" "\
@@ -27838,7 +28176,7 @@ of symbols with local bindings.
 ;;;***
 
 ;;;### (autoloads (url-retrieve-synchronously url-retrieve) "url"
-;;;;;;  "url/url.el" (17402 14976))
+;;;;;;  "url/url.el" (17365 14342))
 ;;; Generated autoloads from url/url.el
 
 (autoload (quote url-retrieve) "url" "\
@@ -27868,7 +28206,7 @@ no further processing).  URL is either a string or a parsed URL.
 ;;;***
 
 ;;;### (autoloads (url-register-auth-scheme url-get-authentication)
-;;;;;;  "url-auth" "url/url-auth.el" (17382 34555))
+;;;;;;  "url-auth" "url/url-auth.el" (17383 32191))
 ;;; Generated autoloads from url/url-auth.el
 
 (autoload (quote url-get-authentication) "url-auth" "\
@@ -27910,8 +28248,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" (17337
-;;;;;;  11067))
+;;;;;;  url-store-in-cache) "url-cache" "url/url-cache.el" (17338
+;;;;;;  41822))
 ;;; Generated autoloads from url/url-cache.el
 
 (autoload (quote url-store-in-cache) "url-cache" "\
@@ -27936,7 +28274,7 @@ Return t iff a cached file has expired.
 
 ;;;***
 
-;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (17382 34555))
+;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (17383 32191))
 ;;; Generated autoloads from url/url-cid.el
 
 (autoload (quote url-cid) "url-cid" "\
@@ -27947,7 +28285,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (url-dav-vc-registered url-dav-supported-p) "url-dav"
-;;;;;;  "url/url-dav.el" (17382 34555))
+;;;;;;  "url/url-dav.el" (17383 32191))
 ;;; Generated autoloads from url/url-dav.el
 
 (autoload (quote url-dav-supported-p) "url-dav" "\
@@ -27962,8 +28300,8 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (url-file) "url-file" "url/url-file.el" (17382
-;;;;;;  34555))
+;;;### (autoloads (url-file) "url-file" "url/url-file.el" (17383
+;;;;;;  32191))
 ;;; Generated autoloads from url/url-file.el
 
 (autoload (quote url-file) "url-file" "\
@@ -27974,7 +28312,7 @@ Handle file: and ftp: URLs.
 ;;;***
 
 ;;;### (autoloads (url-open-stream url-gateway-nslookup-host) "url-gw"
-;;;;;;  "url/url-gw.el" (17382 34555))
+;;;;;;  "url/url-gw.el" (17487 55937))
 ;;; Generated autoloads from url/url-gw.el
 
 (autoload (quote url-gateway-nslookup-host) "url-gw" "\
@@ -27992,8 +28330,8 @@ Will not make a connection if `url-gateway-unplugged' is non-nil.
 ;;;***
 
 ;;;### (autoloads (url-insert-file-contents url-file-local-copy url-copy-file
-;;;;;;  url-handler-mode) "url-handlers" "url/url-handlers.el" (17337
-;;;;;;  11067))
+;;;;;;  url-handler-mode) "url-handlers" "url/url-handlers.el" (17457
+;;;;;;  37507))
 ;;; Generated autoloads from url/url-handlers.el
 
 (defvar url-handler-mode nil "\
@@ -28004,8 +28342,6 @@ use either \\[customize] or the function `url-handler-mode'.")
 
 (custom-autoload (quote url-handler-mode) "url-handlers")
 
-(put (quote url-handler-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote url-handler-mode) "url-handlers" "\
 Use URL to handle URL-like file names.
 
@@ -28038,7 +28374,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p
-;;;;;;  url-http) "url-http" "url/url-http.el" (17421 49420))
+;;;;;;  url-http) "url-http" "url/url-http.el" (17515 39530))
 ;;; Generated autoloads from url/url-http.el
 
 (autoload (quote url-http) "url-http" "\
@@ -28091,7 +28427,7 @@ p3p
 
 ;;;***
 
-;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (17448 18899))
+;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (17457 37507))
 ;;; Generated autoloads from url/url-irc.el
 
 (autoload (quote url-irc) "url-irc" "\
@@ -28101,8 +28437,8 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (17382
-;;;;;;  34555))
+;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (17383
+;;;;;;  32192))
 ;;; Generated autoloads from url/url-ldap.el
 
 (autoload (quote url-ldap) "url-ldap" "\
@@ -28116,7 +28452,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"
-;;;;;;  (17382 34555))
+;;;;;;  (17383 32192))
 ;;; Generated autoloads from url/url-mailto.el
 
 (autoload (quote url-mail) "url-mailto" "\
@@ -28132,7 +28468,7 @@ Handle the mailto: URL syntax.
 ;;;***
 
 ;;;### (autoloads (url-data url-generic-emulator-loader url-info
-;;;;;;  url-man) "url-misc" "url/url-misc.el" (17382 34555))
+;;;;;;  url-man) "url-misc" "url/url-misc.el" (17383 32192))
 ;;; Generated autoloads from url/url-misc.el
 
 (autoload (quote url-man) "url-misc" "\
@@ -28164,7 +28500,7 @@ Fetch a data URL (RFC 2397).
 ;;;***
 
 ;;;### (autoloads (url-snews url-news) "url-news" "url/url-news.el"
-;;;;;;  (17358 30050))
+;;;;;;  (17358 28606))
 ;;; Generated autoloads from url/url-news.el
 
 (autoload (quote url-news) "url-news" "\
@@ -28181,7 +28517,7 @@ Not documented
 
 ;;;### (autoloads (url-ns-user-pref url-ns-prefs isInNet isResolvable
 ;;;;;;  dnsResolve dnsDomainIs isPlainHostName) "url-ns" "url/url-ns.el"
-;;;;;;  (17382 34555))
+;;;;;;  (17383 32192))
 ;;; Generated autoloads from url/url-ns.el
 
 (autoload (quote isPlainHostName) "url-ns" "\
@@ -28222,7 +28558,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (url-generic-parse-url url-recreate-url) "url-parse"
-;;;;;;  "url/url-parse.el" (17382 34555))
+;;;;;;  "url/url-parse.el" (17383 32192))
 ;;; Generated autoloads from url/url-parse.el
 
 (autoload (quote url-recreate-url) "url-parse" "\
@@ -28240,7 +28576,7 @@ Format is:
 ;;;***
 
 ;;;### (autoloads (url-setup-privacy-info) "url-privacy" "url/url-privacy.el"
-;;;;;;  (17348 7449))
+;;;;;;  (17348 1513))
 ;;; Generated autoloads from url/url-privacy.el
 
 (autoload (quote url-setup-privacy-info) "url-privacy" "\
@@ -28256,7 +28592,7 @@ Setup variables that expose info about you and your system.
 ;;;;;;  url-strip-leading-spaces url-eat-trailing-space url-get-normalized-date
 ;;;;;;  url-lazy-message url-normalize-url url-insert-entities-in-string
 ;;;;;;  url-parse-args url-debug url-debug) "url-util" "url/url-util.el"
-;;;;;;  (17382 34555))
+;;;;;;  (17383 32193))
 ;;; Generated autoloads from url/url-util.el
 
 (defvar url-debug nil "\
@@ -28381,7 +28717,7 @@ This uses `url-current-object', set locally to the buffer.
 ;;;***
 
 ;;;### (autoloads (ask-user-about-supersession-threat ask-user-about-lock)
-;;;;;;  "userlock" "userlock.el" (17383 24127))
+;;;;;;  "userlock" "userlock.el" (17383 32125))
 ;;; Generated autoloads from userlock.el
 
 (autoload (quote ask-user-about-lock) "userlock" "\
@@ -28409,7 +28745,7 @@ The buffer in question is current when this function is called.
 
 ;;;***
 
-;;;### (autoloads nil "utf-7" "international/utf-7.el" (17245 4870))
+;;;### (autoloads nil "utf-7" "international/utf-7.el" (17246 18006))
 ;;; Generated autoloads from international/utf-7.el
 (autoload-coding-system 'utf-7 '(require 'utf-7))
 
@@ -28417,7 +28753,7 @@ The buffer in question is current when this function is called.
 
 ;;;### (autoloads (uudecode-decode-region uudecode-decode-region-internal
 ;;;;;;  uudecode-decode-region-external) "uudecode" "gnus/uudecode.el"
-;;;;;;  (17382 1051))
+;;;;;;  (17578 34777))
 ;;; Generated autoloads from gnus/uudecode.el
 
 (autoload (quote uudecode-decode-region-external) "uudecode" "\
@@ -28447,7 +28783,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" (17384 53717))
+;;;;;;  vc-checkin-hook vc-checkout-hook) "vc" "vc.el" (17590 36099))
 ;;; Generated autoloads from vc.el
 
 (defvar vc-checkout-hook nil "\
@@ -28735,7 +29071,7 @@ colors. `vc-annotate-background' specifies the background color.
 
 ;;;***
 
-;;;### (autoloads nil "vc-arch" "vc-arch.el" (17383 24127))
+;;;### (autoloads nil "vc-arch" "vc-arch.el" (17383 32125))
 ;;; Generated autoloads from vc-arch.el
  (defun vc-arch-registered (file)
   (if (vc-find-root file "{arch}/=tagging-method")
@@ -28745,7 +29081,7 @@ colors. `vc-annotate-background' specifies the background color.
 
 ;;;***
 
-;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (17383 24127))
+;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (17383 32125))
 ;;; Generated autoloads from vc-cvs.el
  (defun vc-cvs-registered (f)
   (when (file-readable-p (expand-file-name
@@ -28755,7 +29091,7 @@ colors. `vc-annotate-background' specifies the background color.
 
 ;;;***
 
-;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (17383 24127))
+;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (17383 32125))
 ;;; Generated autoloads from vc-mcvs.el
  (defun vc-mcvs-registered (file)
   (if (vc-find-root file "MCVS/CVS")
@@ -28766,7 +29102,7 @@ colors. `vc-annotate-background' specifies the background color.
 ;;;***
 
 ;;;### (autoloads (vc-rcs-master-templates) "vc-rcs" "vc-rcs.el"
-;;;;;;  (17383 24127))
+;;;;;;  (17383 32125))
 ;;; Generated autoloads from vc-rcs.el
 
 (defvar vc-rcs-master-templates (quote ("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\
@@ -28779,7 +29115,7 @@ For a description of possible values, see `vc-check-master-templates'.")
 ;;;***
 
 ;;;### (autoloads (vc-sccs-master-templates) "vc-sccs" "vc-sccs.el"
-;;;;;;  (17383 24127))
+;;;;;;  (17383 32126))
 ;;; Generated autoloads from vc-sccs.el
 
 (defvar vc-sccs-master-templates (quote ("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\
@@ -28796,7 +29132,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
 
 ;;;***
 
-;;;### (autoloads nil "vc-svn" "vc-svn.el" (17386 47924))
+;;;### (autoloads nil "vc-svn" "vc-svn.el" (17397 61543))
 ;;; Generated autoloads from vc-svn.el
  (defun vc-svn-registered (f)
   (when (file-readable-p (expand-file-name
@@ -28809,7 +29145,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
 ;;;***
 
 ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el"
-;;;;;;  (17388 22062))
+;;;;;;  (17503 24309))
 ;;; Generated autoloads from progmodes/vhdl-mode.el
 
 (autoload (quote vhdl-mode) "vhdl-mode" "\
@@ -29350,7 +29686,7 @@ Key bindings:
 
 ;;;***
 
-;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (17102 18541))
+;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (17097 33503))
 ;;; Generated autoloads from emulation/vi.el
 
 (autoload (quote vi-mode) "vi" "\
@@ -29405,7 +29741,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" (17102 18783))
+;;;;;;  "language/viet-util.el" (17097 33527))
 ;;; Generated autoloads from language/viet-util.el
 
 (autoload (quote viet-encode-viscii-char) "viet-util" "\
@@ -29452,7 +29788,7 @@ 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" (17383
-;;;;;;  24127))
+;;;;;;  32126))
 ;;; Generated autoloads from view.el
 
 (defvar view-mode nil "\
@@ -29662,7 +29998,7 @@ Exit View mode and make the current buffer editable.
 ;;;***
 
 ;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (17383
-;;;;;;  13537))
+;;;;;;  32144))
 ;;; Generated autoloads from emulation/vip.el
 
 (autoload (quote vip-setup) "vip" "\
@@ -29678,7 +30014,7 @@ Turn on VIP emulation of VI.
 ;;;***
 
 ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el"
-;;;;;;  (17399 58140))
+;;;;;;  (17578 34775))
 ;;; Generated autoloads from emulation/viper.el
 
 (autoload (quote toggle-viper-mode) "viper" "\
@@ -29695,7 +30031,7 @@ Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Viper'.
 ;;;***
 
 ;;;### (autoloads (warn lwarn display-warning) "warnings" "emacs-lisp/warnings.el"
-;;;;;;  (17383 16119))
+;;;;;;  (17498 30594))
 ;;; Generated autoloads from emacs-lisp/warnings.el
 
 (defvar warning-prefix-function nil "\
@@ -29733,6 +30069,7 @@ only, and you can use whatever symbols you like.)
 
 LEVEL should be either :debug, :warning, :error, or :emergency
 \(but see `warning-minimum-level' and `warning-minimum-log-level').
+Default is :warning.
 
 :emergency -- a problem that will seriously impair Emacs operation soon
               if you do not attend to it promptly.
@@ -29756,7 +30093,7 @@ Display a warning message made from (format MESSAGE ARGS...).
 Aside from generating the message with `format',
 this is equivalent to `display-warning'.
 
-TYPE is the warning type: either a custom group name (a symbol).
+TYPE is the warning type: either a custom group name (a symbol),
 or a list of symbols whose first element is a custom group name.
 \(The rest of the symbols represent subcategories and
 can be whatever you like.)
@@ -29783,7 +30120,7 @@ this is equivalent to `display-warning', using
 ;;;***
 
 ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el"
-;;;;;;  (17418 2369))
+;;;;;;  (17420 36080))
 ;;; Generated autoloads from wdired.el
 
 (autoload (quote wdired-change-to-wdired-mode) "wdired" "\
@@ -29799,7 +30136,7 @@ See `wdired-mode'.
 
 ;;;***
 
-;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17383 13297))
+;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17383 32178))
 ;;; Generated autoloads from net/webjump.el
 
 (autoload (quote webjump) "webjump" "\
@@ -29816,7 +30153,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"
-;;;;;;  (17388 22062))
+;;;;;;  (17397 61573))
 ;;; Generated autoloads from progmodes/which-func.el
  (put 'which-func-format 'risky-local-variable t)
  (put 'which-func-current 'risky-local-variable t)
@@ -29831,8 +30168,6 @@ use either \\[customize] or the function `which-function-mode'.")
 
 (custom-autoload (quote which-function-mode) "which-func")
 
-(put (quote which-function-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote which-function-mode) "which-func" "\
 Toggle Which Function mode, globally.
 When Which Function mode is enabled, the current function name is
@@ -29850,7 +30185,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"
-;;;;;;  (17383 24127))
+;;;;;;  (17578 34774))
 ;;; Generated autoloads from whitespace.el
 
 (autoload (quote whitespace-toggle-leading-check) "whitespace" "\
@@ -29920,8 +30255,6 @@ use either \\[customize] or the function `whitespace-global-mode'.")
 
 (custom-autoload (quote whitespace-global-mode) "whitespace")
 
-(put (quote whitespace-global-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote whitespace-global-mode) "whitespace" "\
 Toggle using Whitespace mode in new buffers.
 With ARG, turn the mode on iff ARG is positive.
@@ -29940,7 +30273,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" (17383 24127))
+;;;;;;  widget-browse-at) "wid-browse" "wid-browse.el" (17383 32127))
 ;;; Generated autoloads from wid-browse.el
 
 (autoload (quote widget-browse-at) "wid-browse" "\
@@ -29967,8 +30300,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" (17396
-;;;;;;  41256))
+;;;;;;  widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (17397
+;;;;;;  61544))
 ;;; Generated autoloads from wid-edit.el
 
 (autoload (quote widgetp) "wid-edit" "\
@@ -30013,7 +30346,7 @@ Setup current buffer so editing string widgets works.
 
 ;;;### (autoloads (windmove-default-keybindings windmove-down windmove-right
 ;;;;;;  windmove-up windmove-left) "windmove" "windmove.el" (17383
-;;;;;;  24127))
+;;;;;;  32128))
 ;;; Generated autoloads from windmove.el
 
 (autoload (quote windmove-left) "windmove" "\
@@ -30066,7 +30399,7 @@ Default MODIFIER is 'shift.
 ;;;***
 
 ;;;### (autoloads (winner-mode winner-mode) "winner" "winner.el"
-;;;;;;  (17383 24127))
+;;;;;;  (17383 32128))
 ;;; Generated autoloads from winner.el
 
 (defvar winner-mode nil "\
@@ -30085,7 +30418,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" (17383 24127))
+;;;;;;  "woman.el" (17466 42708))
 ;;; Generated autoloads from woman.el
 
 (autoload (quote woman) "woman" "\
@@ -30121,7 +30454,7 @@ decompress the file if appropriate.  See the documentation for the
 ;;;***
 
 ;;;### (autoloads (wordstar-mode) "ws-mode" "emulation/ws-mode.el"
-;;;;;;  (17383 13537))
+;;;;;;  (17383 32145))
 ;;; Generated autoloads from emulation/ws-mode.el
 
 (autoload (quote wordstar-mode) "ws-mode" "\
@@ -30234,7 +30567,7 @@ The key bindings are:
 ;;;***
 
 ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el"
-;;;;;;  (17383 24128))
+;;;;;;  (17383 32129))
 ;;; Generated autoloads from xml.el
 
 (autoload (quote xml-parse-file) "xml" "\
@@ -30260,7 +30593,7 @@ If PARSE-NS is non-nil, then QNAMES are expanded.
 ;;;***
 
 ;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17383
-;;;;;;  24128))
+;;;;;;  32129))
 ;;; Generated autoloads from xt-mouse.el
 
 (defvar xterm-mouse-mode nil "\
@@ -30271,8 +30604,6 @@ use either \\[customize] or the function `xterm-mouse-mode'.")
 
 (custom-autoload (quote xterm-mouse-mode) "xt-mouse")
 
-(put (quote xterm-mouse-mode) (quote custom-set) (quote custom-set-minor-mode))
-
 (autoload (quote xterm-mouse-mode) "xt-mouse" "\
 Toggle XTerm mouse mode.
 With prefix arg, turn XTerm mouse mode on iff arg is positive.
@@ -30289,7 +30620,7 @@ down the SHIFT key while pressing the mouse button.
 ;;;***
 
 ;;;### (autoloads (yenc-extract-filename yenc-decode-region) "yenc"
-;;;;;;  "gnus/yenc.el" (17382 1051))
+;;;;;;  "gnus/yenc.el" (17383 32167))
 ;;; Generated autoloads from gnus/yenc.el
 
 (autoload (quote yenc-decode-region) "yenc" "\
@@ -30305,7 +30636,7 @@ Extract file name from an yenc header.
 ;;;***
 
 ;;;### (autoloads (psychoanalyze-pinhead apropos-zippy insert-zippyism
-;;;;;;  yow) "yow" "play/yow.el" (17382 1892))
+;;;;;;  yow) "yow" "play/yow.el" (17383 32183))
 ;;; Generated autoloads from play/yow.el
 
 (autoload (quote yow) "yow" "\
@@ -30331,7 +30662,7 @@ Zippy goes to the analyst.
 
 ;;;***
 
-;;;### (autoloads (zone) "zone" "play/zone.el" (17382 1892))
+;;;### (autoloads (zone) "zone" "play/zone.el" (17383 32183))
 ;;; Generated autoloads from play/zone.el
 
 (autoload (quote zone) "zone" "\
@@ -30342,7 +30673,7 @@ Zone out, completely.
 ;;;***
 
 ;;;### (autoloads (zone-mode zone-mode-update-serial-hook) "zone-mode"
-;;;;;;  "net/zone-mode.el" (17383 13297))
+;;;;;;  "net/zone-mode.el" (17383 32178))
 ;;; Generated autoloads from net/zone-mode.el
 
 (autoload (quote zone-mode-update-serial-hook) "zone-mode" "\
@@ -30364,65 +30695,64 @@ Zone-mode does two things:
 
 ;;;***
 
-;;;### (autoloads nil nil ("abbrev.el" "bindings.el" "buff-menu.el"
-;;;;;;  "calc/calc-aent.el" "calc/calc-alg.el" "calc/calc-arith.el"
-;;;;;;  "calc/calc-bin.el" "calc/calc-comb.el" "calc/calc-cplx.el"
-;;;;;;  "calc/calc-embed.el" "calc/calc-ext.el" "calc/calc-fin.el"
-;;;;;;  "calc/calc-forms.el" "calc/calc-frac.el" "calc/calc-funcs.el"
-;;;;;;  "calc/calc-graph.el" "calc/calc-help.el" "calc/calc-incom.el"
-;;;;;;  "calc/calc-keypd.el" "calc/calc-lang.el" "calc/calc-macs.el"
-;;;;;;  "calc/calc-map.el" "calc/calc-math.el" "calc/calc-misc.el"
-;;;;;;  "calc/calc-mode.el" "calc/calc-mtx.el" "calc/calc-poly.el"
-;;;;;;  "calc/calc-prog.el" "calc/calc-rewr.el" "calc/calc-rules.el"
-;;;;;;  "calc/calc-sel.el" "calc/calc-stat.el" "calc/calc-store.el"
-;;;;;;  "calc/calc-stuff.el" "calc/calc-trail.el" "calc/calc-undo.el"
-;;;;;;  "calc/calc-units.el" "calc/calc-vec.el" "calc/calc-yank.el"
-;;;;;;  "calc/calcalg2.el" "calc/calcalg3.el" "calc/calccomp.el"
-;;;;;;  "calc/calcsel2.el" "calendar/cal-bahai.el" "calendar/cal-china.el"
-;;;;;;  "calendar/cal-coptic.el" "calendar/cal-french.el" "calendar/cal-islam.el"
-;;;;;;  "calendar/cal-iso.el" "calendar/cal-julian.el" "calendar/cal-mayan.el"
-;;;;;;  "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-start.el" "custom.el" "dframe.el"
-;;;;;;  "dos-fns.el" "dos-vars.el" "dos-w32.el" "ediff-diff.el" "ediff-init.el"
+;;;### (autoloads nil nil ("bindings.el" "buff-menu.el" "calc/calc-aent.el"
+;;;;;;  "calc/calc-alg.el" "calc/calc-arith.el" "calc/calc-bin.el"
+;;;;;;  "calc/calc-comb.el" "calc/calc-cplx.el" "calc/calc-embed.el"
+;;;;;;  "calc/calc-ext.el" "calc/calc-fin.el" "calc/calc-forms.el"
+;;;;;;  "calc/calc-frac.el" "calc/calc-funcs.el" "calc/calc-graph.el"
+;;;;;;  "calc/calc-help.el" "calc/calc-incom.el" "calc/calc-keypd.el"
+;;;;;;  "calc/calc-lang.el" "calc/calc-macs.el" "calc/calc-map.el"
+;;;;;;  "calc/calc-math.el" "calc/calc-misc.el" "calc/calc-mode.el"
+;;;;;;  "calc/calc-mtx.el" "calc/calc-poly.el" "calc/calc-prog.el"
+;;;;;;  "calc/calc-rewr.el" "calc/calc-rules.el" "calc/calc-sel.el"
+;;;;;;  "calc/calc-stat.el" "calc/calc-store.el" "calc/calc-stuff.el"
+;;;;;;  "calc/calc-trail.el" "calc/calc-undo.el" "calc/calc-units.el"
+;;;;;;  "calc/calc-vec.el" "calc/calc-yank.el" "calc/calcalg2.el"
+;;;;;;  "calc/calcalg3.el" "calc/calccomp.el" "calc/calcsel2.el"
+;;;;;;  "calendar/cal-bahai.el" "calendar/cal-china.el" "calendar/cal-coptic.el"
+;;;;;;  "calendar/cal-french.el" "calendar/cal-islam.el" "calendar/cal-iso.el"
+;;;;;;  "calendar/cal-julian.el" "calendar/cal-mayan.el" "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" "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"
-;;;;;;  "emacs-lisp/ewoc.el" "emacs-lisp/find-gc.el" "emacs-lisp/float-sup.el"
-;;;;;;  "emacs-lisp/gulp.el" "emacs-lisp/levents.el" "emacs-lisp/lisp-mnt.el"
-;;;;;;  "emacs-lisp/lisp-mode.el" "emacs-lisp/lisp.el" "emacs-lisp/lmenu.el"
-;;;;;;  "emacs-lisp/lselect.el" "emacs-lisp/lucid.el" "emacs-lisp/map-ynp.el"
-;;;;;;  "emacs-lisp/regi.el" "emacs-lisp/sregex.el" "emacs-lisp/syntax.el"
-;;;;;;  "emacs-lisp/tcover-ses.el" "emacs-lisp/tcover-unsafep.el"
-;;;;;;  "emacs-lock.el" "emulation/cua-gmrk.el" "emulation/cua-rect.el"
-;;;;;;  "emulation/edt-lk201.el" "emulation/edt-mapper.el" "emulation/edt-pc.el"
-;;;;;;  "emulation/edt-vt100.el" "emulation/tpu-mapper.el" "emulation/viper-cmd.el"
-;;;;;;  "emulation/viper-ex.el" "emulation/viper-init.el" "emulation/viper-keym.el"
-;;;;;;  "emulation/viper-macs.el" "emulation/viper-mous.el" "emulation/viper-util.el"
-;;;;;;  "env.el" "erc/erc-backend.el" "erc/erc-goodies.el" "erc/erc-ibuffer.el"
-;;;;;;  "erc/erc-lang.el" "erc/erc-menu.el" "erc/erc-nicklist.el"
-;;;;;;  "eshell/em-alias.el" "eshell/em-banner.el" "eshell/em-basic.el"
-;;;;;;  "eshell/em-cmpl.el" "eshell/em-dirs.el" "eshell/em-glob.el"
-;;;;;;  "eshell/em-hist.el" "eshell/em-ls.el" "eshell/em-pred.el"
-;;;;;;  "eshell/em-prompt.el" "eshell/em-rebind.el" "eshell/em-script.el"
-;;;;;;  "eshell/em-smart.el" "eshell/em-term.el" "eshell/em-unix.el"
-;;;;;;  "eshell/em-xtra.el" "eshell/esh-arg.el" "eshell/esh-cmd.el"
-;;;;;;  "eshell/esh-ext.el" "eshell/esh-io.el" "eshell/esh-maint.el"
-;;;;;;  "eshell/esh-module.el" "eshell/esh-opt.el" "eshell/esh-proc.el"
-;;;;;;  "eshell/esh-util.el" "eshell/esh-var.el" "ezimage.el" "faces.el"
-;;;;;;  "files.el" "foldout.el" "font-core.el" "font-lock.el" "format.el"
-;;;;;;  "forms-d2.el" "forms-pass.el" "frame.el" "generic-x.el" "gnus/compface.el"
+;;;;;;  "emacs-lisp/find-gc.el" "emacs-lisp/float-sup.el" "emacs-lisp/gulp.el"
+;;;;;;  "emacs-lisp/levents.el" "emacs-lisp/lisp-mnt.el" "emacs-lisp/lisp-mode.el"
+;;;;;;  "emacs-lisp/lisp.el" "emacs-lisp/lmenu.el" "emacs-lisp/lselect.el"
+;;;;;;  "emacs-lisp/lucid.el" "emacs-lisp/map-ynp.el" "emacs-lisp/regi.el"
+;;;;;;  "emacs-lisp/sregex.el" "emacs-lisp/syntax.el" "emacs-lisp/tcover-ses.el"
+;;;;;;  "emacs-lisp/tcover-unsafep.el" "emacs-lock.el" "emulation/cua-gmrk.el"
+;;;;;;  "emulation/cua-rect.el" "emulation/edt-lk201.el" "emulation/edt-mapper.el"
+;;;;;;  "emulation/edt-pc.el" "emulation/edt-vt100.el" "emulation/tpu-mapper.el"
+;;;;;;  "emulation/viper-cmd.el" "emulation/viper-ex.el" "emulation/viper-init.el"
+;;;;;;  "emulation/viper-keym.el" "emulation/viper-macs.el" "emulation/viper-mous.el"
+;;;;;;  "emulation/viper-util.el" "env.el" "erc/erc-backend.el" "erc/erc-goodies.el"
+;;;;;;  "erc/erc-ibuffer.el" "erc/erc-lang.el" "erc/erc-menu.el"
+;;;;;;  "erc/erc-nicklist.el" "eshell/em-alias.el" "eshell/em-banner.el"
+;;;;;;  "eshell/em-basic.el" "eshell/em-cmpl.el" "eshell/em-dirs.el"
+;;;;;;  "eshell/em-glob.el" "eshell/em-hist.el" "eshell/em-ls.el"
+;;;;;;  "eshell/em-pred.el" "eshell/em-prompt.el" "eshell/em-rebind.el"
+;;;;;;  "eshell/em-script.el" "eshell/em-smart.el" "eshell/em-term.el"
+;;;;;;  "eshell/em-unix.el" "eshell/em-xtra.el" "eshell/esh-arg.el"
+;;;;;;  "eshell/esh-cmd.el" "eshell/esh-ext.el" "eshell/esh-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" "ezimage.el" "faces.el" "files.el" "finder-inf.el"
+;;;;;;  "foldout.el" "font-core.el" "font-lock.el" "format.el" "forms-d2.el"
+;;;;;;  "forms-pass.el" "frame.el" "fringe.el" "generic-x.el" "gnus/compface.el"
 ;;;;;;  "gnus/dig.el" "gnus/dns.el" "gnus/format-spec.el" "gnus/gnus-async.el"
 ;;;;;;  "gnus/gnus-bcklg.el" "gnus/gnus-cite.el" "gnus/gnus-cus.el"
-;;;;;;  "gnus/gnus-demon.el" "gnus/gnus-diary.el" "gnus/gnus-dup.el"
-;;;;;;  "gnus/gnus-eform.el" "gnus/gnus-ems.el" "gnus/gnus-gl.el"
-;;;;;;  "gnus/gnus-int.el" "gnus/gnus-logic.el" "gnus/gnus-mh.el"
-;;;;;;  "gnus/gnus-salt.el" "gnus/gnus-score.el" "gnus/gnus-setup.el"
-;;;;;;  "gnus/gnus-srvr.el" "gnus/gnus-sum.el" "gnus/gnus-topic.el"
-;;;;;;  "gnus/gnus-undo.el" "gnus/gnus-util.el" "gnus/gnus-uu.el"
-;;;;;;  "gnus/gnus-vm.el" "gnus/hex-util.el" "gnus/ietf-drums.el"
+;;;;;;  "gnus/gnus-demon.el" "gnus/gnus-dup.el" "gnus/gnus-eform.el"
+;;;;;;  "gnus/gnus-ems.el" "gnus/gnus-gl.el" "gnus/gnus-int.el" "gnus/gnus-logic.el"
+;;;;;;  "gnus/gnus-mh.el" "gnus/gnus-salt.el" "gnus/gnus-score.el"
+;;;;;;  "gnus/gnus-setup.el" "gnus/gnus-srvr.el" "gnus/gnus-sum.el"
+;;;;;;  "gnus/gnus-topic.el" "gnus/gnus-undo.el" "gnus/gnus-util.el"
+;;;;;;  "gnus/gnus-uu.el" "gnus/gnus-vm.el" "gnus/hex-util.el" "gnus/ietf-drums.el"
 ;;;;;;  "gnus/imap.el" "gnus/legacy-gnus-agent.el" "gnus/mail-parse.el"
 ;;;;;;  "gnus/mail-prsvr.el" "gnus/mail-source.el" "gnus/mailcap.el"
 ;;;;;;  "gnus/messcompat.el" "gnus/mm-bodies.el" "gnus/mm-decode.el"
@@ -30462,8 +30792,8 @@ Zone-mode does two things:
 ;;;;;;  "mh-e/mh-acros.el" "mh-e/mh-alias.el" "mh-e/mh-buffers.el"
 ;;;;;;  "mh-e/mh-compat.el" "mh-e/mh-funcs.el" "mh-e/mh-gnus.el"
 ;;;;;;  "mh-e/mh-identity.el" "mh-e/mh-inc.el" "mh-e/mh-junk.el"
-;;;;;;  "mh-e/mh-letter.el" "mh-e/mh-limit.el" "mh-e/mh-mime.el"
-;;;;;;  "mh-e/mh-print.el" "mh-e/mh-scan.el" "mh-e/mh-search.el"
+;;;;;;  "mh-e/mh-letter.el" "mh-e/mh-limit.el" "mh-e/mh-loaddefs.el"
+;;;;;;  "mh-e/mh-mime.el" "mh-e/mh-print.el" "mh-e/mh-scan.el" "mh-e/mh-search.el"
 ;;;;;;  "mh-e/mh-seq.el" "mh-e/mh-show.el" "mh-e/mh-speed.el" "mh-e/mh-thread.el"
 ;;;;;;  "mh-e/mh-tool-bar.el" "mh-e/mh-utils.el" "mh-e/mh-xface.el"
 ;;;;;;  "misc.el" "mouse-copy.el" "mouse-drag.el" "mouse.el" "net/eudc-vars.el"
@@ -30481,29 +30811,27 @@ Zone-mode does two things:
 ;;;;;;  "pgg-def.el" "pgg-parse.el" "pgg-pgp.el" "pgg-pgp5.el" "play/gamegrid.el"
 ;;;;;;  "play/gametree.el" "play/meese.el" "progmodes/ada-prj.el"
 ;;;;;;  "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" "rfn-eshadow.el" "s-region.el" "saveplace.el"
-;;;;;;  "sb-image.el" "scroll-bar.el" "select.el" "simple.el" "soundex.el"
-;;;;;;  "startup.el" "subdirs.el" "tempo.el" "term/AT386.el" "term/apollo.el"
-;;;;;;  "term/bobcat.el" "term/cygwin.el" "term/internal.el" "term/iris-ansi.el"
-;;;;;;  "term/linux.el" "term/lk201.el" "term/mac-win.el" "term/news.el"
-;;;;;;  "term/pc-win.el" "term/rxvt.el" "term/sun-mouse.el" "term/sun.el"
-;;;;;;  "term/sup-mouse.el" "term/tty-colors.el" "term/tvi970.el"
+;;;;;;  "progmodes/cc-cmds.el" "progmodes/cc-defs.el" "progmodes/cc-fonts.el"
+;;;;;;  "progmodes/cc-langs.el" "progmodes/cc-menus.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-toolbar.el" "progmodes/mantemp.el" "progmodes/xscheme.el"
+;;;;;;  "register.el" "replace.el" "rfn-eshadow.el" "s-region.el"
+;;;;;;  "saveplace.el" "sb-image.el" "scroll-bar.el" "select.el"
+;;;;;;  "soundex.el" "startup.el" "subdirs.el" "tempo.el" "term/AT386.el"
+;;;;;;  "term/apollo.el" "term/bobcat.el" "term/cygwin.el" "term/internal.el"
+;;;;;;  "term/iris-ansi.el" "term/linux.el" "term/lk201.el" "term/mac-win.el"
+;;;;;;  "term/news.el" "term/pc-win.el" "term/rxvt.el" "term/sun-mouse.el"
+;;;;;;  "term/sun.el" "term/sup-mouse.el" "term/tty-colors.el" "term/tvi970.el"
 ;;;;;;  "term/vt100.el" "term/vt102.el" "term/vt125.el" "term/vt200.el"
 ;;;;;;  "term/vt201.el" "term/vt220.el" "term/vt240.el" "term/vt300.el"
 ;;;;;;  "term/vt320.el" "term/vt400.el" "term/vt420.el" "term/w32-win.el"
 ;;;;;;  "term/wyse50.el" "term/x-win.el" "term/xterm.el" "textmodes/bib-mode.el"
-;;;;;;  "textmodes/fill.el" "textmodes/makeinfo.el" "textmodes/page-ext.el"
-;;;;;;  "textmodes/page.el" "textmodes/paragraphs.el" "textmodes/refbib.el"
-;;;;;;  "textmodes/refer.el" "textmodes/reftex-auc.el" "textmodes/reftex-dcr.el"
-;;;;;;  "textmodes/reftex-ref.el" "textmodes/reftex-sel.el" "textmodes/reftex-toc.el"
-;;;;;;  "textmodes/reftex-vars.el" "textmodes/texnfo-upd.el" "textmodes/text-mode.el"
+;;;;;;  "textmodes/makeinfo.el" "textmodes/page-ext.el" "textmodes/page.el"
+;;;;;;  "textmodes/refbib.el" "textmodes/refer.el" "textmodes/reftex-auc.el"
+;;;;;;  "textmodes/reftex-dcr.el" "textmodes/reftex-ref.el" "textmodes/reftex-sel.el"
+;;;;;;  "textmodes/reftex-toc.el" "textmodes/texnfo-upd.el" "textmodes/text-mode.el"
 ;;;;;;  "timezone.el" "tooltip.el" "tree-widget.el" "uniquify.el"
 ;;;;;;  "url/url-about.el" "url/url-cookie.el" "url/url-dired.el"
 ;;;;;;  "url/url-expand.el" "url/url-ftp.el" "url/url-history.el"
@@ -30511,13 +30839,13 @@ Zone-mode does two things:
 ;;;;;;  "url/url-nfs.el" "url/url-proxy.el" "url/url-vars.el" "url/vc-dav.el"
 ;;;;;;  "vc-hooks.el" "vcursor.el" "version.el" "vms-patch.el" "vmsproc.el"
 ;;;;;;  "vt-control.el" "vt100-led.el" "w32-fns.el" "w32-vars.el"
-;;;;;;  "widget.el" "window.el" "x-dnd.el") (17448 19160 944703))
+;;;;;;  "widget.el" "window.el" "x-dnd.el") (17590 36747 258974))
 
 ;;;***
 
-;;; Local Variables:
-;;; version-control: never
-;;; no-byte-compile: t
-;;; no-update-autoloads: t
-;;; End:
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
 ;;; loaddefs.el ends here
diff --git a/lisp/longlines.el b/lisp/longlines.el
index b11d4e6faba..9da3de217ab 100644
--- a/lisp/longlines.el
+++ b/lisp/longlines.el
@@ -396,16 +396,11 @@ that has changed."
   "Perform line wrapping on the parts of the buffer that have changed.
 This is called by `post-command-hook' after each command."
   (when longlines-wrap-beg
-    (cond ((or (eq this-command 'yank)
-               (eq this-command 'yank-pop))
-           (longlines-decode-region (point) (mark t))
-           (if longlines-showing
-               (longlines-show-region (point) (mark t))))
-          ((and (eq this-command 'newline) longlines-showing)
-           (save-excursion
-             (if (search-backward "\n" nil t)
-                 (longlines-show-region
-                  (match-beginning 0) (match-end 0))))))
+    (if (or (eq this-command 'yank)
+            (eq this-command 'yank-pop))
+        (longlines-decode-region (point) (mark t)))
+    (if longlines-showing
+        (longlines-show-region longlines-wrap-beg longlines-wrap-end))
     (unless (or (eq this-command 'fill-paragraph)
                 (eq this-command 'fill-region))
       (longlines-wrap-region longlines-wrap-beg longlines-wrap-end))
diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el
index 127a550b28c..e2c6396bdb2 100644
--- a/lisp/pcvs-defs.el
+++ b/lisp/pcvs-defs.el
@@ -239,7 +239,10 @@ The CMD used for `cvs-mode-commit' is \"message\".  For that special
 This expression will be evaluated in an environment where DIR is set to
 the directory name of the cvs buffer.")
 
-(defvar cvs-temp-buffer-name '(expand-file-name " *cvs-tmp*" dir)
+(defvar cvs-temp-buffer-name
+  ;; Was '(expand-file-name " *cvs-tmp*" dir), but that causes them to
+  ;; become non-hidden if uniquification is done `forward'.
+  " *cvs-tmp*"
   "*Name of the cvs temporary buffer.
 Output from cvs is placed here for asynchronous commands.")
 
diff --git a/lisp/play/hanoi.el b/lisp/play/hanoi.el
index 296ca82b64a..40a96f4e6c2 100644
--- a/lisp/play/hanoi.el
+++ b/lisp/play/hanoi.el
@@ -399,9 +399,8 @@ BITS must be of length nrings.  Start at START-TIME."
 ;; update display and pause, quitting with a pithy comment if the user
 ;; hits a key.
 (defun hanoi-sit-for (seconds)
-  (sit-for seconds)
-  (if (input-pending-p)
-      (signal 'quit '("I can tell you've had enough"))))
+  (unless (sit-for seconds)
+    (signal 'quit '("I can tell you've had enough"))))
 
 ;; move ring to a given buffer position and update ring's car.
 (defun hanoi-ring-to-pos (ring pos)
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 9dc74264da8..bc00d859c2d 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -1208,60 +1208,36 @@ If you use ada-xref.el:
         ff-file-created-hook 'ada-make-body)
   (add-hook 'ff-pre-load-hook 'ada-which-function-are-we-in)
 
-  ;; Some special constructs for find-file.el
-  ;; We do not need to add the construction for 'with', which is in the
-  ;; standard find-file.el
+  ;; Some special constructs for find-file.el.
   (make-local-variable 'ff-special-constructs)
-
-  ;; Go to the parent package :
-  (add-to-list 'ff-special-constructs
-               (cons (eval-when-compile
-                       (concat "^\\(private[ \t]\\)?[ \t]*package[ \t]+"
-                               "\\(body[ \t]+\\)?"
-                               "\\(\\(\\sw\\|[_.]\\)+\\)\\.\\(\\sw\\|_\\)+[ \t\n]+is"))
-                     (lambda ()
-                       (if (fboundp 'ff-get-file)
-                           (if (boundp 'fname)
-                               (set 'fname (ff-get-file
-                                            ada-search-directories-internal
-                                            (ada-make-filename-from-adaname
-                                             (match-string 3))
-                                            ada-spec-suffixes)))))))
-  ;; Another special construct for find-file.el : when in a separate clause,
-  ;; go to the correct package.
-  (add-to-list 'ff-special-constructs
-               (cons "^separate[ \t\n]*(\\(\\(\\sw\\|[_.]\\)+\\))"
-                     (lambda ()
-                       (if (fboundp 'ff-get-file)
-                           (if (boundp 'fname)
-                               (setq fname (ff-get-file
-                                            ada-search-directories-internal
-                                            (ada-make-filename-from-adaname
-                                             (match-string 1))
-                                            ada-spec-suffixes)))))))
-
-  ;; Another special construct, that redefines the one in find-file.el. The
-  ;; old one can handle only one possible type of extension for Ada files
-  ;;  remove from the list the standard "with..." that is put by find-file.el,
-  ;;  since it uses the old ada-spec-suffix variable
-  ;; This one needs to replace the standard one defined in find-file.el (with
-  ;;  Emacs <= 20.4), since that one uses the old variable ada-spec-suffix
-  (let ((old-construct
-         (assoc "^with[ \t]+\\([a-zA-Z0-9_\\.]+\\)" ff-special-constructs))
-        (new-cdr
-         (lambda ()
-           (if (fboundp 'ff-get-file)
-               (if (boundp 'fname)
-                   (set 'fname (ff-get-file
-                                ada-search-directories-internal
-                                (ada-make-filename-from-adaname
-                                 (match-string 1))
-                                ada-spec-suffixes)))))))
-    (if old-construct
-        (setcdr old-construct new-cdr)
-      (add-to-list 'ff-special-constructs
-                   (cons "^with[ \t]+\\([a-zA-Z0-9_\\.]+\\)"
-                         new-cdr))))
+  (mapc (lambda (pair)
+          (add-to-list 'ff-special-constructs pair))
+        `(
+          ;; Go to the parent package.
+          (,(eval-when-compile
+              (concat "^\\(private[ \t]\\)?[ \t]*package[ \t]+"
+                      "\\(body[ \t]+\\)?"
+                      "\\(\\(\\sw\\|[_.]\\)+\\)\\.\\(\\sw\\|_\\)+[ \t\n]+is"))
+           . ,(lambda ()
+                (ff-get-file
+                 ada-search-directories-internal
+                 (ada-make-filename-from-adaname (match-string 3))
+                 ada-spec-suffixes)))
+          ;; A "separate" clause.
+          ("^separate[ \t\n]*(\\(\\(\\sw\\|[_.]\\)+\\))"
+           . ,(lambda ()
+                (ff-get-file
+                 ada-search-directories-internal
+                 (ada-make-filename-from-adaname (match-string 1))
+                 ada-spec-suffixes)))
+          ;; A "with" clause.
+          ("^with[ \t]+\\([a-zA-Z0-9_\\.]+\\)"
+           . ,(lambda ()
+                (ff-get-file
+                 ada-search-directories-internal
+                 (ada-make-filename-from-adaname (match-string 1))
+                 ada-spec-suffixes)))
+          ))
 
   ;;  Support for outline-minor-mode
   (set (make-local-variable 'outline-regexp)
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index 284a2edbe94..c93843f3f82 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -32,7 +32,7 @@
 ;;   1. The AWK Mode syntax table.
 ;;   2. Regular expressions for analysing AWK code.
 ;;   3. Indentation calculation stuff ("c-awk-NL-prop text-property").
-;;   4. Syntax-table property/font-locking stuff, but not including the
+;;   4. Syntax-table property/font-locking stuff, including the
 ;;      font-lock-keywords setting.
 ;;   5. The AWK Mode before/after-change-functions.
 ;;   6. AWK Mode specific versions of commands like beginning-of-defun.
@@ -107,7 +107,8 @@
 (eval-and-compile
   (defconst c-awk-escaped-nl "\\\\[\n\r]"))
 ;; Matches an escaped newline.
-(defconst c-awk-escaped-nls* (concat "\\(" c-awk-escaped-nl "\\)*"))
+(eval-and-compile
+  (defconst c-awk-escaped-nls* (concat "\\(" c-awk-escaped-nl "\\)*")))
 ;; Matches a possibly empty sequence of escaped newlines.  Used in
 ;; awk-font-lock-keywords.
 ;; (defconst c-awk-escaped-nls*-with-space*
@@ -852,6 +853,96 @@
 (c-awk-advise-fl-for-awk-region lazy-lock-defer-rest-after-change)
 (c-awk-advise-fl-for-awk-region lazy-lock-defer-line-after-change)
 
+;; Awk regexps written with help from Peter Galbraith
+;; <galbraith@mixing.qc.dfo.ca>.
+;; Take GNU Emacs's 'words out of the following regexp-opts.  They dont work
+;; in Xemacs 21.4.4.  acm 2002/9/19.
+(defconst awk-font-lock-keywords
+  (eval-when-compile
+    (list
+     ;; Function names.
+     '("^\\s *\\(func\\(tion\\)?\\)\\>\\s *\\(\\sw+\\)?"
+       (1 font-lock-keyword-face) (3 font-lock-function-name-face nil t))
+     ;;
+     ;; Variable names.
+     (cons
+      (concat "\\<"
+              (regexp-opt
+               '("ARGC" "ARGIND" "ARGV" "BINMODE" "CONVFMT" "ENVIRON"
+                 "ERRNO" "FIELDWIDTHS" "FILENAME" "FNR" "FS" "IGNORECASE"
+                 "LINT" "NF" "NR" "OFMT" "OFS" "ORS" "PROCINFO" "RLENGTH"
+                 "RS" "RSTART" "RT" "SUBSEP" "TEXTDOMAIN") t) "\\>")
+      'font-lock-variable-name-face)
+
+     ;; Special file names.  (acm, 2002/7/22)
+     ;; The following regexp was created by first evaluating this in GNU Emacs 21.1:
+     ;; (regexp-opt '("/dev/stdin" "/dev/stdout" "/dev/stderr" "/dev/fd/n" "/dev/pid"
+     ;;                 "/dev/ppid" "/dev/pgrpid" "/dev/user") 'words)
+     ;; , removing the "?:" from each "\\(?:" (for backward compatibility with older Emacsen)
+     ;; , replacing the "n" in "dev/fd/n" with "[0-9]+"
+     ;; , removing the unwanted \\< at the beginning, and finally filling out the
+     ;; regexp so that a " must come before, and either a " or heuristic stuff after.
+     ;; The surrounding quotes are fontified along with the filename, since, semantically,
+     ;; they are an indivisible unit.
+     '("\\(\"/dev/\\(fd/[0-9]+\\|p\\(\\(\\(gr\\)?p\\)?id\\)\\|\
+std\\(err\\|in\\|out\\)\\|user\\)\\)\\>\
+\\(\\(\"\\)\\|\\([^\"/\n\r][^\"\n\r]*\\)?$\\)"
+       (1 font-lock-variable-name-face t)
+       (8 font-lock-variable-name-face t t))
+     ;; Do the same (almost) with
+     ;; (regexp-opt '("/inet/tcp/lport/rhost/rport" "/inet/udp/lport/rhost/rport"
+     ;;                 "/inet/raw/lport/rhost/rport") 'words)
+     ;; This cannot be combined with the above pattern, because the match number
+     ;; for the (optional) closing \" would then exceed 9.
+     '("\\(\"/inet/\\(\\(raw\\|\\(tc\\|ud\\)p\\)/lport/rhost/rport\\)\\)\\>\
+\\(\\(\"\\)\\|\\([^\"/\n\r][^\"\n\r]*\\)?$\\)"
+       (1 font-lock-variable-name-face t)
+       (6 font-lock-variable-name-face t t))
+
+     ;; Keywords.
+     (concat "\\<"
+             (regexp-opt
+              '("BEGIN" "END" "break" "continue" "delete" "do" "else"
+                "exit" "for" "getline" "if" "in" "next" "nextfile"
+                "return" "while")
+              t) "\\>")
+
+     ;; Builtins.
+     `(eval . (list
+               ,(concat
+                 "\\<"
+                 (regexp-opt
+                  '("adump" "and" "asort" "atan2" "bindtextdomain" "close"
+                    "compl" "cos" "dcgettext" "exp" "extension" "fflush"
+                    "gensub" "gsub" "index" "int" "length" "log" "lshift"
+                    "match" "mktime" "or" "print" "printf" "rand" "rshift"
+                    "sin" "split" "sprintf" "sqrt" "srand" "stopme"
+                    "strftime" "strtonum" "sub" "substr"  "system"
+                    "systime" "tolower" "toupper" "xor") t)
+                 "\\>")
+               0 c-preprocessor-face-name))
+
+     ;; gawk debugging keywords.  (acm, 2002/7/21)
+     ;; (Removed, 2003/6/6.  These functions are now fontified as built-ins)
+     ;; (list (concat "\\<" (regexp-opt '("adump" "stopme") t) "\\>")
+     ;;    0 'font-lock-warning-face)
+
+     ;; User defined functions with an apparent spurious space before the
+     ;; opening parenthesis.  acm, 2002/5/30.
+     `(,(concat "\\(\\w\\|_\\)" c-awk-escaped-nls* "\\s "
+                c-awk-escaped-nls*-with-space* "(")
+       (0 'font-lock-warning-face))
+
+     ;; Space after \ in what looks like an escaped newline.  2002/5/31
+     '("\\\\\\s +$" 0 font-lock-warning-face t)
+
+     ;; Unbalanced string (") or regexp (/) delimiters.  2002/02/16.
+     '("\\s|" 0 font-lock-warning-face t nil)
+     ;; gawk 3.1 localizable strings ( _"translate me!").  2002/5/21
+     '("\\(_\\)\\s|" 1 font-lock-warning-face)
+     '("\\(_\\)\\s\"" 1 font-lock-string-face) ; FIXME! not for XEmacs. 2002/10/6
+     ))
+  "Default expressions to highlight in AWK mode.")
 
 ;; ACM 2002/9/29.  Movement functions, e.g. for C-M-a and C-M-e
 
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index d39c4880dcc..ecad9174e57 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -69,14 +69,15 @@
           (not (fboundp 'push)))
       (cc-load "cc-fix")))
 
-(eval-after-load "font-lock"
-  '(if (and (not (featurep 'cc-fix)) ; only load the file once.
+; (eval-after-load "font-lock"  ; 2006-07-09.  font-lock is now preloaded
+;   '
+(if (and (not (featurep 'cc-fix)) ; only load the file once.
             (featurep 'xemacs) ; There is now (2005/12) code in GNU Emacs CVS
                                ; to make the call to f-l-c-k throw an error.
             (let (font-lock-keywords)
               (font-lock-compile-keywords '("\\<\\>"))
               font-lock-keywords))     ; did the previous call foul this up?
-       (load "cc-fix")))
+       (load "cc-fix")) ;)
 
 ;; The above takes care of the delayed loading, but this is necessary
 ;; to ensure correct byte compilation.
@@ -1034,35 +1035,35 @@ MODE is either a mode symbol or a list of mode symbols."
 
 
 ;; Make edebug understand the macros.
-(eval-after-load "edebug"
-  '(progn
-     (def-edebug-spec cc-eval-when-compile t)
-     (def-edebug-spec c-point t)
-     (def-edebug-spec c-set-region-active t)
-     (def-edebug-spec c-safe t)
-     (def-edebug-spec c-save-buffer-state let*)
-     (def-edebug-spec c-tentative-buffer-changes t)
-     (def-edebug-spec c-forward-syntactic-ws t)
-     (def-edebug-spec c-backward-syntactic-ws t)
-     (def-edebug-spec c-forward-sexp t)
-     (def-edebug-spec c-backward-sexp t)
-     (def-edebug-spec c-up-list-forward t)
-     (def-edebug-spec c-up-list-backward t)
-     (def-edebug-spec c-down-list-forward t)
-     (def-edebug-spec c-down-list-backward t)
-     (def-edebug-spec c-add-syntax t)
-     (def-edebug-spec c-add-class-syntax t)
-     (def-edebug-spec c-benign-error t)
-     (def-edebug-spec c-with-syntax-table t)
-     (def-edebug-spec c-skip-ws-forward t)
-     (def-edebug-spec c-skip-ws-backward t)
-     (def-edebug-spec c-major-mode-is t)
-     (def-edebug-spec c-put-char-property t)
-     (def-edebug-spec c-get-char-property t)
-     (def-edebug-spec c-clear-char-property t)
-     (def-edebug-spec c-clear-char-properties t)
-     (def-edebug-spec c-put-overlay t)
-     (def-edebug-spec c-delete-overlay t)))
+;(eval-after-load "edebug" ; 2006-07-09: def-edebug-spec is now in subr.el.
+;  '(progn
+(def-edebug-spec cc-eval-when-compile t)
+(def-edebug-spec c-point t)
+(def-edebug-spec c-set-region-active t)
+(def-edebug-spec c-safe t)
+(def-edebug-spec c-save-buffer-state let*)
+(def-edebug-spec c-tentative-buffer-changes t)
+(def-edebug-spec c-forward-syntactic-ws t)
+(def-edebug-spec c-backward-syntactic-ws t)
+(def-edebug-spec c-forward-sexp t)
+(def-edebug-spec c-backward-sexp t)
+(def-edebug-spec c-up-list-forward t)
+(def-edebug-spec c-up-list-backward t)
+(def-edebug-spec c-down-list-forward t)
+(def-edebug-spec c-down-list-backward t)
+(def-edebug-spec c-add-syntax t)
+(def-edebug-spec c-add-class-syntax t)
+(def-edebug-spec c-benign-error t)
+(def-edebug-spec c-with-syntax-table t)
+(def-edebug-spec c-skip-ws-forward t)
+(def-edebug-spec c-skip-ws-backward t)
+(def-edebug-spec c-major-mode-is t)
+(def-edebug-spec c-put-char-property t)
+(def-edebug-spec c-get-char-property t)
+(def-edebug-spec c-clear-char-property t)
+(def-edebug-spec c-clear-char-properties t)
+(def-edebug-spec c-put-overlay t)
+(def-edebug-spec c-delete-overlay t) ;))
 
 
 ;;; Functions.
@@ -1738,9 +1739,10 @@ constant.  A file is identified by its base name."
                                ,@(and pre-files `(',pre-files))))))
 
 (put 'c-lang-defconst 'lisp-indent-function 1)
-(eval-after-load "edebug"
-  '(def-edebug-spec c-lang-defconst
-     (&define name [&optional stringp] [&rest sexp def-form])))
+;(eval-after-load "edebug" ; 2006-07-09: def-edebug-spec is now in subr.el.
+;  '
+(def-edebug-spec c-lang-defconst
+  (&define name [&optional stringp] [&rest sexp def-form]))
 
 (defun c-define-lang-constant (name bindings &optional pre-files)
   ;; Used by `c-lang-defconst'.
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 75d631ac399..9c051506888 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -348,15 +348,15 @@
                  highlights))))
         nil)))
 
-  (eval-after-load "edebug"
-    '(progn
-       (def-edebug-spec c-fontify-types-and-refs let*)
-       (def-edebug-spec c-make-syntactic-matcher t)
-       ;; If there are literal quoted or backquoted highlight specs in
-       ;; the call to `c-make-font-lock-search-function' then let's
-       ;; instrument the forms in them.
-       (def-edebug-spec c-make-font-lock-search-function
-         (form &rest &or ("quote" (&rest form)) ("`" (&rest form)) form)))))
+;  (eval-after-load "edebug" ; 2006-07-09: def-edebug-spec is now in subr.el.
+;    '(progn
+  (def-edebug-spec c-fontify-types-and-refs let*)
+  (def-edebug-spec c-make-syntactic-matcher t)
+  ;; If there are literal quoted or backquoted highlight specs in
+  ;; the call to `c-make-font-lock-search-function' then let's
+  ;; instrument the forms in them.
+  (def-edebug-spec c-make-font-lock-search-function
+    (form &rest &or ("quote" (&rest form)) ("`" (&rest form)) form)));))
 
 (defun c-fontify-recorded-types-and-refs ()
   ;; Convert the ranges recorded on `c-record-type-identifiers' and
@@ -2268,101 +2268,7 @@ need for `pike-font-lock-extra-types'.")
           autodoc-font-lock-doc-comments)))))
 
 
-;; AWK.
-
-;; Awk regexps written with help from Peter Galbraith
-;; <galbraith@mixing.qc.dfo.ca>.
-;; Take GNU Emacs's 'words out of the following regexp-opts.  They dont work
-;; in Xemacs 21.4.4.  acm 2002/9/19.
-(eval-after-load "cc-awk"               ; Evaluate while loading cc-fonts
-  `(defconst awk-font-lock-keywords     ; Evaluate after loading cc-awk
-     ',(eval-when-compile               ; Evaluate while compiling cc-fonts
-         (list
-          ;; Function names.
-          '("^\\s *\\(func\\(tion\\)?\\)\\>\\s *\\(\\sw+\\)?"
-            (1 font-lock-keyword-face) (3 font-lock-function-name-face nil t))
-          ;;
-          ;; Variable names.
-          (cons
-           (concat "\\<"
-                   (regexp-opt
-                    '("ARGC" "ARGIND" "ARGV" "BINMODE" "CONVFMT" "ENVIRON"
-                      "ERRNO" "FIELDWIDTHS" "FILENAME" "FNR" "FS" "IGNORECASE"
-                      "LINT" "NF" "NR" "OFMT" "OFS" "ORS" "PROCINFO" "RLENGTH"
-                      "RS" "RSTART" "RT" "SUBSEP" "TEXTDOMAIN") t) "\\>")
-           'font-lock-variable-name-face)
-
-          ;; Special file names.  (acm, 2002/7/22)
-          ;; The following regexp was created by first evaluating this in GNU Emacs 21.1:
-          ;; (regexp-opt '("/dev/stdin" "/dev/stdout" "/dev/stderr" "/dev/fd/n" "/dev/pid"
-          ;;                 "/dev/ppid" "/dev/pgrpid" "/dev/user") 'words)
-          ;; , removing the "?:" from each "\\(?:" (for backward compatibility with older Emacsen)
-          ;; , replacing the "n" in "dev/fd/n" with "[0-9]+"
-          ;; , removing the unwanted \\< at the beginning, and finally filling out the
-          ;; regexp so that a " must come before, and either a " or heuristic stuff after.
-          ;; The surrounding quotes are fontified along with the filename, since, semantically,
-          ;; they are an indivisible unit.
-          '("\\(\"/dev/\\(fd/[0-9]+\\|p\\(\\(\\(gr\\)?p\\)?id\\)\\|\
-std\\(err\\|in\\|out\\)\\|user\\)\\)\\>\
-\\(\\(\"\\)\\|\\([^\"/\n\r][^\"\n\r]*\\)?$\\)"
-            (1 font-lock-variable-name-face t)
-            (8 font-lock-variable-name-face t t))
-          ;; Do the same (almost) with
-          ;; (regexp-opt '("/inet/tcp/lport/rhost/rport" "/inet/udp/lport/rhost/rport"
-          ;;                 "/inet/raw/lport/rhost/rport") 'words)
-          ;; This cannot be combined with the above pattern, because the match number
-          ;; for the (optional) closing \" would then exceed 9.
-          '("\\(\"/inet/\\(\\(raw\\|\\(tc\\|ud\\)p\\)/lport/rhost/rport\\)\\)\\>\
-\\(\\(\"\\)\\|\\([^\"/\n\r][^\"\n\r]*\\)?$\\)"
-            (1 font-lock-variable-name-face t)
-            (6 font-lock-variable-name-face t t))
-
-          ;; Keywords.
-          (concat "\\<"
-                  (regexp-opt
-                   '("BEGIN" "END" "break" "continue" "delete" "do" "else"
-                     "exit" "for" "getline" "if" "in" "next" "nextfile"
-                     "return" "while")
-                   t) "\\>")
-
-          ;; Builtins.
-          `(eval . (list
-                    ,(concat
-                      "\\<"
-                      (regexp-opt
-                       '("adump" "and" "asort" "atan2" "bindtextdomain" "close"
-                         "compl" "cos" "dcgettext" "exp" "extension" "fflush"
-                         "gensub" "gsub" "index" "int" "length" "log" "lshift"
-                         "match" "mktime" "or" "print" "printf" "rand" "rshift"
-                         "sin" "split" "sprintf" "sqrt" "srand" "stopme"
-                         "strftime" "strtonum" "sub" "substr"  "system"
-                         "systime" "tolower" "toupper" "xor") t)
-                      "\\>")
-                    0 c-preprocessor-face-name))
-
-          ;; gawk debugging keywords.  (acm, 2002/7/21)
-          ;; (Removed, 2003/6/6.  These functions are now fontified as built-ins)
-;;      (list (concat "\\<" (regexp-opt '("adump" "stopme") t) "\\>")
-;;         0 'font-lock-warning-face)
-
-          ;; User defined functions with an apparent spurious space before the
-          ;; opening parenthesis.  acm, 2002/5/30.
-          `(,(concat "\\(\\w\\|_\\)" c-awk-escaped-nls* "\\s "
-                     c-awk-escaped-nls*-with-space* "(")
-            (0 'font-lock-warning-face))
-
-          ;; Space after \ in what looks like an escaped newline.  2002/5/31
-          '("\\\\\\s +$" 0 font-lock-warning-face t)
-
-          ;; Unbalanced string (") or regexp (/) delimiters.  2002/02/16.
-          '("\\s|" 0 font-lock-warning-face t nil)
-          ;; gawk 3.1 localizable strings ( _"translate me!").  2002/5/21
-          '("\\(_\\)\\s|" 1 font-lock-warning-face)
-          '("\\(_\\)\\s\"" 1 font-lock-string-face) ; FIXME! not for XEmacs. 2002/10/6
-          ))
-     "Default expressions to highlight in AWK mode."))
-
-
+;; 2006-07-10:  awk-font-lock-keywords has been moved back to cc-awk.el.
 (cc-provide 'cc-fonts)
 
 ;;; arch-tag: 2f65f405-735f-4da5-8d4b-b957844c5203
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 8120094f606..e7a0d03cc55 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -173,9 +173,10 @@ the evaluated constant value at compile time."
   `',var)
 
 (put 'c-lang-defvar 'lisp-indent-function 'defun)
-(eval-after-load "edebug"
-  '(def-edebug-spec c-lang-defvar
-     (&define name def-form &optional stringp)))
+; (eval-after-load "edebug" ; 2006-07-09: def-edebug-spec is now in subr.el.
+;  '
+(def-edebug-spec c-lang-defvar
+  (&define name def-form &optional stringp)) ;)
 
 (eval-and-compile
   ;; Some helper functions used when building the language constants.
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 9eebdb2bb7f..7343ec735ea 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -114,8 +114,9 @@
 
 ;; Load cc-fonts first after font-lock is loaded, since it isn't
 ;; necessary until font locking is requested.
-(eval-after-load "font-lock"
-  '(require 'cc-fonts))
+; (eval-after-load "font-lock" ; 2006-07-09: font-lock is now preloaded.
+;   '
+(require 'cc-fonts) ;)
 
 ;; cc-langs isn't loaded when we're byte compiled, so add autoload
 ;; directives for the interface functions.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 5da86972ec5..525c462d4eb 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -223,10 +223,15 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
 \\(.+\\):\\([0-9]+\\)\\(?:\\(:\\)\\|\\(,\\)\\)?" 1 2 nil (3 . 4))
 
     (gnu
+     ;; I have no idea what this first line is supposed to match, but it
+     ;; makes things ambiguous with output such as "foo:344:50:blabla" since
+     ;; the "foo" part can match this first line (in which case the file
+     ;; name as "344").  To avoid this, we disallow filenames exclusively
+     ;; composed of digits.  --Stef
      "^\\(?:[[:alpha:]][-[:alnum:].]+: ?\\)?\
-\\([/.]*[a-zA-Z]:?[^ \t\n:]*\\|{standard input}\\): ?\
-\\([0-9]+\\)\\([.:]?\\)\\([0-9]+\\)?\
-\\(?:-\\(?:\\([0-9]+\\)\\3\\)?\\.?\\([0-9]+\\)?\\)?:\
+\\([0-9]*[^0-9\n].*?\\): ?\
+\\([0-9]+\\)\\(?:\\([.:]\\)\\([0-9]+\\)\\)?\
+\\(?:-\\([0-9]+\\)?\\(?:\\3\\([0-9]+\\)\\)?\\)?:\
 \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\
  *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\)\\)?"
      1 (2 . 5) (4 . 6) (7 . 8))
@@ -293,7 +298,7 @@ File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?"
 \\(?:: \\(warning:\\)?\\|$\\| ),\\)" 1 2 nil (3))
 
     (gcov-file
-     "^ *-: *\\(0\\):Source:\\(.+\\)$" 
+     "^ *-: *\\(0\\):Source:\\(.+\\)$"
      2 1 nil 0 nil
      (1 compilation-line-face prepend) (2 compilation-info-face prepend))
     (gcov-header
@@ -312,11 +317,11 @@ File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?"
      (1 compilation-line-face prepend))
     (gcov-called-line
      "^ *\\([0-9]+\\): *\\([0-9]+\\):.*$"
-     nil 2 nil 0 nil 
+     nil 2 nil 0 nil
      (0 'default t)
      (1 compilation-info-face prepend) (2 compilation-line-face prepend))
     (gcov-never-called
-     "^ *\\(#####\\): *\\([0-9]+\\):.*$" 
+     "^ *\\(#####\\): *\\([0-9]+\\):.*$"
      nil 2 nil 2 nil
      (0 'default t)
      (1 compilation-error-face prepend) (2 compilation-line-face prepend))
@@ -400,7 +405,12 @@ you may also want to change `compilation-page-delimiter'.")
   "Value of `page-delimiter' in Compilation mode.")
 
 (defvar compilation-mode-font-lock-keywords
-   '(;; configure output lines.
+   '(;; Don't highlight this as a compilation message.
+     ("^Compilation started at.*"
+      (0 '(face nil message nil help-echo nil mouse-face nil) t))
+     ("^Compiling file .*"
+      (0 '(face nil message nil help-echo nil mouse-face nil) t))
+     ;; configure output lines.
      ("^[Cc]hecking \\(?:[Ff]or \\|[Ii]f \\|[Ww]hether \\(?:to \\)?\\)?\\(.+\\)\\.\\.\\. *\\(?:(cached) *\\)?\\(\\(yes\\(?: .+\\)?\\)\\|no\\|\\(.*\\)\\)$"
       (1 font-lock-variable-name-face)
       (2 (compilation-face '(4 . 3))))
@@ -408,9 +418,11 @@ you may also want to change `compilation-page-delimiter'.")
      ("^\\([[:alnum:]_/.+-]+\\)\\(\\[\\([0-9]+\\)\\]\\)?[ \t]*:"
       (1 font-lock-function-name-face) (3 compilation-line-face nil t))
      (" --?o\\(?:utfile\\|utput\\)?[= ]?\\(\\S +\\)" . 1)
-     ("^Compilation \\(finished\\)"
+     ("^Compilation \\(finished\\).*"
+      (0 '(face nil message nil help-echo nil mouse-face nil) t)
       (1 compilation-info-face))
-     ("^Compilation \\(exited abnormally\\|interrupt\\|killed\\|terminated\\)\\(?:.*with code \\([0-9]+\\)\\)?"
+     ("^Compilation \\(exited abnormally\\|interrupt\\|killed\\|terminated\\)\\(?:.*with code \\([0-9]+\\)\\)?.*"
+      (0 '(face nil message nil help-echo nil mouse-face nil) t)
       (1 compilation-error-face)
       (2 compilation-error-face nil t)))
    "Additional things to highlight in Compilation mode.
@@ -1791,49 +1803,67 @@ If DIRECTORY. is nil, that means use `default-directory'.
 If FILENAME is not found at all, ask the user where to find it.
 Pop up the buffer containing MARKER and scroll to MARKER if we ask the user."
   (or formats (setq formats '("%s")))
-  (save-excursion
-    (let ((dirs compilation-search-path)
-          (spec-dir (if directory
-                        (expand-file-name directory)
-                      default-directory))
-          buffer thisdir fmts name)
-      (if (file-name-absolute-p filename)
-          ;; The file name is absolute.  Use its explicit directory as
-          ;; the first in the search path, and strip it from FILENAME.
-          (setq filename (abbreviate-file-name (expand-file-name filename))
-                dirs (cons (file-name-directory filename) dirs)
-                filename (file-name-nondirectory filename)))
-      ;; Now search the path.
-      (while (and dirs (null buffer))
-        (setq thisdir (or (car dirs) spec-dir)
-              fmts formats)
-        ;; For each directory, try each format string.
-        (while (and fmts (null buffer))
-          (setq name (expand-file-name (format (car fmts) filename) thisdir)
-                buffer (and (file-exists-p name)
-                            (find-file-noselect name))
-                fmts (cdr fmts)))
-        (setq dirs (cdr dirs)))
-      (or buffer
-          ;; The file doesn't exist.  Ask the user where to find it.
-          (let ((pop-up-windows t))
-            (compilation-set-window (display-buffer (marker-buffer marker))
-                                    marker)
-            (let ((name (expand-file-name
-                         (read-file-name
-                          (format "Find this %s in (default %s): "
-                                  compilation-error filename)
-                          spec-dir filename t))))
-              (if (file-directory-p name)
-                  (setq name (expand-file-name filename name)))
-              (setq buffer (and (file-exists-p name)
-                                (find-file name))))))
-      ;; Make intangible overlays tangible.
-      (mapcar (function (lambda (ov)
-                          (when (overlay-get ov 'intangible)
-                            (overlay-put ov 'intangible nil))))
-              (overlays-in (point-min) (point-max)))
-      buffer)))
+  (let ((dirs compilation-search-path)
+        (spec-dir (if directory
+                      (expand-file-name directory)
+                    default-directory))
+        buffer thisdir fmts name)
+    (if (file-name-absolute-p filename)
+        ;; The file name is absolute.  Use its explicit directory as
+        ;; the first in the search path, and strip it from FILENAME.
+        (setq filename (abbreviate-file-name (expand-file-name filename))
+              dirs (cons (file-name-directory filename) dirs)
+              filename (file-name-nondirectory filename)))
+    ;; Now search the path.
+    (while (and dirs (null buffer))
+      (setq thisdir (or (car dirs) spec-dir)
+            fmts formats)
+      ;; For each directory, try each format string.
+      (while (and fmts (null buffer))
+        (setq name (expand-file-name (format (car fmts) filename) thisdir)
+              buffer (and (file-exists-p name)
+                          (find-file-noselect name))
+              fmts (cdr fmts)))
+      (setq dirs (cdr dirs)))
+    (while (null buffer)    ;Repeat until the user selects an existing file.
+      ;; The file doesn't exist.  Ask the user where to find it.
+      (save-excursion            ;This save-excursion is probably not right.
+        (let ((pop-up-windows t))
+          (compilation-set-window (display-buffer (marker-buffer marker))
+                                  marker)
+          (let* ((name (read-file-name
+                        (format "Find this %s in (default %s): "
+                                compilation-error filename)
+                        spec-dir filename t nil
+                        ;; Try to make sure the user can only select
+                        ;; a valid answer.  This predicate may be ignored,
+                        ;; tho, so we still have to double-check afterwards.
+                        ;; TODO: We should probably fix read-file-name so
+                        ;; that it never ignores this predicate, even when
+                        ;; using popup dialog boxes.
+                        (lambda (name)
+                          (if (file-directory-p name)
+                              (setq name (expand-file-name filename name)))
+                          (file-exists-p name))))
+                 (origname name))
+            (cond
+             ((not (file-exists-p name))
+              (message "Cannot find file `%s'" name)
+              (ding) (sit-for 2))
+             ((and (file-directory-p name)
+                   (not (file-exists-p
+                         (setq name (expand-file-name filename name)))))
+              (message "No `%s' in directory %s" filename origname)
+              (ding) (sit-for 2))
+             (t
+              (setq buffer (find-file-noselect name))))))))
+    ;; Make intangible overlays tangible.
+    ;; This is weird: it's not even clear which is the current buffer,
+    ;; so the code below can't be expected to DTRT here.  -- Stef
+    (dolist (ov (overlays-in (point-min) (point-max)))
+      (when (overlay-get ov 'intangible)
+        (overlay-put ov 'intangible nil)))
+    buffer))
 
 (defun compilation-get-file-structure (file &optional fmt)
   "Retrieve FILE's file-structure or create a new one.
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 3c328697a20..7a45dcd655e 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -2734,24 +2734,24 @@ means the member buffer is standalone.  CLASS is its class."
     ;; is on if not specified as an argument.
     (unless class
       (setq class (ebrowse-tree-at-point)))
-    (with-output-to-temp-buffer ebrowse-member-buffer-name
-      (save-excursion
-        (set-buffer standard-output)
+    (save-selected-window
+      (if temp-buffer
+          (pop-to-buffer temp-buffer)
+        (pop-to-buffer (get-buffer-create ebrowse-member-buffer-name))
         ;; If new buffer, set the mode and initial values of locals
-        (unless temp-buffer
-          (ebrowse-member-mode))
-        ;; Set local variables
-        (setq ebrowse--member-list (funcall list class)
-              ebrowse--displayed-class class
-              ebrowse--accessor list
-              ebrowse--tree-obarray classes
-              ebrowse--frozen-flag stand-alone
-              ebrowse--tags-file-name tags-file-name
-              ebrowse--header header
-              ebrowse--tree tree
-              buffer-read-only t)
-        (ebrowse-redisplay-member-buffer)
-        (current-buffer)))))
+        (ebrowse-member-mode))
+      ;; Set local variables
+      (setq ebrowse--member-list (funcall list class)
+            ebrowse--displayed-class class
+            ebrowse--accessor list
+            ebrowse--tree-obarray classes
+            ebrowse--frozen-flag stand-alone
+            ebrowse--tags-file-name tags-file-name
+            ebrowse--header header
+            ebrowse--tree tree
+            buffer-read-only t)
+      (ebrowse-redisplay-member-buffer)
+      (current-buffer))))
 
 
 (defun ebrowse-member-display-p (member)
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 684102015cc..810a7b3e973 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -1019,7 +1019,7 @@ The key should be one of the cars in `gdb-buffer-rules-assoc'."
   (interactive)
   (if gdb-use-separate-io-buffer
       (gdb-display-buffer
-       (gdb-get-buffer-create 'gdb-inferior-io))))
+       (gdb-get-buffer-create 'gdb-inferior-io) t)))
 
 (defconst gdb-frame-parameters
   '((height . 14) (width . 80)
@@ -1556,7 +1556,7 @@ happens to be appropriate."
     (goto-char (point-max))
     (insert-before-markers string))
   (if (not (string-equal string ""))
-      (gdb-display-buffer (gdb-get-buffer-create 'gdb-inferior-io))))
+      (gdb-display-buffer (gdb-get-buffer-create 'gdb-inferior-io) t)))
 
 (defun gdb-clear-inferior-io ()
   (with-current-buffer (gdb-get-buffer-create 'gdb-inferior-io)
@@ -1865,7 +1865,7 @@ static char *magick[] = {
   "Display status of user-settable breakpoints."
   (interactive)
   (gdb-display-buffer
-   (gdb-get-buffer-create 'gdb-breakpoints-buffer)))
+   (gdb-get-buffer-create 'gdb-breakpoints-buffer) t))
 
 (defun gdb-frame-breakpoints-buffer ()
   "Display status of user-settable breakpoints in a new frame."
@@ -2041,7 +2041,7 @@ static char *magick[] = {
   "Display backtrace of current stack."
   (interactive)
   (gdb-display-buffer
-   (gdb-get-buffer-create 'gdb-stack-buffer)))
+   (gdb-get-buffer-create 'gdb-stack-buffer) t))
 
 (defun gdb-frame-stack-buffer ()
   "Display backtrace of current stack in a new frame."
@@ -2122,7 +2122,7 @@ static char *magick[] = {
   "Display IDs of currently known threads."
   (interactive)
   (gdb-display-buffer
-   (gdb-get-buffer-create 'gdb-threads-buffer)))
+   (gdb-get-buffer-create 'gdb-threads-buffer) t))
 
 (defun gdb-frame-threads-buffer ()
   "Display IDs of currently known threads in a new frame."
@@ -2256,7 +2256,7 @@ static char *magick[] = {
   "Display integer register contents."
   (interactive)
   (gdb-display-buffer
-   (gdb-get-buffer-create 'gdb-registers-buffer)))
+   (gdb-get-buffer-create 'gdb-registers-buffer) t))
 
 (defun gdb-frame-registers-buffer ()
   "Display integer register contents in a new frame."
@@ -2580,7 +2580,7 @@ corresponding to the mode line clicked."
   "Display memory contents."
   (interactive)
   (gdb-display-buffer
-   (gdb-get-buffer-create 'gdb-memory-buffer)))
+   (gdb-get-buffer-create 'gdb-memory-buffer) t))
 
 (defun gdb-frame-memory-buffer ()
   "Display memory contents in a new frame."
@@ -2687,7 +2687,7 @@ corresponding to the mode line clicked."
   "Display local variables of current stack and their values."
   (interactive)
   (gdb-display-buffer
-   (gdb-get-buffer-create 'gdb-locals-buffer)))
+   (gdb-get-buffer-create 'gdb-locals-buffer) t))
 
 (defun gdb-frame-locals-buffer ()
   "Display local variables of current stack and their values in a new frame."
@@ -2698,7 +2698,7 @@ corresponding to the mode line clicked."
 
 
 ;;;; Window management
-(defun gdb-display-buffer (buf &optional size)
+(defun gdb-display-buffer (buf dedicated &optional size)
   (let ((answer (get-buffer-window buf 0))
         (must-split nil))
     (if answer
@@ -2707,7 +2707,8 @@ corresponding to the mode line clicked."
       (pop-to-buffer gud-comint-buffer) ;Select the right frame.
       (let ((window (get-lru-window)))
         (if (and window
-            (not (eq window (get-buffer-window gud-comint-buffer))))
+                 (not (memq window `(,(get-buffer-window gud-comint-buffer)
+                                     ,gdb-source-window))))
             (progn
               (set-window-buffer window buf)
               (setq answer window))
@@ -2718,7 +2719,7 @@ corresponding to the mode line clicked."
                  (new-size (and size (< size cur-size) (- cur-size size))))
             (setq answer (split-window largest new-size))
             (set-window-buffer answer buf)
-            (set-window-dedicated-p answer t)))
+            (set-window-dedicated-p answer dedicated)))
       answer)))
 
 
@@ -3162,7 +3163,7 @@ BUFFER nil or omitted means use the current buffer."
   (interactive)
   (setq gdb-previous-frame nil)
   (gdb-display-buffer
-   (gdb-get-buffer-create 'gdb-assembler-buffer)))
+   (gdb-get-buffer-create 'gdb-assembler-buffer) t))
 
 (defun gdb-frame-assembler-buffer ()
   "Display disassembly view in a new frame."
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index eb803422027..37d4952058b 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -232,8 +232,7 @@ See `compilation-error-screen-columns'"
 ;; override compilation-last-buffer
 (defvar grep-last-buffer nil
   "The most recent grep buffer.
-A grep buffer becomes most recent when its process is started
-or when it is used with \\[grep-next-match].
+A grep buffer becomes most recent when you select Grep mode in it.
 Notice that using \\[next-error] or \\[compile-goto-error] modifies
 `complation-last-buffer' rather than `grep-last-buffer'.")
 
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index c57c88d3ece..97e54135a6f 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -2763,7 +2763,8 @@ Obeying it means displaying in another window the specified file and line."
             (gud-find-file true-file)))
          (window (and buffer (or (get-buffer-window buffer)
                                  (if (memq gud-minor-mode '(gdbmi gdba))
-                                     (gdb-display-source-buffer buffer))
+                                     (unless (gdb-display-source-buffer buffer)
+                                       (gdb-display-buffer buffer nil)))
                                  (display-buffer buffer))))
          (pos))
     (if buffer
@@ -2793,7 +2794,10 @@ Obeying it means displaying in another window the specified file and line."
             (cond ((or (< pos (point-min)) (> pos (point-max)))
                    (widen)
                    (goto-char pos))))
-          (if window (set-window-point window gud-overlay-arrow-position))))))
+          (when window 
+            (set-window-point window gud-overlay-arrow-position)
+            (if (memq gud-minor-mode '(gdbmi gdba))
+                (setq gdb-source-window window)))))))
 
 ;; The gud-call function must do the right thing whether its invoking
 ;; keystroke is from the GUD buffer itself (via major-mode binding)
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index bdc8161c80f..f4c117fd935 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -4384,7 +4384,7 @@ idlwave-shell-electric-debug-mode-map)
      ["Edit Default Cmd" idlwave-shell-edit-default-command-line t])
     ("Breakpoints"
      ["Set Breakpoint" idlwave-shell-break-here 
-      :keys "C-c C-d C-c" :active (eq major-mode 'idlwave-mode)]
+      :keys "C-c C-d C-b" :active (eq major-mode 'idlwave-mode)]
      ("Set Special Breakpoint"
       ["Set After Count Breakpoint"
        (progn
diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el
index b6e6e4fc456..863f972086e 100644
--- a/lisp/progmodes/octave-inf.el
+++ b/lisp/progmodes/octave-inf.el
@@ -37,18 +37,18 @@
   :group 'octave)
 
 (defcustom inferior-octave-program "octave"
-  "*Program invoked by `inferior-octave'."
+  "Program invoked by `inferior-octave'."
   :type 'string
   :group 'octave-inferior)
 
 (defcustom inferior-octave-prompt
   "\\(^octave\\(\\|.bin\\)\\(-[.0-9]+\\)?\\(:[0-9]+\\)?\\|^debug\\|^\\)>+ "
-  "*Regexp to match prompts for the inferior Octave process."
+  "Regexp to match prompts for the inferior Octave process."
   :type 'regexp
   :group 'octave-inferior)
 
 (defcustom inferior-octave-startup-file nil
-  "*Name of the inferior Octave startup file.
+  "Name of the inferior Octave startup file.
 The contents of this file are sent to the inferior Octave process on
 startup."
   :type '(choice (const :tag "None" nil)
@@ -56,34 +56,31 @@ startup."
   :group 'octave-inferior)
 
 (defcustom inferior-octave-startup-args nil
-  "*List of command line arguments for the inferior Octave process.
+  "List of command line arguments for the inferior Octave process.
 For example, for suppressing the startup message and using `traditional'
 mode, set this to (\"-q\" \"--traditional\")."
   :type '(repeat string)
   :group 'octave-inferior)
 
-(defvar inferior-octave-mode-map nil
-  "Keymap used in Inferior Octave mode.")
-(if inferior-octave-mode-map
-    ()
-  (let ((map (copy-keymap comint-mode-map)))
+(defvar inferior-octave-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map comint-mode-map)
     (define-key map "\t" 'comint-dynamic-complete)
     (define-key map "\M-?" 'comint-dynamic-list-filename-completions)
     (define-key map "\C-c\C-l" 'inferior-octave-dynamic-list-input-ring)
     (define-key map [menu-bar inout list-history]
       '("List Input History" . inferior-octave-dynamic-list-input-ring))
     (define-key map "\C-c\C-h" 'octave-help)
-    (setq inferior-octave-mode-map map)))
+    map)
+  "Keymap used in Inferior Octave mode.")
 
-(defvar inferior-octave-mode-syntax-table nil
-  "Syntax table in use in inferior-octave-mode buffers.")
-(if inferior-octave-mode-syntax-table
-    ()
+(defvar inferior-octave-mode-syntax-table
   (let ((table (make-syntax-table)))
     (modify-syntax-entry ?\` "w" table)
     (modify-syntax-entry ?\# "<" table)
     (modify-syntax-entry ?\n ">" table)
-    (setq inferior-octave-mode-syntax-table table)))
+    table)
+  "Syntax table in use in inferior-octave-mode buffers.")
 
 (defcustom inferior-octave-mode-hook nil
   "*Hook to be run when Inferior Octave mode is started."
@@ -154,9 +151,9 @@ Entry to this mode successively runs the hooks `comint-mode-hook' and
   (setq comint-input-ring-file-name
         (or (getenv "OCTAVE_HISTFILE") "~/.octave_hist")
         comint-input-ring-size (or (getenv "OCTAVE_HISTSIZE") 1024)
-        comint-input-filter-functions '(inferior-octave-directory-tracker)
-        comint-dynamic-complete-functions
-        inferior-octave-dynamic-complete-functions)
+        comint-input-filter-functions '(inferior-octave-directory-tracker))
+  (set (make-local-variable 'comint-dynamic-complete-functions)
+       inferior-octave-dynamic-complete-functions)
   (comint-read-input-ring t)
 
   (run-mode-hooks 'inferior-octave-mode-hook))
@@ -272,8 +269,7 @@ is NOT available with versions of Octave prior to 2.0."
           (save-excursion
             (skip-syntax-backward "w_" (comint-line-beginning-position))
             (buffer-substring-no-properties (point) end)))
-         (proc (get-buffer-process inferior-octave-buffer))
-         (filter (process-filter proc)))
+         (proc (get-buffer-process inferior-octave-buffer)))
     (cond (inferior-octave-complete-impossible
            (error (concat
                    "Your Octave does not have `completion_matches'.  "
@@ -299,7 +295,7 @@ is NOT available with versions of Octave prior to 2.0."
             command inferior-octave-output-list)))))
 
 (defun inferior-octave-dynamic-list-input-ring ()
-  "List the buffer's input history in a help buffer"
+  "List the buffer's input history in a help buffer."
   ;; We cannot use `comint-dynamic-list-input-ring', because it replaces
   ;; "completion" by "history reference" ...
   (interactive)
@@ -394,5 +390,5 @@ directory and makes this the current buffer's default directory."
 
 (provide 'octave-inf)
 
-;;; arch-tag: bdce0395-24d1-4bb4-bfba-6fb1eeb1a660
+;; arch-tag: bdce0395-24d1-4bb4-bfba-6fb1eeb1a660
 ;;; octave-inf.el ends here
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index b80fe4c0fbc..8cfe0871056 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -982,7 +982,10 @@ Point is at the beginning of the next line."
 (defun sh-quoted-subshell (limit)
   "Search for a subshell embedded in a string. Find all the unescaped
 \" characters within said subshell, remembering that subshells can nest."
-  (if (re-search-forward "\"\\(?:.\\|\n\\)*?\\(\\$(\\|`\\)" limit t)
+  ;; FIXME: This can (and often does) match multiple lines, yet it makes no
+  ;; effort to handle multiline cases correctly, so it ends up being
+  ;; rather flakey.
+  (if (re-search-forward "\"\\(?:\\(?:.\\|\n\\)*?[^\\]\\(\\\\\\\\\\)*\\)?\\(\\$(\\|`\\)" limit t)
       ;; bingo we have a $( or a ` inside a ""
       (let ((char (char-after (point)))
             (continue t)
@@ -1002,23 +1005,27 @@ Point is at the beginning of the next line."
           ;; ( [preceeded by $ ]   => increase nesting
           ;; " [nesting <= 0 ]     => terminate, we're done.
           ;; " [nesting >  0 ]     => remember this, it's not a proper "
-          (if (eq ?\\ last) nil
-            (if (eq ?\` char) (setq nest (+ nest (if bq -1 1)) bq (not bq))
-              (if (and (> nest 0) (eq ?\) char))  (setq nest (1- nest))
-                (if (and (eq ?$ last) (eq ?\( char)) (setq nest (1+ nest))
-                  (if (and (> nest 0) (eq ?\( char)) (setq nest (1+ nest))
-                    (if (eq char ?\")
-                        (if (>= 0 nest) (setq continue nil)
-                          (setq seen (cons pos seen)) ) ))))))
+          ;; FIXME: don't count parens that appear within quotes.
+          (cond
+           ((eq ?\\ last) nil)
+           ((eq ?\` char) (setq nest (+ nest (if bq -1 1)) bq (not bq)))
+           ((and (> nest 0) (eq ?\) char))   (setq nest (1- nest)))
+           ((and (eq ?$ last) (eq ?\( char)) (setq nest (1+ nest)))
+           ((and (> nest 0) (eq ?\( char))   (setq nest (1+ nest)))
+           ((eq char ?\")
+            (if (>= 0 nest) (setq continue nil) (push pos seen))))
           ;;(message "POS: %d [%d]" pos nest)
           (setq last char
                 pos  (1+ pos)
                 char (char-after pos)) )
+        ;; FIXME: why construct a costly match data to pass to
+        ;; sh-apply-quoted-subshell rather than apply the highlight
+        ;; directly here?  -- Stef
         (when seen
           ;;(message "SEEN: %S" seen)
           (setq data (list (current-buffer)))
-          (mapc (lambda (P)
-                  (setq data (cons P (cons (1+ P) data)) ) ) seen)
+          (dolist(P seen)
+            (setq data (cons P (cons (1+ P) data))))
           (store-match-data data))
         data) ))
 
diff --git a/lisp/server.el b/lisp/server.el
index 266d9d7824f..fc0f90f6f05 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -203,18 +203,14 @@ are done with it in the server.")
     (dolist (frame (frame-list))
       (when (equal (frame-parameter frame 'display) display)
         (select-frame frame)))
-    ;; If there's no frame on that display yet, create a dummy one
-    ;; and select it.
+    ;; If there's no frame on that display yet, create and select one.
     (unless (equal (frame-parameter (selected-frame) 'display) display)
       (select-frame
        (make-frame-on-display
         display
-        ;; This frame is only there in place of an actual "current display"
-        ;; setting, so we want it to be as unobtrusive as possible.  That's
-        ;; what the invisibility is for.  The minibuffer setting is so that
-        ;; we don't end up displaying a buffer in it (which noone would
-        ;; notice).
-        '((visibility . nil) (minibuffer . only)))))))
+        ;; This frame may be deleted later (see server-process-filter)
+        ;; so we want it to be as unobtrusive as possible.
+        '((visibility . nil)))))))
 
 (defun server-unquote-arg (arg)
   (replace-regexp-in-string
@@ -383,8 +379,14 @@ PROC is the server process.  Format of STRING is \"PATH PATH PATH... \\n\"."
           (unless nowait
             (message "%s" (substitute-command-keys
                       "When done with a buffer, type \\[server-edit]")))))
-      ;; Avoid preserving the connection after the last real frame is deleted.
-      (if tmp-frame (delete-frame tmp-frame))))
+      ;; If the temporary frame is still the selected frame, make it
+      ;; real.  If not (which can happen if the user's customizations
+      ;; call pop-to-buffer etc.), delete it to avoid preserving the
+      ;; connection after the last real frame is deleted.
+      (if tmp-frame
+          (if (eq (selected-frame) tmp-frame)
+              (set-frame-parameter tmp-frame 'visibility t)
+            (delete-frame tmp-frame)))))
   ;; Save for later any partial line that remains.
   (when (> (length string) 0)
     (process-put proc 'previous-string string)))
diff --git a/lisp/shell.el b/lisp/shell.el
index 6b22ac79238..6a145ae1569 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -423,7 +423,8 @@ buffer."
   (setq comint-delimiter-argument-list shell-delimiter-argument-list)
   (setq comint-file-name-chars shell-file-name-chars)
   (setq comint-file-name-quote-list shell-file-name-quote-list)
-  (setq comint-dynamic-complete-functions shell-dynamic-complete-functions)
+  (set (make-local-variable 'comint-dynamic-complete-functions)
+       shell-dynamic-complete-functions)
   (set (make-local-variable 'paragraph-separate) "\\'")
   (make-local-variable 'paragraph-start)
   (setq paragraph-start comint-prompt-regexp)
diff --git a/lisp/simple.el b/lisp/simple.el
index 1778c15acfc..204684a3d5b 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1669,7 +1669,7 @@ is not *inside* the region START...END."
              '(0 . 0)))
     '(0 . 0)))
 
-(defcustom undo-ask-before-discard t
+(defcustom undo-ask-before-discard nil
   "If non-nil ask about discarding undo info for the current command.
 Normally, Emacs discards the undo info for the current command if
 it exceeds `undo-outer-limit'.  But if you set this option
diff --git a/lisp/subr.el b/lisp/subr.el
index 387228fbb8c..9169857539a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -53,6 +53,12 @@ This is the global do-nothing version.  There is also `testcover-1value'
 that complains if FORM ever does return differing values."
   form)
 
+(defmacro def-edebug-spec (symbol spec)
+  "Set the `edebug-form-spec' property of SYMBOL according to SPEC.
+Both SYMBOL and SPEC are unevaluated. The SPEC can be 0, t, a symbol
+\(naming a function), or a list."
+  `(put (quote ,symbol) 'edebug-form-spec (quote ,spec)))
+
 (defmacro lambda (&rest cdr)
   "Return a lambda expression.
 A call of the form (lambda ARGS DOCSTRING INTERACTIVE BODY) is
@@ -1693,6 +1699,45 @@ by doing (clear-string STRING)."
             (sit-for 1)
             t)))
     n))
+
+(defun sit-for (seconds &optional nodisp obsolete)
+  "Perform redisplay, then wait for SECONDS seconds or until input is available.
+SECONDS may be a floating-point value.
+\(On operating systems that do not support waiting for fractions of a
+second, floating-point values are rounded down to the nearest integer.)
+
+If optional arg NODISP is t, don't redisplay, just wait for input.
+Redisplay does not happen if input is available before it starts.
+
+Value is t if waited the full time with no input arriving, and nil otherwise.
+
+An obsolete, but still supported form is
+\(sit-for SECONDS &optional MILLISECONDS NODISP)
+where the optional arg MILLISECONDS specifies an additional wait period,
+in milliseconds; this was useful when Emacs was built without
+floating point support.
+
+\(fn SECONDS &optional NODISP)"
+  (when (or obsolete (numberp nodisp))
+    (setq seconds (+ seconds (* 1e-3 nodisp)))
+    (setq nodisp obsolete))
+  (if noninteractive
+      (progn (sleep-for seconds) t)
+    (unless nodisp (redisplay))
+    (or (<= seconds 0)
+        (let ((timer (timer-create))
+              (echo-keystrokes 0))
+          (if (catch 'sit-for-timeout
+                (timer-set-time timer (timer-relative-time
+                                       (current-time) seconds))
+                (timer-set-function timer 'with-timeout-handler
+                                    '(sit-for-timeout))
+                (timer-activate timer)
+                (push (read-event) unread-command-events)
+                nil)
+              t
+            (cancel-timer timer)
+            nil)))))
 
 ;;; Atomic change groups.
 
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index c6b3c4d1ba3..21515e02612 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -182,9 +182,13 @@
                                   initial-frame-alist)))
 
 (defvar x-display-name nil
-  "The X display name specifying server and X frame.")
+  "The name of the X display on which Emacs was started.
+
+For the X display name of individual frames, see the `display'
+frame parameter.")
 
 (defun x-handle-display (switch)
+  "Handle -display DISPLAY option."
   (setq x-display-name (car x-invocation-args)
         x-invocation-args (cdr x-invocation-args))
   ;; Make subshell programs see the same DISPLAY value Emacs really uses.
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 9218c565c97..95f73b56952 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -408,18 +408,19 @@ Point is moved to just past the fill prefix on the first line."
                           "\\)?[ \t]*")
                 "[ \t]*")))
     (goto-char from)
-    (if (>= (+ (current-left-margin) (length prefix))
-            (current-fill-column))
-        (error "fill-prefix too long for specified width"))
+    ;; Why signal an error here?  The problem needs to be caught elsewhere.
+    ;; (if (>= (+ (current-left-margin) (length prefix))
+    ;;         (current-fill-column))
+    ;;     (error "fill-prefix too long for specified width"))
     (forward-line 1)
     (while (< (point) to)
       (if (looking-at fpre)
-          (delete-region (point) (match-end 0)))
+          (delete-region (point) (match-end 0)))
       (forward-line 1))
     (goto-char from)
     (if (looking-at fpre)
         (goto-char (match-end 0)))
-    (setq from (point))))
+    (point)))
 
 ;; The `fill-space' property carries the string with which a newline
 ;; should be replaced when unbreaking a line (in fill-delete-newlines).
@@ -628,7 +629,12 @@ space does not end a sentence, so don't break a line there."
         (oneleft nil))
 
     (beginning-of-line)
-    (setq from (point))
+    ;; We used to round up to whole line, but that prevents us from
+    ;; correctly handling filling of mixed code-and-comment where we do want
+    ;; to fill the comment but not the code.  So only use (point) if it's
+    ;; further than `from', which means that `from' is followed by some
+    ;; number of empty lines.
+    (setq from (max (point) from))
 
     ;; Delete all but one soft newline at end of region.
     ;; And leave TO before that one.
@@ -799,7 +805,7 @@ If `fill-paragraph-function' is nil, return the `fill-prefix' used for filling."
 If we're not in a comment, just return nil so that the caller
 can take care of filling.  JUSTIFY is used as in `fill-paragraph'."
   (comment-normalize-vars)
-  (let (has-code-and-comment    ; Non-nil if it contains code and a comment.
+  (let (has-code-and-comment ; Non-nil if it contains code and a comment.
         comin comstart)
     ;; Figure out what kind of comment we are looking at.
     (save-excursion
@@ -857,12 +863,13 @@ can take care of filling.  JUSTIFY is used as in `fill-paragraph'."
                          (or (comment-search-forward (line-end-position) t)
                              (point)))
                         (looking-at comment-re))
-                      1 2))))
-           ;; Find the beginning of the first line past the region to fill.
-           (save-excursion
-             (while (progn (forward-line 1)
-                           (looking-at comment-re)))
-             (point)))
+                      (progn (setq comstart (point)) 1)
+                    (progn (setq comstart (point)) 2)))))
+             ;; Find the beginning of the first line past the region to fill.
+             (save-excursion
+               (while (progn (forward-line 1)
+                             (looking-at comment-re)))
+               (point)))
             ;; Obey paragraph starters and boundaries within comments.
             (let* ((paragraph-separate
                     ;; Use the default values since they correspond to
@@ -874,7 +881,7 @@ can take care of filling.  JUSTIFY is used as in `fill-paragraph'."
                     (concat paragraph-start "\\|[ \t]*\\(?:"
                             comment-start-skip "\\)\\(?:"
                             (default-value 'paragraph-start) "\\)"))
-                   ;; We used to reply on fill-prefix to break paragraph at
+                   ;; We used to rely on fill-prefix to break paragraph at
                    ;; comment-starter changes, but it did not work for the
                    ;; first line (mixed comment&code).
                    ;; We now use comment-re instead to "manually" make sure
@@ -893,7 +900,7 @@ can take care of filling.  JUSTIFY is used as in `fill-paragraph'."
 
           ;; Find the fill-prefix to use.
           (cond
-           (fill-prefix)                ; Use the user-provided fill prefix.
+           (fill-prefix)          ; Use the user-provided fill prefix.
            ((and adaptive-fill-mode     ; Try adaptive fill mode.
                  (setq fill-prefix (fill-context-prefix beg end))
                  (string-match comment-start-skip fill-prefix)))
@@ -903,7 +910,7 @@ can take care of filling.  JUSTIFY is used as in `fill-paragraph'."
           ;; Don't fill with narrowing.
           (or
            (fill-region-as-paragraph
-            beg end justify nil
+            (max comstart beg) end justify nil
             ;; Don't canonicalize spaces within the code just before
             ;; the comment.
             (save-excursion
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 79d526cbe76..4cda0d6b3a0 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
-;; Version: 4.42
+;; Version: 4.43
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -90,6 +90,9 @@
 ;;
 ;; Recent changes
 ;; --------------
+;; Version 4.43
+;;    - Big fixes
+;;
 ;; Version 4.42
 ;;    - Bug fixes
 ;;    - `s' key in the agenda saves all org-mode buffers.
@@ -209,7 +212,7 @@
 
 ;;; Customization variables
 
-(defvar org-version "4.42"
+(defvar org-version "4.43"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -4700,12 +4703,13 @@ the children that do not contain any open TODO items."
         (pc '(:org-comment t))
         (pall '(:org-archived t :org-comment t))
         (rea (concat ":" org-archive-tag ":"))
-        file re)
+        bmp file re)
     (save-excursion
       (while (setq file (pop files))
         (org-check-agenda-file file)
         (set-buffer (org-get-agenda-file-buffer file))
         (widen)
+        (setq bmp (buffer-modified-p))
         (save-excursion
           (remove-text-properties (point-min) (point-max) pall)
           (when org-agenda-skip-archived-trees
@@ -4717,7 +4721,8 @@ the children that do not contain any open TODO items."
           (setq re (concat "^\\*+ +" org-comment-string "\\>"))
           (while (re-search-forward re nil t)
             (add-text-properties
-             (match-beginning 0) (org-end-of-subtree t) pc)))))))
+             (match-beginning 0) (org-end-of-subtree t) pc)))
+        (set-buffer-modified-p bmp)))))
 
 (defun org-agenda-skip ()
   "Throw to `:skip' in places that should be skipped."
@@ -7432,9 +7437,11 @@ the documentation of `org-diary'."
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (catch :skip
-        (and org-agenda-todo-ignore-scheduled
-             (looking-at sched-re)
-             (throw :skip nil))
+        (when (and org-agenda-todo-ignore-scheduled
+                   (looking-at sched-re))
+          ;; FIXME: the following test also happens below, but we need it here
+          (or org-agenda-todo-list-sublevels (org-end-of-subtree 'invisible))
+          (throw :skip nil))
         (org-agenda-skip)
         (goto-char (match-beginning 1))
         (setq marker (org-agenda-new-marker (1+ (match-beginning 0)))
@@ -8696,7 +8703,7 @@ With prefix ARG, realign all tags in headings in the current buffer."
                                    nil nil current 'org-tags-history))))
         (while (string-match "[-+&]+" tags)
           (setq tags (replace-match ":" t t tags))))
-
+      
       (unless (setq empty (string-match "\\`[\t ]*\\'" tags))
         (unless (string-match ":$" tags) (setq tags (concat tags ":")))
         (unless (string-match "^:" tags) (setq tags (concat ":" tags))))
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 8794ebddc15..9e0b6b63901 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -37,7 +37,7 @@
     (defmacro defcustom (var value doc &rest ignore)
       `(defvar ,var ,value ,doc)))
 
-(defvar texinfmt-version "2.41 of  1 Mar 2005")
+(defvar texinfmt-version "2.42 of  7 Jul 2006")
 
 (defun texinfmt-version (&optional here)
   "Show the version of texinfmt.el in the minibuffer.
@@ -1555,7 +1555,9 @@ The node is constructed automatically."
               "  Node: " node-name "-Footnotes, Up: " node-name "\n")
       (setq start (point))
       (insert (format "\n(%d)  %s\n" texinfo-footnote-number arg))
-      (fill-region start (point))))))
+      (narrow-to-region (save-excursion (goto-char start) (point)) (point))
+      (fill-region (point-min) (point-max))
+      (widen)))))
 
 (defun texinfo-format-end-node ()
   "Format footnote in the End of node style, with notes at end of node."
@@ -2118,11 +2120,18 @@ This command is executed when texinfmt sees @item inside @multitable."
     (insert unformated-row)
     (goto-char (point-min))
 ;; 1. Check for correct number of @tab in line.
-    (let ((tab-number 1))                       ; one @tab between two columns
+    (let ((tab-number 1))               ; one @tab between two columns
       (while (search-forward "@tab" nil t)
         (setq tab-number (1+ tab-number)))
-      (if (/= tab-number (length table-widths))
-          (error "Wrong number of @tab's in a @multitable row")))
+      (let ((needed-tabs (- (length table-widths) tab-number)))
+        (when (> needed-tabs 0)
+              (goto-char (point-min)) 
+              (end-of-line)
+              (while (> needed-tabs 0)
+                (insert "@w{ }\n@tab")
+                (setq needed-tabs (1- needed-tabs))
+                (message
+                 "Added @tabs and empty spaces to a @multitable row")))))
     (goto-char (point-min))
 ;; 2. Format each cell, and copy to a rectangle
     ;; buffer looks like this:    A1  @tab  A2  @tab  A3
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index ff5fcf2b33c..e9a640973bb 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -256,7 +256,7 @@ ACTION-PREFIX is the symbol to place before the ACTION command
                          filein
                          (or output-format "jpeg")
                          fileout)))
-    (call-process shell-file-name nil nil nil "-c" command)))
+    (call-process shell-file-name nil nil nil shell-command-switch command)))
 
 (defun thumbs-new-image-size (s increment)
   "New image (a cons of width x height)."
diff --git a/lisp/tumme.el b/lisp/tumme.el
index d6420bf33d7..b45052bf09e 100644
--- a/lisp/tumme.el
+++ b/lisp/tumme.el
@@ -491,7 +491,8 @@ with the comment."
   :group 'tumme)
 
 (defcustom tumme-external-viewer
-  ;; TODO: use mailcap, dired-guess-shell-alist-default, dired-view-command-alist
+  ;; TODO: Use mailcap, dired-guess-shell-alist-default,
+  ;; dired-view-command-alist.
   (cond ((executable-find "display"))
         ((executable-find "xli"))
         ((executable-find "qiv") "qiv -t"))
@@ -627,7 +628,7 @@ according to the Thumbnail Managing Standard."
                 (setq thumbnail-dir (file-name-directory thumbnail-file))))
       (message "Creating thumbnail directory.")
       (make-directory thumbnail-dir))
-    (shell-command command nil)))
+    (call-process shell-file-name nil nil nil shell-command-switch command)))
 
 ;;;###autoload
 (defun tumme-dired-insert-marked-thumbs ()
@@ -643,8 +644,10 @@ according to the Thumbnail Managing Standard."
                                ;; Can't use (overlays-at (point)), BUG?
                                (overlays-in (point) (1+ (point)))))
        (put-image thumb-file image-pos)
-       (setq overlay (car (delq nil (mapcar (lambda (o) (and (overlay-get o 'put-image) o))
-                                            (overlays-in (point) (1+ (point)))))))
+       (setq 
+        overlay
+        (car (delq nil (mapcar (lambda (o) (and (overlay-get o 'put-image) o))
+                               (overlays-in (point) (1+ (point)))))))
        (overlay-put overlay 'image-file image-file)
        (overlay-put overlay 'thumb-file thumb-file)))
    nil)
@@ -716,8 +719,7 @@ Otherwise, delete overlays."
 (defun tumme-create-thumbnail-buffer ()
   "Create thumb buffer and set `tumme-thumbnail-mode'."
   (let ((buf (get-buffer-create tumme-thumbnail-buffer)))
-    (save-excursion
-      (set-buffer buf)
+    (with-current-buffer buf
       (setq buffer-read-only t)
       (if (not (eq major-mode 'tumme-thumbnail-mode))
           (tumme-thumbnail-mode)))
@@ -729,8 +731,7 @@ Otherwise, delete overlays."
 (defun tumme-create-display-image-buffer ()
   "Create image display buffer and set `tumme-display-image-mode'."
   (let ((buf (get-buffer-create tumme-display-image-buffer)))
-    (save-excursion
-      (set-buffer buf)
+    (with-current-buffer buf
       (setq buffer-read-only t)
       (if (not (eq major-mode 'tumme-display-image-mode))
           (tumme-display-image-mode)))
@@ -812,8 +813,7 @@ thumbnail buffer to be selected."
         (setq files (list (dired-get-filename)))
       (setq files (dired-get-marked-files)))
     (setq dired-buf (current-buffer))
-    (save-excursion
-      (set-buffer buf)
+    (with-current-buffer buf
       (let ((inhibit-read-only t))
         (if (not append)
             (erase-buffer)
@@ -1170,10 +1170,9 @@ dired."
         (dired-buf (tumme-associated-dired-buffer)))
     (if (not (and dired-buf file-name))
         (message "No image, or image with correct properties, at point.")
-      (save-excursion
+    (with-current-buffer dired-buf
         (message file-name)
         (setq file-name (file-name-nondirectory file-name))
-        (set-buffer dired-buf)
         (goto-char (point-min))
         (if (search-forward file-name nil t)
             (cond ((eq command 'mark) (dired-mark 1))
@@ -1294,7 +1293,8 @@ You probably want to use this together with
   (define-key tumme-thumbnail-mode-map "L" 'tumme-rotate-original-left)
   (define-key tumme-thumbnail-mode-map "R" 'tumme-rotate-original-right)
 
-  (define-key tumme-thumbnail-mode-map "D" 'tumme-thumbnail-set-image-description)
+  (define-key tumme-thumbnail-mode-map "D"
+    'tumme-thumbnail-set-image-description)
 
   (define-key tumme-thumbnail-mode-map "\C-d" 'tumme-delete-char)
   (define-key tumme-thumbnail-mode-map " "
@@ -1686,25 +1686,22 @@ Ask user how many thumbnails should be displayed per row."
 
 (defun tumme-thumbnail-display-external ()
   "Display original image for thumbnail at point using external viewer."
-
   (interactive)
   (let ((file (tumme-original-file-name)))
     (if (not (tumme-image-at-point-p))
         (message "No thumbnail at point")
       (if (not file)
           (message "No original file name found")
-        (shell-command (format "%s \"%s\""
-                               tumme-external-viewer
-                               file))))))
+        (call-process shell-file-name nil nil nil shell-command-switch
+                      (format "%s \"%s\"" tumme-external-viewer file))))))
 
 ;;;###autoload
 (defun tumme-dired-display-external ()
   "Display file at point using an external viewer."
   (interactive)
   (let ((file (dired-get-filename)))
-    (shell-command (format "%s \"%s\""
-                           tumme-external-viewer
-                           file))))
+    (call-process shell-file-name nil nil nil shell-command-switch
+                  (format "%s \"%s\"" tumme-external-viewer file))))
 
 (defun tumme-window-width-pixels (window)
   "Calculate WINDOW width in pixels."
@@ -1776,12 +1773,12 @@ original size."
                   (cons ?h height)
                   (cons ?f file)
                   (cons ?t new-file))))
-          (setq ret (shell-command command nil))
+          (setq ret (call-process shell-file-name nil nil nil
+                                  shell-command-switch command))
           (if (not (= 0 ret))
               (error "Could not resize image")))
       (copy-file file new-file t))
-    (save-excursion
-      (set-buffer (tumme-create-display-image-buffer))
+    (with-current-buffer (tumme-create-display-image-buffer)
       (let ((inhibit-read-only t))
         (erase-buffer)
         (clear-image-cache)
@@ -1829,7 +1826,7 @@ With prefix argument ARG, display image in its original size."
                       (cons ?p tumme-cmd-rotate-thumbnail-program)
                       (cons ?d degrees)
                       (cons ?t (expand-file-name file)))))
-      (shell-command command nil)
+      (call-process shell-file-name nil nil nil shell-command-switch command)
       ;; Clear the cache to refresh image. I wish I could just refresh
       ;; the current file but I do not know how to do that. Yet...
       (clear-image-cache))))
@@ -1874,11 +1871,13 @@ overwritten.  This confirmation can be turned off using
                       (cons ?d degrees)
                       (cons ?o (expand-file-name file))
                       (cons ?t tumme-temp-rotate-image-file))))
-      (if (not (= 0 (shell-command command nil)))
+      (if (not (= 0 (call-process shell-file-name nil nil nil
+                                  shell-command-switch command)))
           (error "Could not rotate image")
         (tumme-display-image tumme-temp-rotate-image-file)
         (if (or (and tumme-rotate-original-ask-before-overwrite
-                     (y-or-n-p "Rotate to temp file OK.  Overwrite original image? "))
+                     (y-or-n-p
+                      "Rotate to temp file OK.  Overwrite original image? "))
                 (not tumme-rotate-original-ask-before-overwrite))
             (progn
               (copy-file tumme-temp-rotate-image-file file t)
@@ -1910,7 +1909,8 @@ YYYY_MM_DD_HH_MM_DD_ORIG_FILE_NAME.jpg.  Used from
                 (format-time-string
                  "%Y:%m:%d %H:%M:%S"
                  (nth 5 (file-attributes (expand-file-name file))))))
-      (setq data (tumme-get-exif-data (expand-file-name file) "DateTimeOriginal")))
+      (setq data (tumme-get-exif-data (expand-file-name file)
+                                      "DateTimeOriginal")))
     (while (string-match "[ :]" data)
       (setq data (replace-match "_" nil nil data)))
     (format "%s%s%s" data
@@ -1930,7 +1930,8 @@ default value at the prompt."
            (old-value (tumme-get-exif-data file "ImageDescription")))
       (if (eq 0
               (tumme-set-exif-data file "ImageDescription"
-                                   (read-string "Value of ImageDescription: " old-value)))
+                                   (read-string "Value of ImageDescription: "
+                                                old-value)))
           (message "Successfully wrote ImageDescription tag.")
         (error "Could not write ImageDescription tag")))))
 
@@ -1944,7 +1945,7 @@ default value at the prompt."
                     (cons ?f (expand-file-name file))
                     (cons ?t tag-name)
                     (cons ?v tag-value))))
-    (shell-command command nil)))
+    (call-process shell-file-name nil nil nil shell-command-switch command)))
 
 (defun tumme-get-exif-data (file tag-name)
   "From FILE, return EXIF tag TAG-NAME."
@@ -1956,10 +1957,10 @@ default value at the prompt."
                     (cons ?p tumme-cmd-read-exif-data-program)
                     (cons ?f file)
                     (cons ?t tag-name))))
-    (save-excursion
-      (set-buffer buf)
+    (with-current-buffer buf
       (delete-region (point-min) (point-max))
-      (if (not (eq (shell-command command buf) 0))
+      (if (not (eq (call-process shell-file-name nil t nil
+                                 shell-command-switch command) 0))
           (error "Could not get EXIF tag")
         (goto-char (point-min))
         ;; Clean buffer from newlines and carriage returns before
@@ -2084,11 +2085,11 @@ as initial value."
 (defun tumme-get-comment (file)
   "Get comment for file FILE."
   (save-excursion
-    (let (end buf comment-beg comment (base-name (file-name-nondirectory file)))
+    (let (end buf comment-beg comment)
       (setq buf (find-file tumme-db-file))
       (goto-char (point-min))
       (when (search-forward-regexp
-             (format "^%s" base-name) nil t)
+             (format "^%s" file) nil t)
         (end-of-line)
         (setq end (point))
         (beginning-of-line)
@@ -2377,7 +2378,8 @@ when using per-directory thumbnail file storage"))
               ;; Insert thumbnail with link to full image
               (insert
                (format "<a href=\"%s/%s\"><img src=\"%s/%s\"%s></a>\n"
-                       tumme-gallery-image-root-url (file-name-nondirectory file)
+                       tumme-gallery-image-root-url
+                       (file-name-nondirectory file)
                        tumme-gallery-thumb-image-root-url
                        (file-name-nondirectory (tumme-thumb-name file)) file))
               ;; Insert comment, if any
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 8eb2cd8471b..901fac01208 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,8 +1,23 @@
+2006-07-12  Michael Olson  <mwolson@gnu.org>
+
+        * url-irc.el (url-irc-erc): Call erc-handle-irc-url.
+
+2006-07-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * url-cookie.el: Remove spurious * in docstrings.
+        (url-cookie-write-file): Don't use versioned backups.
+        (url-cookie-host-can-set-p): Remove unused var `tmp'.
+
+2006-07-04  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+        * url-cookie.el (url-cookie-save-interval): Move to url-cookie group.
+        (url-cookie-write-file): Reset url-cookies-changed-since-last-save.
+
 2006-05-12  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * url-http.el (url-http-file-exists-p): Test if status is integer.
 
-2006-05-05  Andreas Seltenreich  <seltenreich@gmx.de>  (tiny change)
+2006-05-05  Andreas Seltenreich  <seltenreich@gmx.de>
 
         * url-http.el (url-http-parse-headers): Don't reuse connection if
         "Connection: close" header was seen.
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index 53ba75f4cbb..e74d4989117 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -88,18 +88,18 @@ A cookie vector object is a vector of 7 slots:
 (defvar url-cookie-storage nil         "Where cookies are stored.")
 (defvar url-cookie-secure-storage nil  "Where secure cookies are stored.")
 (defcustom url-cookie-file nil
-  "*File where cookies are stored on disk."
+  "File where cookies are stored on disk."
   :type '(choice (const :tag "Default" :value nil) file)
   :group 'url-file
   :group 'url-cookie)
 
 (defcustom url-cookie-confirmation nil
-  "*If non-nil, confirmation by the user is required to accept HTTP cookies."
+  "If non-nil, confirmation by the user is required to accept HTTP cookies."
   :type 'boolean
   :group 'url-cookie)
 
 (defcustom url-cookie-multiple-line nil
-  "*If nil, HTTP requests put all cookies for the server on one line.
+  "If nil, HTTP requests put all cookies for the server on one line.
 Some web servers, such as http://www.hotmail.com/, only accept cookies
 when they are on one line.  This is broken behavior, but just try
 telling Microsoft that."
@@ -168,7 +168,13 @@ telling Microsoft that."
       (insert ")\n(setq url-cookie-secure-storage\n '")
       (pp url-cookie-secure-storage (current-buffer))
       (insert ")\n")
+      (insert ";; Local Variables:\n"
+              ";; version-control: never\n"
+              ";; no-byte-compile: t\n"
+              ";; End:\n")
+      (set (make-local-variable 'version-control) t)
       (write-file fname)
+      (setq url-cookies-changed-since-last-save nil)
       (kill-buffer (current-buffer))))))
 
 (defun url-cookie-store (name value &optional expires domain localpart secure)
@@ -313,18 +319,17 @@ telling Microsoft that."
 '.'s in the domain name in order to set a cookie.")
 
 (defcustom url-cookie-trusted-urls nil
-  "*A list of regular expressions matching URLs to always accept cookies from."
+  "A list of regular expressions matching URLs to always accept cookies from."
   :type '(repeat regexp)
   :group 'url-cookie)
 
 (defcustom url-cookie-untrusted-urls nil
-  "*A list of regular expressions matching URLs to never accept cookies from."
+  "A list of regular expressions matching URLs to never accept cookies from."
   :type '(repeat regexp)
   :group 'url-cookie)
 
 (defun url-cookie-host-can-set-p (host domain)
   (let ((numdots 0)
-        (tmp domain)
         (last nil)
         (case-fold-search t)
         (mindots 3))
@@ -444,7 +449,7 @@ telling Microsoft that."
 (defvar url-cookie-timer nil)
 
 (defcustom url-cookie-save-interval 3600
-  "*The number of seconds between automatic saves of cookies.
+  "The number of seconds between automatic saves of cookies.
 Default is 1 hour.  Note that if you change this variable outside of
 the `customize' interface after `url-do-setup' has been run, you need
 to run the `url-cookie-setup-save-timer' function manually."
@@ -453,7 +458,7 @@ to run the `url-cookie-setup-save-timer' function manually."
            (if (bound-and-true-p url-setup-done)
                (url-cookie-setup-save-timer)))
   :type 'integer
-  :group 'url)
+  :group 'url-cookie)
 
 (defun url-cookie-setup-save-timer ()
   "Reset the cookie saver timer."
diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el
index 6a7a62573e9..19eec6f2ef2 100644
--- a/lisp/url/url-irc.el
+++ b/lisp/url/url-irc.el
@@ -68,9 +68,7 @@ PASSWORD - What password to use"
       (switch-to-buffer (concat chan "@" host)))))
 
 (defun url-irc-erc (host port channel user password)
-  (erc-select :server host :port port :nick user :password password)
-  (when channel
-    (erc-join-channel channel)))
+  (erc-handle-irc-url host port channel user password))
 
 ;;;###autoload
 (defun url-irc (url)
diff --git a/lisp/vc.el b/lisp/vc.el
index 8290fd5b943..d72ee4c7e4e 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -934,11 +934,12 @@ Else, add CODE to the process' sentinel."
   (let ((proc (get-buffer-process (current-buffer))))
     (cond
      ;; If there's no background process, just execute the code.
-     ((null proc) (eval code))
-     ;; If the background process has exited, reap it and try again
-     ((eq (process-status proc) 'exit)
-      (delete-process proc)
-      (vc-exec-after code))
+     ;; We used to explicitly call delete-process on exited processes,
+     ;; but this led to timing problems causing process output to be
+     ;; lost.  Terminated processes get deleted automatically
+     ;; anyway. -- cyd
+     ((or (null proc) (eq (process-status proc) 'exit))
+      (eval code))
      ;; If a process is running, add CODE to the sentinel
      ((eq (process-status proc) 'run)
       (let ((sentinel (process-sentinel proc)))
@@ -2446,9 +2447,9 @@ If FOCUS-REV is non-nil, leave the point at that revision."
          (vc-call print-log file)
          (set-buffer "*vc*"))))
     (pop-to-buffer (current-buffer))
-    (log-view-mode)
     (vc-exec-after
      `(let ((inhibit-read-only t))
+        (log-view-mode)
         (goto-char (point-max)) (forward-line -1)
         (while (looking-at "=*\n")
           (delete-char (- (match-end 0) (match-beginning 0)))
@@ -2456,7 +2457,7 @@ If FOCUS-REV is non-nil, leave the point at that revision."
         (goto-char (point-min))
         (if (looking-at "[\b\t\n\v\f\r ]+")
             (delete-char (- (match-end 0) (match-beginning 0))))
-        (shrink-window-if-larger-than-buffer)
+        ;; (shrink-window-if-larger-than-buffer)
         ;; move point to the log entry for the current version
         (vc-call-backend ',(vc-backend file)
                          'show-log-entry