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

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 97-112)

   - Update from CVS
   - Merge from erc--emacs--0
   - Update from CVS: src/regex.c (extend_range_table_work_area): Fix typo.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 37)

   - Update from CVS

52 files changed, 2135 insertions, 1374 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b0b7945e007..6b91115cd67 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,388 @@
+2006-02-21  Richard M. Stallman  <rms@gnu.org>
+
+        * progmodes/sh-script.el (sh-mode): Set shell type based on file name
+        if there's no other specific basis.
+
+        * emacs-lisp/unsafep.el (unsafep): Don't treat &rest or &optional
+        as variables at all.
+        (unsafep-variable): Rename arg; doc fix.
+
+        * abbrevlist.el (list-one-abbrev-table): Add autoload.
+
+        * calendar/appt.el (diary-selective-display): Add defvar.
+
+        * sort.el (sort-columns): Use Posix arg syntax for `sort'.
+
+        * isearch.el (search-whitespace-regexp): Fix custom type.
+
+        * help.el (describe-key-briefly): Compute interactive args
+        in same was as before previous change.
+
+        * files.el (enable-local-variables): Doc fix.
+
+2006-02-21  Kim F. Storm  <storm@cua.dk>
+
+        * fringe.el: Cleanup as file is now pre-loaded.
+        (fringe-bitmaps): Initialize unconditionally.
+        (fringe-mode, set-fringe-style): Remove autoload cookies.
+
+2006-02-21  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
+
+        * fringe.el (fringe-bitmaps): Rename `horisontal-bar' to
+        `horizontal-bar'.
+        (fringe-cursor-alist): Use `horizontal-bar'.
+
+2006-02-20  Kim F. Storm  <storm@cua.dk>
+
+        * fringe.el (fringe-bitmaps): Update to new bitmap names.
+        (fringe-indicator-alist, fringe-cursor-alist): Initialize.
+
+        * loadup.el: Load "fringe" on window systems.
+
+2006-02-20  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gud.el (gud-speedbar-buttons): Use shadow face for all
+        out of scope components.
+
+        * progmodes/gdb-ui.el (gdb-speedbar-auto-raise): Don't enable by
+        default.
+
+2006-02-20  Chong Yidong  <cyd@stupidchicken.com>
+
+        * custom.el (customize-mark-to-save, customize-mark-as-set): Load
+        the symbol first.
+
+2006-02-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * buff-menu.el (list-buffers-noselect): Turn also "\n" into a
+        strech spec so it doesn't display as "^J" on the header line
+        when `Buffer-menu-use-header-line' is t.
+
+2006-02-20  Nick Roberts  <nickrob@snap.net.nz>
+
+        * speedbar.el (speedbar-make-button): Keep text properties
+        of string arguments if desired.
+
+        * progmodes/gud.el (gud-speedbar-buttons): Fontify watch
+        expessions.
+
+        * progmodes/gdb-ui.el (gdb-speedbar-expand-node): Force update
+        of speedbar.
+
+2006-02-19  Ryan Yeske  <rcyeske@gmail.com>
+
+        * ffap.el (ffap-read-file-or-url): Bind `completion-ignore-case'
+        to value of `read-file-name-completion-ignore-case'.
+
+2006-02-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * custom.el (customize-mark-as-set): Push to `user' theme.
+
+        * cus-edit.el (custom-save-variables): Allow unthemed values.
+        (customize-set-variable): Push setting to `user' theme.
+
+2006-02-19  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gud.el: Don't require font-lock as it's now
+        automatically loaded.
+        (gud-speedbar-buttons): Replace gdb-var-changed with
+        gdb-force-update.
+
+        * progmodes/gdb-ui.el (gdb-force-update): Rename from
+        gdb-var-changed.
+        (gdb-post-prompt): Use it.
+        (gdb-var-create-handler, gdb-var-evaluate-expression-handler)
+        (gdb-var-update-handler, gdb-var-delete)
+        (gdb-speedbar-expand-node, gdb-var-list-children-handler-1)
+        (gdb-var-update-handler-1): Don't set gdb-var-changed, just set
+        gdb-force-update in gdb-post-prompt.
+        (gdb-reset): Clear watch expressions from speedbar when quitting.
+
+2006-02-19  Michael Kifer  <kifer@cs.stonybrook.edu>
+
+        * viper-cmd.el (viper-insert-state-post-command-sentinel)
+        (viper-change-state-to-vi, viper-change-state-to-emacs):
+        Make aware of cursor coloring in the Emacs state.
+        (viper-special-read-and-insert-char): Use read-char-exclusive.
+        (viper-minibuffer-trim-tail): Workaround for fields in minibuffer.
+
+        * viper-init.el (viper-emacs-state-cursor-color): New variable.
+
+        * viper-util.el (viper-save-cursor-color)
+        (viper-get-saved-cursor-color-in-replace-mode)
+        (viper-get-saved-cursor-color-in-insert-mode)
+        (viper-restore-cursor-color): Make aware of the cursor color in Emacs
+        state.
+        (viper-get-saved-cursor-color-in-emacs-mode): New function.
+
+        * ediff-diff.el (ediff-ignore-case, ediff-ignore-case-option)
+        (ediff-ignore-case-option3, ediff-actual-diff-options)
+        (ediff-actual-diff3-options): New variables to control case sensitivity.
+        (ediff-make-diff2-buffer, ediff-setup-fine-diff-regions)
+        (ediff-setup-diff-regions3): Make aware of case-sensitivity.
+        (ediff-toggle-ignore-case): New function.
+        (ediff-extract-diffs, ediff-extract-diffs3): Preserve point in buffers.
+
+        * ediff-help.el (ediff-long-help-message-narrow2)
+        (ediff-long-help-message-compare2, ediff-long-help-message-compare3)
+        (ediff-long-help-message-word-mode): Add ignore-case command.
+        (ediff-help-for-quick-help): Add ignore-case command.
+
+        * ediff-merg.el: Move provide to the end.
+
+        * ediff-ptch.el: Move provide to the end.
+
+        * ediff-wind.el: Move provide to the end.
+
+        * ediff-mult.el: Move provide to the end.
+        (ediff-set-meta-overlay): Enable follow-link.
+
+        * ediff.el: Move provide to the end.
+        Break recursive load cycle in eval-when-compile.
+        (ediff-patch-buffer): Better heuristics.
+
+        * ediff-util.el: Move provide to the end.
+        Break recursive load cycle in eval-when-compile.
+        (ediff-setup-keymap): Add binding for #c.  Replace some defsubsts with
+        defuns.
+        (ediff-submit-report): Pass the values of ediff-diff3-program,
+        ediff-diff3-options.
+
+2006-02-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * help-fns.el (help-do-arg-highlight): Recognize also ARG- followed by
+        the opening bracket of the following bracketing pairs: {}, [], (), <>,
+        `' (for example, in the docstring of `windmove-default-keybindings').
+
+2006-02-19  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gud.el (gud-speedbar-buttons): Update properly for
+        shadow face.  Don't provide binding to edit variable when it is
+        out of scope.
+
+        * progmodes/gdb-ui.el (gdb-var-evaluate-expression-handler)
+        (gdb-var-update-handler): Detect out of scope variables with pre
+        GDB 6.4 too.
+        (gdb-post-prompt): Revert changet 2006-02-17 (force update).
+        Reset status of variable objects to nil in update handlers.
+        (gdb-var-update-handler-1): Detect when a variable object comes
+        in scope.  setcar on var changes gdb-var-list directly.
+
+2006-02-17  Juri Linkov  <juri@jurta.org>
+
+        * ffap.el (ffap) <defface>: Add explicit face declaration.
+        (ffap-highlight): Use face `ffap' directly instead of checking
+        for its existence.
+
+        * icomplete.el (icomplete-get-keys): Use `t' for the second arg
+        `visible-ok' of `other-buffer' to find the right original buffer.
+
+        * info.el (Info-search): Skip `Local Variables' node.
+
+2006-02-17  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-find-file): Check for symbols `apropos', `history',
+        `toc' in the input filename, and return these symbols as is.
+        (Info-find-node-2): Set Info-current-file to symbols `apropos',
+        `history', `toc' instead of strings.
+        (Info-set-mode-line): For non-string Info-current-file use the
+        symbol's name inside **.
+        (Info-isearch-push-state): Add quote before Info-current-file and
+        Info-current-node.
+        (Info-isearch-pop-state): Use `equal' instead of `string='.
+        (Info-extract-pointer, Info-following-node-name): Use
+        `match-string-no-properties' instead of `match-string'.
+        (Info-up): Check `old-file' for `stringp'.
+        (Info-history): Use `equal' instead of `string-equal'.
+        Check `file' for `stringp'.
+        (Info-history): Use symbol `history' instead of string as first arg
+        of `Info-find-node'.
+        (Info-toc): Check `Info-current-file' for `stringp'.  Use symbol
+        `toc' instead of string.
+        (Info-extract-menu-node-name): Use `buffer-substring-no-properties'
+        instead of `buffer-substring', and `match-string-no-properties'
+        instead of `match-string'.
+        (Info-index-nodes): Check for symbols `apropos', `history', `toc'
+        instead of strings.
+        (info-apropos): Use `Info-find-node' instead of `Info-goto-node'.
+        Use symbol `apropos' instead of string.
+        (Info-copy-current-node-name): Check `Info-current-file' for
+        `stringp' and construct a command with `Info-find-node' from it.
+        (Info-fontify-node): Use `match-string-no-properties' instead of
+        `match-string' and check file names for `stringp'.
+        (Info-desktop-buffer-misc-data): Check for symbols `apropos',
+        `history', `toc' instead of strings.
+
+2006-02-17  Chong Yidong  <cyd@stupidchicken.com>
+
+        * files.el: Rearrange functions and variables in the file local
+        variables section.
+
+2006-02-17  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * files.el: Add truncate-lines, ispell-check-comments and
+        ispell-local-dictionary as safe local variables.
+
+2006-02-18  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gud.el (gud-speedbar-buttons): Use shadow face for
+        out of scope variables.
+        (gud-speedbar-buttons): Use unless.
+
+        * progmodes/gdb-ui.el (gdb-var-list): Update doc string.
+        (gdb-init-1, gdb-var-changed): Set gdb-var-changed to t initially.
+        (gdb-show-changed-values): Also use for out of scope variables.
+        (gdb-var-update-handler-1): Note if variable goes out of scope.
+
+2006-02-17  Ryan Yeske  <rcyeske@gmail.com>
+
+        * net/rcirc.el (rcirc-connect): Make all arguments optional, and
+        default to global variable values for unsupplied args.
+        (rcirc-get-buffer-create): Fix bug with setting the target.
+        (rcirc-any-buffer): Rename from rcirc-get-any-buffer, and include
+        test for rcirc-always-use-server-buffer-flag here.
+        (rcirc-response-formats): Add %N, which is a facified nick.  %n
+        uses the default face.  Change the ACTION format string.  If the
+        "nick" is the server, don't print anything for that field.
+        Comment fixes.
+        (rcirc-target-buffer): Don't test
+        rcirc-always-use-server-buffer-flag here.
+        (rcirc-print): Squeeze extra spaces out of the text before message.
+        (rcirc-put-nick-channel): Strip potential "@" char from nick
+        before adding them to nick table.
+        (rcirc-url-regexp): Improve to match address like "foo.com".
+
+2006-02-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * allout.el (allout-hidden-p): Move this defsubst before
+        allout-overlay-interior-modification-handler, where it is first
+        used.
+
+2006-02-17  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el: Use allout invisible-text overlays instead of
+        selective display for concealed text.  Also, lots of general
+        cleanup, and improved compatibility code.
+
+        (allout-version) Incremented, corrected, revised, and refined
+        module commentary.
+
+        (provide 'allout): Moved to the bottom, added a require of overlay.
+
+        (allout-encrypt-unencrypted-on-saves): Defaults to t instead of
+        `except-current'.
+        (allout-write-file-hook-handler): Minimize delay.
+        (count-trailing-whitespace-region): New function so
+        auto-encryption of current topic can resituate cursor exactly.
+        PGP/GPG encryption trims trailing whitespace from lines, which
+        must be accounted for across encryption then decryption.
+
+        (allout-command-prefix): Now defaults to "\C-c<space>" rather than
+        just plain "\C-c", to avoid intruding on user's keybinding space.
+
+        (allout-toggle-current-subtree-encryption): Pass along fetch-pass
+        parameter, so user request to provide a new password is done.
+
+        (allout-outside-normal-auto-fill-function, allout-auto-fill):
+        Refined mechanism for auto-filling behavior while in allout mode.
+
+        (allout-mode): Explicitly specify the mode map in the docstring.
+        Clarify provision for various write-file hook var names.
+        Adjusted for invisible-text overlays instead of selective-display.
+
+        (allout-depth): Really return 0 if not within any topic.  This
+        rectifies `allout-beginning-of-level' and sequence numbering
+        errors that occur when cutting and pasting numbered topics.
+        Changed from a in-line subst to a regular function, as well.
+
+        (allout-pre-next-prefix): Renamed from allout-pre-next-preface.
+
+        (allout-end-of-subtree, allout-end-of-subtree)
+        (allout-end-of-entry, allout-end-of-current-heading)
+        (allout-next-visible-heading, allout-open-topic, allout-show-entry)
+        (allout-show-children, allout-show-to-offshoot)
+        (allout-hide-current-entry, allout-show-current-entry): Rectified
+        handling of trailing blank lines between items.
+
+        (allout-line-boundary-regexp, set-allout-regexp, allout-depth)
+        (allout-current-depth, allout-unprotected, allout-hidden-p)
+        (allout-on-current-heading-p, allout-listify-exposed)
+        (allout-chart-subtree, allout-goto-prefix)
+        (allout-back-to-current-heading, allout-get-body-text)
+        (allout-snug-back, allout-flag-current-subtree, allout-show-all)
+        (allout-hide-region-body, allout-toggle-subtree-encryption)
+        (allout-encrypt-string, allout-encrypted-key-info)
+        (allout-next-topic-pending-encryption, allout-encrypt-decrypted)
+        (allout-file-vars-section-data): Adjusted for use with
+        invisible-text overlays instead of selective-display.
+
+        (allout-kill-line, allout-kill-topic, allout-yank-processing):
+        Reworked for use with invisible text overlays.
+
+        (allout-current-topic-collapsed-p): New function.
+
+        (allout-hide-current-subtree): Use allout-current-topic-collapsed-p
+        to know when to close the containing topic.
+
+        (allout-pre-command-business, allout-post-command-business):
+        Simplify undo-batching and dynamic isearch exposure.
+
+        (allout-set-overlay-category): New for invisible-text overlays.
+        Sets properties of allout-overlay-category, used by
+        allout-flag-region to set invisible-text overlay properties.
+        (allout-get-invisibility-overlay): Get the first qualifying
+        invisibility overlay, so we can find the extent of it.
+        (allout-back-to-visible-text): Get to just before the beginnining
+        of the current invisibility overlay, if any.
+
+        (allout-overlay-insert-in-front-handler)
+        (allout-overlay-interior-modification-handler)
+        (allout-before-change-handler, allout-isearch-end-handler): New
+        functions to handle extraordinary actions affecting concealed
+        text.
+
+        (allout-flag-region): Use overlays instead of selective-display
+        for invisible text - by inheritence from the properties of
+        allout-overlay-category in mainline Emacs, and applied
+        property-by-property in XEmacs, some recent versions of which
+        don't inherit the properties from the category.  Provisions to
+        respond to concealed-text edits simplified drastically.
+
+        (allout-isearch-rectification, allout-isearch-was-font-lock)
+        (allout-isearch-expose, allout-enwrap-isearch)
+        (allout-isearch-abort, allout-pre-was-isearching)
+        (allout-isearch-prior-pos, allout-isearch-did-quit)
+        (allout-isearch-dynamic-expose)
+        (allout-hide-current-entry-completely): Functions deleted.
+
+        (allout-undo-aggregation): Explicit undo aggregation no longer
+        necessary due to transition away from selective-display.
+
+        (set-allout-regexp, allout-up-current-level)
+        (allout-next-visible-heading, allout-forward-current-level)
+        (allout-open-topic, allout-reindent-body, allout-rebullet-topic)
+        (allout-kill-line, allout-yank-processing, allout-show-children)
+        (allout-expose-topic, allout-old-expose-topic)
+        (allout-listify-exposed, allout-insert-latex-header)
+        (allout-toggle-subtree-encryption, allout-encrypt-string)
+        (remove-from-invisibility-spec, allout-hide-current-subtree):
+        Ditched unused variables.
+
+2006-02-17  Agustin Martin  <agustin.martin@hispalinux.es>
+
+        * textmodes/ispell.el (ispell-change-dictionary): Call
+        ispell-buffer-local-dict instead of
+        ispell-accept-buffer-local-defs.
+        (ispell-local-dictionary-alist): Accept as valid any coding-system
+        supported by Emacs.
+        (ispell-dictionary-alist-3): Esperanto dictionary's coding system
+        changed to iso-8859-3.
+
 2006-02-17  Nick Roberts  <nickrob@snap.net.nz>
 
         * speedbar.el (speedbar-frame-width): Make an inline function
         instead of a macro.  Use frame-width.
-        (speedbar-try-completion, speedbar-update-contents) 
+        (speedbar-try-completion, speedbar-update-contents)
         (speedbar-timer-fn): Use consp.
         (speedbar-update-localized-contents): Try to preserve point.
 
diff --git a/lisp/abbrevlist.el b/lisp/abbrevlist.el
index bd3482f974b..d52ccffeb3c 100644
--- a/lisp/abbrevlist.el
+++ b/lisp/abbrevlist.el
@@ -28,6 +28,7 @@
 
 ;;; Code:
 
+;;;###autoload
 (defun list-one-abbrev-table (abbrev-table output-buffer)
   "Display alphabetical listing of ABBREV-TABLE in buffer OUTPUT-BUFFER."
   (with-output-to-temp-buffer output-buffer
diff --git a/lisp/allout.el b/lisp/allout.el
index 78e61dacde2..69d72506fce 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -1,12 +1,12 @@
 ;;; allout.el --- extensive outline mode for use alone and with other modes
 
 ;; Copyright (C) 1992, 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Ken Manheimer <ken dot manheimer at gmail dot com>
 ;; Maintainer: Ken Manheimer <ken dot manheimer at gmail dot com>
 ;; Created: Dec 1991 - first release to usenet
-;; Version: 2.1
+;; Version: 2.2
 ;; Keywords: outlines wp languages
 
 ;; This file is part of GNU Emacs.
@@ -28,36 +28,39 @@
 
 ;;; Commentary:
 
-;; Allout outline mode provides extensive outline formatting and
-;; and manipulation beyond standard emacs outline mode.  It provides
-;; for structured editing of outlines, as well as navigation and
-;; exposure.  It also provides for syntax-sensitive text like
-;; programming languages.  (For an example, see the allout code
-;; itself, which is organized in ;; an outline framework.)
+;; Allout outline minor mode provides extensive outline formatting and
+;; and manipulation beyond standard emacs outline mode.  Some features:
 ;;
-;; Some features:
-;;
-;;  - classic outline-mode topic-oriented navigation and exposure adjustment
-;;  - topic-oriented editing including coherent topic and subtopic
-;;    creation, promotion, demotion, cut/paste across depths, etc
-;;  - incremental search with dynamic exposure and reconcealment of text
-;;  - customizable bullet format enbles programming-language specific
-;;    outlining, for ultimate code-folding editing.  (allout code itself is
-;;    formatted as an outline - do ESC-x eval-current-buffer in allout.el
-;;    to try it out.)
-;;  - configurable per-file initial exposure settings
-;;  - symmetric-key and key-pair topic encryption, plus symmetric passphrase
+;;  - Classic outline-mode topic-oriented navigation and exposure adjustment
+;;  - Topic-oriented editing including coherent topic and subtopic
+;;    creation, promotion, demotion, cut/paste across depths, etc.
+;;  - Incremental search with dynamic exposure and reconcealment of text
+;;  - Customizable bullet format - enables programming-language specific
+;;    outlining, for code-folding editing.  (Allout code itself is to try it;
+;;    formatted as an outline - do ESC-x eval-current-buffer in allout.el; but
+;;    emacs local file variables need to be enabled when the
+;;    file was visited - see `enable-local-variables'.)
+;;  - Configurable per-file initial exposure settings
+;;  - Symmetric-key and key-pair topic encryption, plus symmetric passphrase
 ;;    mnemonic support, with verification against an established passphrase
 ;;    (using a stashed encrypted dummy string) and user-supplied hint
-;;    maintenance.  (see allout-toggle-current-subtree-encryption docstring.)
-;;  - automatic topic-number maintenance
-;;  - "hot-spot" operation, for single-keystroke maneuvering and
+;;    maintenance.  (See allout-toggle-current-subtree-encryption docstring.)
+;;  - Automatic topic-number maintenance
+;;  - "Hot-spot" operation, for single-keystroke maneuvering and
 ;;    exposure control (see the allout-mode docstring)
-;;  - easy rendering of exposed portions into numbered, latex, indented, etc
+;;  - Easy rendering of exposed portions into numbered, latex, indented, etc
 ;;    outline styles
+;;  - Careful attention to whitespace - enabling blank lines between items
+;;    and maintenance of hanging indentation (in paragraph auto-fill and
+;;    across topic promotion and demotion) of topic bodies consistent with
+;;    indentation of their topic header.
 ;;
 ;; and more.
 ;;
+;; See the `allout-mode' function's docstring for an introduction to the
+;; mode.  The development version and helpful notes are available at
+;; http://myriadicity.net/Sundry/EmacsAllout .
+;;
 ;; The outline menubar additions provide quick reference to many of
 ;; the features, and see the docstring of the variable `allout-init'
 ;; for instructions on priming your emacs session for automatic
@@ -75,20 +78,18 @@
 
 ;;; Code:
 
-;;;_* Provide
-;(provide 'outline)
-(provide 'allout)
-
 ;;;_* Dependency autoloads
+(require 'overlay)
 (eval-when-compile (progn (require 'pgg)
                           (require 'pgg-gpg)
-                          (fset 'allout-real-isearch-abort
-                                (symbol-function 'isearch-abort))
+                          (require 'overlay)
                           ))
 (autoload 'pgg-gpg-symmetric-key-p "pgg-gpg"
   "True if decoded armor MESSAGE-KEYS has symmetric encryption indicator.")
 
 ;;;_* USER CUSTOMIZATION VARIABLES:
+
+;;;_ > defgroup allout
 (defgroup allout nil
   "Extensive outline mode for use alone and with other modes."
   :prefix "allout-"
@@ -151,7 +152,7 @@ lines at the bottom of an Emacs Lisp file:
 will, modulo the above-mentioned conditions, cause the mode to be
 activated when the file is visited, followed by the equivalent of
 `\(allout-expose-topic 0 : -1 -1 0)'.  \(This is the layout used for
-the allout.el, itself.)
+the allout.el source file.)
 
 Also, allout's mode-specific provisions will make topic prefixes default
 to the comment-start string, if any, of the language of the file.  This
@@ -450,7 +451,7 @@ variable for details about allout ajustment of file variables."
   :group 'allout)
 (make-variable-buffer-local 'allout-passphrase-hint-handling)
 ;;;_  = allout-encrypt-unencrypted-on-saves
-(defcustom allout-encrypt-unencrypted-on-saves 'except-current
+(defcustom allout-encrypt-unencrypted-on-saves t
   "*When saving, should topics pending encryption be encrypted?
 
 The idea is to prevent file-system exposure of any un-encrypted stuff, and
@@ -485,8 +486,11 @@ disable auto-saves for that file."
 ;;;_ + Miscellaneous customization
 
 ;;;_  = allout-command-prefix
-(defcustom allout-command-prefix "\C-c"
-  "*Key sequence to be used as prefix for outline mode command key bindings."
+(defcustom allout-command-prefix "\C-c "
+  "*Key sequence to be used as prefix for outline mode command key bindings.
+
+Default is '\C-c<space>'; just '\C-c' is more short-and-sweet, if you're
+willing to let allout use a bunch of \C-c keybindings."
   :type 'string
   :group 'allout)
 
@@ -538,23 +542,12 @@ unless optional third, non-nil element is present.")
         ("=t" allout-latexify-exposed)
         ("=p" allout-flatten-exposed-to-buffer)))
 
-;;;_  = allout-isearch-dynamic-expose
-(defcustom allout-isearch-dynamic-expose t
-  "*Non-nil enable dynamic exposure of hidden incremental-search
-targets as they're encountered."
-  :type 'boolean
-  :group 'allout)
-(make-variable-buffer-local 'allout-isearch-dynamic-expose)
-
 ;;;_  = allout-use-hanging-indents
 (defcustom allout-use-hanging-indents t
   "*If non-nil, topic body text auto-indent defaults to indent of the header.
 Ie, it is indented to be just past the header prefix.  This is
 relevant mostly for use with indented-text-mode, or other situations
-where auto-fill occurs.
-
-\[This feature no longer depends in any way on the `filladapt.el'
-lisp-archive package.\]"
+where auto-fill occurs."
   :type 'boolean
   :group 'allout)
 (make-variable-buffer-local 'allout-use-hanging-indents)
@@ -597,7 +590,7 @@ For details, see `allout-toggle-current-subtree-encryption's docstring."
 ;;;_ #1 Internal Outline Formatting and Configuration
 ;;;_  : Version
 ;;;_   = allout-version
-(defvar allout-version "2.1"
+(defvar allout-version "2.2"
   "Version of currently loaded outline package.  \(allout.el)")
 ;;;_   > allout-version
 (defun allout-version (&optional here)
@@ -636,9 +629,9 @@ and `allout-distinctive-bullets-string'.")
 (defvar allout-line-boundary-regexp ()
   "`allout-regexp' with outline style beginning-of-line anchor.
 
-\(Ie, C-j, *or* C-m, for prefixes of hidden topics).  This is properly
-set when `allout-regexp' is produced by `set-allout-regexp', so
-that (match-beginning 2) and (match-end 2) delimit the prefix.")
+This is properly set when `allout-regexp' is produced by
+`set-allout-regexp', so that (match-beginning 2) and (match-end
+2) delimit the prefix.")
 (make-variable-buffer-local 'allout-line-boundary-regexp)
 ;;;_   = allout-bob-regexp
 (defvar allout-bob-regexp ()
@@ -753,11 +746,9 @@ Works with respect to `allout-plain-bullets-string' and
         cur-string
         cur-len
         cur-char
-        cur-char-string
-        index
-        new-string)
+        index)
     (while strings
-      (setq new-string "") (setq index 0)
+      (setq index 0)
       (setq cur-len (length (setq cur-string (symbol-value (car strings)))))
       (while (< index cur-len)
         (setq cur-char (aref cur-string index))
@@ -788,7 +779,7 @@ Works with respect to `allout-plain-bullets-string' and
                                allout-primary-bullet
                                "+\\|\^l"))
   (setq allout-line-boundary-regexp
-        (concat "\\([\n\r]\\)\\(" allout-regexp "\\)"))
+        (concat "\\(\n\\)\\(" allout-regexp "\\)"))
   (setq allout-bob-regexp
         (concat "\\(\\`\\)\\(" allout-regexp "\\)"))
   )
@@ -955,42 +946,28 @@ from the list."
           (setq allout-mode-prior-settings rebuild)))))
   )
 ;;;_  : Mode-specific incidentals
-;;;_   = allout-pre-was-isearching nil
-(defvar allout-pre-was-isearching nil
-  "Cue for isearch-dynamic-exposure mechanism, implemented in
-allout-pre- and -post-command-hooks.")
-(make-variable-buffer-local 'allout-pre-was-isearching)
-;;;_   = allout-isearch-prior-pos nil
-(defvar allout-isearch-prior-pos nil
-  "Cue for isearch-dynamic-exposure tracking, used by
-`allout-isearch-expose'.")
-(make-variable-buffer-local 'allout-isearch-prior-pos)
-;;;_   = allout-isearch-did-quit
-(defvar allout-isearch-did-quit nil
-  "Distinguishes isearch conclusion and cancellation.
-
-Maintained by allout-isearch-abort \(which is wrapped around the real
-isearch-abort), and monitored by allout-isearch-expose for action.")
-(make-variable-buffer-local 'allout-isearch-did-quit)
 ;;;_   > allout-unprotected (expr)
 (defmacro allout-unprotected (expr)
-  "Enable internal outline operations to alter read-only text."
-  `(let ((was-inhibit-r-o inhibit-read-only))
-     (unwind-protect
-         (progn
-           (setq inhibit-read-only t)
-           ,expr)
-       (setq inhibit-read-only was-inhibit-r-o)
-       )
-     )
-  )
-;;;_   = allout-undo-aggregation
-(defvar allout-undo-aggregation 30
-  "Amount of successive self-insert actions to bunch together per undo.
-
-This is purely a kludge variable, regulating the compensation for a bug in
-the way that `before-change-functions' and undo interact.")
-(make-variable-buffer-local 'allout-undo-aggregation)
+  "Enable internal outline operations to alter invisible text."
+  `(let ((inhibit-read-only t))
+     ,expr))
+;;;_   = 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-view-change-hook
+(defvar allout-view-change-hook nil
+  "*Hook that's run after allout outline visibility changes.")
+
+;;;_   = allout-outside-normal-auto-fill-function
+(defvar allout-outside-normal-auto-fill-function nil
+  "Value of normal-auto-fill-function outside of allout mode.
+
+Used by allout-auto-fill to do the mandated normal-auto-fill-function
+wrapped within allout's automatic fill-prefix setting.")
+(make-variable-buffer-local 'allout-outside-normal-auto-fill-function)
 ;;;_   = file-var-bug hack
 (defvar allout-v18/19-file-var-hack nil
   "Horrible hack used to prevent invalid multiple triggering of outline
@@ -1059,7 +1036,7 @@ was encrypted automatically as part of a file write or autosave.")
                           (allout-next-topic-pending-encryption except-mark))
           (progn
             (message "auto-encrypting pending topics")
-            (sit-for 2)
+            (sit-for 0)
             (condition-case failure
                 (setq allout-after-save-decrypt
                       (allout-encrypt-decrypted except-mark))
@@ -1184,7 +1161,6 @@ the following two lines in your Emacs init file:
                         ((message
                           "Outline mode auto-activation and -layout enabled.")
                          'full)))))))
-
 ;;;_  > allout-setup-menubar ()
 (defun allout-setup-menubar ()
   "Populate the current buffer's menubar with `allout-mode' stuff."
@@ -1197,12 +1173,37 @@ 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)
+  ;; 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
+       'allout-isearch-end-handler)
+  (if (featurep 'xemacs)
+      (put 'allout-overlay-category 'start-open t)
+    (put 'allout-overlay-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))))
 ;;;_  > allout-mode (&optional toggle)
 ;;;_   : Defun:
 ;;;###autoload
 (defun allout-mode (&optional toggle)
 ;;;_    . Doc string:
   "Toggle minor mode for controlling exposure and editing of text outlines.
+\\<allout-mode-map>
 
 Optional arg forces mode to re-initialize iff arg is positive num or
 symbol.  Allout outline mode always runs as a minor mode.
@@ -1244,62 +1245,69 @@ The bindings are dictated by the `allout-keybindings-list' and
 \\[allout-forward-current-level] allout-forward-current-level    | \\[allout-show-current-entry] allout-show-current-entry
 \\[allout-backward-current-level] allout-backward-current-level   | \\[allout-show-all] allout-show-all
 \\[allout-end-of-entry] allout-end-of-entry
-\\[allout-beginning-of-current-entry,] allout-beginning-of-current-entry, alternately, goes to hot-spot
+\\[allout-beginning-of-current-entry] allout-beginning-of-current-entry, alternately, goes to hot-spot
 
         Topic Header Production:
         -----------------------
-\\[allout-open-sibtopic]  allout-open-sibtopic  Create a new sibling after current topic.
-\\[allout-open-subtopic]  allout-open-subtopic  ... an offspring of current topic.
-\\[allout-open-supertopic]  allout-open-supertopic      ... a sibling of the current topic's parent.
+\\[allout-open-sibtopic]        allout-open-sibtopic    Create a new sibling after current topic.
+\\[allout-open-subtopic]        allout-open-subtopic    ... an offspring of current topic.
+\\[allout-open-supertopic]      allout-open-supertopic  ... a sibling of the current topic's parent.
 
         Topic Level and Prefix Adjustment:
         ---------------------------------
-\\[allout-shift-in]  allout-shift-in    Shift current topic and all offspring deeper.
-\\[allout-shift-out]  allout-shift-out  ... less deep.
-\\[allout-rebullet-current-heading]  allout-rebullet-current-heading Prompt for alternate bullet for
+\\[allout-shift-in]     allout-shift-in Shift current topic and all offspring deeper.
+\\[allout-shift-out]    allout-shift-out        ... less deep.
+\\[allout-rebullet-current-heading]     allout-rebullet-current-heading Prompt for alternate bullet for
                                          current topic.
 \\[allout-rebullet-topic]       allout-rebullet-topic   Reconcile bullets of topic and its offspring
                                 - distinctive bullets are not changed, others
                                   alternated according to nesting depth.
-\\[allout-number-siblings]  allout-number-siblings      Number bullets of topic and siblings - the
+\\[allout-number-siblings]      allout-number-siblings  Number bullets of topic and siblings - the
                                 offspring are not affected.  With repeat
                                 count, revoke numbering.
 
         Topic-oriented Killing and Yanking:
         ----------------------------------
-\\[allout-kill-topic]     allout-kill-topic     Kill current topic, including offspring.
-\\[allout-kill-line]     allout-kill-line       Like kill-line, but reconciles numbering, etc.
-\\[allout-yank]     allout-yank         Yank, adjusting depth of yanked topic to
+\\[allout-kill-topic]   allout-kill-topic       Kill current topic, including offspring.
+\\[allout-kill-line]    allout-kill-line        Like kill-line, but reconciles numbering, etc.
+\\[allout-yank] allout-yank             Yank, adjusting depth of yanked topic to
                                 depth of heading if yanking into bare topic
                                 heading (ie, prefix sans text).
-\\[allout-yank-pop]     allout-yank-pop Is to allout-yank as yank-pop is to yank
+\\[allout-yank-pop]     allout-yank-pop Is to allout-yank as yank-pop is to yank
+
+        Topic-oriented Encryption:
+        -------------------------
+\\[allout-toggle-current-subtree-encryption]    allout-toggle-current-subtree-encryption Encrypt/Decrypt topic content
 
         Misc commands:
         -------------
 M-x outlineify-sticky           Activate outline mode for current buffer,
                                 and establish a default file-var setting
                                 for `allout-layout'.
-\\[allout-mark-topic]     allout-mark-topic
+\\[allout-mark-topic]           allout-mark-topic
 \\[allout-copy-exposed-to-buffer]     allout-copy-exposed-to-buffer
                                 Duplicate outline, sans concealed text, to
                                 buffer with name derived from derived from that
                                 of current buffer - \"*BUFFERNAME exposed*\".
-\\[allout-flatten-exposed-to-buffer]     allout-flatten-exposed-to-buffer
+\\[allout-flatten-exposed-to-buffer]    allout-flatten-exposed-to-buffer
                                 Like above 'copy-exposed', but convert topic
                                 prefixes to section.subsection... numeric
                                 format.
-ESC ESC (allout-init t) Setup Emacs session for outline mode
+\\[eval-expression] (allout-init t)     Setup Emacs session for outline mode
                                 auto-activation.
 
-                  Encrypted Entries
+                  Topic Encryption
 
-Outline mode supports easily togglable gpg encryption of topics, with
-niceties like support for symmetric and key-pair modes, passphrase timeout,
-passphrase consistency checking, user-provided hinting for symmetric key
-mode, and auto-encryption of topics pending encryption on save.  The aim is
-to enable reliable topic privacy while preventing accidents like neglected
-encryption, encryption with a mistaken passphrase, forgetting which
-passphrase was used, and other practical pitfalls.
+Outline mode supports gpg encryption of topics, with support for
+symmetric and key-pair modes, passphrase timeout, passphrase
+consistency checking, user-provided hinting for symmetric key
+mode, and auto-encryption of topics pending encryption on save.
+\(Topics pending encryption are, by default, automatically
+encrypted during file saves; if you're editing the contents of
+such a topic, it is automatically decrypted for continued
+editing.)  The aim is reliable topic privacy while preventing
+accidents like neglected encryption before saves, forgetting
+which passphrase was used, and other practical pitfalls.
 
 See `allout-toggle-current-subtree-encryption' function docstring and
 `allout-encrypt-unencrypted-on-saves' customization variable for details.
@@ -1309,22 +1317,21 @@ See `allout-toggle-current-subtree-encryption' function docstring and
 Hot-spot operation provides a means for easy, single-keystroke outline
 navigation and exposure control.
 
-\\<allout-mode-map>
 When the text cursor is positioned directly on the bullet character of
 a topic, regular characters (a to z) invoke the commands of the
 corresponding allout-mode keymap control chars.  For example, \"f\"
-would invoke the command typically bound to \"C-c C-f\"
+would invoke the command typically bound to \"C-c<space>C-f\"
 \(\\[allout-forward-current-level] `allout-forward-current-level').
 
-Thus, by positioning the cursor on a topic bullet, you can execute
-the outline navigation and manipulation commands with a single
-keystroke.  Non-literal chars never get this special translation, so
-you can use them to get away from the hot-spot, and back to normal
-operation.
+Thus, by positioning the cursor on a topic bullet, you can
+execute the outline navigation and manipulation commands with a
+single keystroke.  Regular navigation keys (eg, \\[forward-char], \\[next-line]) never get
+this special translation, so you can use them to get out of the
+hot-spot and back to normal operation.
 
 Note that the command `allout-beginning-of-current-entry' \(\\[allout-beginning-of-current-entry]\)
 will move to the hot-spot when the cursor is already located at the
-beginning of the current entry, so you can simply hit \\[allout-beginning-of-current-entry]
+beginning of the current entry, so you usually can hit \\[allout-beginning-of-current-entry]
 twice in a row to get to the hot-spot.
 
                             Terminology
@@ -1332,7 +1339,7 @@ twice in a row to get to the hot-spot.
 Topic hierarchy constituents - TOPICS and SUBTOPICS:
 
 TOPIC:  A basic, coherent component of an Emacs outline.  It can
-        contain other topics, and it can be subsumed by other topics,
+        contain and be contained by other topics.
 CURRENT topic:
         The visible topic most immediately containing the cursor.
 DEPTH:  The degree of nesting of a topic; it increases with
@@ -1376,13 +1383,13 @@ PREFIX-LEAD:
         docstring for more detail.
 PREFIX-PADDING:
         Spaces or asterisks which separate the prefix-lead and the
-        bullet, according to the depth of the topic.
+        bullet, determining the depth of the topic.
 BULLET: A character at the end of the topic prefix, it must be one of
         the characters listed on `allout-plain-bullets-string' or
         `allout-distinctive-bullets-string'.  (See the documentation
         for these variables for more details.)  The default choice of
-        bullet when generating varies in a cycle with the depth of the
-        topic.
+        bullet when generating topics varies in a cycle with the depth of
+        the topic.
 ENTRY:  The text contained in a topic before any offspring.
 BODY:   Same as ENTRY.
 
@@ -1393,7 +1400,6 @@ EXPOSURE:
 CONCEALED:
         Topics and entry text whose display is inhibited.  Contiguous
         units of concealed text is represented by `...' ellipses.
-        (Ref the `selective-display' var.)
 
         Concealed topics are effectively collapsed within an ancestor.
 CLOSED: A topic whose immediate offspring and body-text is concealed.
@@ -1415,9 +1421,11 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
          ;; allout-mode already called once during this complex command?
          (same-complex-command (eq allout-v18/19-file-var-hack
                                   (car command-history)))
-         (write-file-hook-var-name (if (boundp 'write-file-functions)
-                                       'write-file-functions
-                                     'local-write-file-hooks))
+         (write-file-hook-var-name (cond ((boundp 'write-file-functions)
+                                          'write-file-functions)
+                                         ((boundp 'write-file-hooks)
+                                          'write-file-hooks)
+                                         (t 'local-write-file-hooks)))
          do-layout
          )
 
@@ -1465,9 +1473,8 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
           (progn
            (allout-resumptions 'allout-primary-bullet)
            (allout-resumptions 'allout-old-style-prefixes)))
-      (allout-resumptions 'selective-display)
-      (if (and (boundp 'before-change-functions) before-change-functions)
-          (allout-resumptions 'before-change-functions))
+      ;;(allout-resumptions 'selective-display)
+      (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)))
@@ -1476,9 +1483,8 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
                  auto-save-hook))
       (allout-resumptions 'paragraph-start)
       (allout-resumptions 'paragraph-separate)
-      (allout-resumptions (if (string-match "^18" emacs-version)
-                              'auto-fill-hook
-                            'auto-fill-function))
+      (allout-resumptions 'auto-fill-function)
+      (allout-resumptions 'normal-auto-fill-function)
       (allout-resumptions 'allout-former-auto-filler)
       (setq allout-mode nil))
 
@@ -1490,6 +1496,8 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
            (allout-resumptions 'allout-primary-bullet '("*"))
            (allout-resumptions 'allout-old-style-prefixes '(()))))
 
+      (allout-set-overlay-category)     ; Doesn't hurt to redo this.
+
       (allout-infer-header-lead)
       (allout-infer-body-reindent)
 
@@ -1525,25 +1533,24 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
                                                 (current-local-map)))
         )
 
-                                       ; selective-display is the
-                                       ; emacs conditional exposure
-                                       ; mechanism:
-      (allout-resumptions 'selective-display '(t))
+      (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:
-      (let* ((fill-func-var (if (string-match "^18" emacs-version)
-                               'auto-fill-hook
-                             'auto-fill-function))
-            (fill-func (symbol-value fill-func-var)))
-        ;; Register prevailing fill func for use by allout-auto-fill:
-        (allout-resumptions 'allout-former-auto-filler (list fill-func))
-        ;; Register allout-auto-fill to be used if filling is active:
-        (allout-resumptions fill-func-var '(allout-auto-fill)))
+      ;; 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
@@ -1563,10 +1570,6 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
       (if allout-layout
           (setq do-layout t))
 
-      (if (and allout-isearch-dynamic-expose
-               (not (fboundp 'allout-real-isearch-abort)))
-          (allout-enwrap-isearch))
-
       (run-hooks 'allout-mode-hook)
       (setq allout-mode t))
 
@@ -1602,9 +1605,92 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
     allout-mode
     )                                   ; let*
   )                                     ; defun
+
+;;;_  - Position Assessment
+;;;_   > allout-hidden-p (&optional pos)
+(defsubst allout-hidden-p (&optional pos)
+  "Non-nil if the character after point is invisible."
+  (get-char-property (or pos (point)) 'invisible))
+
 ;;;_  > allout-minor-mode
 (defalias 'allout-minor-mode 'allout-mode)
 
+;;;_  > allout-overlay-insert-in-front-handler (ol after beg end
+;;;                                                &optional prelen)
+(defun allout-overlay-insert-in-front-handler (ol after beg end
+                                                  &optional prelen)
+  "Shift the overlay so stuff inserted in front of it are excluded."
+  (if after
+      (move-overlay ol (1+ beg) (overlay-end ol))))
+;;;_  > allout-overlay-interior-modification-handler (ol after beg end
+;;;                                                      &optional prelen)
+(defun allout-overlay-interior-modification-handler (ol after beg end
+                                                        &optional prelen)
+  "Get confirmation before making arbitrary changes to invisible text.
+
+We expose the invisible text and ask for confirmation.  Refusal or
+keyboard-quit abandons the changes, with keyboard-quit additionally
+reclosing the opened text.
+
+No confirmation is necessary when inhibit-read-only is set - eg, allout
+internal functions use this feature cohesively bunch changes."
+
+  (when (and (not inhibit-read-only) (not after))
+    (let ((start (point))
+          (ol-start (overlay-start ol))
+          (ol-end (overlay-end ol))
+          (msg "Change within concealed text disallowed.")
+          opened
+          first)
+      (goto-char beg)
+      (while (< (point) end)
+        (when (allout-hidden-p)
+          (allout-show-to-offshoot)
+          (if (allout-hidden-p)
+              (save-excursion (forward-char 1)
+                              (allout-show-to-offshoot)))
+          (when (not first)
+            (setq opened t)
+            (setq first (point))))
+        (goto-char (if (featurep 'xemacs)
+                       (next-property-change (1+ (point)) nil end)
+                     (next-char-property-change (1+ (point)) end))))
+      (when first
+        (goto-char first)
+        (condition-case nil
+            (if (not
+                 (yes-or-no-p
+                  (substitute-command-keys
+                   (concat "Modify this concealed text?  (\"no\" aborts,"
+                           " \\[keyboard-quit] also reconceals) "))))
+                (progn (goto-char start)
+                       (error "Concealed-text change refused.")))
+          (quit (allout-flag-region ol-start ol-end nil)
+                (allout-flag-region ol-start ol-end t)
+                (error "Concealed-text change abandoned, text reconcealed."))))
+      (goto-char start))))
+;;;_  > allout-before-change-handler (beg end)
+(defun allout-before-change-handler (beg end)
+  "Protect against changes to invisible text.
+
+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)
+      nil
+    (allout-overlay-interior-modification-handler nil 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.
+
+Optional OVERLAY parameter is for when this function is used by
+`isearch-open-invisible' overlay property.  It is otherwise unused, so this
+function can also be used as an `isearch-mode-end-hook'."
+
+  (if (and (allout-mode-p) (allout-hidden-p))
+      (allout-show-to-offshoot)))
+
 ;;;_ #3 Internal Position State-Tracking - "allout-recent-*" funcs
 ;;; All the basic outline functions that directly do string matches to
 ;;; evaluate heading prefix location set the variables
@@ -1667,7 +1753,6 @@ to return the current depth of the most recently matched topic."
 
 ;;;_ #4 Navigation
 
-;;;_  - Position Assessment
 ;;;_   : Location Predicates
 ;;;_    > allout-on-current-heading-p ()
 (defun allout-on-current-heading-p ()
@@ -1675,7 +1760,7 @@ to return the current depth of the most recently matched topic."
 
 Actually, returns prefix beginning point."
   (save-excursion
-    (beginning-of-line)
+    (allout-beginning-of-current-line)
     (and (looking-at allout-regexp)
          (allout-prefix-data (match-beginning 0) (match-end 0)))))
 ;;;_    > allout-on-heading-p ()
@@ -1686,39 +1771,36 @@ Actually, returns prefix beginning point."
   (and (save-excursion (beginning-of-line)
                        (looking-at allout-regexp))
        (= (point)(save-excursion (allout-end-of-prefix)(point)))))
-;;;_    > allout-hidden-p ()
-(defmacro allout-hidden-p ()
-  "True if point is in hidden text."
-  '(save-excursion
-     (and (re-search-backward "[\n\r]" () t)
-          (= ?\r (following-char)))))
-;;;_    > allout-visible-p ()
-(defmacro allout-visible-p ()
-  "True if point is not in hidden text."
-  (interactive)
-  '(not (allout-hidden-p)))
 ;;;_   : Location attributes
 ;;;_    > allout-depth ()
-(defsubst allout-depth ()
-  "Like `allout-current-depth', but respects hidden as well as visible topics."
+(defun allout-depth ()
+  "Return depth of topic most immediately containing point.
+
+Return zero if point is not within any topic.
+
+Like `allout-current-depth', but respects hidden as well as visible topics."
   (save-excursion
-    (if (allout-goto-prefix)
-        (allout-recent-depth)
-      (progn
-        ;; Oops, no prefix, zero prefix data:
-        (allout-prefix-data (point)(point))
-        ;; ... and return 0:
-        0))))
+    (let ((start-point (point)))
+      (if (and (allout-goto-prefix)
+               (not (< start-point (point))))
+          (allout-recent-depth)
+        (progn
+          ;; Oops, no prefix, zero prefix data:
+          (allout-prefix-data (point)(point))
+          ;; ... and return 0:
+          0)))))
 ;;;_    > allout-current-depth ()
-(defmacro allout-current-depth ()
-  "Return nesting depth of visible topic most immediately containing point."
-  '(save-excursion
-     (if (allout-back-to-current-heading)
-         (max 1
-              (- allout-recent-prefix-end
-                 allout-recent-prefix-beginning
-                 allout-header-subtraction))
-       0)))
+(defun allout-current-depth ()
+  "Return depth of visible topic most immediately containing point.
+
+Return zero if point is not within any topic."
+  (save-excursion
+    (if (allout-back-to-current-heading)
+        (max 1
+             (- allout-recent-prefix-end
+                allout-recent-prefix-beginning
+                allout-header-subtraction))
+      0)))
 ;;;_    > allout-get-current-prefix ()
 (defun allout-get-current-prefix ()
   "Topic prefix of the current topic."
@@ -1734,7 +1816,7 @@ Actually, returns prefix beginning point."
 ;;;_    > allout-current-bullet ()
 (defun allout-current-bullet ()
   "Return bullet of current (visible) topic heading, or none if none found."
-  (condition-case err
+  (condition-case nil
       (save-excursion
         (allout-back-to-current-heading)
         (buffer-substring (- allout-recent-prefix-end 1)
@@ -1783,7 +1865,31 @@ Outermost is first."
     rev-sibls)
   )
 
-;;;_  - Navigation macros
+;;;_  - Navigation routines
+;;;_   > allout-beginning-of-current-line ()
+(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.
+  (move-beginning-of-line 1)
+  (beginning-of-line)
+  (while (or (not (bolp)) (allout-hidden-p))
+    (beginning-of-line)
+    (if (or (allout-hidden-p) (not (bolp)))
+        (forward-char -1))))
+;;;_   > allout-end-of-current-line ()
+(defun allout-end-of-current-line ()
+  "Move to the end of line, past concealed text if any."
+  ;; XXX This is for symmetry with `allout-beginning-of-current-line' -
+  ;; `move-end-of-line' doesn't suffer the same problem as
+  ;; `move-beginning-of-line'.
+  (end-of-line)
+  (while (allout-hidden-p)
+    (end-of-line)
+    (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.
@@ -1798,7 +1904,7 @@ Returns the location of the heading, or nil if none found."
        (goto-char (or (match-beginning 2)
                       allout-recent-prefix-beginning))
        (or (match-end 2) allout-recent-prefix-end))))
-;;;_   : allout-this-or-next-heading
+;;;_   > allout-this-or-next-heading
 (defun allout-this-or-next-heading ()
   "Position cursor on current or next heading."
   ;; A throwaway non-macro that is defined after allout-next-heading
@@ -1822,6 +1928,21 @@ Return the location of the beginning of the heading, or nil if not found."
             (goto-char (or (match-beginning 2)
                            allout-recent-prefix-beginning))
             (or (match-end 2) allout-recent-prefix-end))))))
+;;;_   > allout-get-invisibility-overlay ()
+(defun allout-get-invisibility-overlay ()
+  "Return the overlay at point that dictates allout invisibility."
+  (let ((overlays (overlays-at (point)))
+        got)
+    (while (and overlays (not got))
+      (if (equal (overlay-get (car overlays) 'invisible) 'allout)
+          (setq got (car overlays))))
+    got))
+;;;_   > allout-back-to-visible-text ()
+(defun allout-back-to-visible-text ()
+  "Move to most recent prior character that is visible, and return point."
+    (if (allout-hidden-p)
+      (goto-char (overlay-start (allout-get-invisibility-overlay))))
+    (point))
 
 ;;;_  - Subtree Charting
 ;;;_   " These routines either produce or assess charts, which are
@@ -1912,11 +2033,11 @@ starting point, and PREV-DEPTH is depth of prior topic."
                                         ; the original level.  Position
                                         ; to the end of it:
         (progn (and (not (eobp)) (forward-char -1))
-               (and (memq (preceding-char) '(?\n ?\r))
-                    (memq (aref (buffer-substring (max 1 (- (point) 3))
-                                                  (point))
-                                1)
-                          '(?\n ?\r))
+               (and (= (preceding-char) ?\n)
+                    (= (aref (buffer-substring (max 1 (- (point) 3))
+                                               (point))
+                             1)
+                       ?\n)
                     (forward-char -1))
                (setq allout-recent-end-of-subtree (point))))
 
@@ -1954,7 +2075,7 @@ start point."
             (if further (setq result (append further result)))
             (setq chart (cdr chart)))
         (goto-char here)
-        (if (= (preceding-char) ?\r)
+        (if (allout-hidden-p)
             (setq result (cons here result)))
         (setq chart (cdr chart))))
     result))
@@ -2003,7 +2124,7 @@ Returns the point at the beginning of the prefix, or nil if none."
 
   (let (done)
     (while (and (not done)
-                (re-search-backward "[\n\r]" nil 1))
+                (search-backward "\n" nil 1))
       (forward-char 1)
       (if (looking-at allout-regexp)
           (setq done (allout-prefix-data (match-beginning 0)
@@ -2042,19 +2163,30 @@ otherwise skip white space between bullet and ensuing text."
    (1- (match-end 0))))
 ;;;_   > allout-back-to-current-heading ()
 (defun allout-back-to-current-heading ()
-  "Move to heading line of current topic, or beginning if already on the line."
-
-  (beginning-of-line)
-  (prog1 (or (allout-on-current-heading-p)
-             (and (re-search-backward (concat "^\\(" allout-regexp "\\)")
-                                      nil
-                                      'move)
-                  (allout-prefix-data (match-beginning 1)(match-end 1))))
-    (if (interactive-p) (allout-end-of-prefix))))
+  "Move to heading line of current topic, or beginning if already on the line.
+
+Return value of point, unless we started outside of (before any) topics,
+in which case we return nil."
+
+  (allout-beginning-of-current-line)
+  (if (or (allout-on-current-heading-p)
+          (and (re-search-backward (concat "^\\(" allout-regexp "\\)")
+                                   nil 'move)
+               (progn (while (allout-hidden-p)
+                        (allout-beginning-of-current-line)
+                        (if (not (looking-at allout-regexp))
+                            (re-search-backward (concat
+                                                 "^\\(" allout-regexp "\\)")
+                                                nil 'move)))
+                      (allout-prefix-data (match-beginning 1)
+                                          (match-end 1)))))
+      (if (interactive-p)
+          (allout-end-of-prefix)
+        (point))))
 ;;;_   > allout-back-to-heading ()
 (defalias 'allout-back-to-heading 'allout-back-to-current-heading)
-;;;_   > allout-pre-next-preface ()
-(defun allout-pre-next-preface ()
+;;;_   > allout-pre-next-prefix ()
+(defun allout-pre-next-prefix ()
   "Skip forward to just before the next heading line.
 
 Returns that character position."
@@ -2062,12 +2194,16 @@ Returns that character position."
   (if (re-search-forward allout-line-boundary-regexp nil 'move)
       (prog1 (goto-char (match-beginning 0))
              (allout-prefix-data (match-beginning 2)(match-end 2)))))
-;;;_   > allout-end-of-subtree (&optional current)
-(defun allout-end-of-subtree (&optional current)
+;;;_   > allout-end-of-subtree (&optional current include-trailing-blank)
+(defun allout-end-of-subtree (&optional current include-trailing-blank)
   "Put point at the end of the last leaf in the containing topic.
 
-If optional CURRENT is true (default false), then put point at the end of
-the containing visible topic.
+Optional CURRENT means put point at the end of the containing
+visible topic.
+
+Optional INCLUDE-TRAILING-BLANK means include a trailing blank line, if
+any, as part of the subtree.  Otherwise, that trailing blank will be
+excluded as delimiting whitespace between topics.
 
 Returns the value of point."
   (interactive "P")
@@ -2080,18 +2216,21 @@ Returns the value of point."
                 (> (allout-recent-depth) level))
       (allout-next-heading))
     (and (not (eobp)) (forward-char -1))
-    (and (memq (preceding-char) '(?\n ?\r))
-         (memq (aref (buffer-substring (max 1 (- (point) 3)) (point)) 1)
-               '(?\n ?\r))
+    (if (and (not include-trailing-blank) (= ?\n (preceding-char)))
          (forward-char -1))
     (setq allout-recent-end-of-subtree (point))))
-;;;_   > allout-end-of-current-subtree ()
-(defun allout-end-of-current-subtree ()
+;;;_   > allout-end-of-current-subtree (&optional include-trailing-blank)
+(defun allout-end-of-current-subtree (&optional include-trailing-blank)
+
   "Put point at end of last leaf in currently visible containing topic.
 
+Optional INCLUDE-TRAILING-BLANK means include a trailing blank line, if
+any, as part of the subtree.  Otherwise, that trailing blank will be
+excluded as delimiting whitespace between topics.
+
 Returns the value of point."
   (interactive)
-  (allout-end-of-subtree t))
+  (allout-end-of-subtree t include-trailing-blank))
 ;;;_   > allout-beginning-of-current-entry ()
 (defun allout-beginning-of-current-entry ()
   "When not already there, position point at beginning of current topic header.
@@ -2104,18 +2243,23 @@ If already there, move cursor to bullet for hot-spot operation.
     (if (and (interactive-p)
              (= (point) start-point))
         (goto-char (allout-current-bullet-pos)))))
-;;;_   > allout-end-of-entry ()
-(defun allout-end-of-entry ()
-  "Position the point at the end of the current topics' entry."
+;;;_   > allout-end-of-entry (&optional inclusive)
+(defun allout-end-of-entry (&optional inclusive)
+  "Position the point at the end of the current topics' entry.
+
+Optional INCLUSIVE means also include trailing empty line, if any.  When
+unset, whitespace between items separates them even when the items are
+collapsed."
   (interactive)
-  (prog1 (allout-pre-next-preface)
-    (if (and (not (bobp))(looking-at "^$"))
-        (forward-char -1))))
+  (allout-pre-next-prefix)
+  (if (and (not inclusive) (not (bobp)) (= ?\n (preceding-char)))
+      (forward-char -1))
+  (point))
 ;;;_   > allout-end-of-current-heading ()
 (defun allout-end-of-current-heading ()
   (interactive)
   (allout-beginning-of-current-entry)
-  (re-search-forward "[\n\r]" nil t)
+  (search-forward "\n" nil t)
   (forward-char -1))
 (defalias 'allout-end-of-heading 'allout-end-of-current-heading)
 ;;;_   > allout-get-body-text ()
@@ -2123,13 +2267,13 @@ If already there, move cursor to bullet for hot-spot operation.
   "Return the unmangled body text of the topic immediately containing point."
   (save-excursion
     (allout-end-of-prefix)
-    (if (not (re-search-forward "[\n\r]" nil t))
+    (if (not (search-forward "\n" nil t))
         nil
       (backward-char 1)
       (let ((pre-body (point)))
         (if (not pre-body)
             nil
-          (allout-end-of-entry)
+          (allout-end-of-entry t)
           (if (not (= pre-body (point)))
               (buffer-substring-no-properties (1+ pre-body) (point))))
         )
@@ -2189,8 +2333,7 @@ DONT-COMPLAIN is non-nil."
   (allout-back-to-current-heading)
   (let ((present-level (allout-recent-depth))
         (last-good (point))
-        failed
-        return)
+        failed)
     ;; Loop for iterating arg:
     (while (and (> (allout-recent-depth) 1)
                 (> arg 0)
@@ -2260,11 +2403,9 @@ Presumes point is at the start of a topic prefix."
  (if (or (bobp) (eobp))
      nil
    (forward-char -1))
- (if (or (bobp) (not (memq (preceding-char) '(?\n ?\r))))
+ (if (or (bobp) (not (= ?\n (preceding-char))))
      nil
-   (forward-char -1)
-   (if (or (bobp) (not (memq (preceding-char) '(?\n ?\r))))
-       (forward-char -1)))
+   (forward-char -1))
  (point))
 ;;;_   > allout-beginning-of-level ()
 (defun allout-beginning-of-level ()
@@ -2282,19 +2423,19 @@ Presumes point is at the start of a topic prefix."
 (defun allout-next-visible-heading (arg)
   "Move to the next ARG'th visible heading line, backward if arg is negative.
 
-Move as far as possible in indicated direction \(beginning or end of
-buffer) if headings are exhausted."
+Move to buffer limit in indicated direction if headings are exhausted."
 
   (interactive "p")
   (let* ((backward (if (< arg 0) (setq arg (* -1 arg))))
          (step (if backward -1 1))
-         (start-point (point))
          prev got)
 
     (while (> arg 0)                    ; limit condition
       (while (and (not (if backward (bobp)(eobp))) ; boundary condition
                   ;; Move, skipping over all those concealed lines:
-                  (< -1 (forward-line step))
+                  (prog1 (condition-case nil (or (line-move step) t)
+                           (error nil))
+                    (allout-beginning-of-current-line))
                   (not (setq got (looking-at allout-regexp)))))
       ;; Register this got, it may be the last:
       (if got (setq prev got))
@@ -2323,7 +2464,6 @@ Takes optional repeat-count, goes backward if count is negative.
 Returns resulting position, else nil if none found."
   (interactive "p")
   (let ((start-depth (allout-current-depth))
-        (start-point (point))
         (start-arg arg)
         (backward (> 0 arg))
         last-depth
@@ -2386,51 +2526,17 @@ are mapped to the command of the corresponding control-key on the
 - Implement (and clear) `allout-post-goto-bullet', for hot-spot
   outline commands.
 
-- Decrypt topic currently being edited if it was encrypted for a save.
-
-- Massage buffer-undo-list so successive, standard character self-inserts are
-  aggregated.  This kludge compensates for lack of undo bunching when
-  before-change-functions is used."
+- Decrypt topic currently being edited if it was encrypted for a save."
 
                                         ; Apply any external change func:
   (if (not (allout-mode-p))             ; In allout-mode.
       nil
-    (if allout-isearch-dynamic-expose
-        (allout-isearch-rectification))
-    ;; Undo bunching business:
-    (if (and (listp buffer-undo-list)   ; Undo history being kept.
-             (equal this-command 'self-insert-command)
-             (equal last-command 'self-insert-command))
-        (let* ((prev-stuff (cdr buffer-undo-list))
-               (before-prev-stuff (cdr (cdr prev-stuff)))
-               cur-cell cur-from cur-to
-               prev-cell prev-from prev-to)
-          (if (and before-prev-stuff    ; Goes back far enough to bother,
-                   (not (car prev-stuff)) ; and break before current,
-                   (not (car before-prev-stuff)) ; !and break before prev!
-                   (setq prev-cell (car (cdr prev-stuff))) ; contents now,
-                   (setq cur-cell (car buffer-undo-list)) ; contents prev.
-
-                   ;; cur contents denote a single char insertion:
-                   (numberp (setq cur-from (car cur-cell)))
-                   (numberp (setq cur-to (cdr cur-cell)))
-                   (= 1 (- cur-to cur-from))
-
-                   ;; prev contents denote fewer than aggregate-limit
-                   ;; insertions:
-                   (numberp (setq prev-from (car prev-cell)))
-                   (numberp (setq prev-to (cdr prev-cell)))
-                                        ; Below threshold:
-                   (> allout-undo-aggregation (- prev-to prev-from)))
-              (setq buffer-undo-list
-                    (cons (cons prev-from cur-to)
-                          (cdr (cdr (cdr buffer-undo-list))))))))
 
     (if (and (boundp 'allout-after-save-decrypt)
              allout-after-save-decrypt)
         (allout-after-saves-handler))
 
-    ;; Implement -post-goto-bullet, if set: (must be after undo business)
+    ;; Implement -post-goto-bullet, if set:
     (if (and allout-post-goto-bullet
              (allout-current-bullet-pos))
         (progn (goto-char (allout-current-bullet-pos))
@@ -2456,10 +2562,6 @@ return to regular interpretation of self-insert characters."
   (if (not (allout-mode-p))
       ;; Shouldn't be invoked if not in allout-mode, but just in case:
       nil
-    ;; Register isearch status:
-    (if (and (boundp  'isearch-mode) isearch-mode)
-        (setq allout-pre-was-isearching t)
-      (setq allout-pre-was-isearching nil))
     ;; Hot-spot navigation provisions:
     (if (and (eq this-command 'self-insert-command)
              (eq (point)(allout-current-bullet-pos)))
@@ -2499,110 +2601,6 @@ See `allout-init' for setup instructions."
            (not (allout-mode-p))
            allout-layout)
       (allout-mode t)))
-;;;_   > allout-isearch-rectification
-(defun allout-isearch-rectification ()
-  "Rectify outline exposure before, during, or after isearch.
-
-Called as part of `allout-post-command-business'."
-
-  (let ((isearching (and (boundp 'isearch-mode) isearch-mode)))
-    (cond ((and isearching (not allout-pre-was-isearching))
-           (allout-isearch-expose 'start))
-          ((and isearching allout-pre-was-isearching)
-           (allout-isearch-expose 'continue))
-          ((and (not isearching) allout-pre-was-isearching)
-           (allout-isearch-expose 'final))
-          ;; Not and wasn't isearching:
-          (t (setq allout-isearch-prior-pos nil)
-             (setq allout-isearch-did-quit nil)))))
-;;;_   = allout-isearch-was-font-lock
-(defvar allout-isearch-was-font-lock
-  (and (boundp 'font-lock-mode) font-lock-mode))
-;;;_   > allout-isearch-expose (mode)
-(defun allout-isearch-expose (mode)
-  "MODE is either 'clear, 'start, 'continue, or 'final."
-  ;; allout-isearch-prior-pos encodes exposure status of prior pos:
-  ;; (pos was-vis header-pos end-pos)
-  ;; pos        - point of concern
-  ;; was-vis    - t, else 'topic if entire topic was exposed, 'entry otherwise
-  ;; Do reclosure or prior pos, as necessary:
-  (if (eq mode 'start)
-      (setq allout-isearch-was-font-lock (and (boundp 'font-lock-mode)
-                                               font-lock-mode)
-            font-lock-mode nil)
-    (if (eq mode 'final)
-        (setq font-lock-mode allout-isearch-was-font-lock))
-    (if (and allout-isearch-prior-pos
-             (listp allout-isearch-prior-pos))
-        ;; Conceal prior peek:
-        (allout-flag-region (car (cdr allout-isearch-prior-pos))
-                             (car (cdr (cdr allout-isearch-prior-pos)))
-                             ?\r)))
-  (if (allout-visible-p)
-      (setq allout-isearch-prior-pos nil)
-    (if (not (eq mode 'final))
-        (setq allout-isearch-prior-pos (cons (point) (allout-show-entry)))
-      (if allout-isearch-did-quit
-          nil
-        (setq allout-isearch-prior-pos nil)
-        (allout-show-children))))
-  (setq allout-isearch-did-quit nil))
-;;;_   > allout-enwrap-isearch ()
-(defun allout-enwrap-isearch ()
-  "Impose `allout-mode' isearch-abort wrapper for dynamic exposure in isearch.
-
-The function checks to ensure that the rebinding is done only once."
-
-  (add-hook 'isearch-mode-end-hook 'allout-isearch-rectification)
-  (if (fboundp 'allout-real-isearch-abort)
-      ;;
-      nil
-                                        ; Ensure load of isearch-mode:
-    (if (or (and (fboundp 'isearch-mode)
-                 (fboundp 'isearch-abort))
-            (condition-case error
-                (load-library "isearch-mode")
-              ('file-error (message
-                            "Skipping isearch-mode provisions - %s '%s'"
-                            (car (cdr error))
-                            (car (cdr (cdr error))))
-                           (sit-for 1)
-                           ;; Inhibit subsequent tries and return nil:
-                           (setq allout-isearch-dynamic-expose nil))))
-        ;; Isearch-mode loaded, encapsulate specific entry points for
-        ;; outline dynamic-exposure business:
-        (progn
-          ;; stash crucial isearch-mode funcs under known, private
-          ;; names, then register wrapper functions under the old
-          ;; names, in their stead:
-          (fset 'allout-real-isearch-abort (symbol-function 'isearch-abort))
-          (fset 'isearch-abort 'allout-isearch-abort)))))
-;;;_   > allout-isearch-abort ()
-(defun allout-isearch-abort ()
-  "Wrapper for allout-real-isearch-abort \(which see), to register
-actual quits."
-  (interactive)
-  (setq allout-isearch-did-quit nil)
-  (condition-case what
-      (allout-real-isearch-abort)
-    ('quit (setq allout-isearch-did-quit t)
-          (signal 'quit nil))))
-
-;;; Prevent unnecessary font-lock while isearching!
-(defvar isearch-was-font-locking nil)
-(defun isearch-inhibit-font-lock ()
-  "Inhibit `font-lock' while isearching - for use on `isearch-mode-hook'."
-  (if (and (allout-mode-p) (boundp 'font-lock-mode) font-lock-mode)
-      (setq isearch-was-font-locking t
-            font-lock-mode nil)))
-(add-hook 'isearch-mode-hook 'isearch-inhibit-font-lock)
-(defun isearch-reenable-font-lock ()
-  "Reenable font-lock after isearching - for use on `isearch-mode-end-hook'."
-  (if (and (boundp 'font-lock-mode) font-lock-mode)
-      (if (and (allout-mode-p) isearch-was-font-locking)
-          (setq isearch-was-font-locking nil
-                font-lock-mode t))))
-(add-hook 'isearch-mode-end-hook 'isearch-reenable-font-lock)
 
 ;;;_  - Topic Format Assessment
 ;;;_   > allout-solicit-alternate-bullet (depth &optional current-bullet)
@@ -2807,15 +2805,20 @@ index for each successive sibling)."
                                    ((allout-sibling-index))))))
     )
   )
-;;;_   > allout-open-topic (relative-depth &optional before use_recent_bullet)
-(defun allout-open-topic (relative-depth &optional before use_recent_bullet)
+;;;_   > allout-open-topic (relative-depth &optional before offer-recent-bullet)
+(defun allout-open-topic (relative-depth &optional before offer-recent-bullet)
   "Open a new topic at depth DEPTH.
 
 New topic is situated after current one, unless optional flag BEFORE
-is non-nil, or unless current line is complete empty (not even
-whitespace), in which case open is done on current line.
+is non-nil, or unless current line is completely empty - lacking even
+whitespace - in which case open is done on the current line.
 
-If USE_RECENT_BULLET is true, offer to use the bullet of the prior sibling.
+When adding an offspring, it will be added immediately after the parent if
+the other offspring are exposed, or after the last child if the offspring
+are hidden.  \(The intervening offspring will be exposed in the latter
+case.)
+
+If OFFER-RECENT-BULLET is true, offer to use the bullet of the prior sibling.
 
 Nuances:
 
@@ -2839,12 +2842,12 @@ Nuances:
   having to go to its preceding sibling, and then open forward
   from there."
 
+  (allout-beginning-of-current-line)
   (let* ((depth (+ (allout-current-depth) relative-depth))
          (opening-on-blank (if (looking-at "^\$")
                                (not (setq before nil))))
          ;; bunch o vars set while computing ref-topic
          opening-numbered
-         opening-encrypted
          ref-depth
          ref-bullet
          (ref-topic (save-excursion
@@ -2864,13 +2867,6 @@ Nuances:
                                        (allout-descend-to-depth depth))
                                    (if (allout-numbered-type-prefix)
                                        allout-numbered-bullet))))
-                      (setq opening-encrypted
-                            (save-excursion
-                              (and allout-topic-encryption-bullet
-                                   (or (<= relative-depth 0)
-                                       (allout-descend-to-depth depth))
-                                   (if (allout-numbered-type-prefix)
-                                       allout-numbered-bullet))))
                       (point)))
          dbl-space
          doing-beginning)
@@ -2891,122 +2887,98 @@ Nuances:
                          (save-excursion
                            ;; succeeded by a blank line?
                            (allout-end-of-current-subtree)
-                           (bolp)))
+                           (looking-at "\n\n")))
                     (and (= ref-depth 1)
                          (or before
                              (= depth 1)
                              (save-excursion
                                ;; Don't already have following
                                ;; vertical padding:
-                               (not (allout-pre-next-preface)))))))
+                               (not (allout-pre-next-prefix)))))))
 
-                                        ; Position to prior heading,
-                                        ; if inserting backwards, and
-                                        ; not going outwards:
+          ;; Position to prior heading, if inserting backwards, and not
+          ;; going outwards:
           (if (and before (>= relative-depth 0))
               (progn (allout-back-to-current-heading)
                             (setq doing-beginning (bobp))
                             (if (not (bobp))
                                 (allout-previous-heading)))
             (if (and before (bobp))
-                (allout-unprotected (allout-open-line-not-read-only))))
+                (open-line 1)))
 
           (if (<= relative-depth 0)
               ;; Not going inwards, don't snug up:
               (if doing-beginning
-                  (allout-unprotected
-                   (if (not dbl-space)
-                       (allout-open-line-not-read-only)
-                     (allout-open-line-not-read-only)
-                     (allout-open-line-not-read-only)))
+                  (if (not dbl-space)
+                      (open-line 1)
+                    (open-line 2))
                 (if before
                     (progn (end-of-line)
-                           (allout-pre-next-preface)
-                           (while (= ?\r (following-char))
+                           (allout-pre-next-prefix)
+                           (while (and (= ?\n (following-char))
+                                       (save-excursion
+                                         (forward-char 1)
+                                         (allout-hidden-p)))
                              (forward-char 1))
                            (if (not (looking-at "^$"))
-                               (allout-unprotected
-                                (allout-open-line-not-read-only))))
-                  (allout-end-of-current-subtree)))
-            ;; Going inwards - double-space if first offspring is,
-            ;; otherwise snug up.
-            (end-of-line)               ; So we skip any concealed progeny.
-            (allout-pre-next-preface)
+                               (open-line 1)))
+                  (allout-end-of-current-subtree)
+                  (if (looking-at "\n\n") (forward-char 1))))
+            ;; Going inwards - double-space if first offspring is
+            ;; double-spaced, otherwise snug up.
+            (allout-end-of-entry)
+            (line-move 1)
+            (allout-beginning-of-current-line)
+            (backward-char 1)
             (if (bolp)
                 ;; Blank lines between current header body and next
                 ;; header - get to last substantive (non-white-space)
                 ;; line in body:
-                (re-search-backward "[^ \t\n]" nil t))
+                (progn (setq dbl-space t)
+                       (re-search-backward "[^ \t\n]" nil t)))
+            (if (looking-at "\n\n")
+                (setq dbl-space t))
             (if (save-excursion
                   (allout-next-heading)
-                  (if (> (allout-recent-depth) ref-depth)
-                      ;; This is an offspring.
-                      (progn (forward-line -1)
-                             (looking-at "^\\s-*$"))))
+                  (when (> (allout-recent-depth) ref-depth)
+                    ;; This is an offspring.
+                    (forward-line -1)
+                    (looking-at "^\\s-*$")))
                 (progn (forward-line 1)
-                       (allout-unprotected
-                        (allout-open-line-not-read-only))
+                       (open-line 1)
                        (forward-line 1)))
-            (end-of-line))
+            (allout-end-of-current-line))
+
           ;;(if doing-beginning (goto-char doing-beginning))
           (if (not (bobp))
               ;; We insert a newline char rather than using open-line to
               ;; avoid rear-stickiness inheritence of read-only property.
               (progn (if (and (not (> depth ref-depth))
                               (not before))
-                         (allout-unprotected
-                          (allout-open-line-not-read-only))
-                       (if (> depth ref-depth)
-                         (allout-unprotected
-                          (allout-open-line-not-read-only))
+                         (open-line 1)
+                       (if (and (not dbl-space) (> depth ref-depth))
+                           (newline 1)
                          (if dbl-space
-                             (allout-unprotected
-                              (allout-open-line-not-read-only))
+                             (open-line 1)
                            (if (not before)
-                               (allout-unprotected (newline 1))))))
-                     (if dbl-space
-                         (allout-unprotected (newline 1)))
+                               (newline 1)))))
+                     (if (and dbl-space (not (> relative-depth 0)))
+                         (newline 1))
                      (if (and (not (eobp))
                               (not (bolp)))
                          (forward-char 1))))
           ))
-    (insert (concat (allout-make-topic-prefix opening-numbered
-                                              t
-                                              depth)
-                           " "))
-
-    ;;(if doing-beginning (save-excursion (newline (if dbl-space 2 1))))
-
-
-    (allout-rebullet-heading (and use_recent_bullet         ;;; solicit
-                                   ref-bullet)
-                              depth                          ;;; depth
-                              nil                            ;;; number-control
-                              nil                            ;;; index
-                              t)
+    (insert (concat (allout-make-topic-prefix opening-numbered t depth)
+                    " "))
+
+    (allout-rebullet-heading (and offer-recent-bullet ref-bullet)
+                              depth nil nil t)
+    (if (> relative-depth 0)
+        (save-excursion (goto-char ref-topic)
+                        (allout-show-children)))
     (end-of-line)
     )
   )
-;;;_    . open-topic contingencies
-;;;_     ; base topic - one from which open was issued
-;;;_      , beginning char
-;;;_      , amount of space before will be used, unless opening in place
-;;;_      , end char will be used, unless opening before (and it still may)
-;;;_     ; absolute depth of new topic
-;;;_     ! insert in place - overrides most stuff
-;;;_     ; relative depth of new re base
-;;;_     ; before or after base topic
-;;;_     ; spacing around topic, if any, prior to new topic and at same depth
-;;;_     ; buffer boundaries - special provisions for beginning and end ob
-;;;_     ; level 1 topics have special provisions also - double space.
-;;;_     ; location of new topic
-;;;_   > allout-open-line-not-read-only ()
-(defun allout-open-line-not-read-only ()
-  "Open line and remove inherited read-only text prop from new char, if any."
-  (open-line 1)
-  (if (plist-get (text-properties-at (point)) 'read-only)
-      (allout-unprotected
-       (remove-text-properties (point) (+ 1 (point)) '(read-only nil)))))
 ;;;_   > allout-open-subtopic (arg)
 (defun allout-open-subtopic (arg)
   "Open new topic header at deeper level than the current one.
@@ -3055,9 +3027,12 @@ Maintains outline hanging topic indentation if
                                ;; 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)
-        (do-auto-fill))))
+        (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.
@@ -3071,7 +3046,6 @@ Note that refill of indented paragraphs is not done."
     (allout-end-of-prefix)
     (let* ((new-margin (current-column))
            excess old-indent-begin old-indent-end
-           curr-ind
            ;; We want the column where the header-prefix text started
            ;; *before* the prefix was changed, so we infer it relative
            ;; to the new margin and the shift in depth:
@@ -3081,7 +3055,7 @@ Note that refill of indented paragraphs is not done."
       (allout-unprotected
        (save-match-data
          (while
-             (and (re-search-forward "[\n\r]\\(\\s-*\\)"
+             (and (re-search-forward "\n\\(\\s-*\\)"
                                      nil
                                      t)
                   ;; Register the indent data, before we reset the
@@ -3231,8 +3205,7 @@ Descends into invisible as well as visible topics, however.
 
 With repeat count, shift topic depth by that amount."
   (interactive "P")
-  (let ((start-col (current-column))
-        (was-eol (eolp)))
+  (let ((start-col (current-column)))
     (save-excursion
       ;; Normalize arg:
       (cond ((null arg) (setq arg 0))
@@ -3414,8 +3387,8 @@ depth, however."
               (if (and (> predecessor-depth 0)
                        (> (+ current-depth arg)
                           (1+ predecessor-depth)))
-                  (error (concat "May not shift deeper than offspring depth"
-                                 " of previous topic")))))))
+                  (error (concat "Disallowed shift deeper than"
+                                 " containing topic's children.")))))))
   (allout-rebullet-topic arg))
 ;;;_    > allout-shift-out (arg)
 (defun allout-shift-out (arg)
@@ -3436,84 +3409,72 @@ depth, however."
 
   (interactive "*P")
 
-  (let ((start-point (point))
-        (leading-kill-ring-entry (car kill-ring))
-        binding)
-
-    (condition-case err
-
-        (if (not (and (allout-mode-p)        ; active outline mode,
-                      allout-numbered-bullet ; numbers may need adjustment,
-                      (bolp)                  ; may be clipping topic head,
-                      (looking-at allout-regexp))) ; are clipping topic head.
-            ;; Above conditions do not obtain - just do a regular kill:
-            (kill-line arg)
-          ;; Ah, have to watch out for adjustments:
-          (let* ((depth (allout-depth))
-                 (start-point (point))
-                 binding)
-                                        ; Do the kill, presenting option
-                                        ; for read-only text:
-            (kill-line arg)
+  (if (or (not (allout-mode-p))
+          (not (bolp))
+          (not (looking-at allout-regexp)))
+      ;; Above conditions do not obtain - just do a regular kill:
+      (kill-line arg)
+    ;; Ah, have to watch out for adjustments:
+    (let* ((beg (point))
+           (beg-hidden (allout-hidden-p))
+           (end-hidden (save-excursion (allout-end-of-current-line)
+                                       (allout-hidden-p)))
+           (depth (allout-depth))
+           (collapsed (allout-current-topic-collapsed-p)))
+
+      (if collapsed
+          (put-text-property beg (1+ beg) 'allout-was-collapsed t)
+        (remove-text-properties beg (1+ beg) '(allout-was-collapsed t)))
+
+      (if (and (not beg-hidden) (not end-hidden))
+          (allout-unprotected (kill-line arg))
+        (kill-line arg))
                                         ; Provide some feedback:
-          (sit-for 0)
-          (save-excursion
-                                        ; Start with the topic
-                                        ; following killed line:
+      (sit-for 0)
+      (if allout-numbered-bullet
+          (save-excursion               ; Renumber subsequent topics if needed:
             (if (not (looking-at allout-regexp))
                 (allout-next-heading))
-            (allout-renumber-to-depth depth))))
-      ;; condition case handler:
-      (text-read-only
-       (goto-char start-point)
-       (setq binding (where-is-internal 'allout-kill-topic nil t))
-       (cond ((not binding) (setq binding ""))
-             ((arrayp binding)
-              (setq binding (mapconcat 'key-description (list binding) ", ")))
-             (t (setq binding (format "%s" binding))))
-       ;; ensure prior kill-ring leader is properly restored:
-       (if (eq leading-kill-ring-entry (cadr kill-ring))
-           ;; Aborted kill got pushed on front - ditch it:
-           (let ((got (car kill-ring)))
-             (setq kill-ring (cdr kill-ring))
-             got)
-         ;; Aborted kill got appended to prior - resurrect prior:
-         (setcar kill-ring leading-kill-ring-entry))
-       ;; make last-command skip this failed command, so kill-appending
-       ;; conditions track:
-       (setq this-command last-command)
-       (error (concat "read-only text hit - use %s allout-kill-topic to"
-                      " discard collapsed stuff")
-              binding)))
-    )
-  )
+            (allout-renumber-to-depth depth))))))
 ;;;_    > allout-kill-topic ()
 (defun allout-kill-topic ()
   "Kill topic together with subtopics.
 
-Leaves primary topic's trailing vertical whitespace, if any."
+Trailing whitespace is killed with a topic if that whitespace:
+
+ - would separate the topic from a subsequent sibling
+ - would separate the topic from the end of buffer
+ - would not be added to whitespace already separating the topic from the
+   previous one.
+
+Completely collapsed topics are marked as such, for re-collapse
+when yank with allout-yank into an outline as a heading."
 
   ;; Some finagling is done to make complex topic kills appear faster
   ;; than they actually are.  A redisplay is performed immediately
-  ;; after the region is disposed of, though the renumbering process
+  ;; after the region is deleted, though the renumbering process
   ;; has yet to be performed.  This means that there may appear to be
-  ;; a lag *after* the kill has been performed.
+  ;; a lag *after* a kill has been performed.
 
   (interactive)
-  (let* ((beg (prog1 (allout-back-to-current-heading)(beginning-of-line)))
+  (let* ((collapsed (allout-current-topic-collapsed-p))
+         (beg (prog1 (allout-back-to-current-heading) (beginning-of-line)))
          (depth (allout-recent-depth)))
     (allout-end-of-current-subtree)
+    (if (and (/= (current-column) 0) (not (eobp)))
+        (forward-char 1))
     (if (not (eobp))
-        (if (or (not (looking-at "^$"))
-                ;; A blank line - cut it with this topic *unless* this
-                ;; is the last topic at this level, in which case
-                ;; we'll leave the blank line as part of the
-                ;; containing topic:
-                (save-excursion
-                  (and (allout-next-heading)
-                       (>= (allout-recent-depth) depth))))
+        (if (and (looking-at "\n")
+                 (or (save-excursion
+                       (or (not (allout-next-heading))
+                           (= depth (allout-recent-depth))))
+                     (and (> (- beg (point-min)) 3)
+                          (string= (buffer-substring (- beg 2) beg) "\n\n"))))
             (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 (kill-region beg (point)))
     (sit-for 0)
     (save-excursion
@@ -3521,7 +3482,7 @@ Leaves primary topic's trailing vertical whitespace, if any."
 ;;;_    > allout-yank-processing ()
 (defun allout-yank-processing (&optional arg)
 
-  "Incidental outline-specific business to be done just after text yanks.
+  "Incidental allout-specific business to be done just after text yanks.
 
 Does depth adjustment of yanked topics, when:
 
@@ -3542,10 +3503,12 @@ however, are left exactly like normal, non-allout-specific yanks."
   (interactive "*P")
                                         ; Get to beginning, leaving
                                         ; region around subject:
-  (if (< (my-mark-marker t) (point))
+  (if (< (allout-mark-marker t) (point))
       (exchange-point-and-mark))
   (let* ((subj-beg (point))
-         (subj-end (my-mark-marker t))
+         (into-bol (bolp))
+         (subj-end (allout-mark-marker t))
+         (was-collapsed (get-text-property subj-beg 'allout-was-collapsed))
          ;; 'resituate' if yanking an entire topic into topic header:
          (resituate (and (allout-e-o-prefix-p)
                          (looking-at (concat "\\(" allout-regexp "\\)"))
@@ -3554,7 +3517,7 @@ however, are left exactly like normal, non-allout-specific yanks."
          ;; `rectify-numbering' if resituating (where several topics may
          ;; be resituating) or yanking a topic into a topic slot (bol):
          (rectify-numbering (or resituate
-                                (and (bolp) (looking-at allout-regexp)))))
+                                (and into-bol (looking-at allout-regexp)))))
     (if resituate
                                         ; The yanked stuff is a topic:
         (let* ((prefix-len (- (match-end 1) subj-beg))
@@ -3575,7 +3538,6 @@ however, are left exactly like normal, non-allout-specific yanks."
                             (allout-prefix-data (match-beginning 0)
                                                  (match-end 0)))
                        (allout-recent-depth))))
-               done
                (more t))
           (setq rectify-numbering allout-numbered-bullet)
           (if adjust-to-depth
@@ -3616,7 +3578,7 @@ however, are left exactly like normal, non-allout-specific yanks."
                     (progn
                       (beginning-of-line)
                       (delete-region (point) subj-beg)
-                      (set-marker (my-mark-marker t) subj-end)
+                      (set-marker (allout-mark-marker t) subj-end)
                       (goto-char subj-beg)
                       (allout-end-of-prefix))
                                         ; Delete base subj prefix,
@@ -3643,6 +3605,9 @@ however, are left exactly like normal, non-allout-specific yanks."
                                           nil   ;;; index
                                           t))
             (message ""))))
+    (when (and (or into-bol resituate) was-collapsed)
+      (remove-text-properties subj-beg (1+ subj-beg) '(allout-was-collapsed))
+      (allout-hide-current-subtree))
     (if (not resituate)
       (exchange-point-and-mark))))
 ;;;_    > allout-yank (&optional arg)
@@ -3678,7 +3643,8 @@ works with normal `yank' in non-outline buffers."
   (setq this-command 'yank)
   (yank arg)
   (if (allout-mode-p)
-      (allout-yank-processing)))
+      (allout-yank-processing))
+)
 ;;;_    > allout-yank-pop (&optional arg)
 (defun allout-yank-pop (&optional arg)
   "Yank-pop like `allout-yank' when popping to bare outline prefixes.
@@ -3736,93 +3702,51 @@ by pops to non-distinctive yanks.  Bug..."
 ;;;_  - Fundamental
 ;;;_   > allout-flag-region (from to flag)
 (defun allout-flag-region (from to flag)
-  "Hide or show lines from FROM to TO, via Emacs selective-display FLAG char.
-Ie, text following flag C-m \(carriage-return) is hidden until the
-next C-j (newline) char.
-
-Returns the endpoint of the region."
-  ;; "OFR-" prefixes to avoid collisions with vars in code calling the macro.
-  ;; ie, elisp macro vars are not 'hygenic', so distinct names are necessary.
-  (let ((was-inhibit-r-o inhibit-read-only)
-        (was-undo-list buffer-undo-list)
-        (was-modified (buffer-modified-p))
-        trans)
-    (unwind-protect
-     (save-excursion
-       (setq inhibit-read-only t)
-       (setq buffer-undo-list t)
-       (if (> from to)
-           (setq trans from from to to trans))
-       (subst-char-in-region from to
-                             (if (= flag ?\n) ?\r ?\n)
-                             flag t)
-       ;; adjust character read-protection on all the affected lines.
-       ;; we handle the region line-by-line.
-       (goto-char to)
-       (end-of-line)
-       (setq to (min (+ 2 (point)) (point-max)))
-       (goto-char from)
-       (beginning-of-line)
-       (while (< (point) to)
-         ;; handle from start of exposed to beginning of hidden, or eol:
-         (remove-text-properties (point)
-                                 (progn (if (re-search-forward "[\r\n]"
-                                                               nil t)
-                                            (forward-char -1))
-                                        (point))
-                                 '(read-only nil))
-         ;; handle from start of hidden, if any, to eol:
-         (if (and (not (eobp)) (= (char-after (point)) ?\r))
-             (put-text-property (point) (progn (end-of-line) (point))
-                                'read-only t))
-         ;; Handle the end-of-line to beginning of next line:
-         (if (not (eobp))
-             (progn (forward-char 1)
-                    (remove-text-properties (1- (point)) (point)
-                                            '(read-only nil)))))
-       )
-     (if (not was-modified)
-         (set-buffer-modified-p nil))
-     (setq inhibit-read-only was-inhibit-r-o)
-     (setq buffer-undo-list was-undo-list)
-     )
-    )
-  )
+  "Conceal text from FROM to TO if FLAG is non-nil, else reveal it.
+
+Text is shown if flag is nil and hidden otherwise."
+  ;; We use outline invisibility spec.
+  (remove-overlays from to 'category 'allout-overlay-category)
+  (when flag
+    (let ((o (make-overlay from to)))
+      (overlay-put o 'category 'allout-overlay-category)
+      (when (featurep 'xemacs)
+        (let ((props (symbol-plist 'allout-overlay-category)))
+          (while props
+            (overlay-put o (pop props) (pop props)))))))
+  (run-hooks 'allout-view-change-hook))
 ;;;_   > allout-flag-current-subtree (flag)
 (defun allout-flag-current-subtree (flag)
-  "Hide or show subtree of currently-visible topic.
-
-See `allout-flag-region' for more details."
+  "Conceal currently-visible topic's subtree if FLAG non-nil, else reveal it."
 
   (save-excursion
     (allout-back-to-current-heading)
-    (let ((from (point))
-          (to (progn (allout-end-of-current-subtree) (1- (point)))))
-      (allout-flag-region from to flag))))
+    (end-of-line)
+    (allout-flag-region (point)
+                        ;; Exposing must not leave trailing blanks hidden,
+                        ;; but can leave them exposed when hiding, so we
+                        ;; can use flag's inverse as the
+                        ;; include-trailing-blank cue:
+                        (allout-end-of-current-subtree (not flag))
+                        flag)))
 
 ;;;_  - Topic-specific
-;;;_   > allout-show-entry ()
-(defun allout-show-entry ()
+;;;_   > allout-show-entry (&optional inclusive)
+(defun allout-show-entry (&optional inclusive)
   "Like `allout-show-current-entry', reveals entries nested 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
-exposure.  `allout-hide-current-entry-completely' or `allout-show-offshoot'
-should be used after the peek to rectify the exposure."
+exposure.  `allout-show-offshoot' should be used after the peek to rectify
+the exposure."
 
   (interactive)
   (save-excursion
-    (let ((at (point))
-          beg end)
+    (let (beg end)
       (allout-goto-prefix)
-      (setq beg (if (= (preceding-char) ?\r) (1- (point)) (point)))
-      (re-search-forward "[\n\r]" nil t)
-      (setq end (1- (if (< at (point))
-                        ;; We're on topic head line - show only it:
-                        (point)
-                      ;; or we're in body - include it:
-                      (max beg (or (allout-pre-next-preface) (point))))))
-      (allout-flag-region beg end ?\n)
+      (setq beg (if (allout-hidden-p) (1- (point)) (point)))
+      (setq end (allout-pre-next-prefix))
+      (allout-flag-region beg end nil)
       (list beg end))))
 ;;;_   > allout-show-children (&optional level strict)
 (defun allout-show-children (&optional level strict)
@@ -3843,67 +3767,59 @@ Returns point at end of subtree that was opened, if any.  (May get a
 point of non-opened subtree?)"
 
   (interactive "p")
-  (let (max-pos)
+  (let ((start-point (point)))
     (if (and (not strict)
-             (allout-hidden-p))
+             (allout-hidden-p))
 
-        (progn (allout-show-to-offshoot) ; Point's concealed, open to
-                                          ; expose it.
-               ;; Then recurse, but with "strict" set so we don't
-               ;; infinite regress:
-               (setq max-pos (allout-show-children level t)))
+        (progn (allout-show-to-offshoot) ; Point's concealed, open to
+                                        ; expose it.
+               ;; Then recurse, but with "strict" set so we don't
+               ;; infinite regress:
+               (allout-show-children level t))
 
       (save-excursion
-        (save-restriction
-          (let* ((start-pt (point))
-                 (chart (allout-chart-subtree (or level 1)))
-                 (to-reveal (allout-chart-to-reveal chart (or level 1))))
-            (goto-char start-pt)
-            (if (and strict (= (preceding-char) ?\r))
-                ;; Concealed root would already have been taken care of,
-                ;; unless strict was set.
-                (progn
-                  (allout-flag-region (point) (allout-snug-back) ?\n)
-                  (if allout-show-bodies
-                      (progn (goto-char (car to-reveal))
-                             (allout-show-current-entry)))))
-            (while to-reveal
-              (goto-char (car to-reveal))
-              (allout-flag-region (point) (allout-snug-back) ?\n)
-              (if allout-show-bodies
-                  (progn (goto-char (car to-reveal))
-                         (allout-show-current-entry)))
-              (setq to-reveal (cdr to-reveal)))))))))
-;;;_   > allout-hide-point-reconcile ()
-(defun allout-hide-reconcile ()
-  "Like `allout-hide-current-entry'; hides completely if within hidden region.
-
-Specifically intended for aberrant exposure states, like entries that were
-exposed by `allout-show-entry' but are within otherwise concealed regions."
-  (interactive)
-  (save-excursion
-    (allout-goto-prefix)
-    (allout-flag-region (if (not (bobp)) (1- (point)) (point))
-                         (progn (allout-pre-next-preface)
-                                (if (= ?\r (following-char))
-                                    (point)
-                                  (1- (point))))
-                         ?\r)))
+        (allout-beginning-of-current-line)
+        (save-restriction
+          (let* ((chart (allout-chart-subtree (or level 1)))
+                 (to-reveal (allout-chart-to-reveal chart (or level 1))))
+            (goto-char start-point)
+            (when (and strict (allout-hidden-p))
+              ;; Concealed root would already have been taken care of,
+              ;; unless strict was set.
+              (allout-flag-region (point) (allout-snug-back) nil)
+              (when allout-show-bodies
+                (goto-char (car to-reveal))
+                (allout-show-current-entry)))
+            (while to-reveal
+              (goto-char (car to-reveal))
+              (allout-flag-region (save-excursion (allout-snug-back) (point))
+                                  (progn (search-forward "\n" nil t)
+                                         (1- (point)))
+                                  nil)
+              (when allout-show-bodies
+                (goto-char (car to-reveal))
+                (allout-show-current-entry))
+              (setq to-reveal (cdr to-reveal)))))))
+    ;; Compensate for `save-excursion's maintenance of point
+    ;; within invisible text:
+    (goto-char start-point)))
 ;;;_   > allout-show-to-offshoot ()
 (defun allout-show-to-offshoot ()
   "Like `allout-show-entry', but reveals all concealed ancestors, as well.
 
-As with `allout-hide-current-entry-completely', useful for rectifying
-aberrant exposure states produced by `allout-show-entry'."
-
+Useful for coherently exposing to a random point in a hidden region."
   (interactive)
   (save-excursion
     (let ((orig-pt (point))
           (orig-pref (allout-goto-prefix))
           (last-at (point))
           bag-it)
-      (while (or bag-it (= (preceding-char) ?\r))
-        (beginning-of-line)
+      (while (or bag-it (allout-hidden-p))
+        (while (allout-hidden-p)
+          ;; XXX We would use `(move-beginning-of-line 1)', but it gets
+          ;; stuck on hidden newlines at column 80, as of GNU Emacs 22.0.50.
+          (beginning-of-line)
+          (if (allout-hidden-p) (forward-char -1)))
         (if (= last-at (setq last-at (point)))
             ;; Oops, we're not making any progress!  Show the current
             ;; topic completely, and bag this try.
@@ -3926,38 +3842,24 @@ aberrant exposure states produced by `allout-show-entry'."
   (interactive)
   (allout-back-to-current-heading)
   (save-excursion
-   (allout-flag-region (point)
+    (end-of-line)
+    (allout-flag-region (point)
                         (progn (allout-end-of-entry) (point))
-                        ?\r)))
+                        t)))
 ;;;_   > allout-show-current-entry (&optional arg)
 (defun allout-show-current-entry (&optional arg)
 
-  "Show body following current heading, or hide the entry if repeat count."
+  "Show body following current heading, or hide entry with universal argument."
 
   (interactive "P")
   (if arg
       (allout-hide-current-entry)
+    (save-excursion (allout-show-to-offshoot))
     (save-excursion
       (allout-flag-region (point)
-                           (progn (allout-end-of-entry) (point))
-                           ?\n)
+                          (progn (allout-end-of-entry t) (point))
+                          nil)
       )))
-;;;_   > allout-hide-current-entry-completely ()
-; ... allout-hide-current-entry-completely also for isearch dynamic exposure:
-(defun allout-hide-current-entry-completely ()
-  "Like `allout-hide-current-entry', but conceal topic completely.
-
-Specifically intended for aberrant exposure states, like entries that were
-exposed by `allout-show-entry' but are within otherwise concealed regions."
-  (interactive)
-  (save-excursion
-    (allout-goto-prefix)
-    (allout-flag-region (if (not (bobp)) (1- (point)) (point))
-                         (progn (allout-pre-next-preface)
-                                (if (= ?\r (following-char))
-                                    (point)
-                                  (1- (point))))
-                         ?\r)))
 ;;;_   > allout-show-current-subtree (&optional arg)
 (defun allout-show-current-subtree (&optional arg)
   "Show everything within the current topic.  With a repeat-count,
@@ -3970,11 +3872,27 @@ expose this topic and its siblings."
             (error "No topics")
           ;; got to first, outermost topic - set to expose it and siblings:
           (message "Above outermost topic - exposing all.")
-          (allout-flag-region (point-min)(point-max) ?\n))
+          (allout-flag-region (point-min)(point-max) nil))
+      (allout-beginning-of-current-line)
       (if (not arg)
-          (allout-flag-current-subtree ?\n)
+          (allout-flag-current-subtree nil)
         (allout-beginning-of-level)
         (allout-expose-topic '(* :))))))
+;;;_   > allout-current-topic-collapsed-p (&optional include-single-liners)
+(defun allout-current-topic-collapsed-p (&optional include-single-liners)
+  "True if the currently visible containing topic is already collapsed.
+
+If optional INCLUDE-SINGLE-LINERS is true, then include single-line
+topics \(which intrinsically can be considered both collapsed and
+not\), as collapsed.  Otherwise they are considered uncollapsed."
+  (save-excursion
+      (and 
+       (= (progn (allout-back-to-current-heading)
+                 (move-end-of-line 1)
+                 (point))
+          (allout-end-of-current-subtree))
+       (or include-single-liners
+           (progn (backward-char 1) (allout-hidden-p))))))
 ;;;_   > allout-hide-current-subtree (&optional just-close)
 (defun allout-hide-current-subtree (&optional just-close)
   "Close the current topic, or containing topic if this one is already closed.
@@ -3982,35 +3900,21 @@ expose this topic and its siblings."
 If this topic is closed and it's a top level topic, close this topic
 and its siblings.
 
-If optional arg JUST-CLOSE is non-nil, do not treat the parent or
+If optional arg JUST-CLOSE is non-nil, do not close the parent or
 siblings, even if the target topic is already closed."
 
   (interactive)
-  (let ((from (point))
-        (orig-eol (progn (end-of-line)
-                         (if (not (allout-goto-prefix))
-                             (error "No topics found")
-                           (end-of-line)(point)))))
-    (allout-flag-current-subtree ?\r)
-    (goto-char from)
-    (if (and (= orig-eol (progn (goto-char orig-eol)
-                                (end-of-line)
-                                (point)))
-             (not just-close)
-             ;; Structure didn't change - try hiding current level:
-             (goto-char from)
-             (if (allout-up-current-level 1 t)
-                 t
-               (goto-char 0)
-               (let ((msg
-                      "Top-level topic already closed - closing siblings..."))
-                 (message msg)
-                 (allout-expose-topic '(0 :))
-                 (message (concat msg "  Done.")))
-               nil)
-             (/= (allout-recent-depth) 0))
-        (allout-hide-current-subtree))
-      (goto-char from)))
+  (let* ((from (point))
+         (sibs-msg "Top-level topic already closed - closing siblings...")
+         (current-exposed (not (allout-current-topic-collapsed-p t))))
+    (cond (current-exposed (allout-flag-current-subtree t))
+          (just-close nil)
+          ((allout-up-current-level 1 t) (allout-hide-current-subtree))
+          (t (goto-char 0)
+             (message sibs-msg)
+             (allout-expose-topic '(0 :))
+             (message (concat sibs-msg "  Done."))))
+    (goto-char from)))
 ;;;_   > allout-show-current-branches ()
 (defun allout-show-current-branches ()
   "Show all subheadings of this heading, but not their bodies."
@@ -4031,7 +3935,7 @@ siblings, even if the target topic is already closed."
   "Show all of the text in the buffer."
   (interactive)
   (message "Exposing entire buffer...")
-  (allout-flag-region (point-min) (point-max) ?\n)
+  (allout-flag-region (point-min) (point-max) nil)
   (message "Exposing entire buffer...  Done."))
 ;;;_   > allout-hide-bodies ()
 (defun allout-hide-bodies ()
@@ -4046,11 +3950,11 @@ siblings, even if the target topic is already closed."
       (narrow-to-region start end)
       (goto-char (point-min))
       (while (not (eobp))
-        (allout-flag-region (point)
-                             (progn (allout-pre-next-preface) (point)) ?\r)
+        (end-of-line)
+        (allout-flag-region (point) (allout-end-of-entry) t)
         (if (not (eobp))
             (forward-char
-             (if (looking-at "[\n\r][\n\r]")
+             (if (looking-at "\n\n")
                  2 1)))))))
 
 ;;;_   > allout-expose-topic (spec)
@@ -4117,9 +4021,7 @@ Examples:
     (let ((depth (allout-depth))
           (max-pos 0)
           prev-elem curr-elem
-          stay done
-          snug-back
-          )
+          stay)
       (while spec
         (setq prev-elem curr-elem
               curr-elem (car spec)
@@ -4147,7 +4049,7 @@ Examples:
                        (setq spec (append (make-list residue prev-elem)
                                           spec)))))))
          ((numberp curr-elem)
-          (if (and (>= 0 curr-elem) (allout-visible-p))
+          (if (and (>= 0 curr-elem) (not (allout-hidden-p)))
               (save-excursion (allout-hide-current-subtree t)
                               (if (> 0 curr-elem)
                                   nil
@@ -4207,7 +4109,6 @@ Optional FOLLOWERS arguments dictate exposure for succeeding siblings."
 
   (interactive "xExposure spec: ")
   (let ((depth (allout-current-depth))
-        done
         max-pos)
     (cond ((null spec) nil)
           ((symbolp spec)
@@ -4387,7 +4288,7 @@ header and body.  The elements of that list are:
   (save-excursion
     (let*
         ;; state vars:
-        (strings prefix pad result depth new-depth out gone-out bullet beg
+        (strings prefix result depth new-depth out gone-out bullet beg
                  next done)
 
       (goto-char start)
@@ -4419,16 +4320,11 @@ header and body.  The elements of that list are:
                        beg
                                         ;To hidden text or end of line:
                        (progn
-                         (search-forward "\r"
-                                         (save-excursion (end-of-line)
-                                                         (point))
-                                         1)
-                         (if (= (preceding-char) ?\r)
-                             (1- (point))
-                           (point))))
+                         (end-of-line)
+                         (allout-back-to-visible-text)))
                       strings))
-          (if (< (point) next)          ; Resume from after hid text, if any.
-              (forward-line 1))
+          (when (< (point) next)      ; Resume from after hid text, if any.
+            (line-move 1))
           (setq beg (point)))
         ;; Accumulate list for this topic:
         (setq strings (nreverse strings))
@@ -4488,7 +4384,7 @@ header and body.  The elements of that list are:
 ;;;_   > allout-process-exposed (&optional func from to frombuf
 ;;;                                         tobuf format)
 (defun allout-process-exposed (&optional func from to frombuf tobuf
-                                          format &optional start-num)
+                                          format start-num)
   "Map function on exposed parts of current topic; results to another buffer.
 
 All args are options; default values itemized below.
@@ -4694,13 +4590,6 @@ environment.  Leaves point at the end of the line."
         (page-numbering (if allout-number-pages
                             "\\pagestyle{empty}\n"
                           ""))
-        (linesdef (concat "\\def\\beginlines{"
-                          "\\par\\begingroup\\nobreak\\medskip"
-                          "\\parindent=0pt\n"
-                          " \\kern1pt\\nobreak \\obeylines \\obeyspaces "
-                          "\\everypar{\\strut}}\n"
-                          "\\def\\endlines{"
-                          "\\kern1pt\\endgroup\\medbreak\\noindent}\n"))
         (titlecmd (format "\\newcommand{\\titlecmd}[1]{{%s #1}}\n"
                           allout-title-style))
         (labelcmd (format "\\newcommand{\\labelcmd}[1]{{%s #1}}\n"
@@ -4733,7 +4622,7 @@ environment.  Leaves point at the end of the line."
         (title (format "%s%s%s%s"
                        "\\titlecmd{"
                        (allout-latex-verb-quote (if allout-title
-                                                (condition-case err
+                                                (condition-case nil
                                                     (eval allout-title)
                                                   ('error "<unnamed buffer>"))
                                               "Unnamed Outline"))
@@ -4913,7 +4802,7 @@ solicited whenever the passphrase is changed."
   (interactive "P")
   (save-excursion
     (allout-back-to-current-heading)
-    (allout-toggle-subtree-encryption)
+    (allout-toggle-subtree-encryption fetch-pass)
     )
   )
 ;;;_  > allout-toggle-subtree-encryption (&optional fetch-pass)
@@ -4948,20 +4837,23 @@ See `allout-toggle-current-subtree-encryption' for more details."
             (progn (if (= (point-max) after-bullet-pos)
                        (error "no body to encrypt"))
                    (allout-encrypted-topic-p)))
-           (was-collapsed (if (not (re-search-forward "[\n\r]" nil t))
+           (was-collapsed (if (not (search-forward "\n" nil t))
                               nil
                             (backward-char 1)
-                            (looking-at "\r")))
+                            (allout-hidden-p)))
            (subtree-beg (1+ (point)))
            (subtree-end (allout-end-of-subtree))
            (subject-text (buffer-substring-no-properties subtree-beg
                                                          subtree-end))
            (subtree-end-char (char-after (1- subtree-end)))
-           (subtree-trailling-char (char-after subtree-end))
-           (place-holder (if (or (string= "" subject-text)
-                                 (string= "\n" subject-text))
-                             (error "No topic contents to %scrypt"
-                                    (if was-encrypted "de" "en"))))
+           (subtree-trailing-char (char-after subtree-end))
+           ;; kluge - result-text needs to be nil, but we also want to
+           ;;         check for the error condition
+           (result-text (if (or (string= "" subject-text)
+                                (string= "\n" subject-text))
+                            (error "No topic contents to %scrypt"
+                                   (if was-encrypted "de" "en"))
+                          nil))
            ;; Assess key parameters:
            (key-info (or
                       ;; detect the type by which it is already encrypted
@@ -4972,8 +4864,7 @@ See `allout-toggle-current-subtree-encryption' for more details."
                       '(symmetric nil)))
            (for-key-type (car key-info))
            (for-key-identity (cadr key-info))
-           (fetch-pass (and fetch-pass (member fetch-pass '(16 (16)))))
-           result-text)
+           (fetch-pass (and fetch-pass (member fetch-pass '(16 (16))))))
 
       (setq result-text
             (allout-encrypt-string subject-text was-encrypted
@@ -4987,12 +4878,12 @@ See `allout-toggle-current-subtree-encryption' for more details."
          (delete-region subtree-beg subtree-end)
          (insert result-text)
          (if was-collapsed
-             (allout-flag-region subtree-beg (1- (point)) ?\r))
-         ;; adjust trailling-blank-lines to preserve topic spacing:
+             (allout-flag-region (1- subtree-beg) (point) t))
+         ;; adjust trailing-blank-lines to preserve topic spacing:
          (if (not was-encrypted)
-             (if (and (member subtree-end-char '(?\r ?\n))
-                      (member subtree-trailling-char '(?\r ?\n)))
-                 (insert subtree-trailling-char)))
+             (if (and (= subtree-end-char ?\n)
+                      (= subtree-trailing-char ?\n))
+                 (insert subtree-trailing-char)))
          ;; Ensure that the item has an encrypted-entry bullet:
          (if (not (string= (buffer-substring-no-properties
                             (1- after-bullet-pos) after-bullet-pos)
@@ -5060,8 +4951,7 @@ Returns the resulting string, or nil if the transformation fails."
                                       target-prompt-id
                                     (or (buffer-file-name allout-buffer)
                                         target-prompt-id))))
-         (comment "Processed by allout driving pgg")
-         work-buffer result result-text status)
+         result-text status)
 
     (if (and fetch-pass (not passphrase))
         ;; Force later fetch by evicting passphrase from the cache.
@@ -5083,7 +4973,7 @@ Returns the resulting string, or nil if the transformation fails."
                                                        retried fetch-pass)))
         (with-temp-buffer
 
-          (insert (subst-char-in-string ?\r ?\n text))
+          (insert text)
 
           (cond
 
@@ -5319,7 +5209,7 @@ An error is raised if the text is not encrypted."
   (require 'pgg-parse)
   (save-excursion
     (with-temp-buffer
-      (insert (subst-char-in-string ?\r ?\n text))
+      (insert text)
       (let* ((parsed-armor (pgg-parse-armor-region (point-min) (point-max)))
              (type (if (pgg-gpg-symmetric-key-p parsed-armor)
                        'symmetric
@@ -5442,21 +5332,21 @@ must also have content."
     (while (not done)
 
       (if (not (re-search-forward
-                (format "\\(\\`\\|[\n\r]\\)%s *%s[^*]"
+                (format "\\(\\`\\|\n\\)%s *%s[^*]"
                         (regexp-quote allout-header-prefix)
                         (regexp-quote allout-topic-encryption-bullet))
                 nil t))
           (setq got nil
                 done t)
         (goto-char (setq got (match-beginning 0)))
-        (if (looking-at "[\n\r]")
+        (if (looking-at "\n")
             (forward-char 1))
         (setq got (point)))
 
       (cond ((not got)
              (setq done t))
 
-            ((not (re-search-forward "[\n\r]"))
+            ((not (search-forward "\n"))
              (setq got nil
                    done t))
 
@@ -5498,26 +5388,28 @@ save.  See `allout-encrypt-unencrypted-on-saves' for more info."
 
   (interactive "p")
   (save-excursion
-    (let ((current-mark (point-marker))
-          was-modified
-          bo-subtree
-          editing-topic editing-point)
+    (let* ((current-mark (point-marker))
+           (current-mark-position (marker-position current-mark))
+           was-modified
+           bo-subtree
+           editing-topic editing-point)
       (goto-char (point-min))
       (while (allout-next-topic-pending-encryption except-mark)
         (setq was-modified (buffer-modified-p))
-        (if (save-excursion
-              (and (boundp 'allout-encrypt-unencrypted-on-saves)
-                   allout-encrypt-unencrypted-on-saves
-                   (setq bo-subtree (re-search-forward "[\n\r]"))
-                   ;; Not collapsed:
-                   (string= (match-string 0) "\n")
-                   (>= current-mark (point))
-                   (allout-end-of-current-subtree)
-                   (<= current-mark (point))))
+        (when (save-excursion
+                (and (boundp 'allout-encrypt-unencrypted-on-saves)
+                     allout-encrypt-unencrypted-on-saves
+                     (setq bo-subtree (re-search-forward "$"))
+                     (not (allout-hidden-p))
+                     (>= current-mark (point))
+                     (allout-end-of-current-subtree)
+                     (<= current-mark (point))))
             (setq editing-topic (point)
                   ;; we had to wait for this 'til now so prior topics are
                   ;; encrypted, any relevant text shifts are in place:
-                  editing-point (marker-position current-mark)))
+                  editing-point (- current-mark-position
+                                   (count-trailing-whitespace-region
+                                    bo-subtree current-mark-position))))
         (allout-toggle-subtree-encryption)
         (if (not was-modified)
             (set-buffer-modified-p nil))
@@ -5579,11 +5471,11 @@ Returns list `(beginning-point prefix-string suffix-string)'."
         (setq beg (- (point) 16))
         (setq suffix (buffer-substring-no-properties
                       (point)
-                      (progn (if (re-search-forward "[\n\r]" nil t)
+                      (progn (if (search-forward "\n" nil t)
                                  (forward-char -1))
                              (point))))
         (setq prefix (buffer-substring-no-properties
-                      (progn (if (re-search-backward "[\n\r]" nil t)
+                      (progn (if (search-backward "\n" nil t)
                                  (forward-char 1))
                              (point))
                       beg))
@@ -5639,7 +5531,7 @@ enable-local-variables must be true for any of this to happen."
         (allout-show-to-offshoot)
         (if (search-forward (concat "\n" prefix varname ":") nil t)
             (let* ((value-beg (point))
-                   (line-end (progn (if (re-search-forward "[\n\r]" nil t)
+                   (line-end (progn (if (search-forward "\n" nil t)
                                         (forward-char -1))
                                     (point)))
                    (value-end (- line-end (length suffix))))
@@ -5710,26 +5602,29 @@ Optional arg SUCCESSIVE-BACKSLASHES is used internally for recursion."
                 (regexp-sans-escapes (substring regexp 1)))
       ;; Exclude first char, but maintain count:
       (regexp-sans-escapes (substring regexp 1) successive-backslashes))))
-;;;_  - add-hook definition for divergent emacsen
-;;;_   > add-hook (hook function &optional append)
-(if (not (fboundp 'add-hook))
-    (defun add-hook (hook function &optional append)
-      "Add to the value of HOOK the function FUNCTION unless already present.
-\(It becomes the first hook on the list unless optional APPEND is non-nil, in
-which case it becomes the last).  HOOK should be a symbol, and FUNCTION may be
-any valid function.  HOOK's value should be a list of functions, not a single
-function.  If HOOK is void, it is first set to nil."
-      (or (boundp hook) (set hook nil))
-      (or (if (consp function)
-              ;; Clever way to tell whether a given lambda-expression
-              ;; is equal to anything in the hook.
-              (let ((tail (assoc (cdr function) (symbol-value hook))))
-                (equal function tail))
-            (memq function (symbol-value hook)))
-          (set hook
-               (if append
-                   (nconc (symbol-value hook) (list function))
-                 (cons function (symbol-value hook)))))))
+;;;_  > count-trailing-whitespace-region (beg end)
+(defun count-trailing-whitespace-region (beg end)
+  "Return number of trailing whitespace chars between BEG and END.
+
+If BEG is bigger than END we return 0."
+  (if (> beg end)
+      0
+    (save-excursion
+      (goto-char beg)
+      (let ((count 0))
+        (while (re-search-forward "[    ][      ]*$" end t)
+          (goto-char (1+ (match-beginning 0)))
+          (setq count (1+ count)))
+        count))))
+;;;_  > allout-mark-marker to accommodate divergent emacsen:
+(defun allout-mark-marker (&optional force buffer)
+  "Accommodate the different signature for `mark-marker' across Emacsen.
+
+XEmacs takes two optional args, while mainline GNU Emacs does not,
+so pass them along when appropriate."
+  (if (featurep 'xemacs)
+      (apply 'mark-marker force buffer)
+    (mark-marker)))
 ;;;_  > subst-char-in-string if necessary
 (if (not (fboundp 'subst-char-in-string))
     (defun subst-char-in-string (fromchar tochar string &optional inplace)
@@ -5742,17 +5637,159 @@ Unless optional argument INPLACE is non-nil, return a new string."
           (if (eq (aref newstr i) fromchar)
               (aset newstr i tochar)))
         newstr)))
-;;;_  : my-mark-marker to accommodate divergent emacsen:
-(defun my-mark-marker (&optional force buffer)
-  "Accommodate the different signature for `mark-marker' across Emacsen.
-
-XEmacs takes two optional args, while mainline GNU Emacs does not,
-so pass them along when appropriate."
-  (if (featurep 'xemacs)
-      (apply 'mark-marker force buffer)
-    (mark-marker)))
-
-;;;_ #10 Under development
+;;;_  > wholenump if necessary
+(if (not (fboundp 'wholenump))
+    (defalias 'wholenump 'natnump))
+;;;_  > remove-overlays if necessary
+(if (not (fboundp 'remove-overlays))
+    (defun remove-overlays (&optional beg end name val)
+      "Clear BEG and END of overlays whose property NAME has value VAL.
+Overlays might be moved and/or split.
+BEG and END default respectively to the beginning and end of buffer."
+      (unless beg (setq beg (point-min)))
+      (unless end (setq end (point-max)))
+      (if (< end beg)
+          (setq beg (prog1 end (setq end beg))))
+      (save-excursion
+        (dolist (o (overlays-in beg end))
+          (when (eq (overlay-get o name) val)
+            ;; Either push this overlay outside beg...end
+            ;; or split it to exclude beg...end
+            ;; or delete it entirely (if it is contained in beg...end).
+            (if (< (overlay-start o) beg)
+                (if (> (overlay-end o) end)
+                    (progn
+                      (move-overlay (copy-overlay o)
+                                    (overlay-start o) beg)
+                      (move-overlay o end (overlay-end o)))
+                  (move-overlay o (overlay-start o) beg))
+              (if (> (overlay-end o) end)
+                  (move-overlay o end (overlay-end o))
+                (delete-overlay o)))))))
+  )
+;;;_  > copy-overlay if necessary - xemacs ~ 21.4
+(if (not (fboundp 'copy-overlay))
+    (defun copy-overlay (o)
+      "Return a copy of overlay O."
+      (let ((o1 (make-overlay (overlay-start o) (overlay-end o)
+                              ;; FIXME: there's no easy way to find the
+                              ;; insertion-type of the two markers.
+                              (overlay-buffer o)))
+            (props (overlay-properties o)))
+        (while props
+          (overlay-put o1 (pop props) (pop props)))
+        o1)))
+;;;_  > add-to-invisibility-spec if necessary - xemacs ~ 21.4
+(if (not (fboundp 'add-to-invisibility-spec))
+    (defun add-to-invisibility-spec (element)
+      "Add ELEMENT to `buffer-invisibility-spec'.
+See documentation for `buffer-invisibility-spec' for the kind of elements
+that can be added."
+      (if (eq buffer-invisibility-spec t)
+          (setq buffer-invisibility-spec (list t)))
+      (setq buffer-invisibility-spec
+            (cons element buffer-invisibility-spec))))
+;;;_  > remove-from-invisibility-spec if necessary - xemacs ~ 21.4
+(if (not (fboundp 'remove-from-invisibility-spec))
+    (defun remove-from-invisibility-spec (element)
+      "Remove ELEMENT from `buffer-invisibility-spec'."
+      (if (consp buffer-invisibility-spec)
+          (setq buffer-invisibility-spec (delete element
+                                                 buffer-invisibility-spec)))))
+;;;_  > move-beginning-of-line if necessary - older emacs, xemacs
+(if (not (fboundp 'move-beginning-of-line))
+    (defun move-beginning-of-line (arg)
+      "Move point to beginning of current line as displayed.
+\(This disregards invisible newlines such as those
+which are part of the text that an image rests on.)
+
+With argument ARG not nil or 1, move forward ARG - 1 lines first.
+If point reaches the beginning or end of buffer, it stops there.
+To ignore intangibility, bind `inhibit-point-motion-hooks' to t.
+
+This function does not move point across a field boundary unless that
+would move point to a different line than the original, unconstrained
+result.  If N is nil or 1, and a front-sticky field starts at point,
+the point does not move.  To ignore field boundaries bind
+`inhibit-field-text-motion' to t."
+      (interactive "p")
+      (or arg (setq arg 1))
+      (if (/= arg 1)
+          (condition-case nil (line-move (1- arg)) (error nil)))
+
+      (let ((orig (point)))
+        ;; Move to beginning-of-line, ignoring fields and invisibles.
+        (skip-chars-backward "^\n")
+        (while (and (not (bobp)) (line-move-invisible-p (1- (point))))
+          (goto-char (if (featurep 'xemacs)
+                         (previous-property-change (point))
+                       (previous-char-property-change (point))))
+          (skip-chars-backward "^\n"))
+        (vertical-motion 0)
+        (if (/= orig (point))
+            (goto-char (constrain-to-field (point) orig (/= arg 1) t nil)))))
+)
+;;;_  > move-end-of-line if necessary - older emacs, xemacs
+(if (not (fboundp 'move-end-of-line))
+    (defun move-end-of-line (arg)
+      "Move point to end of current line as displayed.
+\(This disregards invisible newlines such as those
+which are part of the text that an image rests on.)
+
+With argument ARG not nil or 1, move forward ARG - 1 lines first.
+If point reaches the beginning or end of buffer, it stops there.
+To ignore intangibility, bind `inhibit-point-motion-hooks' to t.
+
+This function does not move point across a field boundary unless that
+would move point to a different line than the original, unconstrained
+result.  If N is nil or 1, and a rear-sticky field ends at point,
+the point does not move.  To ignore field boundaries bind
+`inhibit-field-text-motion' to t."
+      (interactive "p")
+      (or arg (setq arg 1))
+      (let ((orig (point))
+            done)
+        (while (not done)
+          (let ((newpos
+                 (save-excursion
+                   (let ((goal-column 0))
+                     (and (condition-case nil
+                              (or (line-move arg) t)
+                            (error nil))
+                          (not (bobp))
+                          (progn
+                            (while (and (not (bobp)) (line-move-invisible-p (1- (point))))
+                              (goto-char (previous-char-property-change (point))))
+                            (backward-char 1)))
+                     (point)))))
+            (goto-char newpos)
+            (if (and (> (point) newpos)
+                     (eq (preceding-char) ?\n))
+                (backward-char 1)
+              (if (and (> (point) newpos) (not (eobp))
+                       (not (eq (following-char) ?\n)))
+                  ;; If we skipped something intangible
+                  ;; and now we're not really at eol,
+                  ;; keep going.
+                  (setq arg 1)
+                (setq done t)))))
+        (if (/= orig (point))
+            (goto-char (constrain-to-field (point) orig (/= arg 1) t
+                                           nil)))))
+  )
+;;;_  > line-move-invisible-p if necessary
+(if (not (fboundp 'line-move-invisible-p))
+    (defun line-move-invisible-p (pos)
+      "Return non-nil if the character after POS is currently invisible."
+      (let ((prop
+             (get-char-property pos 'invisible)))
+        (if (eq buffer-invisibility-spec t)
+            prop
+          (or (memq prop buffer-invisibility-spec)
+              (assq prop buffer-invisibility-spec))))))
+
+
+;;;_ #10 Unfinished
 ;;;_  > allout-bullet-isearch (&optional bullet)
 (defun allout-bullet-isearch (&optional bullet)
   "Isearch \(regexp) for topic with bullet BULLET."
@@ -5769,8 +5806,9 @@ so pass them along when appropriate."
                                 bullet)))
     (isearch-repeat 'forward)
     (isearch-mode t)))
-;;;_  ? Re hooking up with isearch - use isearch-op-fun rather than
-;;;     wrapping the isearch functions.
+
+;;;_ #11 Provide
+(provide 'allout)
 
 ;;;_* Local emacs vars.
 ;;; The following `allout-layout' local variable setting:
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 5388ff9863d..3094da3bfe8 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -706,9 +706,9 @@ For more information, see the function `buffer-menu'."
          list desired-point)
     (when Buffer-menu-use-header-line
       (let ((pos 0))
-        ;; Turn spaces in the header into stretch specs so they work
-        ;; regardless of the header-line face.
-        (while (string-match "[ \t]+" header pos)
+        ;; Turn whitespace chars in the header into stretch specs so
+        ;; they work regardless of the header-line face.
+        (while (string-match "[ \t\n]+" header pos)
           (setq pos (match-end 0))
           (put-text-property (match-beginning 0) pos 'display
                              ;; Assume fixed-size chars in the buffer.
@@ -726,6 +726,7 @@ For more information, see the function `buffer-menu'."
       (erase-buffer)
       (setq standard-output (current-buffer))
       (unless Buffer-menu-use-header-line
+        ;; Use U+2014 (EM DASH) to underline if possible, else U+002D (HYPHEN-MINUS)
         (let ((underline (if (char-displayable-p ?—) ?— ?-)))
           (insert header
                   (apply 'string
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 571b4ec132a..bce30a1de20 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -78,6 +78,7 @@
 ;; Make sure calendar is loaded when we compile this.
 (require 'calendar)
 
+(defvar diary-selective-display)
 
 ;;;###autoload
 (defcustom appt-issue-message t
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 3d06bd0fcae..feacc9adf0d 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -932,6 +932,7 @@ If given a prefix (or a COMMENT argument), also prompt for a comment."
                                        "Set customized value for %s to: "
                                        current-prefix-arg))
   (custom-load-symbol variable)
+  (custom-push-theme 'theme-value variable 'user 'set (custom-quote value))
   (funcall (or (get variable 'custom-set) 'set-default) variable value)
   (put variable 'customized-value (list (custom-quote value)))
   (cond ((string= comment "")
@@ -4166,7 +4167,9 @@ This function does not save the buffer."
       (mapatoms
        (lambda (symbol)
          (if (and (get symbol 'saved-value)
-                  (eq 'user (car (car-safe (get symbol 'theme-value)))))
+                  ;; ignore theme values
+                  (or (null (get symbol 'theme-value))
+                      (eq 'user (caar (get symbol 'theme-value)))))
              (nconc saved-list (list symbol)))))
       (setq saved-list (sort (cdr saved-list) 'string<))
       (unless (bolp)
diff --git a/lisp/custom.el b/lisp/custom.el
index 0f95e3bab73..15b5b4a815c 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -653,6 +653,7 @@ default value.  Otherwise, set it to nil.
 To actually save the value, call `custom-save-all'.
 
 Return non-nil iff the `saved-value' property actually changed."
+  (custom-load-symbol symbol)
   (let* ((get (or (get symbol 'custom-get) 'default-value))
          (value (funcall get symbol))
          (saved (get symbol 'saved-value))
@@ -681,6 +682,7 @@ or else if it is different from the standard value, set the
 default value.  Otherwise, set it to nil.
 
 Return non-nil iff the `customized-value' property actually changed."
+  (custom-load-symbol symbol)
   (let* ((get (or (get symbol 'custom-get) 'default-value))
          (value (funcall get symbol))
          (customized (get symbol 'customized-value))
@@ -690,7 +692,9 @@ Return non-nil iff the `customized-value' property actually changed."
             (not (equal value (condition-case nil
                                   (eval (car old))
                                 (error nil)))))
-        (put symbol 'customized-value (list (custom-quote value)))
+        (progn (put symbol 'customized-value (list (custom-quote value)))
+               (custom-push-theme 'theme-value symbol 'user 'set
+                                  (custom-quote value)))
       (put symbol 'customized-value nil))
     ;; Changed?
     (not (equal customized (get symbol 'customized-value)))))
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index 67da6eae25d..62a6386584e 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -26,7 +26,6 @@
 
 ;;; Code:
 
-(provide 'ediff-diff)
 
 ;; compiler pacifier
 (defvar ediff-default-variant)
@@ -129,13 +128,33 @@ are `-I REGEXP', to ignore changes whose lines match the REGEXP."
 
 (defcustom ediff-diff-options ""
   "*Options to pass to `ediff-diff-program'.
-If Unix diff is used as `ediff-diff-program', then the most useful options are
+If Unix diff is used as `ediff-diff-program', then a useful option is
 `-w', to ignore space, and `-i', to ignore case of letters.
-At present, the option `-c' is not allowed."
+Options `-c' and `-i' are not allowed. Case sensitivity can be toggled
+interactively using [ediff-toggle-ignore-case]"
   :set 'ediff-reset-diff-options
   :type 'string
   :group 'ediff-diff)
 
+(ediff-defvar-local ediff-ignore-case nil
+  "*If t, skip over difference regions that differ only in letter case.
+This variable can be set either in .emacs or toggled interactively.
+Use `setq-default' if setting it in .emacs")
+
+(defcustom ediff-ignore-case-option "-i"
+  "*Option that causes the diff program to ignore case of letters."
+  :type 'string
+  :group 'ediff-diff)
+
+(defcustom ediff-ignore-case-option3 ""
+  "*Option that causes the diff3 program to ignore case of letters.
+GNU diff3 doesn't have such an option."
+  :type 'string
+  :group 'ediff-diff)
+
+;; the actual options used in comparison
+(ediff-defvar-local ediff-actual-diff-options "" "")
+
 (defcustom ediff-custom-diff-program ediff-diff-program
   "*Program to use for generating custom diff output for saving it in a file.
 This output is not used by Ediff internally."
@@ -155,6 +174,10 @@ This output is not used by Ediff internally."
   :set 'ediff-reset-diff-options
   :type 'string
   :group 'ediff-diff)
+
+;; the actual options used in comparison
+(ediff-defvar-local ediff-actual-diff3-options "" "")
+
 (defcustom ediff-diff3-ok-lines-regexp
   "^\\([1-3]:\\|====\\|  \\|.*Warning *:\\|.*No newline\\|.*missing newline\\|^\C-m$\\)"
   "*Regexp that matches normal output lines from `ediff-diff3-program'.
@@ -182,7 +205,7 @@ Use `setq-default' if setting it in .emacs")
 This variable can be set either in .emacs or toggled interactively.
 Use `setq-default' if setting it in .emacs")
 
-(ediff-defvar-local ediff-auto-refine-limit 1400
+(ediff-defvar-local ediff-auto-refine-limit 14000
   "*Auto-refine only the regions of this size \(in bytes\) or less.")
 
 ;;; General
@@ -227,9 +250,9 @@ one optional arguments, diff-number to refine.")
 ;; ediff-setup-diff-regions-function, which can also have the value
 ;; ediff-setup-diff-regions3, which takes 4 arguments.
 (defun ediff-setup-diff-regions (file-A file-B file-C)
-  ;; looking either for '-c' or a 'c' in a set of clustered non-long options
-  (if (string-match "^-c\\| -c\\|-[^- ]+c" ediff-diff-options)
-      (error "Option `-c' is not allowed in `ediff-diff-options'"))
+  ;; looking for '-c', '-i', or a 'c', 'i' among clustered non-long options
+  (if (string-match "^-[ci]\\| -[ci]\\|-[^- ]+[ci]" ediff-diff-options)
+      (error "Options `-c' and `-i' are not allowed in `ediff-diff-options'"))
 
   ;; create, if it doesn't exist
   (or (ediff-buffer-live-p ediff-diff-buffer)
@@ -266,7 +289,7 @@ one optional arguments, diff-number to refine.")
              (ediff-exec-process ediff-diff-program
                                  diff-buffer
                                  'synchronize
-                                 ediff-diff-options file1 file2)
+                                 ediff-actual-diff-options file1 file2)
              (message "")
              (ediff-with-current-buffer diff-buffer
                (buffer-size))))))
@@ -284,7 +307,9 @@ one optional arguments, diff-number to refine.")
   (let (diff3-job diff-program diff-options ok-regexp diff-list)
     (setq diff3-job ediff-3way-job
           diff-program (if diff3-job ediff-diff3-program ediff-diff-program)
-          diff-options (if diff3-job ediff-diff3-options ediff-diff-options)
+          diff-options (if diff3-job
+                           ediff-actual-diff3-options
+                         ediff-actual-diff-options)
           ok-regexp (if diff3-job
                         ediff-diff3-ok-lines-regexp
                         ediff-diff-ok-lines-regexp))
@@ -366,11 +391,14 @@ one optional arguments, diff-number to refine.")
         (B-buffer ediff-buffer-B)
         (C-buffer ediff-buffer-C)
         (a-prev 1) ; this is needed to set the first diff line correctly
+        (a-prev-pt nil)
         (b-prev 1)
+        (b-prev-pt nil)
         (c-prev 1)
+        (c-prev-pt nil)
         diff-list shift-A shift-B
         )
-
+    
     ;; diff list contains word numbers, unless changed later
     (setq diff-list (cons (if word-mode 'words 'points)
                           diff-list))
@@ -382,7 +410,7 @@ one optional arguments, diff-number to refine.")
               shift-B
               (ediff-overlay-start
                (ediff-get-value-according-to-buffer-type 'B bounds))))
-
+    
     ;; reset point in buffers A/B/C
     (ediff-with-current-buffer A-buffer
       (goto-char (if shift-A shift-A (point-min))))
@@ -466,11 +494,13 @@ one optional arguments, diff-number to refine.")
                ;; we must disable and then restore longlines-mode
                (if (eq longlines-mode-val 1)
                    (longlines-mode 0))
+               (goto-char (or a-prev-pt shift-A (point-min)))
                (forward-line (- a-begin a-prev))
                (setq a-begin-pt (point))
                (forward-line (- a-end a-begin))
                (setq a-end-pt (point)
-                     a-prev a-end)
+                     a-prev a-end
+                     a-prev-pt a-end-pt)
                (if (eq longlines-mode-val 1)
                    (longlines-mode longlines-mode-val))
                ))
@@ -479,11 +509,13 @@ one optional arguments, diff-number to refine.")
                     (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
                (if (eq longlines-mode-val 1)
                    (longlines-mode 0))
+               (goto-char (or b-prev-pt shift-B (point-min)))
                (forward-line (- b-begin b-prev))
                (setq b-begin-pt (point))
                (forward-line (- b-end b-begin))
                (setq b-end-pt (point)
-                     b-prev b-end)
+                     b-prev b-end
+                     b-prev-pt b-end-pt)
                (if (eq longlines-mode-val 1)
                    (longlines-mode longlines-mode-val))
                ))
@@ -493,11 +525,13 @@ one optional arguments, diff-number to refine.")
                         (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
                    (if (eq longlines-mode-val 1)
                        (longlines-mode 0))
+                   (goto-char (or c-prev-pt (point-min)))
                    (forward-line (- c-begin c-prev))
                    (setq c-begin-pt (point))
                    (forward-line (- c-end c-begin))
                    (setq c-end-pt (point)
-                         c-prev c-end)
+                         c-prev c-end
+                         c-prev-pt c-end-pt)
                    (if (eq longlines-mode-val 1)
                        (longlines-mode longlines-mode-val))
                  )))
@@ -987,8 +1021,11 @@ delimiter regions"))
         (C-buffer ediff-buffer-C)
         (anc-buffer ediff-ancestor-buffer)
         (a-prev 1) ; needed to set the first diff line correctly
+        (a-prev-pt nil)
         (b-prev 1)
+        (b-prev-pt nil)
         (c-prev 1)
+        (c-prev-pt nil)
         (anc-prev 1)
         diff-list shift-A shift-B shift-C
         )
@@ -1089,11 +1126,13 @@ delimiter regions"))
                      ;; we must disable and then restore longlines-mode
                      (if (eq longlines-mode-val 1)
                          (longlines-mode 0))
+                     (goto-char (or a-prev-pt shift-A (point-min)))
                      (forward-line (- a-begin a-prev))
                      (setq a-begin-pt (point))
                      (forward-line (- a-end a-begin))
                      (setq a-end-pt (point)
-                           a-prev a-end)
+                           a-prev a-end
+                           a-prev-pt a-end-pt)
                      (if (eq longlines-mode-val 1)
                          (longlines-mode longlines-mode-val))
                      ))
@@ -1102,11 +1141,13 @@ delimiter regions"))
                           (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
                      (if (eq longlines-mode-val 1)
                          (longlines-mode 0))
+                     (goto-char (or b-prev-pt shift-B (point-min)))
                      (forward-line (- b-begin b-prev))
                      (setq b-begin-pt (point))
                      (forward-line (- b-end b-begin))
                      (setq b-end-pt (point)
-                           b-prev b-end)
+                           b-prev b-end
+                           b-prev-pt b-end-pt)
                      (if (eq longlines-mode-val 1)
                          (longlines-mode longlines-mode-val))
                      ))
@@ -1115,11 +1156,13 @@ delimiter regions"))
                           (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
                      (if (eq longlines-mode-val 1)
                          (longlines-mode 0))
+                     (goto-char (or c-prev-pt shift-C (point-min)))
                      (forward-line (- c-begin c-prev))
                      (setq c-begin-pt (point))
                      (forward-line (- c-end c-begin))
                      (setq c-end-pt (point)
-                           c-prev c-end)
+                           c-prev c-end
+                           c-prev-pt c-end-pt)
                      (if (eq longlines-mode-val 1)
                          (longlines-mode longlines-mode-val))
                      ))
@@ -1171,13 +1214,17 @@ delimiter regions"))
 ;; File-C is either the third file to compare (in case of 3-way comparison)
 ;; or it is the ancestor file.
 (defun ediff-setup-diff-regions3 (file-A file-B file-C)
+  ;; looking for '-i' or a 'i' among clustered non-long options
+  (if (string-match "^-i\\| -i\\|-[^- ]+i" ediff-diff-options)
+      (error "Option `-i' is not allowed in `ediff-diff3-options'"))
+
   (or (ediff-buffer-live-p ediff-diff-buffer)
       (setq ediff-diff-buffer
             (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*"))))
 
   (message "Computing differences ...")
   (ediff-exec-process ediff-diff3-program ediff-diff-buffer 'synchronize
-                      ediff-diff3-options file-A file-B file-C)
+                      ediff-actual-diff3-options file-A file-B file-C)
 
   (ediff-prepare-error-list ediff-diff3-ok-lines-regexp ediff-diff-buffer)
   ;;(message "Computing differences ... done")
@@ -1471,6 +1518,35 @@ affects only files whose names match the expression."
       (setq file-list-list (cdr file-list-list)))
     (reverse result)))
 
+;; Ignore case handling - some ideas from drew.adams@@oracle.com
+(defun ediff-toggle-ignore-case ()
+  (interactive)
+  (ediff-barf-if-not-control-buffer)
+  (setq ediff-ignore-case (not ediff-ignore-case))
+  (cond (ediff-ignore-case
+         (setq ediff-actual-diff-options 
+               (concat ediff-diff-options " " ediff-ignore-case-option)
+               ediff-actual-diff3-options
+               (concat ediff-diff3-options " " ediff-ignore-case-option3))
+         (message "Ignoring regions that differ only in case"))
+        (t
+         (setq ediff-actual-diff-options ediff-diff-options
+               ediff-actual-diff3-options ediff-diff3-options)
+         (message "Ignoring case differences turned OFF")))
+  (cond (ediff-merge-job
+         (message "Ignoring letter case is too dangerous in merge jobs"))
+        ((and ediff-diff3-job (string= ediff-ignore-case-option3 ""))
+         (message "Ignoring letter case is not supported by this diff3 program"))
+        ((and (not ediff-3way-job) (string= ediff-ignore-case-option ""))
+         (message "Ignoring letter case is not supported by this diff program"))
+        (t
+         (sit-for 1)
+         (ediff-update-diffs)))
+  )
+
+
+(provide 'ediff-diff)
+
 
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
diff --git a/lisp/ediff-help.el b/lisp/ediff-help.el
index cc266e3c8a3..d5f505c7de3 100644
--- a/lisp/ediff-help.el
+++ b/lisp/ediff-help.el
@@ -26,7 +26,6 @@
 
 ;;; Code:
 
-(provide 'ediff-help)
 
 ;; Compiler pacifier start
 (defvar ediff-multiframe)
@@ -61,8 +60,8 @@ For help on a specific command:  Click Button 2 over it; or
 p,DEL -previous diff |     | -vert/horiz split   | xy -copy buf X's region to Y
 n,SPC -next diff     |     h -hilighting         | rx -restore buf X's old diff
     j -jump to diff  |     @ -auto-refinement    |  * -refine current region
-   gx -goto X's point|                           |  ! -update diff regions
-  C-l -recenter      |    ## -ignore whitespace  |
+   gx -goto X's point|    ## -ignore whitespace  |  ! -update diff regions
+  C-l -recenter      |    #c -ignore case        |
   v/V -scroll up/dn  | #f/#h -focus/hide regions | wx -save buf X
   </> -scroll lt/rt  |     X -read-only in buf X | wd -save diff output
     ~ -rotate buffers|     m -wide display       |
@@ -75,8 +74,8 @@ Normally, not a user option.  See `ediff-help-message' for details.")
 p,DEL -previous diff |     | -vert/horiz split   |a/b -copy A/B's region to B/A
 n,SPC -next diff     |     h -hilighting         | rx -restore buf X's old diff
     j -jump to diff  |     @ -auto-refinement    |  * -refine current region
-   gx -goto X's point|                           |  ! -update diff regions
-  C-l -recenter      |    ## -ignore whitespace  |
+   gx -goto X's point|    ## -ignore whitespace  |  ! -update diff regions
+  C-l -recenter      |    #c -ignore case        |
   v/V -scroll up/dn  | #f/#h -focus/hide regions | wx -save buf X
   </> -scroll lt/rt  |     X -read-only in buf X | wd -save diff output
     ~ -swap variants |     m -wide display       |
@@ -89,8 +88,8 @@ Normally, not a user option.  See `ediff-help-message' for details.")
 p,DEL -previous diff |     | -vert/horiz split   |a/b -copy A/B's region to B/A
 n,SPC -next diff     |     h -hilighting         | rx -restore buf X's old diff
     j -jump to diff  |     @ -auto-refinement    |  * -refine current region
-   gx -goto X's point|     % -narrow/widen buffs |  ! -update diff regions
-  C-l -recenter      |    ## -ignore whitespace  |
+   gx -goto X's point|    ## -ignore whitespace  |  ! -update diff regions
+  C-l -recenter      |    #c -ignore case        |  % -narrow/widen buffs 
   v/V -scroll up/dn  | #f/#h -focus/hide regions | wx -save buf X
   </> -scroll lt/rt  |     X -read-only in buf X | wd -save diff output
     ~ -swap variants |     m -wide display       |
@@ -103,8 +102,8 @@ Normally, not a user option.  See `ediff-help-message' for details.")
 p,DEL -previous diff |     | -vert/horiz split   | xy -copy buf X's region to Y
 n,SPC -next diff     |     h -hilighting         | rx -restore buf X's old diff
     j -jump to diff  |                           |
-   gx -goto X's point|     % -narrow/widen buffs |  ! -recompute diffs
-  C-l -recenter      |                           |
+   gx -goto X's point|    % -narrow/widen buffs  |  ! -recompute diffs
+  C-l -recenter      |    #c -ignore case        |
   v/V -scroll up/dn  | #f/#h -focus/hide regions | wx -save buf X
   </> -scroll lt/rt  |     X -read-only in buf X | wd -save diff output
     ~ -swap variants |     m -wide display       |
@@ -228,6 +227,7 @@ the value of this variable and the variables `ediff-help-message-*' in
             ((string= cmd "r") (re-search-forward "^`r'"))
             ((string= cmd "rx") (re-search-forward "^`ra'"))
             ((string= cmd "##") (re-search-forward "^`##'"))
+            ((string= cmd "#c") (re-search-forward "^`#c'"))
             ((string= cmd "#f/#h") (re-search-forward "^`#f'"))
             ((string= cmd "X") (re-search-forward "^`A'"))
             ((string= cmd "v/V") (re-search-forward "^`v'"))
@@ -325,5 +325,8 @@ the value of this variable and the variables `ediff-help-message-*' in
   (customize-group "ediff"))
 
 
+(provide 'ediff-help)
+
+
 ;;; arch-tag: 05659813-7fcf-4274-964f-d2f577431a9d
 ;;; ediff-help.el ends here
diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el
index 1b86e2f8f62..fcf261efd06 100644
--- a/lisp/ediff-hook.el
+++ b/lisp/ediff-hook.el
@@ -371,5 +371,6 @@
 
 (provide 'ediff-hook)
 
+
 ;;; arch-tag: 512f8656-8a4b-4789-af5d-5c6144498df3
 ;;; ediff-hook.el ends here
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index 4897ffd2e59..2fc0ceefe4d 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -1867,6 +1867,7 @@ Unless optional argument INPLACE is non-nil, return a new string."
              (set-buffer ,old-buffer)
              (set-syntax-table ,old-table)))))))
 
+
 (provide 'ediff-init)
 
 
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index 7f0eea2cf09..92f462c0181 100644
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -26,7 +26,6 @@
 
 ;;; Code:
 
-(provide 'ediff-merg)
 
 ;; compiler pacifier
 (defvar ediff-window-A)
@@ -390,6 +389,9 @@ Combining is done according to the specifications in variable
         )))
 
 
+(provide 'ediff-merg)
+
+
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index c24e32a2124..0bbd3298c7a 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -104,7 +104,6 @@
 
 ;;; Code:
 
-(provide 'ediff-mult)
 
 (defgroup ediff-mult nil
   "Multi-file and multi-buffer processing in Ediff."
@@ -123,7 +122,6 @@
 ;; end pacifier
 
 (require 'ediff-init)
-(require 'ediff-util)
 
 ;; meta-buffer
 (ediff-defvar-local ediff-meta-buffer nil "")
@@ -1473,6 +1471,7 @@ Useful commands:
       (ediff-overlay-put overl 'highlight t))
     (ediff-overlay-put overl 'ediff-meta-info prop)
     (ediff-overlay-put overl 'invisible hidden)
+    (ediff-overlay-put overl 'follow-link t)
     (if (numberp session-number)
         (ediff-overlay-put overl 'ediff-meta-session-number session-number))))
 
@@ -2384,6 +2383,8 @@ for operation, or simply indicate which are equal files.  If it is nil, then
     ))
 
 
+(provide 'ediff-mult)
+
 
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el
index 9c5c75d847c..b911c33f0fb 100644
--- a/lisp/ediff-ptch.el
+++ b/lisp/ediff-ptch.el
@@ -26,7 +26,6 @@
 
 ;;; Code:
 
-(provide 'ediff-ptch)
 
 (defgroup ediff-ptch nil
   "Ediff patch support."
@@ -844,6 +843,8 @@ you can still examine the changes via M-x ediff-files"
 
 
 
+(provide 'ediff-ptch)
+
 
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index feb7b69d7b6..dff3c6bee61 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -26,7 +26,6 @@
 
 ;;; Code:
 
-(provide 'ediff-util)
 
 ;; Compiler pacifier
 (defvar ediff-patch-diagnostics)
@@ -49,6 +48,7 @@
 
 (eval-when-compile
   (let ((load-path (cons (expand-file-name ".") load-path)))
+    (provide 'ediff-util) ; to break recursive load cycle
     (or (featurep 'ediff-init)
         (load "ediff-init.el" nil nil 'nosuffix))
     (or (featurep 'ediff-help)
@@ -234,6 +234,7 @@ to invocation.")
   (define-key ediff-mode-map "#"  nil)
   (define-key ediff-mode-map "#h"  'ediff-toggle-regexp-match)
   (define-key ediff-mode-map "#f"  'ediff-toggle-regexp-match)
+  (define-key ediff-mode-map "#c"  'ediff-toggle-ignore-case)
   (or ediff-word-mode
       (define-key ediff-mode-map "##"  'ediff-toggle-skip-similar))
   (define-key ediff-mode-map "o"   nil)
@@ -1133,7 +1134,7 @@ of the current buffer."
 ;;       ))
 
 
-(defsubst ediff-file-checked-out-p (file)
+(defun ediff-file-checked-out-p (file)
   (or (not (featurep 'vc-hooks))
       (and (vc-backend file)
            (if (fboundp 'vc-state)
@@ -1143,7 +1144,7 @@ of the current buffer."
              (vc-locking-user file))
            )))
 
-(defsubst ediff-file-checked-in-p (file)
+(defun ediff-file-checked-in-p (file)
   (and (featurep 'vc-hooks)
        ;; CVS files are considered not checked in
        (not (memq (vc-backend file) '(nil CVS)))
@@ -3079,7 +3080,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
         )))
 
 
-(defsubst ediff-highlight-diff (n)
+(defun ediff-highlight-diff (n)
   "Put face on diff N.  Invoked for X displays only."
   (ediff-highlight-diff-in-one-buffer n 'A)
   (ediff-highlight-diff-in-one-buffer n 'B)
@@ -3088,7 +3089,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
   )
 
 
-(defsubst ediff-unhighlight-diff ()
+(defun ediff-unhighlight-diff ()
   "Remove overlays from buffers A, B, and C."
   (ediff-unhighlight-diff-in-one-buffer 'A)
   (ediff-unhighlight-diff-in-one-buffer 'B)
@@ -3097,7 +3098,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
   )
 
 ;; delete highlighting overlays, restore faces to their original form
-(defsubst ediff-unhighlight-diffs-totally ()
+(defun ediff-unhighlight-diffs-totally ()
   (ediff-unhighlight-diffs-totally-in-one-buffer 'A)
   (ediff-unhighlight-diffs-totally-in-one-buffer 'B)
   (ediff-unhighlight-diffs-totally-in-one-buffer 'C)
@@ -3686,7 +3687,7 @@ Ediff Control Panel to restore highlighting."
             (>= (point) end))))))
 
 
-(defsubst ediff-get-region-contents (n buf-type ctrl-buf &optional start end)
+(defun ediff-get-region-contents (n buf-type ctrl-buf &optional start end)
   (ediff-with-current-buffer
       (ediff-with-current-buffer ctrl-buf (ediff-get-buffer buf-type))
     (buffer-substring
@@ -3945,6 +3946,7 @@ Ediff Control Panel to restore highlighting."
         (ediff-device-type (ediff-device-type))
         varlist salutation buffer-name)
     (setq varlist '(ediff-diff-program ediff-diff-options
+                    ediff-diff3-program ediff-diff3-options
                     ediff-patch-program ediff-patch-options
                     ediff-shell
                     ediff-use-faces
@@ -4300,6 +4302,8 @@ Mail anyway? (y or n) ")
 
 (run-hooks 'ediff-load-hook)
 
+(provide 'ediff-util)
+
 
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index 4c9dc4dd9c8..3e8b1c37572 100644
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -311,6 +311,7 @@
 
 (provide 'ediff-vers)
 
+
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 648a80b6156..28369f9f6bd 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -26,7 +26,6 @@
 
 ;;; Code:
 
-(provide 'ediff-wind)
 
 ;; Compiler pacifier
 (defvar icon-title-format)
@@ -1314,6 +1313,9 @@ It assumes that it is called from within the control buffer."
                              ediff-wide-display-p)))))))
 
 
+(provide 'ediff-wind)
+
+
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
diff --git a/lisp/ediff.el b/lisp/ediff.el
index abb0f22b047..bb6cfc6b72e 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -7,8 +7,8 @@
 ;; Created: February 2, 1994
 ;; Keywords: comparing, merging, patching, tools, unix
 
-(defconst ediff-version "2.80.1" "The current version of Ediff")
-(defconst ediff-date "November 25, 2005" "Date of last update")
+(defconst ediff-version "2.81" "The current version of Ediff")
+(defconst ediff-date "February 18, 2006" "Date of last update")
 
 
 ;; This file is part of GNU Emacs.
@@ -107,7 +107,6 @@
 
 ;;; Code:
 
-(provide 'ediff)
 
 ;; Compiler pacifier
 (defvar cvs-cookie-handle)
@@ -121,6 +120,7 @@
          (load "pcl-cvs" 'noerror)))
 (eval-when-compile
   (let ((load-path (cons (expand-file-name ".") load-path)))
+    (provide 'ediff) ; to break recursive load cycle
     (or (featurep 'ediff-init)
         (load "ediff-init.el" nil nil 'nosuffix))
     (or (featurep 'ediff-mult)
@@ -1374,7 +1374,7 @@ patch. If not given, the user is prompted according to the prefix argument."
    patch-buf
    (read-buffer
     "Which buffer to patch? "
-    (current-buffer))))
+    (ediff-other-buffer patch-buf))))
 
 
 ;;;###autoload
@@ -1533,6 +1533,9 @@ With optional NODE, goes to that node."
 
 (run-hooks 'ediff-load-hook)
 
+(provide 'ediff)
+
+
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
diff --git a/lisp/emacs-lisp/unsafep.el b/lisp/emacs-lisp/unsafep.el
index 41e98694c71..aeaf653aef6 100644
--- a/lisp/emacs-lisp/unsafep.el
+++ b/lisp/emacs-lisp/unsafep.el
@@ -148,10 +148,10 @@ of symbols with local bindings."
        ((eq fun 'lambda)
         ;;First arg is temporary bindings
         (mapc #'(lambda (x)
-                  (let ((y (unsafep-variable x t)))
-                    (if y (throw 'unsafep y)))
                   (or (memq x '(&optional &rest))
-                      (push x unsafep-vars)))
+                      (let ((y (unsafep-variable x t)))
+                        (if y (throw 'unsafep y))
+                        (push x unsafep-vars))))
               (cadr form))
         (unsafep-progn (cddr form)))
        ((eq fun 'let)
@@ -247,17 +247,16 @@ and throws a reason to `unsafep' if unsafe.  Returns SYM."
     (if reason (throw 'unsafep reason))
     sym))
 
-(defun unsafep-variable (sym global-okay)
-  "Return nil if SYM is safe as a let-binding sym
-\(because it already has a temporary binding or is a non-risky buffer-local
-variable), otherwise a reason why it is unsafe.  Failing to be locally bound
-is okay if GLOBAL-OKAY is non-nil."
+(defun unsafep-variable (sym to-bind)
+  "Return nil if SYM is safe to set or bind, or a reason why not.
+If TO-BIND is nil, check whether SYM is safe to set.
+If TO-BIND is t, check whether SYM is safe to bind."
   (cond
    ((not (symbolp sym))
     `(variable ,sym))
    ((risky-local-variable-p sym nil)
     `(risky-local-variable ,sym))
-   ((not (or global-okay
+   ((not (or to-bind
              (memq sym unsafep-vars)
              (local-variable-p sym)))
     `(global-variable ,sym))))
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index db82952a6ef..645f4f26eaf 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -196,6 +196,15 @@
             (viper-save-cursor-color 'before-insert-mode))
         ;; set insert mode cursor color
         (viper-change-cursor-color viper-insert-state-cursor-color)))
+  (if (eq viper-current-state 'emacs-state)
+      (let ((has-saved-cursor-color-in-emacs-mode
+             (stringp (viper-get-saved-cursor-color-in-emacs-mode))))
+        (or has-saved-cursor-color-in-emacs-mode
+            (string= (viper-get-cursor-color) viper-emacs-state-cursor-color)
+            ;; save current color, if not already saved
+            (viper-save-cursor-color 'before-emacs-mode))
+        ;; set emacs mode cursor color
+        (viper-change-cursor-color viper-emacs-state-cursor-color)))
 
   (if (and (memq this-command '(dabbrev-expand hippie-expand))
            (integerp viper-pre-command-point)
@@ -643,9 +652,12 @@
         (indent-to-left-margin))
     (viper-add-newline-at-eob-if-necessary)
     (viper-adjust-undo)
-    (viper-change-state 'vi-state)
 
-    (viper-restore-cursor-color 'after-insert-mode)
+    (if (eq viper-current-state 'emacs-state)
+        (viper-restore-cursor-color 'after-emacs-mode)
+      (viper-restore-cursor-color 'after-insert-mode))
+
+    (viper-change-state 'vi-state)
 
     ;; Protect against user errors in hooks
     (condition-case conds
@@ -709,9 +721,17 @@
   (or (viper-overlay-p viper-replace-overlay)
       (viper-set-replace-overlay (point-min) (point-min)))
   (viper-hide-replace-overlay)
+
+  (let ((has-saved-cursor-color-in-emacs-mode
+         (stringp (viper-get-saved-cursor-color-in-emacs-mode))))
+    (or has-saved-cursor-color-in-emacs-mode
+        (string= (viper-get-cursor-color) viper-emacs-state-cursor-color)
+        (viper-save-cursor-color 'before-emacs-mode))
+    (viper-change-cursor-color viper-emacs-state-cursor-color))
+
   (viper-change-state 'emacs-state)
 
-  ;; Protect agains user errors in hooks
+  ;; Protect against user errors in hooks
   (condition-case conds
       (run-hooks 'viper-emacs-state-hook)
     (error
@@ -820,12 +840,12 @@ Vi's prefix argument will be used.  Otherwise, the prefix argument passed to
                  ;; The next cmd  and viper-set-unread-command-events
                  ;; are intended to prevent the input method
                  ;; from swallowing ^M, ^Q and other special characters
-                 (setq ch (read-char))
+                 (setq ch (read-char-exclusive))
                  ;; replace ^M with the newline
                  (if (eq ch ?\C-m) (setq ch ?\n))
                  ;; Make sure ^V and ^Q work as quotation chars
                  (if (memq ch '(?\C-v ?\C-q))
-                     (setq ch (read-char)))
+                     (setq ch (read-char-exclusive)))
                  (viper-set-unread-command-events ch)
                  (quail-input-method nil)
 
@@ -842,12 +862,12 @@ Vi's prefix argument will be used.  Otherwise, the prefix argument passed to
                ;; same as above but for XEmacs, which doesn't have
                ;; quail-input-method
                (let (unread-command-events)
-                 (setq ch (read-char))
+                 (setq ch (read-char-exclusive))
                  ;; replace ^M with the newline
                  (if (eq ch ?\C-m) (setq ch ?\n))
                  ;; Make sure ^V and ^Q work as quotation chars
                  (if (memq ch '(?\C-v ?\C-q))
-                     (setq ch (read-char)))
+                     (setq ch (read-char-exclusive)))
                  (viper-set-unread-command-events ch)
                  (quail-start-translation nil)
 
@@ -867,12 +887,12 @@ Vi's prefix argument will be used.  Otherwise, the prefix argument passed to
                    (setq ch (aref (read-key-sequence nil) 0)))
                (insert ch))
               (t
-               (setq ch (read-char))
+               (setq ch (read-char-exclusive))
                ;; replace ^M with the newline
                (if (eq ch ?\C-m) (setq ch ?\n))
                ;; Make sure ^V and ^Q work as quotation chars
                (if (memq ch '(?\C-v ?\C-q))
-                   (setq ch (read-char)))
+                   (setq ch (read-char-exclusive)))
                (insert ch))
               )
         (setq last-command-event
@@ -2131,7 +2151,7 @@ To turn this feature off, set this variable to nil."
 Remove this function from `viper-minibuffer-exit-hook', if this causes
 problems."
   (if (viper-is-in-minibuffer)
-      (progn
+      (let ((inhibit-field-text-motion t))
         (goto-char (viper-minibuffer-real-start))
         (end-of-line)
         (delete-region (point) (point-max)))))
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 59a78e46dee..661fc6ede7f 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -434,6 +434,13 @@ delete the text being replaced, as in standard Vi."
 (if (fboundp 'make-variable-frame-local)
     (make-variable-frame-local 'viper-insert-state-cursor-color))
 
+(defcustom viper-emacs-state-cursor-color "Magenta"
+  "Cursor color when Viper is in emacs state."
+  :type 'string
+  :group 'viper)
+(if (fboundp 'make-variable-frame-local)
+    (make-variable-frame-local 'viper-emacs-state-cursor-color))
+
 ;; internal var, used to remember the default cursor color of emacs frames
 (defvar viper-vi-state-cursor-color nil)
 (if (fboundp 'make-variable-frame-local)
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 8f79c0dab4a..c7fe792b5f2 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -175,9 +175,12 @@
              (selected-frame)
              (list
               (cons
-               (if (eq before-which-mode 'before-replace-mode)
-                   'viper-saved-cursor-color-in-replace-mode
-                 'viper-saved-cursor-color-in-insert-mode)
+               (cond ((eq before-which-mode 'before-replace-mode)
+                      'viper-saved-cursor-color-in-replace-mode)
+                     ((eq before-which-mode 'before-emacs-mode)
+                      'viper-saved-cursor-color-in-emacs-mode)
+                     (t
+                      'viper-saved-cursor-color-in-insert-mode))
                color)))
           ))))
 
@@ -188,7 +191,9 @@
     (if viper-emacs-p 'frame-parameter 'frame-property)
     (selected-frame)
     'viper-saved-cursor-color-in-replace-mode)
-   viper-vi-state-cursor-color))
+   (if (eq viper-current-state 'emacs-mode)
+       viper-emacs-state-cursor-color
+     viper-vi-state-cursor-color)))
 
 (defsubst viper-get-saved-cursor-color-in-insert-mode ()
   (or
@@ -196,15 +201,27 @@
     (if viper-emacs-p 'frame-parameter 'frame-property)
     (selected-frame)
     'viper-saved-cursor-color-in-insert-mode)
+   (if (eq viper-current-state 'emacs-mode)
+       viper-emacs-state-cursor-color
+     viper-vi-state-cursor-color)))
+
+(defsubst viper-get-saved-cursor-color-in-emacs-mode ()
+  (or
+   (funcall
+    (if viper-emacs-p 'frame-parameter 'frame-property)
+    (selected-frame)
+    'viper-saved-cursor-color-in-emacs-mode)
    viper-vi-state-cursor-color))
 
 ;; restore cursor color from replace overlay
 (defun viper-restore-cursor-color(after-which-mode)
   (if (viper-overlay-p viper-replace-overlay)
       (viper-change-cursor-color
-       (if (eq after-which-mode 'after-replace-mode)
-           (viper-get-saved-cursor-color-in-replace-mode)
-         (viper-get-saved-cursor-color-in-insert-mode))
+       (cond ((eq after-which-mode 'after-replace-mode)
+              (viper-get-saved-cursor-color-in-replace-mode))
+             ((eq after-which-mode 'after-emacs-mode)
+              (viper-get-saved-cursor-color-in-emacs-mode))
+             (t (viper-get-saved-cursor-color-in-insert-mode)))
        )))
 
 
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 223cff3dd99..fc55d291550 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -9,7 +9,7 @@
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Keywords: emulations
 
-(defconst viper-version "3.11.5 of November 25, 2005"
+(defconst viper-version "3.12 of February 18, 2006"
   "The current version of Viper")
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index ec2098c7bd3..92f8c401336 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,5 +1,21 @@
+2006-02-19  Michael Olson  <mwolson@gnu.org>
+
+        * erc-capab.el (erc-capab-send-identify-messages): Make sure some
+        parameters are strings before using them.  Thanks to Alejandro
+        Benitez for the report.
+
+        * erc.el (erc-version-string): Release ERC 5.1.2.
+
+2006-02-19  Diane Murray  <disumu@x3y2z1.net>
+
+        * erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
+        <C-tab>.
+        (erc-button-previous): New function.
+
 2006-02-15  Michael Olson  <mwolson@gnu.org>
 
+        * NEWS: Add category for ERC 5.2.
+
         * erc.el (erc): Move to the end of the buffer when a continued
         session is detected.  Thanks to e1f and indio for the report and
         testing a potential fix.
@@ -150,7 +166,7 @@
         * erc-stamp.el: Use new arch tagline, since the other one wasn't
         being treated properly.
 
-        * erc.el (erc-version-string): Release ERC 5.1.1
+        * erc.el (erc-version-string): Release ERC 5.1.1.
 
 2006-02-03  Zhang Wei  <id.brep@gmail.com>  (tiny change)
 
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 6c6998a3afc..2ec625cc87f 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -216,6 +216,7 @@ PAR is a number of a regexp grouping whose text will be passed to
         (define-key map (kbd "<button2>") 'erc-button-click-button)
       (define-key map (kbd "<mouse-2>") 'erc-button-click-button))
     (define-key map (kbd "TAB") 'erc-button-next)
+    (define-key map (kbd "<C-tab>") 'erc-button-previous)
     (set-keymap-parent map erc-mode-map)
     map)
   "Local keymap for ERC buttons.")
@@ -427,6 +428,22 @@ call it with the value of the `erc-data' text property."
         (error "No next button"))
       t)))
 
+(defun erc-button-previous ()
+  "Go to the previous button in this buffer."
+  (interactive)
+  (let ((here (point)))
+    (when (< here (erc-beg-of-input-line))
+      (while (and (get-text-property here 'erc-callback)
+                  (not (= here (point-min))))
+        (setq here (1- here)))
+      (while (and (not (get-text-property here 'erc-callback))
+                  (not (= here (point-min))))
+        (setq here (1- here)))
+      (if (> here (point-min))
+          (goto-char here)
+        (error "No previous button"))
+      t)))
+
 (defun erc-browse-emacswiki (thing)
   "Browse to thing in the emacs-wiki."
   (browse-url (concat erc-emacswiki-url thing)))
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index e1dc240901b..63ff60d762e 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.1"
+(defconst erc-version-string "Version 5.1.2"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 1b6665d16d5..5ff63bfdec2 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1255,7 +1255,8 @@ which may actually result in an url rather than a filename."
                     (abbreviate-file-name (expand-file-name guess))
                     ))
           (setq dir (file-name-directory guess))))
-    (let ((minibuffer-completing-file-name t))
+    (let ((minibuffer-completing-file-name t)
+          (completion-ignore-case read-file-name-completion-ignore-case))
       (setq guess
             (completing-read
              prompt
@@ -1321,6 +1322,12 @@ which may actually result in an url rather than a filename."
 (defvar ffap-highlight t
   "If non-nil, ffap highlights the current buffer substring.")
 
+(defface ffap
+  '((t :inherit highlight))
+  "Face used to highlight the current buffer substring."
+  :group 'ffap
+  :version "22.1")
+
 (defvar ffap-highlight-overlay nil
   "Overlay used by `ffap-highlight'.")
 
@@ -1344,8 +1351,7 @@ Uses the face `ffap' if it is defined, or else `highlight'."
    (t
     (setq ffap-highlight-overlay
           (apply 'make-overlay ffap-string-at-point-region))
-    (overlay-put ffap-highlight-overlay 'face
-                      (if (facep 'ffap) 'ffap 'highlight)))))
+    (overlay-put ffap-highlight-overlay 'face 'ffap))))
 
 
 ;;; Main Entrance (`find-file-at-point' == `ffap'):
diff --git a/lisp/files.el b/lisp/files.el
index 285cd50e6af..ab69c7958a9 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -447,10 +447,11 @@ use `before-save-hook'.")
 The value can be t, nil or something else.
 
 A value of t means file local variables specifications are obeyed
-if all the specified variables are safe.  If any variables are
-not safe, you will be queries before setting them.
-A value of nil means file local variables are ignored.
-Any other value means to always query.
+if all the specified variable values are safe; if any values are
+not safe, Emacs queries you, once, whether to set them all.
+
+A value of nil means always ignore the file local variables.
+Any other value means always query you once whether to set them all.
 
 This variable also controls use of major modes specified in
 a -*- line.
@@ -2218,6 +2219,129 @@ Otherwise, return nil; point may be changed."
        (setq end (point))
        (goto-char beg)
        end))))
+
+;;; Handling file local variables
+
+(defvar ignored-local-variables
+  '(ignored-local-variables safe-local-variable-values)
+  "Variables to be ignored in a file's local variable spec.")
+
+(defvar hack-local-variables-hook nil
+  "Normal hook run after processing a file's local variables specs.
+Major modes can use this to examine user-specified local variables
+in order to initialize other data structure based on them.")
+
+(defcustom safe-local-variable-values nil
+  "List variable-value pairs that are considered safe.
+Each element is a cons cell (VAR . VAL), where VAR is a variable
+symbol and VAL is a value that is considered safe."
+  :group 'find-file
+  :type  'alist)
+
+(defcustom safe-local-eval-forms nil
+  "*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."
+  :group 'find-file
+  :version "22.1"
+  :type '(repeat sexp))
+
+;; Risky local variables:
+(mapc (lambda (var) (put var 'risky-local-variable t))
+      '(after-load-alist
+        auto-mode-alist
+        buffer-auto-save-file-name
+        buffer-file-name
+        buffer-file-truename
+        buffer-undo-list
+        dabbrev-case-fold-search
+        dabbrev-case-replace
+        debugger
+        default-text-properties
+        display-time-string
+        enable-local-eval
+        eval
+        exec-directory
+        exec-path
+        file-name-handler-alist
+        font-lock-defaults
+        format-alist
+        frame-title-format
+        global-mode-string
+        header-line-format
+        icon-title-format
+        ignored-local-variables
+        imenu--index-alist
+        imenu-generic-expression
+        inhibit-quit
+        input-method-alist
+        load-path
+        max-lisp-eval-depth
+        max-specpdl-size
+        minor-mode-alist
+        minor-mode-map-alist
+        minor-mode-overriding-map-alist
+        mode-line-buffer-identification
+        mode-line-format
+        mode-line-modes
+        mode-line-modified
+        mode-line-mule-info
+        mode-line-position
+        mode-line-process
+        mode-name
+        outline-level
+        overriding-local-map
+        overriding-terminal-local-map
+        parse-time-rules
+        process-environment
+        rmail-output-file-alist
+        save-some-buffers-action-alist
+        special-display-buffer-names
+        standard-input
+        standard-output
+        unread-command-events
+        vc-mode))
+
+;; Safe local variables:
+;;
+;; For variables defined by minor modes, put the safety declarations
+;; here, not in the file defining the minor mode (when Emacs visits a
+;; file specifying that local variable, the minor mode file may not be
+;; loaded yet).  For variables defined by major modes, the safety
+;; declarations can go into the major mode's file, since that will be
+;; loaded before file variables are processed.
+
+(let ((string-or-null (lambda (a) (or (stringp a) (null a)))))
+  (eval
+   `(mapc (lambda (pair)
+            (put (car pair) 'safe-local-variable (cdr pair)))
+          '((byte-compile-dynamic . t)
+            (c-basic-offset     .  integerp)
+            (c-file-style       .  stringp)
+            (c-indent-level     .  integerp)
+            (comment-column     .  integerp)
+            (compile-command    . ,string-or-null)
+            (fill-column        .  integerp)
+            (fill-prefix        . ,string-or-null)
+            (indent-tabs-mode   .  t)
+            (ispell-check-comments . (lambda (a)
+                                       (memq a '(nil t exclusive))))
+            (ispell-local-dictionary . ,string-or-null)
+            (kept-new-versions  .  integerp)
+            (no-byte-compile    .  t)
+            (no-update-autoloads . t)
+            (outline-regexp     . ,string-or-null)
+            (page-delimiter     . ,string-or-null)
+            (paragraph-start    . ,string-or-null)
+            (paragraph-separate . ,string-or-null)
+            (sentence-end       . ,string-or-null)
+            (sentence-end-double-space . t)
+            (tab-width          .  integerp)
+            (truncate-lines     .  t)
+            (version-control    .  t)))))
+
+(put 'c-set-style 'safe-local-eval-function t)
 
 (defun hack-local-variables-confirm (vars unsafe-vars risky-vars)
   (if noninteractive
@@ -2346,18 +2470,6 @@ and VAL is the specified value."
           mode-specified
         result))))
 
-(defvar hack-local-variables-hook nil
-  "Normal hook run after processing a file's local variables specs.
-Major modes can use this to examine user-specified local variables
-in order to initialize other data structure based on them.")
-
-(defcustom safe-local-variable-values nil
-  "List variable-value pairs that are considered safe.
-Each element is a cons cell (VAR . VAL), where VAR is a variable
-symbol and VAL is a value that is considered safe."
-  :group 'find-file
-  :type  'alist)
-
 (defun hack-local-variables (&optional mode-only)
   "Parse and put into effect this buffer's local variables spec.
 If MODE-ONLY is non-nil, all we do is check whether the major mode
@@ -2479,92 +2591,6 @@ is specified, returning t if it is specified."
                   (hack-one-local-variable (car elt) (cdr elt)))))
           (run-hooks 'hack-local-variables-hook))))))
 
-(defvar ignored-local-variables
-  '(ignored-local-variables safe-local-variable-values)
-  "Variables to be ignored in a file's local variable spec.")
-
-;; Get confirmation before setting these variables as locals in a file.
-(put 'debugger 'risky-local-variable t)
-(put 'enable-local-eval 'risky-local-variable t)
-(put 'ignored-local-variables 'risky-local-variable t)
-(put 'ignored-local-variables 'safe-local-variable-values t)
-(put 'eval 'risky-local-variable t)
-(put 'file-name-handler-alist 'risky-local-variable t)
-(put 'inhibit-quit 'risky-local-variable t)
-(put 'minor-mode-alist 'risky-local-variable t)
-(put 'minor-mode-map-alist 'risky-local-variable t)
-(put 'minor-mode-overriding-map-alist 'risky-local-variable t)
-(put 'overriding-local-map 'risky-local-variable t)
-(put 'overriding-terminal-local-map 'risky-local-variable t)
-(put 'auto-mode-alist 'risky-local-variable t)
-(put 'after-load-alist 'risky-local-variable t)
-(put 'buffer-file-name 'risky-local-variable t)
-(put 'buffer-undo-list 'risky-local-variable t)
-(put 'buffer-auto-save-file-name 'risky-local-variable t)
-(put 'buffer-file-truename 'risky-local-variable t)
-(put 'default-text-properties 'risky-local-variable t)
-(put 'exec-path 'risky-local-variable t)
-(put 'load-path 'risky-local-variable t)
-(put 'exec-directory 'risky-local-variable t)
-(put 'process-environment 'risky-local-variable t)
-(put 'dabbrev-case-fold-search 'risky-local-variable t)
-(put 'dabbrev-case-replace 'risky-local-variable t)
-;; Don't wait for outline.el to be loaded, for the sake of outline-minor-mode.
-(put 'outline-level 'risky-local-variable t)
-(put 'rmail-output-file-alist 'risky-local-variable t)
-(put 'font-lock-defaults 'risky-local-variable t)
-(put 'special-display-buffer-names 'risky-local-variable t)
-(put 'frame-title-format 'risky-local-variable t)
-(put 'global-mode-string 'risky-local-variable t)
-(put 'header-line-format 'risky-local-variable t)
-(put 'icon-title-format 'risky-local-variable t)
-(put 'input-method-alist 'risky-local-variable t)
-(put 'format-alist 'risky-local-variable t)
-(put 'vc-mode 'risky-local-variable t)
-(put 'imenu-generic-expression 'risky-local-variable t)
-(put 'imenu--index-alist 'risky-local-variable t)
-(put 'standard-input 'risky-local-variable t)
-(put 'standard-output 'risky-local-variable t)
-(put 'unread-command-events 'risky-local-variable t)
-(put 'max-lisp-eval-depth 'risky-local-variable t)
-(put 'max-specpdl-size 'risky-local-variable t)
-(put 'mode-line-format 'risky-local-variable t)
-(put 'mode-line-modified 'risky-local-variable t)
-(put 'mode-line-mule-info 'risky-local-variable t)
-(put 'mode-line-buffer-identification 'risky-local-variable t)
-(put 'mode-line-modes 'risky-local-variable t)
-(put 'mode-line-position 'risky-local-variable t)
-(put 'mode-line-process 'risky-local-variable t)
-(put 'mode-name 'risky-local-variable t)
-(put 'display-time-string 'risky-local-variable t)
-(put 'parse-time-rules 'risky-local-variable t)
-
-;; Commonly-encountered local variables that are safe:
-(let ((string-or-null (lambda (a) (or (stringp a) (null a)))))
-  (eval
-   `(mapc (lambda (pair)
-            (put (car pair) 'safe-local-variable (cdr pair)))
-          '((byte-compile-dynamic . t)
-            (c-basic-offset     .  integerp)
-            (c-file-style       .  stringp)
-            (c-indent-level     .  integerp)
-            (comment-column     .  integerp)
-            (compile-command    . ,string-or-null)
-            (fill-column        .  integerp)
-            (fill-prefix        . ,string-or-null)
-            (indent-tabs-mode   .  t)
-            (kept-new-versions  .  integerp)
-            (no-byte-compile    .  t)
-            (no-update-autoloads . t)
-            (outline-regexp     . ,string-or-null)
-            (page-delimiter     . ,string-or-null)
-            (paragraph-start    . ,string-or-null)
-            (paragraph-separate . ,string-or-null)
-            (sentence-end       . ,string-or-null)
-            (sentence-end-double-space . t)
-            (tab-width          .  integerp)
-            (version-control    .  t)))))
-
 (defun safe-local-variable-p (sym val)
   "Non-nil if SYM is safe as a file-local variable with value VAL.
 It is safe if any of these conditions are met:
@@ -2602,17 +2628,6 @@ It is dangerous if either of these conditions are met:
 -[0-9]+$\\|font-lock-syntactic-keywords$\\|-frame-alist$\\|-mode-alist$\\|\
 -map$\\|-map-alist$" (symbol-name sym))))
 
-(defcustom safe-local-eval-forms nil
-  "*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."
-  :group 'find-file
-  :version "22.1"
-  :type '(repeat sexp))
-
-(put 'c-set-style 'safe-local-eval-function t)
-
 (defun hack-one-local-variable-quotep (exp)
   (and (consp exp) (eq (car exp) 'quote) (consp (cdr exp))))
 
@@ -3630,7 +3645,6 @@ This requires the external program `diff' to be in your `exec-path'."
     (?d diff-buffer-with-file
         "view changes in file"))
   "ACTION-ALIST argument used in call to `map-y-or-n-p'.")
-(put 'save-some-buffers-action-alist 'risky-local-variable t)
 
 (defvar buffer-save-without-query nil
   "Non-nil means `save-some-buffers' should save this buffer without asking.")
diff --git a/lisp/fringe.el b/lisp/fringe.el
index fd9e70b5846..317fff0973c 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -1,4 +1,4 @@
-;;; fringe.el --- change fringes appearance in various ways
+;;; fringe.el --- fringe setup and control
 
 ;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
@@ -25,8 +25,9 @@
 
 ;;; Commentary:
 
-;; This file contains helpful functions for customizing the appearance
-;; of the fringe.
+;; This file contains code to initialize the built-in fringe bitmaps
+;; as well as helpful functions for customizing the appearance of the
+;; fringe.
 
 ;; The code is influenced by scroll-bar.el and avoid.el.  The author
 ;; gratefully acknowledge comments and suggestions made by Miles
@@ -40,32 +41,52 @@
   :version "22.1"
   :group 'frames)
 
-;; Standard fringe bitmaps
+;; Define the built-in fringe bitmaps and setup default mappings
 
-(defmacro fringe-bitmap-p (symbol)
-  "Return non-nil if SYMBOL is a fringe bitmap."
-  `(get ,symbol 'fringe))
-
-(defvar fringe-bitmaps)
-
-(unless (or (not (boundp 'fringe-bitmaps))
-            (get 'left-truncation 'fringe))
-  (let ((bitmaps '(left-truncation right-truncation
-                   up-arrow down-arrow
-                   continued-line continuation-line
-                   overlay-arrow
+(when (boundp 'fringe-bitmaps)
+  (let ((bitmaps '(question-mark
+                   left-arrow right-arrow up-arrow down-arrow
+                   left-curly-arrow right-curly-arrow
+                   left-triangle right-triangle
                    top-left-angle top-right-angle
                    bottom-left-angle bottom-right-angle
                    left-bracket right-bracket
-                   filled-box-cursor hollow-box-cursor hollow-square
-                   bar-cursor hbar-cursor
+                   filled-rectangle hollow-rectangle
+                   filled-square hollow-square
+                   vertical-bar horizontal-bar
                    empty-line))
-        (bn 2))
+        (bn 1))
     (while bitmaps
       (push (car bitmaps) fringe-bitmaps)
       (put (car bitmaps) 'fringe bn)
       (setq bitmaps (cdr bitmaps)
-            bn (1+ bn)))))
+            bn (1+ bn))))
+
+  (setq-default fringe-indicator-alist
+                '((truncation . (left-arrow right-arrow))
+                  (continuation . (left-curly-arrow right-curly-arrow))
+                  (overlay-arrow . right-triangle)
+                  (up . up-arrow)
+                  (down . down-arrow)
+                  (top . (top-left-angle top-right-angle))
+                  (bottom . (bottom-left-angle bottom-right-angle
+                             top-right-angle top-left-angle))
+                  (top-bottom . (left-bracket right-bracket
+                                 top-right-angle top-left-angle))
+                  (empty-line . empty-line)
+                  (unknown . question-mark)))
+
+  (setq-default fringe-cursor-alist
+                '((box . filled-rectangle)
+                  (hollow . hollow-rectangle)
+                  (bar . vertical-bar)
+                  (hbar . horizontal-bar)
+                  (hollow-small . hollow-square))))
+
+
+(defmacro fringe-bitmap-p (symbol)
+  "Return non-nil if SYMBOL is a fringe bitmap."
+  `(get ,symbol 'fringe))
 
 
 ;; Control presence of fringes
@@ -137,7 +158,6 @@ See `fringe-mode' for possible values and their effect."
       ;; Otherwise impose the user-specified value of fringe-mode.
       (custom-initialize-reset symbol value))))
 
-;;;###autoload
 (defcustom fringe-mode nil
   "*Specify appearance of fringes on all frames.
 This variable can be nil (the default) meaning the fringes should have
@@ -195,7 +215,6 @@ frame parameter is used."
                nil
              0)))))
 
-;;;###autoload
 (defun fringe-mode (&optional mode)
   "Set the default appearance of fringes on all frames.
 
@@ -221,7 +240,6 @@ frame only, see the command `set-fringe-style'."
   (interactive (list (fringe-query-style 'all-frames)))
   (set-fringe-mode mode))
 
-;;;###autoload
 (defun set-fringe-style (&optional mode)
   "Set the default appearance of fringes on the selected frame.
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 903be005174..c77c92d05c7 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * rfc2047.el (rfc2047-charset-to-coding-system): Don't check the
+        coding system which mm-charset-to-coding-system returns for a
+        given charset is valid.
+
 2006-02-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * html2text.el (html2text-remove-tag-list):
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el
index 1167cb0a62b..501a161e83e 100644
--- a/lisp/gnus/rfc2047.el
+++ b/lisp/gnus/rfc2047.el
@@ -835,7 +835,7 @@ If your Emacs implementation can't decode CHARSET, return nil."
     (cond ((eq cs 'ascii)
            (setq cs (or (mm-charset-to-coding-system mail-parse-charset)
                         'raw-text)))
-          ((setq cs (mm-coding-system-p cs)))
+          ((mm-coding-system-p cs))
           ((and charset
                 (listp mail-parse-ignored-charsets)
                 (memq 'gnus-unknown mail-parse-ignored-charsets))
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 32719275edd..d30fc02c409 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -252,6 +252,7 @@ face (according to `face-differs-from-default-p')."
                          "\\)"
                          "\\(?:es\\|s\\|th\\)?"  ; for ARGth, ARGs
                          "\\(?:-[a-z0-9-]+\\)?"  ; for ARG-xxx, ARG-n
+                         "\\(?:-[{([<`\"].*?\\)?"; for ARG-{x}, (x), <x>, [x], `x'
                          "\\>")                  ; end of word
                  (help-default-arg-highlight arg)
                  doc t t 1)))))
diff --git a/lisp/help.el b/lisp/help.el
index 02045948ecb..f74293b8dd6 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -579,12 +579,8 @@ temporarily enables it to allow getting help on disabled items and buttons."
            (setq key (read-key-sequence "Describe key (or click or menu item): "))
            (list
             key
-            (prefix-numeric-value current-prefix-arg)
-            ;; If KEY is a down-event, read the corresponding up-event
-            ;; and use it as the third argument.
-            (if (and (consp key) (symbolp (car key))
-                     (memq 'down (cdr (get (car key) 'event-symbol-elements))))
-                (read-event))))
+            (if current-prefix-arg (prefix-numeric-value current-prefix-arg))
+            1))
        ;; Put yank-menu back as it was, if we changed it.
        (when saved-yank-menu
          (setq yank-menu (copy-sequence saved-yank-menu))
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 191f1d324e6..f53ef7c91d1 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -146,7 +146,7 @@ is minibuffer."
   (if (commandp func-name)
     (save-excursion
       (let* ((sym (intern func-name))
-             (buf (other-buffer))
+             (buf (other-buffer nil t))
              (map (save-excursion (set-buffer buf) (current-local-map)))
              (keys (where-is-internal sym map)))
         (if keys
diff --git a/lisp/info.el b/lisp/info.el
index e3514fb9729..e9d7f5ca2de 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -622,12 +622,6 @@ just return nil (no error)."
         (cond
          ((string= (downcase filename) "dir")
           (setq found t))
-         ((string= filename "apropos")
-          (setq found 'apropos))
-         ((string= filename "history")
-          (setq found 'history))
-         ((string= filename "toc")
-          (setq found 'toc))
          (t
           (let ((dirs (if (string-match "^\\./" filename)
                           ;; If specified name starts with `./'
@@ -673,7 +667,8 @@ just return nil (no error)."
           (if noerror
               (setq filename nil)
             (error "Info file %s does not exist" filename)))
-        filename)))
+        filename)
+    (and (member filename '(apropos history toc)) filename)))
 
 (defun Info-find-node (filename nodename &optional no-going-back)
   "Go to an Info node specified as separate FILENAME and NODENAME.
@@ -891,9 +886,6 @@ a case-insensitive match is tried."
               (setq Info-current-file
                     (cond
                      ((eq filename t) "dir")
-                     ((eq filename 'apropos) "apropos")
-                     ((eq filename 'history) "history")
-                     ((eq filename 'toc) "toc")
                      (t filename)))
               ))
         ;; Use string-equal, not equal, to ignore text props.
@@ -1409,7 +1401,7 @@ any double quotes or backslashes must be escaped (\\\",\\\\)."
                  (if (stringp Info-current-file)
                      (replace-regexp-in-string
                       "%" "%%" (file-name-nondirectory Info-current-file))
-                   "")
+                   (format "*%S*" Info-current-file))
                  ") "
                  (if Info-current-node
                      (propertize (replace-regexp-in-string
@@ -1648,7 +1640,8 @@ If DIRECTION is `backward', search in the reverse direction."
                             ;; Skip Tag Table node
                             (save-excursion
                               (and (search-backward "\^_" nil t)
-                                   (looking-at "\^_\nTag Table"))))))
+                                   (looking-at
+                                    "\^_\n\\(Tag Table\\|Local Variables\\)"))))))
             (let ((search-spaces-regexp Info-search-whitespace-regexp))
               (if (if backward
                       (re-search-backward regexp bound t)
@@ -1736,7 +1729,8 @@ If DIRECTION is `backward', search in the reverse direction."
                                   ;; Skip Tag Table node
                                   (save-excursion
                                     (and (search-backward "\^_" nil t)
-                                         (looking-at "\^_\nTag Table"))))))
+                                         (looking-at
+                                          "\^_\n\\(Tag Table\\|Local Variables\\)"))))))
                   (let ((search-spaces-regexp Info-search-whitespace-regexp))
                     (if (if backward
                             (re-search-backward regexp nil t)
@@ -1831,11 +1825,11 @@ If DIRECTION is `backward', search in the reverse direction."
 
 (defun Info-isearch-push-state ()
   `(lambda (cmd)
-     (Info-isearch-pop-state cmd ,Info-current-file ,Info-current-node)))
+     (Info-isearch-pop-state cmd ',Info-current-file ',Info-current-node)))
 
 (defun Info-isearch-pop-state (cmd file node)
-  (or (and (string= Info-current-file file)
-           (string= Info-current-node node))
+  (or (and (equal Info-current-file file)
+           (equal Info-current-node node))
       (progn (Info-find-node file node) (sit-for 0))))
 
 (defun Info-isearch-start ()
@@ -1853,7 +1847,7 @@ if ERRORNAME is nil, just return nil."
         (forward-line 1)
         (cond ((re-search-backward
                 (concat name ":" (Info-following-node-name-re)) bound t)
-               (match-string 1))
+               (match-string-no-properties 1))
               ((not (eq errorname t))
                (error "Node has no %s"
                       (capitalize (or errorname name)))))))))
@@ -1875,7 +1869,7 @@ End of submatch 0, 1, and 3 are the same, so you can safely concat."
 ;;; For compatibility; other files have used this name.
 (defun Info-following-node-name ()
   (and (looking-at (Info-following-node-name-re))
-       (match-string 1)))
+       (match-string-no-properties 1)))
 
 (defun Info-next ()
   "Go to the next node of this node."
@@ -1909,7 +1903,8 @@ If SAME-FILE is non-nil, do not move to a different Info file."
       (Info-goto-node node)
       (setq p (point))
       (goto-char (point-min))
-      (if (and (search-forward "\n* Menu:" nil t)
+      (if (and (stringp old-file)
+               (search-forward "\n* Menu:" nil t)
                (re-search-forward
                 (if (string-equal old-node "Top")
                     (concat "\n\\*[^:]+: +(" (file-name-nondirectory old-file) ")")
@@ -1977,51 +1972,53 @@ If SAME-FILE is non-nil, do not move to a different Info file."
           (while hl
             (let ((file (nth 0 (car hl)))
                   (node (nth 1 (car hl))))
-              (if (and (string-equal file curr-file)
-                       (string-equal node curr-node))
+              (if (and (equal file curr-file)
+                       (equal node curr-node))
                   (setq p (point)))
-              (insert "* " node ": ("
-                      (propertize (or (file-name-directory file) "") 'invisible t)
-                      (file-name-nondirectory file)
-                      ")" node ".\n"))
+              (if (stringp file)
+                  (insert "* " node ": ("
+                          (propertize (or (file-name-directory file) "") 'invisible t)
+                          (file-name-nondirectory file)
+                          ")" node ".\n")))
             (setq hl (cdr hl))))))
-    (Info-find-node "history" "Top")
+    (Info-find-node 'history "Top")
     (goto-char (or p (point-min)))))
 
 (defun Info-toc ()
   "Go to a node with table of contents of the current Info file.
 Table of contents is created from the tree structure of menus."
   (interactive)
-  (let ((curr-file (substring-no-properties Info-current-file))
-        (curr-node (substring-no-properties Info-current-node))
-        p)
-    (with-current-buffer (get-buffer-create " *info-toc*")
-      (let ((inhibit-read-only t)
-            (node-list (Info-build-toc curr-file)))
-        (erase-buffer)
-        (goto-char (point-min))
-        (insert "\n\^_\nFile: toc,  Node: Top,  Up: (dir)\n\n")
-        (insert "Table of Contents\n*****************\n\n")
-        (insert "*Note Top: (" curr-file ")Top.\n")
-        (Info-insert-toc
-         (nth 2 (assoc "Top" node-list)) ; get Top nodes
-         node-list 0 curr-file))
-      (if (not (bobp))
-          (let ((Info-hide-note-references 'hide)
-                (Info-fontify-visited-nodes nil))
-            (Info-mode)
-            (setq Info-current-file "toc" Info-current-node "Top")
-            (goto-char (point-min))
-            (narrow-to-region (or (re-search-forward "\n[\^_\f]\n" nil t)
-                                  (point-min))
-                              (point-max))
-            (Info-fontify-node)
-            (widen)))
-      (goto-char (point-min))
-      (if (setq p (search-forward (concat "*Note " curr-node ":") nil t))
-          (setq p (- p (length curr-node) 2))))
-    (Info-find-node "toc" "Top")
-    (goto-char (or p (point-min)))))
+  (if (stringp Info-current-file)
+      (let ((curr-file (substring-no-properties Info-current-file))
+            (curr-node (substring-no-properties Info-current-node))
+            p)
+        (with-current-buffer (get-buffer-create " *info-toc*")
+          (let ((inhibit-read-only t)
+                (node-list (Info-build-toc curr-file)))
+            (erase-buffer)
+            (goto-char (point-min))
+            (insert "\n\^_\nFile: toc,  Node: Top,  Up: (dir)\n\n")
+            (insert "Table of Contents\n*****************\n\n")
+            (insert "*Note Top: (" curr-file ")Top.\n")
+            (Info-insert-toc
+             (nth 2 (assoc "Top" node-list)) ; get Top nodes
+             node-list 0 curr-file))
+          (if (not (bobp))
+              (let ((Info-hide-note-references 'hide)
+                    (Info-fontify-visited-nodes nil))
+                (Info-mode)
+                (setq Info-current-file 'toc Info-current-node "Top")
+                (goto-char (point-min))
+                (narrow-to-region (or (re-search-forward "\n[\^_\f]\n" nil t)
+                                      (point-min))
+                                  (point-max))
+                (Info-fontify-node)
+                (widen)))
+          (goto-char (point-min))
+          (if (setq p (search-forward (concat "*Note " curr-node ":") nil t))
+              (setq p (- p (length curr-node) 2))))
+        (Info-find-node 'toc "Top")
+        (goto-char (or p (point-min))))))
 
 (defun Info-insert-toc (nodes node-list level curr-file)
   "Insert table of contents with references to nodes."
@@ -2221,16 +2218,18 @@ Because of ambiguities, this should be concatenated with something like
         (setq Info-point-loc
               (if (match-beginning 5)
                   (string-to-number (match-string 5))
-                (buffer-substring (match-beginning 0) (1- (match-beginning 1)))))
+                (buffer-substring-no-properties
+                 (match-beginning 0) (1- (match-beginning 1)))))
 ;;; Uncomment next line to use names of cross-references in non-index nodes:
 ;;;       (setq Info-point-loc
 ;;;             (buffer-substring (match-beginning 0) (1- (match-beginning 1))))
       )
     (replace-regexp-in-string
      "[ \n]+" " "
-     (or (match-string 2)
+     (or (match-string-no-properties 2)
          ;; If the node name is the menu entry name (using `entry::').
-         (buffer-substring (match-beginning 0) (1- (match-beginning 1)))))))
+         (buffer-substring-no-properties
+          (match-beginning 0) (1- (match-beginning 1)))))))
 
 ;; No one calls this.
 ;;(defun Info-menu-item-sequence (list)
@@ -2684,7 +2683,7 @@ following nodes whose names also contain the word \"Index\"."
   (or file (setq file Info-current-file))
   (or (assoc file Info-index-nodes)
       ;; Skip virtual Info files
-      (and (member file '("dir" "history" "toc" "apropos"))
+      (and (member file '("dir" apropos history toc))
            (setq Info-index-nodes (cons (cons file nil) Info-index-nodes)))
       (not (stringp file))
       (if Info-file-supports-index-cookies
@@ -2926,7 +2925,7 @@ Build a menu of the possible matches."
              (message "%s" (if (eq (car-safe err) 'error)
                                (nth 1 err) err))
              (sit-for 1 t)))))
-      (Info-goto-node (concat "(" current-file ")" current-node))
+      (Info-find-node current-file current-node)
       (setq Info-history ohist
             Info-history-list ohist-list)
       (message "Searching indices...done")
@@ -2945,7 +2944,7 @@ Build a menu of the possible matches."
                      (if (nth 3 entry)
                          (concat " (line " (nth 3 entry) ")")
                        "")))))
-        (Info-find-node "apropos" "Index")
+        (Info-find-node 'apropos "Index")
         (setq Info-complete-cache nil)))))
 
 (defun Info-undefined ()
@@ -3287,10 +3286,14 @@ With a zero prefix arg, put the name inside a function call to `info'."
   (interactive "P")
   (unless Info-current-node
     (error "No current Info node"))
-  (let ((node (concat "(" (file-name-nondirectory Info-current-file) ")"
-                      Info-current-node)))
+  (let ((node (if (stringp Info-current-file)
+                  (concat "(" (file-name-nondirectory Info-current-file) ")"
+                          Info-current-node))))
     (if (zerop (prefix-numeric-value arg))
         (setq node (concat "(info \"" node "\")")))
+    (unless (stringp Info-current-file)
+      (setq node (format "(Info-find-node '%S '%S)"
+                         Info-current-file Info-current-node)))
     (kill-new node)
     (message "%s" node)))
 
@@ -3817,29 +3820,30 @@ the variable `Info-file-list-for-emacs'."
                                         "^[ \t]+" ""
                                         (replace-regexp-in-string
                                          "[ \t\n]+" " "
-                                         (or (match-string 5)
+                                         (or (match-string-no-properties 5)
                                              (and (not (equal (match-string 4) ""))
-                                                  (match-string 4))
-                                             (match-string 2)))))
+                                                  (match-string-no-properties 4))
+                                             (match-string-no-properties 2)))))
                                  (external-link-p
                                   (string-match "(\\([^)]+\\))\\([^)]*\\)" node))
                                  (file (if external-link-p
                                            (file-name-nondirectory
-                                            (match-string 1 node))
+                                            (match-string-no-properties 1 node))
                                          Info-current-file))
                                  (hl Info-history-list)
                                  res)
                             (if external-link-p
                                 (setq node (if (equal (match-string 2 node) "")
                                                "Top"
-                                             (match-string 2 node))))
+                                             (match-string-no-properties 2 node))))
                             (while hl
                               (if (and (string-equal node (nth 1 (car hl)))
-                                       (string-equal
-                                        file (if external-link-p
-                                                 (file-name-nondirectory
-                                                  (caar hl))
-                                               (caar hl))))
+                                       (equal file
+                                              (if (and external-link-p
+                                                       (stringp (caar hl)))
+                                                  (file-name-nondirectory
+                                                   (caar hl))
+                                                (caar hl))))
                                   (setq res (car hl) hl nil)
                                 (setq hl (cdr hl))))
                             res))) 'info-xref-visited 'info-xref))
@@ -3932,26 +3936,28 @@ the variable `Info-file-list-for-emacs'."
                  (if (and Info-fontify-visited-nodes
                           (save-match-data
                             (let* ((node (if (equal (match-string 3) "")
-                                             (match-string 1)
-                                           (match-string 3)))
+                                             (match-string-no-properties 1)
+                                           (match-string-no-properties 3)))
                                    (external-link-p
                                     (string-match "(\\([^)]+\\))\\([^)]*\\)" node))
                                    (file (if external-link-p
                                              (file-name-nondirectory
-                                              (match-string 1 node))
+                                              (match-string-no-properties 1 node))
                                            Info-current-file))
                                    (hl Info-history-list)
                                    res)
                               (if external-link-p
                                   (setq node (if (equal (match-string 2 node) "")
                                                  "Top"
-                                               (match-string 2 node))))
+                                               (match-string-no-properties 2 node))))
                               (while hl
                                 (if (and (string-equal node (nth 1 (car hl)))
-                                         (string-equal
-                                          file (if external-link-p
-                                                   (file-name-nondirectory (caar hl))
-                                                 (caar hl))))
+                                         (equal file
+                                                (if (and external-link-p
+                                                         (stringp (caar hl)))
+                                                    (file-name-nondirectory
+                                                     (caar hl))
+                                                  (caar hl))))
                                     (setq res (car hl) hl nil)
                                   (setq hl (cdr hl))))
                               res))) 'info-xref-visited 'info-xref)))
@@ -4210,8 +4216,8 @@ BUFFER is the buffer speedbar is requesting buttons for."
 
 (defun Info-desktop-buffer-misc-data (desktop-dirname)
   "Auxiliary information to be saved in desktop file."
-  (if (not (member Info-current-file '("apropos" "history" "toc")))
-      (list Info-current-file Info-current-node)))
+  (unless (member Info-current-file '(apropos history toc nil))
+    (list Info-current-file Info-current-node)))
 
 (defun Info-restore-desktop-buffer (desktop-buffer-file-name
                                     desktop-buffer-name
diff --git a/lisp/isearch.el b/lisp/isearch.el
index c97f5062c61..32228aa6eb9 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -116,8 +116,11 @@ When you put a space or spaces in the incremental regexp, it stands for
 this, unless it is inside of a regexp construct such as [...] or *, + or ?.
 You might want to use something like \"[ \\t\\r\\n]+\" instead.
 In the Customization buffer, that is `[' followed by a space,
-a tab, a carriage return (control-M), a newline, and `]+'."
-  :type 'regexp
+a tab, a carriage return (control-M), a newline, and `]+'.
+
+When this is nil, each space you type matches literally, against one space."
+  :type '(choice (const :tag "Find Spaces Literally" nil)
+                 regexp)
   :group 'isearch)
 
 (defcustom search-invisible 'open
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 58219104e40..00e9e35ff60 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -163,6 +163,7 @@
 
 (if (fboundp 'x-create-frame)
     (progn
+      (load "fringe")
       (load "image")
       (load "international/fontset")
       (load "dnd")
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index e5262693d8a..a1043c6c6ee 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,53 @@
+2006-02-21  Eric Ding  <ericding@alum.mit.edu>
+
+        * mh-e.el (mh-invisible-header-fields-internal): Added entry
+        "X-Sasl-enc:"
+
+2006-02-20  Eric Ding  <ericding@alum.mit.edu>
+
+        * mh-e.el (mh-invisible-header-fields-internal): Added entries
+        "X-Authenticated-Sender:", "X-Barracuda-", "X-EFL-Spamscore",
+        "X-IronPort-AV:", "X-Mail-from:", "X-Mailman-Approved-At:",
+        "X-Resolved-to:", and "X-SA-Exim".  Fixed "X-Bugzilla-" and
+        "X-Roving-" by removing unnecessary "*" at end.
+
+2006-02-19  Bill Wohler  <wohler@newt.com>
+
+        * mh-alias.el (mh-address-mail-regexp)
+        (mh-goto-address-find-address-at-point): Delete copies from
+        goto-addr.el.
+        (mh-alias-suggest-alias): Use goto-address-mail-regexp instead of
+        mh-address-mail-regexp.
+        (mh-alias-add-address-under-point): Use
+        goto-address-find-address-at-point instead of
+        mh-goto-address-find-address-at-point.
+
+        * mh-e.el (mh-show-use-goto-addr-flag): Delete.
+
+        * mh-show.el (mh-show-mode): Mention goto-address-highlight-p in
+        docstring.
+        (mh-show-addr): Call goto-address unconditionally. User should use
+        goto-address-highlight-p instead of mh-show-use-goto-addr-flag.
+
+2006-02-18  Bill Wohler  <wohler@newt.com>
+
+        * mh-e.el (Version, mh-version): Add +cvs to version.
+
+2006-02-18  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E version 7.92.
+
+        * mh-e.el (Version, mh-version): Update for release 7.92.
+
+2006-02-17  Bill Wohler  <wohler@newt.com>
+
+        * mh-e.el (mh-folder-msg-number): Use purple on low-color, light
+        backgrounds per Mark's suggestion.
+
+        * mh-utils.el (mh-image-load-path): Fix problem that images on
+        load-path or image-load-path would win over relative paths (newer
+        MH-E or Emacs distribution).
+
 2006-02-16  Bill Wohler  <wohler@newt.com>
 
         * mh-e.el (mh-inherit-face-flag): New variable. Non-nil means that
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index 9dc2871241f..6dba65d69df 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -35,6 +35,8 @@
 
 (mh-require-cl)
 
+(require 'goto-addr)
+
 (defvar mh-alias-alist 'not-read
   "Alist of MH aliases.")
 (defvar mh-alias-blind-alist nil
@@ -62,11 +64,6 @@ alias files listed in your \"Aliasfile:\" MH profile component are
 automatically included. You can update the alias list manually using
 \\[mh-alias-reload].")
 
-;; Copy of `goto-address-mail-regexp'.
-(defvar mh-address-mail-regexp
-  "[-a-zA-Z0-9._]+@\\([-a-zA-z0-9_]+\\.\\)+[a-zA-Z0-9]+"
-  "A regular expression probably matching an e-mail address.")
-
 
 
 ;;; Alias Loading
@@ -343,7 +340,7 @@ NO-COMMA-SWAP is non-nil."
    ((string-match "^\\(.*\\) +<.*>$" string)
     ;; Some name <somename@foo.bar>  -> recurse -> Some name
     (mh-alias-suggest-alias (match-string 1 string) no-comma-swap))
-   ((string-match (concat mh-address-mail-regexp " +(\\(.*\\))$") string)
+   ((string-match (concat goto-address-mail-regexp " +(\\(.*\\))$") string)
     ;; somename@foo.bar (Some name)  -> recurse -> Some name
     (mh-alias-suggest-alias (match-string 1 string) no-comma-swap))
    ((string-match "^\\(Dr\\|Prof\\)\\.? +\\(.*\\)" string)
@@ -595,24 +592,11 @@ filing messages."
 (defun mh-alias-add-address-under-point ()
   "Insert an alias for address under point."
   (interactive)
-  (let ((address (mh-goto-address-find-address-at-point)))
+  (let ((address (goto-address-find-address-at-point)))
     (if address
         (mh-alias-add-alias nil address)
       (message "No email address found under point"))))
 
-;; From goto-addr.el, which we don't want to force-load on users.
-(defun mh-goto-address-find-address-at-point ()
-  "Find e-mail address around or before point.
-
-Then search backwards to beginning of line for the start of an
-e-mail address. If no e-mail address found, return nil."
-  (re-search-backward "[^-_A-z0-9.@]" (mh-line-beginning-position) 'lim)
-  (if (or (looking-at mh-address-mail-regexp) ; already at start
-          (and (re-search-forward mh-address-mail-regexp
-                                  (mh-line-end-position) 'lim)
-               (goto-char (match-beginning 0))))
-      (mh-match-string-no-properties 0)))
-
 (defun mh-alias-apropos (regexp)
   "Show all aliases or addresses that match a regular expression REGEXP."
   (interactive "sAlias regexp: ")
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 26b1ddd8050..5a07524aec4 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -6,7 +6,7 @@
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
-;; Version: 7.91+cvs
+;; Version: 7.92+cvs
 ;; Keywords: mail
 
 ;; This file is part of GNU Emacs.
@@ -121,7 +121,7 @@
 ;; Try to keep variables local to a single file. Provide accessors if
 ;; variables are shared. Use this section as a last resort.
 
-(defconst mh-version "7.91+cvs" "Version number of MH-E.")
+(defconst mh-version "7.92+cvs" "Version number of MH-E.")
 
 ;; Variants
 
@@ -2303,17 +2303,20 @@ of citations entirely, choose \"None\"."
     "X-AntiAbuse:"                      ; cPanel
     "X-Apparently-From:"                ; MS Outlook
     "X-Apparently-To:"           ; Egroups/yahoogroups mailing list manager
+    "X-Authenticated-Sender:"           ; AT&T Message Center (webmail)
     "X-Authentication-Warning:"         ; sendmail
+    "X-Barracuda-"                      ; Barracuda spam scores
     "X-Beenthere:"                      ; Mailman mailing list manager
     "X-Bogosity:"                       ; bogofilter
     "X-BrightmailFiltered:"             ; Brightmail
     "X-Brightmail-Tracker:"             ; Brightmail
-    "X-Bugzilla-*"                      ; Bugzilla
+    "X-Bugzilla-"                       ; Bugzilla
     "X-Complaints-To:"
     "X-ContentStamp:"                   ; NetZero
     "X-Cron-Env:"
     "X-DMCA"
     "X-Delivered"
+    "X-EFL-Spamscore:"                  ; MIT alumni spam filtering
     "X-ELNK-Trace:"                     ; Earthlink mailer
     "X-Envelope-Date:"                  ; GNU mailutils
     "X-Envelope-From:"
@@ -2337,6 +2340,7 @@ of citations entirely, choose \"None\"."
     "X-Habeas-SWE-9:"                   ; Spam
     "X-Hashcash:"                       ; hashcash
     "X-Info:"                           ; NTMail
+    "X-IronPort-AV:"                    ; IronPort AV
     "X-Juno-"                           ; Juno
     "X-List-Host:"                      ; Unknown mailing list managers
     "X-List-Subscribe:"                 ; Unknown mailing list managers
@@ -2346,12 +2350,14 @@ of citations entirely, choose \"None\"."
     "X-Loop:"                           ; Unknown mailing list managers
     "X-Lumos-SenderID:"                 ; Roving ConstantContact
     "X-MAIL-INFO:"                      ; NetZero
-    "X-MHE-Checksum"                    ; Checksum added during index search
+    "X-MHE-Checksum:"                   ; Checksum added during index search
     "X-MIME-Autoconverted:"             ; sendmail
     "X-MIMETrack:"
     "X-MS-"                             ; MS Outlook
+    "X-Mail-from:"                      ; fastmail.fm
     "X-MailScanner"                     ; ListProc(tm) by CREN
     "X-Mailing-List:"                   ; Unknown mailing list managers
+    "X-Mailman-Approved-At:"            ; Mailman mailing list manager
     "X-Mailman-Version:"                ; Mailman mailing list manager
     "X-Majordomo:"                      ; Majordomo mailing list manager
     "X-Message-Id"
@@ -2380,14 +2386,17 @@ of citations entirely, choose \"None\"."
     "X-Received-Date:"
     "X-Received:"
     "X-Request-"
+    "X-Resolved-to:"                    ; fastmail.fm
     "X-Return-Path-Hint:"               ; Roving ConstantContact
-    "X-Roving-*"                        ; Roving ConstantContact
+    "X-Roving-"                         ; Roving ConstantContact
+    "X-SA-Exim-"                        ; Exim SpamAssassin
     "X-SBClass:"                        ; Spam
     "X-SBNote:"                         ; Spam
     "X-SBPass:"                         ; Spam
     "X-SBRule:"                         ; Spam
     "X-SMTP-"
-    "X-Scanned-By"
+    "X-Sasl-enc:"                       ; Apple Mail
+    "X-Scanned-By:"
     "X-Sender:"
     "X-Server-Date:"
     "X-Server-Uuid:"
@@ -2615,22 +2624,6 @@ message are shown regardless of size."
   :type 'integer
   :group 'mh-show)
 
-(defcustom mh-show-use-goto-addr-flag (and (boundp 'goto-address-highlight-p)
-                                           goto-address-highlight-p)
-  "*Non-nil means highlight URLs and email addresses\\<goto-address-highlight-keymap>.
-
-To send a message using the highlighted email address or to view
-the web page for the highlighted URL, use the middle mouse button
-or \\[goto-address-at-point].
-
-See Info node `(mh-e)Sending Mail' to see how to configure Emacs
-to send the message using MH-E.
-
-The default value of this option comes from the value of
-`goto-address-highlight-p'."
-  :type 'boolean
-  :group 'mh-show)
-
 (defcustom mh-show-use-xface-flag (>= emacs-major-version 21)
   "*Non-nil means display face images in MH-show buffers.
 
@@ -3019,7 +3012,9 @@ GNU Emacs and XEmacs from at least 21.5.23 on.")
        (:foreground "snow4"))
       (((class color) (min-colors 64) (background dark))
        (:foreground "snow3"))
-      (((class color))
+      (((class color) (background light))
+       (:foreground "purple"))
+      (((class color) (background dark))
        (:foreground "cyan"))))
     (mh-folder-refiled
      ((((class color) (min-colors 64) (background light))
@@ -3042,9 +3037,9 @@ GNU Emacs and XEmacs from at least 21.5.23 on.")
       (t
        (:bold t))))
     (mh-folder-tick
-     ((((class color) (background dark))
+     ((((class color) (background light))
        (:background "#dddf7e"))
-      (((class color) (background light))
+      (((class color) (background dark))
        (:background "#dddf7e"))
       (t
        (:underline t))))
diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el
index ab636ae8ab6..3ae609d9204 100644
--- a/lisp/mh-e/mh-show.el
+++ b/lisp/mh-e/mh-show.el
@@ -36,13 +36,13 @@
 (require 'mh-e)
 (require 'mh-scan)
 
+(require 'font-lock)
 (require 'gnus-cite)
 (require 'gnus-util)
+(require 'goto-addr)
 
 (autoload 'mh-make-buffer-data "mh-mime") ;can't be automatically generated
 
-(require 'font-lock)
-
 
 
 ;;; MH-Folder Commands
@@ -818,6 +818,13 @@ operation."
 (define-derived-mode mh-show-mode text-mode "MH-Show"
   "Major mode for showing messages in MH-E.\\<mh-show-mode-map>
 
+Email addresses and URLs in the message are highlighted if the
+option `goto-address-highlight-p' is on, which it is by default.
+To view the web page for a highlighted URL or to send a message
+using a highlighted email address, use the middle mouse button or
+\\[goto-address-at-point]. See Info node `(mh-e)Sending Mail' to
+see how to configure Emacs to send the message using MH-E.
+
 The hook `mh-show-mode-hook' is called upon entry to this mode.
 
 See also `mh-folder-mode'.
@@ -877,10 +884,7 @@ See also `mh-folder-mode'.
 ;;;###mh-autoload
 (defun mh-show-addr ()
   "Use `goto-address'."
-  (when mh-show-use-goto-addr-flag
-    (mh-require 'goto-addr nil t)
-    (if (fboundp 'goto-address)
-        (goto-address))))
+  (goto-address))
 
 ;;;###mh-autoload
 (defun mh-gnus-article-highlight-citation ()
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 58d29bc5d1c..c00558860d1 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -111,18 +111,8 @@ already there.
 See also variable `mh-image-load-path-called-flag'."
   (unless mh-image-load-path-called-flag
     (cond
-     (mh-image-load-path)            ; user setting exists; we're done
-     ((mh-image-search-load-path "mh-logo.xpm")
-      ;; Images already in image-load-path.
-      (setq mh-image-load-path
-            (file-name-directory (mh-image-search-load-path "mh-logo.xpm"))))
-     ((locate-library "mh-logo.xpm")
-      ;; Images already in load-path.
-      (setq mh-image-load-path
-            (file-name-directory (locate-library "mh-logo.xpm"))))
-     (t
-      ;; Guess `mh-image-load-path' if it wasn't provided by the user.
-      (let (mh-library-name)
+     (mh-image-load-path)               ; user setting exists
+     ((let (mh-library-name)            ; try relative setting
         ;; First, find mh-e in the load-path.
         (setq mh-library-name (locate-library "mh-e"))
         (if (not mh-library-name)
@@ -131,7 +121,17 @@ See also variable `mh-image-load-path-called-flag'."
         (setq mh-image-load-path
               (expand-file-name (concat
                                  (file-name-directory mh-library-name)
-                                 "../../etc/images"))))))
+                                 "../../etc/images")))
+        (file-exists-p (expand-file-name "mh-logo.xpm" mh-image-load-path))))
+     ((mh-image-search-load-path "mh-logo.xpm")
+      ;; Images in image-load-path.
+      (setq mh-image-load-path
+            (file-name-directory (mh-image-search-load-path "mh-logo.xpm"))))
+     ((locate-library "mh-logo.xpm")
+      ;; Images in load-path.
+      (setq mh-image-load-path
+            (file-name-directory (locate-library "mh-logo.xpm")))))
+
     (if (not (file-exists-p mh-image-load-path))
         (error "Directory %s in mh-image-load-path does not exist"
                mh-image-load-path))
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 971b65bf25c..f2eff379d14 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -49,7 +49,7 @@
 (defgroup rcirc nil
   "Simple IRC client."
   :version "22.1"
-  :prefix "rcirc"
+  :prefix "rcirc-"
   :group 'applications)
 
 (defcustom rcirc-server "irc.freenode.net"
@@ -295,16 +295,23 @@ If ARG is non-nil, prompt for a server to connect to."
 (defvar rcirc-topic nil)
 (defvar rcirc-keepalive-timer nil)
 (defvar rcirc-last-server-message-time nil)
-(defun rcirc-connect (server port nick user-name full-name startup-channels)
+(defun rcirc-connect (&optional server port nick user-name full-name startup-channels)
   (add-hook 'window-configuration-change-hook
             'rcirc-window-configuration-change)
 
   (save-excursion
     (message "Connecting to %s..." server)
     (let* ((inhibit-eol-conversion)
-           (port-number (if (stringp port)
-                            (string-to-number port)
-                          port))
+           (port-number (if port
+                            (if (stringp port)
+                                (string-to-number port)
+                              port)
+                          rcirc-port))
+           (server (or server rcirc-server))
+           (nick (or nick rcirc-nick))
+           (user-name (or user-name rcirc-user-name))
+           (full-name (or full-name rcirc-user-full-name))
+           (startup-channels (or startup-channels (rcirc-startup-channels server)))
            (process (open-network-stream server nil server port-number)))
       ;; set up process
       (set-process-coding-system process 'raw-text 'raw-text)
@@ -758,9 +765,9 @@ if there is no existing buffer for TARGET, otherwise return nil."
 Create the buffer if it doesn't exist."
   (let ((buffer (rcirc-get-buffer process target)))
     (if buffer
-        (progn
+        (with-current-buffer buffer
           (when (not rcirc-target)
-            (setq rcirc-target target))
+            (setq rcirc-target target))
           buffer)
         ;; create the buffer
         (with-rcirc-process-buffer process
@@ -896,20 +903,22 @@ Create the buffer if it doesn't exist."
   (kill-buffer (current-buffer))
   (set-window-configuration rcirc-window-configuration))
 
-(defun rcirc-get-any-buffer (process)
+(defun rcirc-any-buffer (process)
   "Return a buffer for PROCESS, either the one selected or the process buffer."
-  (let ((buffer (window-buffer (selected-window))))
-    (if (and buffer
-             (with-current-buffer buffer
-               (and (eq major-mode 'rcirc-mode)
-                    (eq rcirc-process process))))
-        buffer
-      (process-buffer process))))
+  (if rcirc-always-use-server-buffer-flag
+      (process-buffer process)
+    (let ((buffer (window-buffer (selected-window))))
+      (if (and buffer
+               (with-current-buffer buffer
+                 (and (eq major-mode 'rcirc-mode)
+                      (eq rcirc-process process))))
+          buffer
+        (process-buffer process)))))
 
 (defcustom rcirc-response-formats
-  '(("PRIVMSG" . "%T<%n> %m")
-    ("NOTICE"  . "%T-%n- %m")
-    ("ACTION"  . "%T[%n] %m")
+  '(("PRIVMSG" . "%T<%N> %m")
+    ("NOTICE"  . "%T-%N- %m")
+    ("ACTION"  . "%T[%N %m]")
     ("COMMAND" . "%T%m")
     ("ERROR"   . "%T%fw!!! %m")
     (t         . "%T%fp*** %fs%n %r %m"))
@@ -921,7 +930,8 @@ The entry's value part should be a string, which is inserted with
 the of the following escape sequences replaced by the described values:
 
   %m        The message text
-  %n        The sender's nick (with face `rcirc-my-nick' or `rcirc-other-nick')
+  %n        The sender's nick
+  %N        The sender's nick (with face `rcirc-my-nick' or `rcirc-other-nick')
   %r        The response-type
   %T        The timestamp (with face `rcirc-timestamp')
   %t        The target
@@ -959,13 +969,20 @@ is found by looking up RESPONSE in `rcirc-response-formats'."
             (cond ((eq key ?%)
                    ;; %% -- literal % character
                    "%")
-                  ((eq key ?n)
-                   ;; %n -- nick
-                   (rcirc-facify (concat (rcirc-abbrev-nick sender)
-                                         (and target (concat "," target)))
-                                 (if (string= sender (rcirc-nick process))
-                                     'rcirc-my-nick
-                                   'rcirc-other-nick)))
+                  ((or (eq key ?n) (eq key ?N))
+                   ;; %n/%N -- nick
+                   (let ((nick (concat (if (string= (with-rcirc-process-buffer
+                                                        process rcirc-server)
+                                                    sender)
+                                           ""
+                                         (rcirc-abbrev-nick sender))
+                                       (and target (concat "," target)))))
+                     (rcirc-facify nick
+                                   (if (eq key ?n)
+                                       face
+                                     (if (string= sender (rcirc-nick process))
+                                         'rcirc-my-nick
+                                       'rcirc-other-nick)))))
                   ((eq key ?T)
                    ;; %T -- timestamp
                    (rcirc-facify
@@ -1015,9 +1032,7 @@ is found by looking up RESPONSE in `rcirc-response-formats'."
   (assert (not (bufferp target)))
   (with-rcirc-process-buffer process
     (cond ((not target)
-           (if rcirc-always-use-server-buffer-flag
-               (process-buffer process)
-             (rcirc-get-any-buffer process)))
+           (rcirc-any-buffer process))
           ((not (rcirc-channel-p target))
            ;; message from another user
            (if (string= response "PRIVMSG")
@@ -1026,7 +1041,7 @@ is found by looking up RESPONSE in `rcirc-response-formats'."
                                                   sender))
              (rcirc-get-buffer process target t)))
           ((or (rcirc-get-buffer process target)
-               (rcirc-get-any-buffer process))))))
+               (rcirc-any-buffer process))))))
 
 (defvar rcirc-activity-type nil)
 (make-variable-buffer-local 'rcirc-activity-type)
@@ -1069,22 +1084,26 @@ record activity."
             (set-marker-insertion-type rcirc-prompt-start-marker nil)
             (set-marker-insertion-type rcirc-prompt-end-marker nil)
 
-            ;; fill the text we just inserted, maybe
-            (when (and rcirc-fill-flag
-                       (not (string= response "372"))) ;/motd
-              (let ((fill-prefix
-                     (or rcirc-fill-prefix
-                         (make-string
-                          (or (next-single-property-change 0 'rcirc-text
-                                                           fmted-text)
-                              8)
-                          ?\s)))
-                    (fill-column (cond ((eq rcirc-fill-column 'frame-width)
-                                        (1- (frame-width)))
-                                       (rcirc-fill-column
-                                        rcirc-fill-column)
-                                       (t fill-column))))
-                (fill-region fill-start rcirc-prompt-start-marker 'left t))))
+            (let ((text-start (make-marker)))
+              (set-marker text-start
+                          (or (next-single-property-change fill-start 
+                                                           'rcirc-text)
+                              (point-max)))
+              ;; squeeze spaces out of text before rcirc-text
+              (fill-region fill-start (1- text-start))
+
+              ;; fill the text we just inserted, maybe
+              (when (and rcirc-fill-flag
+                         (not (string= response "372"))) ;/motd
+                (let ((fill-prefix
+                       (or rcirc-fill-prefix
+                           (make-string (- text-start fill-start) ?\s)))
+                      (fill-column (cond ((eq rcirc-fill-column 'frame-width)
+                                          (1- (frame-width)))
+                                         (rcirc-fill-column
+                                          rcirc-fill-column)
+                                         (t fill-column))))
+                  (fill-region fill-start rcirc-prompt-start-marker 'left t)))))
 
           ;; set inserted text to be read-only
           (when rcirc-read-only-flag
@@ -1175,14 +1194,15 @@ record activity."
 
 (defun rcirc-put-nick-channel (process nick channel)
   "Add CHANNEL to list associated with NICK."
-  (with-rcirc-process-buffer process
-    (let* ((chans (gethash nick rcirc-nick-table))
-           (record (assoc-string channel chans t)))
-      (if record
-          (setcdr record (current-time))
-        (puthash nick (cons (cons channel (current-time))
-                            chans)
-                 rcirc-nick-table)))))
+  (let ((nick (rcirc-user-nick nick)))
+    (with-rcirc-process-buffer process
+      (let* ((chans (gethash nick rcirc-nick-table))
+             (record (assoc-string channel chans t)))
+        (if record
+            (setcdr record (current-time))
+          (puthash nick (cons (cons channel (current-time))
+                              chans)
+                   rcirc-nick-table))))))
 
 (defun rcirc-nick-remove (process nick)
   "Remove NICK from table."
@@ -1613,15 +1633,21 @@ ones added to the list automatically are marked with an asterisk."
   (propertize (or string "") 'face face 'rear-nonsticky t))
 
 (defvar rcirc-url-regexp
-  (rx word-boundary
-      (or "www."
-          (and (or "http" "https" "ftp" "file" "gopher" "news" "telnet" "wais"
-                   "mailto")
-               "://"
-               (1+ (char "a-zA-Z0-9_."))
-               (optional ":" (1+ (char "0-9")))))
-      (1+ (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;.,{}[]"))
-      (char "-a-zA-Z0-9_=#$\@~`%&*+|\\/:;{}[]"))
+  (rx-to-string
+   `(and word-boundary
+         (or "www."
+             (and (or "http" "https" "ftp" "file" "gopher" "news" "telnet" 
+                      "wais" "mailto")
+                  "://"
+                  (1+ (char "-a-zA-Z0-9_."))
+                  (optional ":" (1+ (char "0-9"))))
+             (and (1+ (char "-a-zA-Z0-9_."))
+                  (or ".com" ".net" ".org")
+                  word-boundary))
+         (optional 
+          (and "/"
+               (1+ (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;.,{}[]"))
+               (char "-a-zA-Z0-9_=#$\@~`%&*+|\\/:;{}[]")))))
   "Regexp matching URLs.  Set to nil to disable URL features in rcirc.")
 
 (defun rcirc-browse-url (&optional arg)
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 2e7fa41d622..df603dc0d74 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -107,8 +107,10 @@
 (defvar gdb-current-language nil)
 (defvar gdb-var-list nil
  "List of variables in watch window.
-Each element has the form (EXPRESSION VARNUM NUMCHILD TYPE VALUE CHANGED-P).")
-(defvar gdb-var-changed nil "Non-nil means that `gdb-var-list' has changed.")
+Each element has the form (EXPRESSION VARNUM NUMCHILD TYPE VALUE STATUS) where
+STATUS is nil (unchanged), `changed' or `out-of-scope'.")
+(defvar gdb-force-update t
+ "Non-nil means that view of watch expressions will be updated in the speedbar.")
 (defvar gdb-main-file nil "Source file from which program execution begins.")
 (defvar gdb-overlay-arrow-position nil)
 (defvar gdb-server-prefix nil)
@@ -454,7 +456,7 @@ With arg, use separate IO iff arg is positive."
         gdb-current-language nil
         gdb-frame-number nil
         gdb-var-list nil
-        gdb-var-changed nil
+        gdb-force-update t
         gdb-first-post-prompt t
         gdb-prompting nil
         gdb-input-queue nil
@@ -540,7 +542,7 @@ With arg, use separate IO iff arg is positive."
                   (forward-char 2)
                   (gud-call (concat "until *%a")))))))))
 
-(defcustom gdb-speedbar-auto-raise t
+(defcustom gdb-speedbar-auto-raise nil
   "If non-nil raise speedbar every time display of watch expressions is\
  updated."
   :type 'boolean
@@ -608,8 +610,7 @@ With arg, automatically raise speedbar iff arg is positive."
                       (nth 1 var) "\"\n")
             (concat "-var-evaluate-expression " (nth 1 var) "\n"))
           `(lambda () (gdb-var-evaluate-expression-handler
-                       ,(nth 1 var) nil))))
-        (setq gdb-var-changed t))
+                       ,(nth 1 var) nil)))))
     (if (search-forward "Undefined command" nil t)
         (message-box "Watching expressions requires gdb 6.0 onwards")
       (message "No symbol \"%s\" in current context." expr))))
@@ -618,16 +619,11 @@ With arg, automatically raise speedbar iff arg is positive."
   (goto-char (point-min))
   (re-search-forward ".*value=\\(\".*\"\\)" nil t)
   (catch 'var-found
-    (let ((num 0))
-      (dolist (var gdb-var-list)
-        (if (string-equal varnum (cadr var))
-            (progn
-              (if changed (setcar (nthcdr 5 var) t))
-              (setcar (nthcdr 4 var) (read (match-string 1)))
-              (setcar (nthcdr num gdb-var-list) var)
-              (throw 'var-found nil)))
-        (setq num (+ num 1)))))
-  (setq gdb-var-changed t))
+    (dolist (var gdb-var-list)
+      (when (string-equal varnum (cadr var))
+        (if changed (setcar (nthcdr 5 var) 'changed))
+        (setcar (nthcdr 4 var) (read (match-string 1)))
+        (throw 'var-found nil)))))
 
 (defun gdb-var-list-children (varnum)
   (gdb-enqueue-input
@@ -676,17 +672,22 @@ type=\"\\(.*?\\)\"")
 (defconst gdb-var-update-regexp "name=\"\\(.*?\\)\",in_scope=\"\\(.*?\\)\"")
 
 (defun gdb-var-update-handler ()
+  (dolist (var gdb-var-list)
+    (setcar (nthcdr 5 var) nil))
   (goto-char (point-min))
   (while (re-search-forward gdb-var-update-regexp nil t)
-    (catch 'var-found-1
-      (let ((varnum (match-string 1)))
-        (dolist (var gdb-var-list)
-          (gdb-enqueue-input
-           (list
-            (concat "server interpreter mi \"-var-evaluate-expression "
-                    varnum "\"\n")
-            `(lambda () (gdb-var-evaluate-expression-handler ,varnum t))))
-          (throw 'var-found-1 nil)))))
+    (let ((varnum (match-string 1)))
+      (if  (string-equal (match-string 2) "false")
+          (catch 'var-found
+            (dolist (var gdb-var-list)
+              (when (string-equal varnum (cadr var))
+                (setcar (nthcdr 5 var) 'out-of-scope)
+                (throw 'var-found nil))))
+        (gdb-enqueue-input
+         (list
+          (concat "server interpreter mi \"-var-evaluate-expression "
+                  varnum "\"\n")
+          `(lambda () (gdb-var-evaluate-expression-handler ,varnum t)))))))
   (setq gdb-pending-triggers
         (delq 'gdb-var-update gdb-pending-triggers))
   (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
@@ -722,8 +723,7 @@ type=\"\\(.*?\\)\"")
             (setq gdb-var-list (delq var gdb-var-list))
             (dolist (varchild gdb-var-list)
               (if (string-match (concat (nth 1 var) "\\.") (nth 1 varchild))
-                  (setq gdb-var-list (delq varchild gdb-var-list))))
-            (setq gdb-var-changed t))))))
+                  (setq gdb-var-list (delq varchild gdb-var-list)))))))))
 
 (defun gdb-edit-value (text token indent)
   "Assign a value to a variable displayed in the speedbar."
@@ -739,8 +739,9 @@ type=\"\\(.*?\\)\"")
            'ignore))))
 
 (defcustom gdb-show-changed-values t
-  "If non-nil highlight values that have recently changed in the speedbar.
-The highlighting is done with `font-lock-warning-face'."
+  "If non-nil change the face of out of scope variables and changed values.
+Out of scope variables are suppressed with `shadow' face.
+Changed values are highlighted with the face `font-lock-warning-face'."
   :type 'boolean
   :group 'gud
   :version "22.1")
@@ -760,7 +761,7 @@ INDENT is the current indentation depth."
          (dolist (var gdb-var-list)
            (if (string-match (concat token "\\.") (nth 1 var))
                (setq gdb-var-list (delq var gdb-var-list))))
-         (setq gdb-var-changed t)
+         (setq gdb-force-update t)
          (with-current-buffer gud-comint-buffer
            (speedbar-timer-fn)))))
 
@@ -1214,8 +1215,7 @@ happens to be appropriate."
       ;; FIXME: with GDB-6 on Darwin, this might very well work.
       ;; Only needed/used with speedbar/watch expressions.
       (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
-        (dolist (var gdb-var-list)
-          (setcar (nthcdr 5 var) nil))
+        (setq gdb-force-update t)
         (if (string-equal gdb-version "pre-6.4")
             (gdb-var-update)
           (gdb-var-update-1)))))
@@ -2626,6 +2626,8 @@ Kills the gdb buffers and resets the source buffers."
     (setq gdb-overlay-arrow-position nil))
   (setq overlay-arrow-variable-list
         (delq 'gdb-overlay-arrow-position overlay-arrow-variable-list))
+  (if (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
+      (speedbar-refresh))
   (setq gud-running nil)
   (setq gdb-active-process nil)
   (setq gdb-var-list nil)
@@ -3022,7 +3024,6 @@ value=\\(\".*?\"\\),type=\"\\(.+?\\)\"}")
                         (throw 'child-already-watched nil)))
                   (push varchild var-list))))
           (push var var-list)))
-      (setq gdb-var-changed t)
       (setq gdb-var-list (nreverse var-list)))))
 
 ; Uses "-var-update --all-values".  Needs GDB 6.4 onwards.
@@ -3041,23 +3042,20 @@ value=\\(\".*?\"\\),type=\"\\(.+?\\)\"}")
   "name=\"\\(.*?\\)\",\\(?:value=\\(\".*?\"\\),\\)?in_scope=\"\\(.*?\\)\"")
 
 (defun gdb-var-update-handler-1 ()
+  (dolist (var gdb-var-list)
+    (setcar (nthcdr 5 var) nil))
   (goto-char (point-min))
   (while (re-search-forward gdb-var-update-regexp-1 nil t)
     (let ((varnum (match-string 1)))
-      (catch 'var-found1
-        (let ((num 0))
-          (dolist (var gdb-var-list)
-            (if (string-equal varnum (cadr var))
-                (progn
-                  (setcar (nthcdr 5 var) t)
-                  (setcar (nthcdr 4 var)
-                          (if (string-equal (match-string 3) "true")
-                              (read (match-string 2))
-                            "*changed*"))
-                  (setcar (nthcdr num gdb-var-list) var)
-                  (throw 'var-found1 nil)))
-            (setq num (+ num 1))))))
-    (setq gdb-var-changed t))
+      (catch 'var-found
+        (dolist (var gdb-var-list)
+          (when (string-equal varnum (cadr var))
+            (if (string-equal (match-string 3) "false")
+                (setcar (nthcdr 5 var) 'out-of-scope)
+              (setcar (nthcdr 5 var) 'changed)
+              (setcar (nthcdr 4 var)
+                      (read (match-string 2))))
+            (throw 'var-found nil))))))
   (setq gdb-pending-triggers
    (delq 'gdb-var-update gdb-pending-triggers))
   (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 1d5172a1a52..ea2586a31d6 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -43,14 +43,13 @@
 (eval-when-compile (require 'cl)) ; for case macro
 
 (require 'comint)
-(require 'font-lock)
 
 (defvar gdb-active-process)
 (defvar gdb-define-alist)
 (defvar gdb-macro-info)
 (defvar gdb-server-prefix)
 (defvar gdb-show-changed-values)
-(defvar gdb-var-changed)
+(defvar gdb-force-update)
 (defvar gdb-var-list)
 (defvar gdb-speedbar-auto-raise)
 (defvar tool-bar-map)
@@ -444,7 +443,7 @@ required by the caller."
           (p (window-point window)))
       (cond
        ((memq minor-mode '(gdbmi gdba))
-        (when (or gdb-var-changed
+        (when (or gdb-force-update
                   (not (save-excursion
                          (goto-char (point-min))
                          (let ((case-fold-search t))
@@ -453,51 +452,68 @@ required by the caller."
           (insert "Watch Expressions:\n")
           (if gdb-speedbar-auto-raise
               (raise-frame speedbar-frame))
-          (let ((var-list gdb-var-list))
+          (let ((var-list gdb-var-list) parent)
             (while var-list
-              (let* (char (depth 0) (start 0)
-                     (var (car var-list)) (varnum (nth 1 var)))
+              (let* (char (depth 0) (start 0) (var (car var-list))
+                          (expr (car var)) (varnum (nth 1 var))
+                          (type (nth 3 var)) (status (nth 5 var)))
+                (put-text-property
+                 0 (length expr) 'face font-lock-variable-name-face expr)
+                (put-text-property
+                 0 (length type) 'face font-lock-type-face type)
                 (while (string-match "\\." varnum start)
                   (setq depth (1+ depth)
                         start (1+ (match-beginning 0))))
+                (if (eq depth 0) (setq parent nil))
                 (if (or (equal (nth 2 var) "0")
                         (and (equal (nth 2 var) "1")
-                             (string-match "char \\*$" (nth 3 var))))
-                    (speedbar-make-tag-line 'bracket ?? nil nil
-                                            (concat (car var) "\t" (nth 4 var))
-                                            'gdb-edit-value
-                                            nil
-                                            (if (and (nth 5 var)
-                                                     gdb-show-changed-values)
-                                                'font-lock-warning-face
-                                              nil) depth)
+                             (string-match "char \\*$" type)))
+                    (speedbar-make-tag-line
+                     'bracket ?? nil nil
+                     (concat expr "\t" (nth 4 var))
+                     (if (or parent (eq status 'out-of-scope))
+                         nil 'gdb-edit-value)
+                     nil
+                     (if gdb-show-changed-values
+                         (or parent (case status
+                                      (changed 'font-lock-warning-face)
+                                      (out-of-scope 'shadow)
+                                      (t t)))
+                       t)
+                     depth)
+                  (if (eq status 'out-of-scope) (setq parent 'shadow))
                   (if (and (cadr var-list)
                            (string-match (concat varnum "\\.")
                                          (cadr (cadr var-list))))
                       (setq char ?-)
                     (setq char ?+))
-                  (if (string-match "\\*$" (nth 3 var))
-                      (speedbar-make-tag-line 'bracket char
-                                              'gdb-speedbar-expand-node varnum
-                                              (concat (car var) "\t"
-                                                      (nth 3 var)"\t"
-                                                      (nth 4 var))
-                                              'gdb-edit-value nil
-                                              (if (and (nth 5 var)
-                                                       gdb-show-changed-values)
-                                                  'font-lock-warning-face
-                                                nil) depth)
-                  (speedbar-make-tag-line 'bracket char
-                                          'gdb-speedbar-expand-node varnum
-                                          (concat (car var) "\t" (nth 3 var))
-                                          nil nil nil depth))))
+                  (if (string-match "\\*$" type)
+                      (speedbar-make-tag-line
+                       'bracket char
+                       'gdb-speedbar-expand-node varnum
+                       (concat expr "\t"
+                               type "\t"
+                               (nth 4 var))
+                       (if (or parent status 'out-of-scope)
+                         nil 'gdb-edit-value)
+                       nil
+                       (if (and (or parent status) gdb-show-changed-values)
+                           'shadow t)
+                       depth)
+                    (speedbar-make-tag-line
+                     'bracket char
+                     'gdb-speedbar-expand-node varnum
+                     (concat expr "\t" type)
+                     nil nil
+                     (if (and (or parent status) gdb-show-changed-values)
+                         'shadow t)
+                     depth))))
               (setq var-list (cdr var-list))))
-          (setq gdb-var-changed nil)))
-       (t (if (and (save-excursion
-                     (goto-char (point-min))
-                     (looking-at "Current Stack:"))
-                   (equal gud-last-last-frame gud-last-speedbar-stackframe))
-              nil
+          (setq gdb-force-update nil)))
+       (t (unless (and (save-excursion
+                         (goto-char (point-min))
+                         (looking-at "Current Stack:"))
+                       (equal gud-last-last-frame gud-last-speedbar-stackframe))
             (let ((gud-frame-list
             (cond ((eq minor-mode 'gdb)
                    (gud-gdb-get-stackframe buffer))
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index a70941d9d3e..0ea9eef96cb 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1438,6 +1438,16 @@ with your script for an edit-interpret-debug cycle."
                  ((and buffer-file-name
                        (string-match "\\.m?spec\\'" buffer-file-name))
                   "rpm")))))
+    (unless interpreter
+      (setq interpreter
+            (cond ((string-match "[.]sh\\>" buffer-file-name)
+                   "sh")
+                  ((string-match "[.]bash\\>" buffer-file-name)
+                   "bash")
+                  ((string-match "[.]ksh\\>" buffer-file-name)
+                   "ksh")
+                  ((string-match "[.]csh\\>" buffer-file-name)
+                   "csh"))))
     (sh-set-shell (or interpreter sh-shell-file) nil nil))
   (run-mode-hooks 'sh-mode-hook))
 
diff --git a/lisp/sort.el b/lisp/sort.el
index 174a8531786..5183bf65afa 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -499,8 +499,9 @@ Use \\[untabify] to convert tabs to spaces before sorting."
           ;; in the region, since the sort utility would lose the
           ;; properties.
           (let ((sort-args (list (if reverse "-rt\n" "-t\n")
-                                 (concat "+0." (int-to-string col-start))
-                                 (concat "-0." (int-to-string col-end)))))
+                                 (format "-k1.%d,1.%d"
+                                         (1+ col-start)
+                                         (1+ col-end)))))
             (when sort-fold-case
               (push "-f" sort-args))
             (apply #'call-process-region beg1 end1 "sort" t t nil sort-args))
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 4e639c586f2..4f0e2edf7cb 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -1708,9 +1708,13 @@ Separators are not active, have no labels, depth, or actions."
 (defun speedbar-make-button (start end face mouse function &optional token)
   "Create a button from START to END, with FACE as the display face.
 MOUSE is the mouse face.  When this button is clicked on FUNCTION
-will be run with the TOKEN parameter (any Lisp object)"
+will be run with the TOKEN parameter (any Lisp object).  If FACE
+is t use the text properties of the string that is passed as an
+argument."
+  (unless (eq face t)
+    (put-text-property start end 'face face))
   (add-text-properties
-   start end `(face ,face mouse-face ,mouse invisible nil
+   start end `(mouse-face ,mouse invisible nil
                speedbar-text ,(buffer-substring-no-properties start end)))
   (if speedbar-use-tool-tips-flag
       (put-text-property start end 'help-echo #'dframe-help-echo))
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index f52ed056994..d6fdbffad74 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -508,11 +508,7 @@ re-start emacs."
                                (const "~nroff") (const "~list")
                                (const "~latin1") (const "~latin3")
                                (const :tag "default" nil))
-                       (choice :tag "Coding system"
-                               (const iso-8859-1)
-                               (const iso-8859-2)
-                               (const koi8-r)
-                               (const windows-1251))))
+                       (coding-system :tag "Coding System")))
   :group 'ispell)
 
 
@@ -570,10 +566,10 @@ re-start emacs."
  '(("esperanto"
     "[A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]"
     "[^A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]"
-    "[-']" t ("-C") "~latin3" iso-8859-1)
+    "[-']" t ("-C") "~latin3" iso-8859-3)
    ("esperanto-tex"
     "[A-Za-z^\\]" "[^A-Za-z^\\]"
-    "[-'`\"]" t ("-C" "-d" "esperanto") "~tex" iso-8859-1)
+    "[-'`\"]" t ("-C" "-d" "esperanto") "~tex" iso-8859-3)
    ("francais7"
     "[A-Za-z]" "[^A-Za-z]" "[`'^---]" t nil nil iso-8859-1)
    ("francais"                          ; Francais.aff
@@ -2574,7 +2570,7 @@ By just answering RET you can find out what the current dictionary is."
                (mapcar 'list (ispell-valid-dictionary-list)))
           nil t)
          current-prefix-arg))
-  (unless arg (ispell-accept-buffer-local-defs))
+  (unless arg (ispell-buffer-local-dict))
   (if (equal dict "default") (setq dict nil))
   ;; This relies on completing-read's bug of returning "" for no match
   (cond ((equal dict "")
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 04cd080db8f..cb002731eec 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * url.el (url-redirect-buffer): New var.
+        (url-retrieve-synchronously): Use it to follow redirections.
+
+        * url-http.el: Require `url' rather than try to autoload parts of it.
+        (url-http-find-free-connection): `url-open-stream' needs a real buffer.
+        (url-http-parse-headers): Set `url-redirect-buffer' when following
+        a redirection reply.
+
 2006-01-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * url-news.el: Move defvars out of eval-when-compile.
@@ -18,7 +28,7 @@
         (url-history-save-history): Create parent dir if necessary.
         (url-history-save-history): Don't write the initialization of
         url-history-hash-table into the history file.
-        (url-have-visited-url): Simplify since url-history-hash-table is non-nil.
+        (url-have-visited-url): Simplify since url-history-hash-table isn't nil.
         (url-completion-function): Simplify.
 
         * url-cookie.el (url-cookie-parse-file): Don't complain of missing file.
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index ac8f490f3e8..22ca6010ef9 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1,6 +1,6 @@
 ;;; url-http.el --- HTTP retrieval routines
 
-;; Copyright (C) 1999, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Keywords: comm, data, processes
@@ -35,10 +35,8 @@
 (require 'url-cookie)
 (require 'mail-parse)
 (require 'url-auth)
-(autoload 'url-retrieve-synchronously "url")
-(autoload 'url-retrieve "url")
+(require 'url)
 (autoload 'url-cache-create-filename "url-cache")
-(autoload 'url-mark-buffer-as-dead "url")
 
 (defconst url-http-default-port 80 "Default HTTP port.")
 (defconst url-http-asynchronous-p t "HTTP retrievals are asynchronous.")
@@ -57,15 +55,13 @@ Valid values are 1.1 and 1.0.
 This is only useful when debugging the HTTP subsystem.
 
 Setting this to 1.0 will tell servers not to send chunked encoding,
-and other HTTP/1.1 specific features.
-")
+and other HTTP/1.1 specific features.")
 
 (defvar url-http-attempt-keepalives t
   "Whether to use a single TCP connection multiple times in HTTP.
 This is only useful when debugging the HTTP subsystem.  Setting to
-`nil' will explicitly close the connection to the server after every
-request.
-")
+nil will explicitly close the connection to the server after every
+request.")
 
 ;(eval-when-compile
 ;; These are all macros so that they are hidden from external sight
@@ -119,10 +115,14 @@ request.
         (url-http-debug "Reusing existing connection: %s:%d" host port)
       (url-http-debug "Contacting host: %s:%d" host port))
     (url-lazy-message "Contacting host: %s:%d" host port)
-    (url-http-mark-connection-as-busy host port
-                                      (or found
-                                          (url-open-stream host nil host
-                                                           port)))))
+    (url-http-mark-connection-as-busy
+     host port
+     (or found
+         (let ((buf (generate-new-buffer " *url-http-temp*")))
+           ;; `url-open-stream' needs a buffer in which to do things
+           ;; like authentication.  But we use another buffer afterwards.
+           (unwind-protect (url-open-stream host buf host port)
+             (kill-buffer buf)))))))
 
 ;; Building an HTTP request
 (defun url-http-user-agent-string ()
@@ -346,7 +346,7 @@ This allows us to use `mail-fetch-field', etc."
 
 (defun url-http-handle-cookies ()
   "Handle all set-cookie / set-cookie2 headers in an HTTP response.
-The buffer must already be narrowed to the headers, so mail-fetch-field will
+The buffer must already be narrowed to the headers, so `mail-fetch-field' will
 work correctly."
   (let ((cookies (mail-fetch-field "Set-Cookie" nil nil t))
         (cookies2 (mail-fetch-field "Set-Cookie2" nil nil t))
@@ -509,10 +509,17 @@ should be shown to the user."
            (let ((url-request-method url-http-method)
                  (url-request-data url-http-data)
                  (url-request-extra-headers url-http-extra-headers))
-             (url-retrieve redirect-uri url-callback-function
-                           (cons :redirect
-                                 (cons redirect-uri
-                                       url-callback-arguments)))
+             ;; Put in the current buffer a forwarding pointer to the new
+             ;; destination buffer.
+             ;; FIXME: This is a hack to fix url-retrieve-synchronously
+             ;; without changing the API.  Instead url-retrieve should
+             ;; either simply not return the "destination" buffer, or it
+             ;; should take an optional `dest-buf' argument.
+             (set (make-local-variable 'url-redirect-buffer)
+                  (url-retrieve redirect-uri url-callback-function
+                                (cons :redirect
+                                      (cons redirect-uri
+                                            url-callback-arguments))))
              (url-mark-buffer-as-dead (current-buffer))))))
       (4                                ; Client error
        ;; 400 Bad Request
@@ -1156,7 +1163,7 @@ CBARGS as the arguments."
 
 ;;;###autoload
 (defun url-http-options (url)
-  "Returns a property list describing options available for URL.
+  "Return a property list describing options available for URL.
 This list is retrieved using the `OPTIONS' HTTP method.
 
 Property list members:
@@ -1179,8 +1186,7 @@ p3p
   The `Platform For Privacy Protection' description for the resource.
   Currently this is just the raw header contents.  This is likely to
   change once P3P is formally supported by the URL package or
-  Emacs/W3.
-"
+  Emacs/W3."
   (let* ((url-request-method "OPTIONS")
          (url-request-data nil)
          (buffer (url-retrieve-synchronously url))
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 10c449cb30b..07ac55dcd3d 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -114,6 +114,13 @@ Emacs."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Retrieval functions
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar url-redirect-buffer nil
+  "New buffer into which the retrieval will take place.
+Sometimes while retrieving a URL, the URL library needs to use another buffer
+than the one returned initially by `url-retrieve'.  In this case, it sets this
+variable in the original buffer as a forwarding pointer.")
+
 ;;;###autoload
 (defun url-retrieve (url callback &optional cbargs)
   "Retrieve URL asynchronously and call CALLBACK with CBARGS when finished.
@@ -189,18 +196,22 @@ no further processing).  URL is either a string or a parsed URL."
           (url-debug 'retrieval
                      "Spinning in url-retrieve-synchronously: %S (%S)"
                      retrieval-done asynch-buffer)
-          (if (and proc (memq (process-status proc)
-                              '(closed exit signal failed))
-                   ;; Make sure another process hasn't been started, as can
-                   ;; happen with http redirections.
-                   (eq proc (or (get-buffer-process asynch-buffer) proc)))
-              ;; FIXME: It's not clear whether url-retrieve's callback is
-              ;; guaranteed to be called or not.  It seems that url-http
-              ;; decides sometimes consciously not to call it, so it's not
-              ;; clear that it's a bug, but even then we need to decide how
-              ;; url-http can then warn us that the download has completed.
-              ;; In the mean time, we use this here workaround.
-              (setq retrieval-done t)
+          (if (buffer-local-value 'url-redirect-buffer asynch-buffer)
+              (setq proc (get-buffer-process
+                          (setq asynch-buffer
+                                (buffer-local-value 'url-redirect-buffer
+                                                    asynch-buffer))))
+            (if (and proc (memq (process-status proc)
+                                '(closed exit signal failed))
+                     ;; Make sure another process hasn't been started.
+                     (eq proc (or (get-buffer-process asynch-buffer) proc)))
+                ;; FIXME: It's not clear whether url-retrieve's callback is
+                ;; guaranteed to be called or not.  It seems that url-http
+                ;; decides sometimes consciously not to call it, so it's not
+                ;; clear that it's a bug, but even then we need to decide how
+                ;; url-http can then warn us that the download has completed.
+                ;; In the mean time, we use this here workaround.
+                (setq retrieval-done t))
             ;; We used to use `sit-for' here, but in some cases it wouldn't
             ;; work because apparently pending keyboard input would always
             ;; interrupt it before it got a chance to handle process input.