Merged from miles@gnu.org--gnu-2005 (patch 610-614)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-610
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-611
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-612
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-613
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-614
   Update from CVS

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

41 files changed, 4303 insertions, 875 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da7c1765255..395cf7a2c5e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,285 @@
+2005-10-22  Kenichi Handa  <handa@m17n.org>
+
+        * tar-mode.el (tar-extract): Be sure to call
+        find-operation-coding-system if set-auto-coding doesn't find a
+        coding system.
+
+2005-10-22  Kim F. Storm  <storm@cua.dk>
+
+        * image.el (image-type-header-regexps): Rename from image-type-regexps.
+        Change users.
+        (image-type-file-name-regexps): New defconst.
+        (image-type-from-data): Simplify loop.
+        (image-type-from-buffer): New defun.
+        (image-type-from-file-header): Use it instead of image-type-from-data.
+        Use image-search-load-path instead of only looking in data-directory.
+        (image-type-from-file-name): New defun.
+        (image-search-load-path): Make PATH arg optional, default to image-load-path.
+        Change `pathname' to `filename'.
+
+2005-10-21  Richard M. Stallman  <rms@gnu.org>
+
+        * textmodes/texinfo.el (texinfo-mode): Set sentence-end-base.
+
+        * textmodes/paragraphs.el (sentence-end-base): New variable.
+        (sentence-end): Use sentence-end-base.
+
+2005-10-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * font-lock.el (font-lock-default-fontify-region): Check the multiline
+        property independently from the font-lock-multiline variable.
+
+2005-10-21  Richard M. Stallman  <rms@gnu.org>
+
+        * emacs-lisp/find-func.el (find-library-name): Doc fix.
+
+        * startup.el (command-line): Convert library names
+        in `load-history' to absolute file names.
+
+        * subr.el (symbol-file): Doc fix.
+
+        * loadhist.el (file-loadhist-lookup): Call locate-library
+        instead of find-library-name.  Don't try converting
+        abs file names to library names, since load-history no longer
+        has library names in it.
+        (file-dependents, file-provides, file-requires): Doc fixes.
+
+2005-10-21  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/etags.el (tags-table-mode): New function.
+        (tags-verify-table): Replace initialize-new-tags-table with
+        tags-table-mode.
+
+        * desktop.el (desktop-buffers-not-to-save): Remove TAGS from the
+        default value.
+        (desktop-modes-not-to-save): Add tags-table-mode to the
+        default value.
+
+        * info.el (Info-index-next): Add total number of index
+        alternatives to the message.
+
+        * textmodes/fill.el (fill-nobreak-p): Fix first two rules to skip
+        backward only space (instead of space and period) before looking
+        at sentence end.
+
+        * simple.el (set-variable): Use user-variable-p instead of symbolp.
+        Add the old variable value as 4th default-value arg of read-string.
+
+2005-10-21  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * cus-face.el (custom-declare-face): Make face from X resources
+        also on Mac.
+
+        * disp-table.el (standard-display-g1, standard-display-graphic):
+        Refuse to use string glyphs also on Mac.
+        (standard-display-european): Don't set terminal coding system also
+        on Mac.
+
+        * frame.el (display-screens): Use x-display-screens also on Mac.
+
+2005-10-21  Romain Francoise  <romain@orebokech.com>
+
+        * net/rcirc.el: Now part of GNU Emacs.  Update FSF's address.
+
+2005-10-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/sh-script.el (sh-font-lock-syntactic-keywords): Make $@
+        and $? into sexps.
+
+        * font-lock.el (font-lock-compile-keywords): Add a help-echo to the
+        warning face on open-paren-in-column-0.
+
+        * emacs-lisp/syntax.el (syntax-ppss-flush-cache): Fix corner
+        boundary case.  Fix typo.
+        Suggested by Martin Rudalics <rudalics@gmx.at>.
+
+2005-10-21  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el: (org-combined-agenda-icalendar-file)
+        (org-icalendar-include-todo, org-icalendar-combined-name): New options.
+        (org-export-icalendar-this-file)
+        (org-export-icalendar-all-agenda-files)
+        (org-export-icalendar-combine-agenda-files): New commands.
+        (org-export-icalendar, org-print-icalendar-entries)
+        (org-start-icalendar-file, org-finish-icalendar-file)
+        (org-ical-ts-to-string): New functions.
+        (org-read-date, org-goto-calendar)
+        (org-agenda-goto-calendar): Inhibit displaying diary entries by
+        call to `calendar'.
+        (orgtbl-setup): Remove the :keys arguments from the menu description.
+        (org-after-save-iCalendar-file-hook): New variable.
+
+2005-10-21  Kenichi Handa  <handa@m17n.org>
+
+        * language/vietnamese.el (tcvn-5712): Make it an alias of
+        vietnamese-tcvn coding-system.
+
+2005-10-20  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/ange-ftp.el (ange-ftp-date-regexp): Handle also the case no
+        group id is given.
+
+2005-10-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/sh-script.el (sh-escaped-line-re): New var.
+        (sh-here-doc-open-re, sh-font-lock-close-heredoc): Use it.
+        (sh-font-lock-open-heredoc): Try to properly handle heredoc starters
+        whose line is either continued or ends with a comment.
+
+2005-10-20  Romain Francoise  <romain@orebokech.com>
+
+        * net/rcirc.el (with-rcirc-process-buffer): Move above its first user.
+
+        * replace.el (occur-engine): Add follow-link property.
+
+        * font-core.el (font-lock-mode): Doc fix.
+
+2005-10-20  Richard M. Stallman  <rms@gnu.org>
+
+        * net/rcirc.el: New file.
+
+2005-10-20  Bryan Henderson  <bryanh@giraffe-data.com>  (tiny change)
+
+        * term.el (term-term-name): Initialize to "eterm-color".
+
+2005-10-20  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el: Add autoloads of crypt++ and mailcrypt routines, all
+        for encryption functionality.
+        Move allout customization subgroup from `editing' to `outlines' group.
+        Fix commentary 'keywords' to legitimate ones.
+        Update author info (using my current email address, obscurified).
+        (allout-encrypt-string, allout-encryption-produce-work-buffer)
+        (allout-encrypted-topic-p, allout-encrypted-text-type)
+        (allout-mc-activate-passwd, allout-create-encryption-key-verifier)
+        (allout-situate-encryption-key-verifier)
+        (allout-get-encryption-key-verifier, allout-verify-key)
+        (allout-next-topic-pending-encryption)
+        (allout-encrypt-decrypted, allout-encrypted-type-prefix): New funcs.
+        (outline-topic-encryption-bullet, outline-default-encryption-scheme)
+        (outline-key-verifier-handling, outline-key-hint-handling)
+        (outline-encrypt-unencrypted-on-saves): New defcustoms.
+        (allout-file-key-verifier-string, allout-encryption-scheme)
+        (allout-key-verifier-string, allout-key-hint-string)
+        (allout-after-save-decrypt): New variables.
+        (allout-write-file-hook-handler, allout-auto-save-hook-handler)
+        (allout-after-saves-handler): New hook functions.
+        (allout-post-command-business): Do allout-after-save-decrypt.
+        (allout-enable-file-variable-adjustment): Custom var to enable
+        mechanism for adding and adjusting settings of Emacs file variables.
+        (allout-adjust-file-variable, allout-file-vars-section-data):
+        New functions, implement the mechanism.
+        (outlineify-sticky): Use the file vars mechanism.
+        (allout-inhibit-protection, allout-during-write-cue)
+        (allout-override-protect, allout-before-change-protect): Remove.
+        (allout-flag-region, allout-open-topic): Adjust read-only text.
+        (allout-open-line-not-read-only): Add to facilitate read-only
+        text based protection.
+        (allout-kill-line): Revise to adjust read-only text, clue the
+        user about the inhibition.
+        (allout-unprotected): Use unwind-protect.
+        (allout-shift-in, allout-shift-out): Disallow manually shifting a
+        topic deeper than the offspring depth of the previous topic -
+        avoiding confusing "containment discontinuities".
+        (allout-reindent-bodies): Fix retention of body relative hanging
+        indent during promotion of collapsed bodies.
+        (allout-open-topic): Make it easy to open new topic with same
+        bullet as current topic - topic creation functions provided with
+        any universal argument provokes now prompt for bullet, defaulting
+        to the bullet of the previous topic.
+        (allout-plain-bullets-string, allout-distinctive-bullets-string):
+        Plain bullet alternates '.' period and ',' comma only.  All other
+        bullets are relegated to special status (but customizable).
+        (allout-end-of-entry): Rename from 'allout-end-of-current-entry
+        since it actually operates w.r.t. most immediately containing
+        entry, visible or not.
+        (allout-hide-current-entry, allout-show-current-entry): Use the
+        revised version.
+        (allout-old-expose-topic): Solidify deprecation.
+        (allout-end-of-subtree): Add so we can span concealed as well
+        as visible topics.
+        (allout-end-of-current-subtree): Use `allout-end-of-subtree'.
+        (allout-end-of-current-heading): Tweak to just respect the first line.
+        (allout-get-body-text): Add.
+        (allout-ascend-to-depth, allout-ascend): Position at end of prefix
+        when invoked interactively.
+        (allout-up-current-level): Use `interactive-p'.
+        (allout-mode, allout-init): Miscellaneous docstring and
+        operational refinements, as well as hookups of new encryption stuff.
+        (allout-beginning-of-current-entry): Now works as advertised.
+        (allout-end-of-current-entry): Remove of superfluous allout-show-entry.
+        (allout-isearch-rectification): Refine condition for isearching.
+        (allout-isearch-abort, allout-enwrap-isearch)
+        (allout-flag-region, my-region-active-p): Relocate some macros.
+        (allout-title): Fallback title is '(buffer-name)', not
+        non-existing '(current-buffer-name)'.
+        (subst-char-in-string): Define if absent (for some XEmacs versions).
+
+2005-10-20  Jari Aalto  <jari.aalto@cante.net>
+
+        * mail/sendmail.el (mail-setup-hook, mail-aliases)
+        (mail-yank-prefix, mail-indentation-spaces, mail-yank-hooks)
+        (mail-citation-prefix-regexp, mail-signature-file)
+        (mail-default-headers, mail-bury-selects-summary)
+        (mail-send-nonascii): Add autoload cookies.
+
+2005-10-20  Emanuele Giaquinta  <emanuele.giaquinta@gmail.com>  (tiny change)
+
+        * frame.el (blink-cursor-mode): Add `mac' to the list of
+        window-system's that support blinking cursor.
+
+2005-10-20  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * textmodes/org.el (org-level-color-stars-only): Fix typo in docstring.
+
+2005-10-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in ($(lisp)/mh-e/mh-loaddefs.el):
+        Bind find-file-suppress-same-file-warnings to t, to avoid warnings due
+        to different drive letter case in D:/foo/bar.el vs d:/foo/bar.el.
+
+2005-10-20  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-is-tramp-root): Simplify regexp matching tramp root.
+        (ido-set-current-directory): Don't add / after final @.
+        (ido-file-name-all-completions-1): Adapt to fixed tramp completion.
+        Explicitly handle ange-ftp completion oddities.
+        (ido-make-file-list): Don't rotate list at tramp root to avoid
+        triggering tramp file handler for expand-file-name via get-file-buffer.
+
+2005-10-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * simple.el (eval-expression-print-format): Put the char-string
+        inside the parenthesis, like the other alternative notations.
+        (kill-new): Use push.
+        (copy-to-buffer): Use with-current-buffer.
+        (completion-setup-function): Simplify.
+        (minibuffer-local-must-match-map): Don't add redundant bindings which
+        are already present in its parent (minibuffer-local-completion-map).
+
+        * savehist.el (savehist-coding-system): Revert to checking XEmacs.
+
+2005-10-19  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-units.el (math-standard-units): Add units, adjust
+        symbols and update values.
+        (math-unit-prefixes):  Add more prefixes.
+
+2005-10-19  Romain Francoise  <romain@orebokech.com>
+
+        * bookmark.el (bookmark-menu-heading): New face.
+        (bookmark-bmenu-list): Use it.
+        Don't fiddle with `baud-rate' at top-level.
+
+2005-10-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.el (create-image, find-image): Mention max-image-size in
+        docstring.
+
 2005-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * savehist.el (savehist-load): Revert to checking XEmacs.
+
         * textmodes/conf-mode.el: Don't use font-lock-defaults-alist.
         Various docstring and line-width fixups.
         (conf-mode): Use cond.
@@ -117,15 +397,14 @@
 
 2005-10-18  Jay Belanger  <belanger@truman.edu>
 
-        * calc/calc-store (calc-store-into): Get the proper variable name
+        * calc/calc-store.el (calc-store-into): Get the proper variable name
         to display in message.
 
 2005-10-18  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-ui.el (gdb-var-create-handler): Make watch
         expressions display in speedbar for all buffers when debugging.
-        (gdb-speedbar-expand-node): Ensure node contraction is always
-        updated.
+        (gdb-speedbar-expand-node): Ensure node contraction is always updated.
 
         * speedbar.el (speedbar-set-mode-line-format): Indent properly.
         (speedbar-insert-button, speedbar-make-button):
@@ -249,7 +528,6 @@
         * progmodes/pascal.el (pascal-complete-word)
         (pascal-show-completions): Ditto.
 
-
         * textmodes/bibtex.el (bibtex-complete-internal): Ditto.
 
         * simple.el (completion-common-substring): New variable.
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index 6467fef4e72..51cda269238 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -14639,7 +14639,7 @@
         * font-lock.el (font-lock-defaults, font-lock-defaults-alist)
         (font-lock-multiline, font-lock-fontified, font-lock-mode)
         (turn-on-font-lock, font-lock-add-keywords, global-font-lock-mode)
-        (font-lock-global-modes): Moved to font-core.el.
+        (font-lock-global-modes): Move to font-core.el.
         (font-lock-set-defaults-1): Partially moved to font-core.el.
 
         * font-core.el: New file, with functions taken from font-lock.el.
diff --git a/lisp/allout.el b/lisp/allout.el
index a64ba4b8f9f..5dc16ee3546 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -3,10 +3,10 @@
 ;; Copyright (C) 1992, 1993, 1994, 2001, 2002, 2003, 2004,
 ;;   2005 Free Software Foundation, Inc.
 
-;; Author: Ken Manheimer <klm@zope.com>
-;; Maintainer: Ken Manheimer <klm@zope.com>
+;; 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
-;; Keywords: outlines mode wp languages
+;; Keywords: outlines wp languages
 
 ;; This file is part of GNU Emacs.
 
@@ -34,43 +34,68 @@
 ;; programming languages.  (For an example, see the allout code
 ;; itself, which is organized in ;; an outline framework.)
 ;;
-;; In addition to outline navigation and exposure, allout includes:
+;; Some features:
 ;;
-;;  - topic-oriented repositioning, cut, and paste
-;;  - integral outline exposure-layout
-;;  - incremental search with dynamic exposure and reconcealment of hidden text
+;;  - 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 reliable key
+;;    verification and user-supplied hint maintenance.  (see
+;;    allout-toggle-current-subtree-encryption docstring.)
 ;;  - automatic topic-number maintenance
-;;  - "Hot-spot" operation, for single-keystroke maneuvering and
-;;    exposure control.  (See the `allout-mode' docstring.)
+;;  - "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
+;;    outline styles
 ;;
-;; and many other features.
+;; and more.
 ;;
 ;; The outline menubar additions provide quick reference to many of
-;; the features, and see the docstring of the function `allout-init'
-;; for instructions on priming your Emacs session for automatic
-;; activation of `allout-mode'.
+;; the features, and see the docstring of the variable `allout-init'
+;; for instructions on priming your emacs session for automatic
+;; activation of allout-mode.
 ;;
 ;; See the docstring of the variables `allout-layout' and
 ;; `allout-auto-activation' for details on automatic activation of
-;; allout `allout-mode' as a minor mode.  (It has changed since allout
+;; `allout-mode' as a minor mode.  (It has changed since allout
 ;; 3.x, for those of you that depend on the old method.)
 ;;
 ;; Note - the lines beginning with `;;;_' are outline topic headers.
 ;;        Just `ESC-x eval-current-buffer' to give it a whirl.
 
-;; Ken Manheimer        klm@zope.com
+;; ken manheimer (ken dot manheimer at gmail dot com)
 
 ;;; Code:
 
 ;;;_* Provide
+;(provide 'outline)
 (provide 'allout)
 
+;;;_* Dependency autoloads
+(eval-when-compile 'cl)                 ; otherwise, flet compilation fouls
+(autoload 'crypt-encrypt-buffer "crypt++")
+(setq-default crypt-encryption-type 'gpg)
+
+(autoload 'mc-encrypt "mailcrypt"
+  "*Encrypt the current buffer")
+(autoload 'mc-activate-passwd "mailcrypt"
+  "Activate the passphrase matching ID, using PROMPT for a prompt.
+Return the passphrase.  If PROMPT is nil, only return value if cached.")
+(autoload 'mc-gpg-process-region "mc-gpg")
+(autoload 'mc-dectivate-passwd "mailcrypt"
+  "*Deactivate the passphrase cache.")
+
 ;;;_* USER CUSTOMIZATION VARIABLES:
 (defgroup allout nil
   "Extensive outline mode for use alone and with other modes."
   :prefix "allout-"
-  :group 'editing
-  :version "22.1")
+  :group 'outlines)
 
 ;;;_ + Layout, Mode, and Topic Header Configuration
 
@@ -111,8 +136,8 @@ Buffer-specific.
 
 A list value specifies a default layout for the current buffer, to be
 applied upon activation of `allout-mode'.  Any non-nil value will
-automatically trigger `allout-mode', provided `allout-init'
-has been called to enable it.
+automatically trigger `allout-mode' \(provided `allout-init' has been called
+to enable this behavior).
 
 See the docstring for `allout-init' for details on setting up for
 auto-mode-activation, and for `allout-expose-topic' for the format of
@@ -171,7 +196,7 @@ bullets."
   :group 'allout)
 (make-variable-buffer-local 'allout-primary-bullet)
 ;;;_  = allout-plain-bullets-string
-(defcustom allout-plain-bullets-string ".:,;"
+(defcustom allout-plain-bullets-string ".,"
   "*The bullets normally used in outline topic prefixes.
 
 See `allout-distinctive-bullets-string' for the other kind of
@@ -185,7 +210,7 @@ of this var to take effect."
   :group 'allout)
 (make-variable-buffer-local 'allout-plain-bullets-string)
 ;;;_  = allout-distinctive-bullets-string
-(defcustom allout-distinctive-bullets-string "*+-=>([{}&!?#%\"X@$~_\\"
+(defcustom allout-distinctive-bullets-string "*+-=>()[{}&!?#%\"X@$~_\\:;^"
   "*Persistent outline header bullets used to distinguish special topics.
 
 These bullets are used to distinguish topics from the run-of-the-mill
@@ -198,12 +223,13 @@ rebulleting, so they can be used to characterize topics, eg:
  `?' question topics
  `\(' parenthetic comment \(with a matching close paren inside)
  `[' meta-note \(with a matching close ] inside)
- `\"' a quote
+ `\"' a quotation
  `=' value settings
  `~' \"more or less\"
+ `^' see above
 
-... just for example.  (`#' typically has a special meaning to the
-software, according to the value of `allout-numbered-bullet'.)
+ ... for example.  (`#' typically has a special meaning to the software,
+according to the value of `allout-numbered-bullet'.)
 
 See `allout-plain-bullets-string' for the selection of
 alternating bullets.
@@ -337,7 +363,6 @@ disables numbering maintenance."
 Set this var to the bullet you want to use for file cross-references."
   :type '(choice (const nil) string)
   :group 'allout)
-
 ;;;_  = allout-presentation-padding
 (defcustom allout-presentation-padding 2
   "*Presentation-format white-space padding factor, for greater indent."
@@ -381,7 +406,7 @@ numbers are always used."
   :type 'string
   :group 'allout)
 ;;;_  - allout-title
-(defcustom allout-title '(or buffer-file-name (current-buffer-name))
+(defcustom allout-title '(or buffer-file-name (buffer-name))
   "*Expression to be evaluated to determine the title for LaTeX
 formatted copy."
   :type 'sexp
@@ -397,6 +422,94 @@ formatted copy."
   :type 'string
   :group 'allout)
 
+;;;_ + Topic encryption
+;;;_  = allout-topic-encryption-bullet
+(defcustom allout-topic-encryption-bullet "~"
+  "*Bullet signifying encryption of the entry's body."
+  :type '(choice (const nil) string)
+  :group 'allout)
+;;;_  = allout-default-encryption-scheme
+(defcustom allout-default-encryption-scheme 'mc-scheme-gpg
+  "*Default allout outline topic encryption mode.
+
+See mailcrypt variable `mc-schemes' and mailcrypt docs for encryption schemes."
+  :type 'symbol
+  :group 'allout)
+;;;_  = allout-key-verifier-handling
+(defcustom allout-key-verifier-handling 'situate
+  "*Dictate outline encryption key verifier handling.
+
+The key verifier is string associated with a file that is encrypted with
+the file's current symmetric encryption key.  It is used, if present, to
+confirm that the key entered by the user is the same as the established
+one, or explicitly presenting the user with the choice to go with a
+new key when a difference is encountered.
+
+The range of values are:
+
+ situate - include key verifier string as text in the file's local-vars
+           section
+ transient - establish the value as a variable in the file's buffer, but
+             don't preserve it as a file variable.
+ disabled - don't establish or do verification.
+
+See the docstring for the `allout-enable-file-variable-adjustment'
+variable for details about allout ajustment of file variables."
+  :type '(choice (const situate)
+                 (const transient)
+                 (const disabled))
+  :group 'allout)
+(make-variable-buffer-local 'allout-key-verifier-handling)
+;;;_  = allout-key-hint-handling
+(defcustom allout-key-hint-handling 'always
+  "*Dictate outline encryption key reminder handling:
+
+ always - always show reminder when prompting
+ needed - show reminder on key entry failure
+ manage - never present reminder, but still manage a file-var entry for it
+ disabled - don't even manage the file variable entry
+
+See the docstring for the `allout-enable-file-variable-adjustment'
+variable for details about allout ajustment of file variables."
+  :type '(choice (const always)
+                 (const needed)
+                 (const manage)
+                 (const disabled))
+  :group 'allout)
+(make-variable-buffer-local 'allout-key-hint-handling)
+;;;_  = allout-encrypt-unencrypted-on-saves
+(defcustom allout-encrypt-unencrypted-on-saves 'except-current
+  "*When saving, should topics pending encryption be encrypted?
+
+The idea is to prevent file-system exposure of any un-encrypted stuff, and
+mostly covers both deliberate file writes and auto-saves.
+
+ - Yes: encrypt all topics pending encryption, even if it's the one
+        currently being edited.  \(In that case, the currently edited topic
+        will be automatically decrypted before any user interaction, so they
+        can continue editing but the copy on the file system will be
+        encrypted.)
+        Auto-saves will use the \"All except current topic\" mode if this
+        one is selected, to avoid practical difficulties - see below.
+ - All except current topic: skip the topic currently being edited, even if
+       it's pending encryption.  This may expose the current topic on the
+       file sytem, but avoids the nuisance of prompts for the encryption
+       key in the middle of editing for, eg, autosaves.
+       This mode is used for auto-saves for both this option and \"Yes\".
+ - No: leave it to the user to encrypt any unencrypted topics.
+
+For practical reasons, auto-saves always use the 'except-current policy
+when auto-encryption is enabled.  \(Otherwise, spurious key prompts and
+unavoidable timing collisions are too disruptive.)  If security for a file
+requires that even the current topic is never auto-saved in the clear,
+disable auto-saves for that file."
+
+  :type '(choice (const :tag "Yes" t)
+                 (const :tag "All except current topic" except-current)
+                 (const :tag "No" nil))
+  :group 'allout)
+(make-variable-buffer-local 'allout-encrypt-unencrypted-on-saves)
+
 ;;;_ + Miscellaneous customization
 
 ;;;_  = allout-command-prefix
@@ -422,13 +535,15 @@ unless optional third, non-nil element is present.")
         ("\C-f" allout-forward-current-level)
         ("\C-b" allout-backward-current-level)
         ("\C-a" allout-beginning-of-current-entry)
-        ("\C-e" allout-end-of-current-entry)
+        ("\C-e" allout-end-of-entry)
                                         ; Exposure commands:
         ("\C-i" allout-show-children)
         ("\C-s" allout-show-current-subtree)
         ("\C-h" allout-hide-current-subtree)
+        ("h" allout-hide-current-subtree)
         ("\C-o" allout-show-current-entry)
         ("!" allout-show-all)
+        ("x" allout-toggle-current-subtree-encryption)
                                         ; Alteration commands:
         (" " allout-open-sibtopic)
         ("." allout-open-subtopic)
@@ -489,19 +604,22 @@ those that do not have the variable `comment-start' set.  A value of
 
 (make-variable-buffer-local 'allout-reindent-bodies)
 
-;;;_  = allout-inhibit-protection
-(defcustom allout-inhibit-protection nil
-  "*Non-nil disables warnings and confirmation-checks for concealed-text edits.
+;;;_  = allout-enable-file-variable-adjustment
+(defcustom allout-enable-file-variable-adjustment t
+  "*If non-nil, some allout outline actions can edit Emacs file variables text.
+
+This can range from changes to existing entries, addition of new ones,
+and creation of a new local variables section when necessary.
 
-Outline mode uses Emacs change-triggered functions to detect unruly
-changes to concealed regions.  Set this var non-nil to disable the
-protection, potentially increasing text-entry responsiveness a bit.
+Emacs file variables adjustments are also inhibited if `enable-local-variables'
+is nil.
 
-This var takes effect at `allout-mode' activation, so you may have to
-deactivate and then reactivate the mode if you want to toggle the
-behavior."
+Operations potentially causing edits include allout encryption routines.
+See the docstring for `allout-toggle-current-subtree-encryption' for
+details."
   :type 'boolean
   :group 'allout)
+(make-variable-buffer-local 'allout-enable-file-variable-adjustment)
 
 ;;;_* CODE - no user customizations below.
 
@@ -728,7 +846,16 @@ See doc string for allout-keybindings-list for format of binding list."
                               (car (cdr cell)))))))
             keymap-list)
     map))
-
+;;;_   = allout-prior-bindings - being deprecated.
+(defvar allout-prior-bindings nil
+  "Variable for use in V18, with allout-added-bindings, for
+resurrecting, on mode deactivation, bindings that existed before
+activation.  Being deprecated.")
+;;;_   = allout-added-bindings - being deprecated
+(defvar allout-added-bindings nil
+  "Variable for use in V18, with allout-prior-bindings, for
+resurrecting, on mode deactivation, bindings that existed before
+activation.  Being deprecated.")
 ;;;_  : Menu bar
 (defvar allout-mode-exposure-menu)
 (defvar allout-mode-editing-menu)
@@ -759,7 +886,11 @@ See doc string for allout-keybindings-list for format of binding list."
                       ["Shift Topic Out" allout-shift-out t]
                       ["Rebullet Topic" allout-rebullet-topic t]
                       ["Rebullet Heading" allout-rebullet-current-heading t]
-                      ["Number Siblings" allout-number-siblings t]))
+                      ["Number Siblings" allout-number-siblings t]
+                      "----"
+                      ["Toggle Topic Encryption"
+                       allout-toggle-current-subtree-encryption
+                       (> (allout-current-depth) 1)]))
   (easy-menu-define allout-mode-navigation-menu
                     allout-mode-map
                     "Allout outline navigation menu."
@@ -775,7 +906,7 @@ See doc string for allout-keybindings-list for format of binding list."
                       "----"
                       ["Beginning of Entry"
                        allout-beginning-of-current-entry t]
-                      ["End of Entry" allout-end-of-current-entry t]
+                      ["End of Entry" allout-end-of-entry t]
                       ["End of Subtree" allout-end-of-current-subtree t]))
   (easy-menu-define allout-mode-misc-menu
                     allout-mode-map
@@ -855,13 +986,6 @@ from the list."
           (setq allout-mode-prior-settings rebuild)))))
   )
 ;;;_  : Mode-specific incidentals
-;;;_   = allout-during-write-cue nil
-(defvar allout-during-write-cue nil
-  "Used to inhibit outline change-protection during file write.
-
-See also `allout-post-command-business', `allout-write-file-hook',
-`allout-before-change-protect', and `allout-post-command-business'
-functions.")
 ;;;_   = allout-pre-was-isearching nil
 (defvar allout-pre-was-isearching nil
   "Cue for isearch-dynamic-exposure mechanism, implemented in
@@ -869,22 +993,28 @@ 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'.")
+  "Cue for isearch-dynamic-exposure tracking, used by
+`allout-isearch-expose'.")
 (make-variable-buffer-local 'allout-isearch-prior-pos)
-;;;_   = allout-override-protect nil
-(defvar allout-override-protect nil
-  "Used in `allout-mode' for regulate of concealed-text protection mechanism.
-
-Allout outline mode regulates alteration of concealed text to protect
-against inadvertent, unnoticed changes.  This is for use by specific,
-native outline functions to temporarily override that protection.
-It's automatically reset to nil after every buffer modification.")
-(make-variable-buffer-local 'allout-override-protect)
+;;;_   = 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 (expression)
-  "Evaluate EXPRESSION with `allout-override-protect' let-bound to t."
-  `(let ((allout-override-protect t))
-     ,expression))
+(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.
@@ -897,14 +1027,109 @@ the way that `before-change-functions' and undo interact.")
   "Horrible hack used to prevent invalid multiple triggering of outline
 mode from prop-line file-var activation.  Used by `allout-mode' function
 to track repeats.")
-;;;_   > allout-write-file-hook ()
-(defun allout-write-file-hook ()
-  "In `allout-mode', run as a `write-contents-functions' activity.
-
-Currently just sets `allout-during-write-cue', so outline change-protection
-knows to keep inactive during file write."
-  (setq allout-during-write-cue t)
-  nil)
+;;;_   = allout-file-key-verifier-string
+(defvar allout-file-key-verifier-string nil
+  "Name for use as a file variable for verifying encryption key across
+sessions.")
+(make-variable-buffer-local 'allout-file-key-verifier-string)
+;;;_   = allout-encryption-scheme
+(defvar allout-encryption-scheme nil
+  "*Allout outline topic encryption scheme pending for the current buffer.
+
+Intended as a file-specific (buffer local) setting, it defaults to the
+value of allout-default-encryption-scheme if nil.")
+(make-variable-buffer-local 'allout-encryption-scheme)
+;;;_   = allout-key-verifier-string
+(defvar allout-key-verifier-string nil
+  "Setting used to test solicited encryption keys against that already
+associated with a file.
+
+It consists of an encrypted random string useful only to verify that a key
+entered by the user is effective for decryption.  The key itself is \*not*
+recorded in the file anywhere, and the encrypted contents are random binary
+characters to avoid exposing greater susceptibility to search attacks.
+
+The verifier string is retained as an Emacs file variable, as well as in
+the emacs buffer state, if file variable adjustments are enabled.  See
+`allout-enable-file-variable-adjustment' for details about that.")
+(make-variable-buffer-local 'allout-key-verifier-string)
+(setq-default allout-key-verifier-string nil)
+;;;_   = allout-key-hint-string
+(defvar allout-key-hint-string ""
+  "Variable used to retain a reminder string for a file's encryption key.
+
+See the description of `allout-key-hint-handling' for details about how
+the reminder is deployed.
+
+The hint is retained as an Emacs file variable, as well as in the emacs buffer
+state, if file variable adjustments are enabled.  See
+`allout-enable-file-variable-adjustment' for details about that.")
+(make-variable-buffer-local 'allout-key-hint-string)
+(setq-default allout-key-hint-string "")
+;;;_   = allout-after-save-decrypt
+(defvar allout-after-save-decrypt nil
+  "Internal variable, is nil or has the value of two points:
+
+ - the location of a topic to be decrypted after saving is done
+ - where to situate the cursor after the decryption is performed
+
+This is used to decrypt the topic that was currently being edited, if it
+was encrypted automatically as part of a file write or autosave.")
+(make-variable-buffer-local 'allout-after-save-decrypt)
+;;;_   > allout-write-file-hook-handler ()
+(defun allout-write-file-hook-handler ()
+  "Implement `allout-encrypt-unencrypted-on-saves' policy for file writes."
+
+  (if (or (not (boundp 'allout-encrypt-unencrypted-on-saves))
+          (not allout-encrypt-unencrypted-on-saves))
+      nil
+    (let ((except-mark (and (equal allout-encrypt-unencrypted-on-saves
+                                   'except-current)
+                            (point-marker))))
+      (if (save-excursion (goto-char (point-min))
+                          (allout-next-topic-pending-encryption except-mark))
+          (progn
+            (message "auto-encrypting pending topics")
+            (sit-for 2)
+            (condition-case failure
+                (setq allout-after-save-decrypt
+                      (allout-encrypt-decrypted except-mark))
+              (error (progn
+                       (message
+                        "allout-write-file-hook-handler suppressing error %s"
+                        failure)
+                       (sit-for 2))))))
+      ))
+    nil)
+;;;_   > allout-auto-save-hook-handler ()
+(defun allout-auto-save-hook-handler ()
+  "Implement `allout-encrypt-unencrypted-on-saves' policy for auto saves."
+
+  (if  allout-encrypt-unencrypted-on-saves
+      ;; Always implement 'except-current policy when enabled.
+      (let ((allout-encrypt-unencrypted-on-saves 'except-current))
+        (allout-write-file-hook-handler))))
+;;;_   > allout-after-saves-handler ()
+(defun allout-after-saves-handler ()
+  "Decrypt topic encrypted for save, if it's currently being edited.
+
+Ie, if it was pending encryption and contained the point in its body before
+the save.
+
+We use values stored in `allout-after-save-decrypt' to locate the topic
+and the place for the cursor after the decryption is done."
+  (if (not (and (allout-mode-p)
+                (boundp 'allout-after-save-decrypt)
+                allout-after-save-decrypt))
+      t
+    (goto-char (car allout-after-save-decrypt))
+    (let ((was-modified (buffer-modified-p)))
+      (allout-toggle-current-subtree-encryption)
+      (if (not was-modified)
+          (set-buffer-modified-p nil)))
+    (goto-char (cadr allout-after-save-decrypt))
+    (setq allout-after-save-decrypt nil))
+  )
 
 ;;;_ #2 Mode activation
 ;;;_  = allout-mode
@@ -916,11 +1141,10 @@ knows to keep inactive during file write."
   'allout-mode)
 ;;;_  = allout-explicitly-deactivated
 (defvar allout-explicitly-deactivated nil
-  "Non-nil if `allout-mode' was last deliberately deactivated.
+  "If t, `allout-mode's last deactivation was deliberate.
 So `allout-post-command-business' should not reactivate it...")
 (make-variable-buffer-local 'allout-explicitly-deactivated)
 ;;;_  > allout-init (&optional mode)
-;;;###autoload
 (defun allout-init (&optional mode)
   "Prime `allout-mode' to enable/disable auto-activation, wrt `allout-layout'.
 
@@ -939,9 +1163,9 @@ of allout outline mode, contingent to the buffer-specific setting of
 the `allout-layout' variable.  (See `allout-layout' and
 `allout-expose-topic' docstrings for more details on auto layout).
 
-`allout-init' works by setting up (or removing)
-`allout-find-file-hook' in `find-file-hook', and giving
-`allout-auto-activation' a suitable setting.
+`allout-init' works by setting up (or removing) the `allout-mode'
+find-file-hook, and giving `allout-auto-activation' a suitable
+setting.
 
 To prime your Emacs session for full auto-outline operation, include
 the following two lines in your Emacs init file:
@@ -949,32 +1173,35 @@ the following two lines in your Emacs init file:
 \(require 'allout)
 \(allout-init t)"
 
-  (interactive
-   (let ((m (completing-read
-             (concat "Select outline auto setup mode "
-                     "(empty for report, ? for options) ")
-             '(("nil")("full")("activate")("deactivate")
-               ("ask") ("report") (""))
-             nil
-             t)))
-     (if (string= m "") 'report
-       (intern-soft m))))
+  (interactive)
+  (if (interactive-p)
+      (progn
+        (setq mode
+              (completing-read
+               (concat "Select outline auto setup mode "
+                       "(empty for report, ? for options) ")
+               '(("nil")("full")("activate")("deactivate")
+                 ("ask") ("report") (""))
+               nil
+               t))
+        (if (string= mode "")
+            (setq mode 'report)
+          (setq mode (intern-soft mode)))))
   (let
       ;; convenience aliases, for consistent ref to respective vars:
       ((hook 'allout-find-file-hook)
        (curr-mode 'allout-auto-activation))
 
     (cond ((not mode)
-           (setq find-file-hook (delq hook find-file-hook))
+           (setq find-file-hooks (delq hook find-file-hooks))
            (if (interactive-p)
                (message "Allout outline mode auto-activation inhibited.")))
           ((eq mode 'report)
-           (if (memq hook find-file-hook)
-               ;; Just punt and use the reports from each of the modes:
-               (allout-init (symbol-value curr-mode))
-             (allout-init nil)
-             (message "Allout outline mode auto-activation inhibited.")))
-          (t (add-hook 'find-file-hook hook)
+           (if (not (memq hook find-file-hooks))
+               (allout-init nil)
+             ;; Just punt and use the reports from each of the modes:
+             (allout-init (symbol-value curr-mode))))
+          (t (add-hook 'find-file-hooks hook)
              (set curr-mode             ; `set', not `setq'!
                   (cond ((eq mode 'activate)
                          (message
@@ -1022,10 +1249,11 @@ outline.)
 
 In addition to outline navigation and exposure, allout includes:
 
- - topic-oriented repositioning, cut, and paste
+ - topic-oriented repositioning, promotion/demotion, cut, and paste
  - integral outline exposure-layout
  - incremental search with dynamic exposure and reconcealment of hidden text
  - automatic topic-number maintenance
+ - easy topic encryption and decryption
  - \"Hot-spot\" operation, for single-keystroke maneuvering and
     exposure control.  \(See the allout-mode docstring.)
 
@@ -1035,7 +1263,7 @@ Below is a description of the bindings, and then explanation of
 special `allout-mode' features and terminology.  See also the outline
 menubar additions for quick reference to many of the features, and see
 the docstring of the function `allout-init' for instructions on
-priming your Emacs session for automatic activation of `allout-mode'.
+priming your emacs session for automatic activation of `allout-mode'.
 
 
 The bindings are dictated by the `allout-keybindings-list' and
@@ -1048,7 +1276,7 @@ C-c C-p allout-previous-visible-heading | C-c C-i allout-show-children
 C-c C-u allout-up-current-level         | C-c C-s allout-show-current-subtree
 C-c C-f allout-forward-current-level    | C-c C-o allout-show-current-entry
 C-c C-b allout-backward-current-level   | ^U C-c C-s allout-show-all
-C-c C-e allout-end-of-current-entry     |          allout-hide-current-leaves
+C-c C-e allout-end-of-entry             |          allout-hide-current-leaves
 C-c C-a allout-beginning-of-current-entry, alternately, goes to hot-spot
 
         Topic Header Production:
@@ -1064,7 +1292,7 @@ C-c <	allout-shift-out	... less deep.
 C-c<CR> allout-rebullet-topic   Reconcile bullets of topic and its offspring
                                 - distinctive bullets are not changed, others
                                   alternated according to nesting depth.
-C-c *   allout-rebullet-current-heading Prompt for alternate bullet for
+C-c b   allout-rebullet-current-heading Prompt for alternate bullet for
                                          current topic.
 C-c #   allout-number-siblings  Number bullets of topic and siblings - the
                                 offspring are not affected.  With repeat
@@ -1087,8 +1315,8 @@ M-x outlineify-sticky		Activate outline mode for current buffer,
 C-c C-SPC allout-mark-topic
 C-c = c allout-copy-exposed-to-buffer
                                 Duplicate outline, sans concealed text, to
-                                buffer with name derived from derived from
-                                that of current buffer - \"*XXX exposed*\".
+                                buffer with name derived from derived from that
+                                of current buffer - \"*BUFFERNAME exposed*\".
 C-c = p allout-flatten-exposed-to-buffer
                                 Like above 'copy-exposed', but convert topic
                                 prefixes to section.subsection... numeric
@@ -1096,6 +1324,19 @@ C-c = p	allout-flatten-exposed-to-buffer
 ESC ESC (allout-init t) Setup Emacs session for outline mode
                                 auto-activation.
 
+                  Encrypted Entries
+
+Outline mode supports easily togglable gpg encryption of topics, with
+niceities like support for symmetric and key-pair modes, key timeout, key
+consistency checking, user-provided hinting for symmetric key mode, and
+auto-encryption of topics pending encryption on save.  The aim is to enable
+reliable topic privacy while preventing accidents like neglected
+encryption, encryption with a mistaken key, forgetting which key was used,
+and other practical pitfalls.
+
+See the `allout-toggle-current-subtree-encryption' function and
+`allout-encrypt-unencrypted-on-saves' customization variable for details.
+
                  HOT-SPOT Operation
 
 Hot-spot operation provides a means for easy, single-keystroke outline
@@ -1148,11 +1389,11 @@ Topic text constituents:
 
 HEADER: The first line of a topic, include the topic PREFIX and header
         text.
-PREFIX: The leading text of a topic which distinguishes it from
-        normal text.  It has a strict form, which consists of a
-        prefix-lead string, padding, and a bullet.  The bullet may be
-        followed by a number, indicating the ordinal number of the
-        topic among its siblings, a space, and then the header text.
+PREFIX: The leading text of a topic which distinguishes it from normal
+        text.  It has a strict form, which consists of a prefix-lead
+        string, padding, and a bullet.  The bullet may be followed by a
+        number, indicating the ordinal number of the topic among its
+        siblings, a space, and then the header text.
 
         The relative length of the PREFIX determines the nesting depth
         of the topic.
@@ -1223,7 +1464,7 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
      ;; off on second invocation, so we detect it as best we can, and
      ;; skip everything.
      ((and same-complex-command         ; Still in same complex command
-                                        ; as last time `allout-mode' invoked.
+                                        ; as last time `allout-mode' invoked.
           active                        ; Already activated.
           (not explicit-activation)     ; Prop-line file-vars don't have args.
           (string-match "^19.1[89]"     ; Bug only known to be in v19.18 and
@@ -1238,6 +1479,19 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
                                        ; active state or *de*activation
                                        ; specifically requested:
       (setq allout-explicitly-deactivated t)
+      (if (string-match "^18\." emacs-version)
+                                       ; Revoke those keys that remain
+                                       ; as we set them:
+          (let ((curr-loc (current-local-map)))
+           (mapcar (function
+                    (lambda (cell)
+                      (if (eq (lookup-key curr-loc (car cell))
+                              (car (cdr cell)))
+                          (define-key curr-loc (car cell)
+                            (assq (car cell) allout-prior-bindings)))))
+                   allout-added-bindings)
+           (allout-resumptions 'allout-added-bindings)
+           (allout-resumptions 'allout-prior-bindings)))
 
       (if allout-old-style-prefixes
           (progn
@@ -1246,9 +1500,12 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
       (allout-resumptions 'selective-display)
       (if (and (boundp 'before-change-functions) before-change-functions)
           (allout-resumptions 'before-change-functions))
-      (setq write-contents-functions
-            (delq 'allout-write-file-hook
-                  write-contents-functions))
+      (setq local-write-file-hooks
+           (delq 'allout-write-file-hook-handler
+                 local-write-file-hooks))
+      (setq auto-save-hook
+           (delq 'allout-auto-save-hook-handler
+                 auto-save-hook))
       (allout-resumptions 'paragraph-start)
       (allout-resumptions 'paragraph-separate)
       (allout-resumptions (if (string-match "^18" emacs-version)
@@ -1288,25 +1545,27 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
                      (cons '(allout-mode . allout-mode-map)
                            minor-mode-map-alist))))
 
+                                       ; V18 minor-mode key bindings:
+                                       ; Stash record of added bindings
+                                       ; for later revocation:
+        (allout-resumptions 'allout-added-bindings
+                            (list allout-keybindings-list))
+        (allout-resumptions 'allout-prior-bindings
+                            (list (current-local-map)))
                                        ; and add them:
         (use-local-map (produce-allout-mode-map allout-keybindings-list
                                                 (current-local-map)))
         )
 
                                        ; selective-display is the
-                                       ; Emacs conditional exposure
+                                       ; emacs conditional exposure
                                        ; mechanism:
       (allout-resumptions 'selective-display '(t))
-      (if allout-inhibit-protection
-          t
-        (allout-resumptions 'before-change-functions
-                            '(allout-before-change-protect)))
       (add-hook 'pre-command-hook 'allout-pre-command-business)
       (add-hook 'post-command-hook 'allout-post-command-business)
-                                       ; Temporarily set by any outline
-                                       ; functions that can be trusted to
-                                       ; deal properly with concealed text.
-      (add-hook 'write-contents-functions 'allout-write-file-hook)
+      (add-hook 'local-write-file-hooks 'allout-write-file-hook-handler)
+      (make-variable-buffer-local 'auto-save-hook)
+      (add-hook 'auto-save-hook 'allout-auto-save-hook-handler)
                                        ; Custom auto-fill func, to support
                                        ; respect for topic headline,
                                        ; hanging-indents, etc:
@@ -1337,7 +1596,8 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
       (if allout-layout
           (setq do-layout t))
 
-      (if allout-isearch-dynamic-expose
+      (if (and allout-isearch-dynamic-expose
+               (not (fboundp 'allout-real-isearch-abort)))
           (allout-enwrap-isearch))
 
       (run-hooks 'allout-mode-hook)
@@ -1376,7 +1636,6 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
     )                                   ; let*
   )                                     ; defun
 ;;;_  > allout-minor-mode
-;;; XXX released verion doesn't do this?
 (defalias 'allout-minor-mode 'allout-mode)
 
 ;;;_ #3 Internal Position State-Tracking - "allout-recent-*" funcs
@@ -1400,12 +1659,12 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
   "Buffer point last returned by `allout-end-of-current-subtree'.")
 (make-variable-buffer-local 'allout-recent-end-of-subtree)
 ;;;_  > allout-prefix-data (beg end)
-(defmacro allout-prefix-data (beginning end)
+(defmacro allout-prefix-data (beg end)
   "Register allout-prefix state data - BEGINNING and END of prefix.
 
 For reference by `allout-recent' funcs.  Returns BEGINNING."
   `(setq allout-recent-prefix-end ,end
-         allout-recent-prefix-beginning ,beginning))
+         allout-recent-prefix-beginning ,beg))
 ;;;_  > allout-recent-depth ()
 (defmacro allout-recent-depth ()
   "Return depth of last heading encountered by an outline maneuvering function.
@@ -1612,9 +1871,12 @@ Return the location of the beginning of the heading, or nil if not found."
   "Produce a location \"chart\" of subtopics of the containing topic.
 
 Optional argument LEVELS specifies the depth \(relative to start
-depth) for the chart.
+depth) for the chart.  Subsequent optional args are not for public
+use.
+
+Point is left at the end of the subtree.
 
-Charts are used to capture outline structure, so that outline altering
+Charts are used to capture outline structure, so that outline-altering
 routines need assess the structure only once, and then use the chart
 for their elaborate manipulations.
 
@@ -1625,11 +1887,9 @@ list containing, recursively, the charts for the respective subtopics.
 The chart for a topics' offspring precedes the entry for the topic
 itself.
 
-\(fn &optional LEVELS)"
-
-  ;; The other function parameters are for internal recursion, and should
-  ;; not be specified by external callers.  ORIG-DEPTH is depth of topic at
-  ;; starting point, and PREV-DEPTH is depth of prior topic."
+The other function parameters are for internal recursion, and should
+not be specified by external callers.  ORIG-DEPTH is depth of topic at
+starting point, and PREV-DEPTH is depth of prior topic."
 
   (let ((original (not orig-depth))     ; `orig-depth' set only in recursion.
         chart curr-depth)
@@ -1835,11 +2095,18 @@ 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-current-subtree ()
-(defun allout-end-of-current-subtree ()
-  "Put point at the end of the last leaf in the currently visible topic."
-  (interactive)
-  (allout-back-to-current-heading)
+;;;_   > allout-end-of-subtree (&optional current)
+(defun allout-end-of-subtree (&optional current)
+  "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.
+
+Returns the value of point."
+  (interactive "P")
+  (if current
+      (allout-back-to-current-heading)
+    (allout-goto-prefix))
   (let ((level (allout-recent-depth)))
     (allout-next-heading)
     (while (and (not (eobp))
@@ -1851,9 +2118,16 @@ Returns that character position."
                '(?\n ?\r))
          (forward-char -1))
     (setq allout-recent-end-of-subtree (point))))
+;;;_   > allout-end-of-current-subtree ()
+(defun allout-end-of-current-subtree ()
+  "Put point at end of last leaf in currently visible containing topic.
+
+Returns the value of point."
+  (interactive)
+  (allout-end-of-subtree t))
 ;;;_   > allout-beginning-of-current-entry ()
 (defun allout-beginning-of-current-entry ()
-  "When not already there, position point at beginning of current topic's body.
+  "When not already there, position point at beginning of current topic header.
 
 If already there, move cursor to bullet for hot-spot operation.
 \(See `allout-mode' doc string for details on hot-spot operation.)"
@@ -1863,11 +2137,10 @@ 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-current-entry ()
-(defun allout-end-of-current-entry ()
+;;;_   > allout-end-of-entry ()
+(defun allout-end-of-entry ()
   "Position the point at the end of the current topics' entry."
   (interactive)
-  (allout-show-entry)
   (prog1 (allout-pre-next-preface)
     (if (and (not (bobp))(looking-at "^$"))
         (forward-char -1))))
@@ -1875,9 +2148,27 @@ If already there, move cursor to bullet for hot-spot operation.
 (defun allout-end-of-current-heading ()
   (interactive)
   (allout-beginning-of-current-entry)
-  (forward-line -1)
-  (end-of-line))
+  (re-search-forward "[\n\r]" nil t)
+  (forward-char -1))
 (defalias 'allout-end-of-heading 'allout-end-of-current-heading)
+;;;_   > allout-get-body-text ()
+(defun allout-get-body-text ()
+  "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))
+        nil
+      (backward-char 1)
+      (let ((pre-body (point)))
+        (if (not pre-body)
+            nil
+          (allout-end-of-entry)
+          (if (not (= pre-body (point)))
+              (buffer-substring-no-properties (1+ pre-body) (point))))
+        )
+      )
+    )
+  )
 
 ;;;_  - Depth-wise
 ;;;_   > allout-ascend-to-depth (depth)
@@ -1892,12 +2183,16 @@ If already there, move cursor to bullet for hot-spot operation.
         (if (= (allout-recent-depth) depth)
             (progn (goto-char allout-recent-prefix-beginning)
                    depth)
-          (goto-char last-good)))))
+          (goto-char last-good)
+          nil))
+    (if (interactive-p) (allout-end-of-prefix))))
 ;;;_   > allout-ascend ()
 (defun allout-ascend ()
   "Ascend one level, returning t if successful, nil if not."
-  (if (allout-beginning-of-level)
-      (allout-previous-heading)))
+  (prog1
+      (if (allout-beginning-of-level)
+          (allout-previous-heading))
+    (if (interactive-p) (allout-end-of-prefix))))
 ;;;_   > allout-descend-to-depth (depth)
 (defun allout-descend-to-depth (depth)
   "Descend to depth DEPTH within current topic.
@@ -1917,13 +2212,13 @@ Returning depth if successful, nil if not."
       nil))
   )
 ;;;_   > allout-up-current-level (arg &optional dont-complain)
-(defun allout-up-current-level (arg &optional dont-complain interactive)
+(defun allout-up-current-level (arg &optional dont-complain)
   "Move out ARG levels from current visible topic.
 
 Positions on heading line of containing topic.  Error if unable to
 ascend that far, or nil if unable to ascend but optional arg
 DONT-COMPLAIN is non-nil."
-  (interactive "p\np")
+  (interactive "p")
   (allout-back-to-current-heading)
   (let ((present-level (allout-recent-depth))
         (last-good (point))
@@ -1944,12 +2239,12 @@ DONT-COMPLAIN is non-nil."
     (if (or failed
             (> arg 0))
         (progn (goto-char last-good)
-               (if interactive (allout-end-of-prefix))
+               (if (interactive-p) (allout-end-of-prefix))
                (if (not dont-complain)
                    (error "Can't ascend past outermost level")
-                 (if interactive (allout-end-of-prefix))
+                 (if (interactive-p) (allout-end-of-prefix))
                  nil))
-      (if interactive (allout-end-of-prefix))
+      (if (interactive-p) (allout-end-of-prefix))
       allout-recent-prefix-beginning)))
 
 ;;;_  - Linear
@@ -1981,7 +2276,7 @@ Return depth if successful, nil otherwise."
         nil))))
 ;;;_   > allout-previous-sibling (&optional depth backward)
 (defun allout-previous-sibling (&optional depth backward)
-  "Like `allout-forward-current-level', but backwards & respect invisible topics.
+  "Like `allout-forward-current-level' backwards, respecting invisible topics.
 
 Optional DEPTH specifies depth to traverse, default current depth.
 
@@ -2015,7 +2310,7 @@ Presumes point is at the start of a topic prefix."
   (let ((depth (allout-depth)))
     (while (allout-previous-sibling depth nil))
     (prog1 (allout-recent-depth)
-      (allout-end-of-prefix))))
+      (if (interactive-p) (allout-end-of-prefix)))))
 ;;;_   > allout-next-visible-heading (arg)
 (defun allout-next-visible-heading (arg)
   "Move to the next ARG'th visible heading line, backward if arg is negative.
@@ -2053,13 +2348,13 @@ matches)."
   (interactive "p")
   (allout-next-visible-heading (- arg)))
 ;;;_   > allout-forward-current-level (arg)
-(defun allout-forward-current-level (arg &optional interactive)
+(defun allout-forward-current-level (arg)
   "Position point at the next heading of the same level.
 
 Takes optional repeat-count, goes backward if count is negative.
 
 Returns resulting position, else nil if none found."
-  (interactive "p\np")
+  (interactive "p")
   (let ((start-depth (allout-current-depth))
         (start-point (point))
         (start-arg arg)
@@ -2087,7 +2382,7 @@ Returns resulting position, else nil if none found."
                   (= (allout-recent-depth) start-depth)))
         allout-recent-prefix-beginning
       (goto-char last-good)
-      (if (not interactive)
+      (if (not (interactive-p))
           nil
         (allout-end-of-prefix)
         (error "Hit %s level %d topic, traversed %d of %d requested"
@@ -2096,10 +2391,10 @@ Returns resulting position, else nil if none found."
                (- (abs start-arg) arg)
                (abs start-arg))))))
 ;;;_   > allout-backward-current-level (arg)
-(defun allout-backward-current-level (arg &optional interactive)
+(defun allout-backward-current-level (arg)
   "Inverse of `allout-forward-current-level'."
-  (interactive "p\np")
-  (if interactive
+  (interactive "p")
+  (if (interactive-p)
       (let ((current-prefix-arg (* -1 arg)))
         (call-interactively 'allout-forward-current-level))
     (allout-forward-current-level (* -1 arg))))
@@ -2107,121 +2402,6 @@ Returns resulting position, else nil if none found."
 ;;;_ #5 Alteration
 
 ;;;_  - Fundamental
-;;;_   > allout-before-change-protect (beg end)
-(defun allout-before-change-protect (beg end)
-  "Outline before-change hook, regulates changes to concealed text.
-
-Reveal concealed text that would be changed by current command, and
-offer user choice to commit or forego the change.  Unchanged text is
-reconcealed.  User has option to have changed text reconcealed.
-
-Undo commands are specially treated - the user is not prompted for
-choice, the undoes are always committed (based on presumption that the
-things being undone were already subject to this regulation routine),
-and undoes always leave the changed stuff exposed.
-
-Changes to concealed regions are ignored while file is being written.
-\(This is for the sake of functions that do change the file during
-writes, like crypt and zip modes.)
-
-Locally bound in outline buffers to `before-change-functions', which
-in Emacs 19 is run before any change to the buffer.
-
-Any functions which set [`this-command' to `undo', or which set]
-`allout-override-protect' non-nil (as does, eg, allout-flag-chars)
-are exempt from this restriction."
-  (if (and (allout-mode-p)
-                                        ; allout-override-protect
-                                        ; set by functions that know what
-                                        ; they're doing, eg outline internals:
-           (not allout-override-protect)
-           (not allout-during-write-cue)
-           (save-match-data             ; Preserve operation position state.
-                                        ; Both beginning and end chars must
-                                        ; be exposed:
-             (save-excursion (if (memq this-command '(newline open-line))
-                                 ;; Compensate for stupid Emacs {new,
-                                 ;; open-}line display optimization:
-                                 (setq beg (1+ beg)
-                                       end (1+ end)))
-                             (goto-char beg)
-                             (or (allout-hidden-p)
-                                 (and (not (= beg end))
-                                      (goto-char end)
-                                      (allout-hidden-p))))))
-      (save-match-data
-        (if (equal this-command 'undo)
-                 ;; Allow undo without inhibition.
-                 ;; - Undoing new and open-line hits stupid Emacs redisplay
-                 ;;   optimization (em 19 cmds.c, ~ line 200).
-                 ;; - Presumably, undoing what was properly protected when
-                 ;;   done.
-                 ;; - Undo may be users' only recourse in protection faults.
-                 ;; So, expose what getting changed:
-            (progn (message "Undo! - exposing concealed target...")
-                   (if (allout-hidden-p)
-                       (allout-show-children))
-                   (message "Undo!"))
-          (let (response
-                (rehide-completely (save-excursion (allout-goto-prefix)
-                                                   (allout-hidden-p)))
-                rehide-place)
-
-            (save-excursion
-              (if (condition-case err
-                      ;; Condition case to catch keyboard quits during reads.
-                      (progn
-                                        ; Give them a peek where
-                        (save-excursion
-                          (if (eolp) (setq rehide-place
-                                           (allout-goto-prefix)))
-                          (allout-show-entry))
-                                        ; Present the message, but...
-                                        ; leave the cursor at the location
-                                        ; until they respond:
-                                        ; Then interpret the response:
-                        (while
-                            (progn
-                              (message (concat "Change inside concealed"
-                                               " region - do it? "
-                                               "(n or 'y'/'r'eclose)"))
-                              (setq response (read-char))
-                              (not
-                               (cond ((memq response '(?r ?R))
-                                      (setq response 'reclose))
-                                     ((memq response '(?y ?Y ? ))
-                                      (setq response t))
-                                     ((memq response '(?n ?N 127))
-                                      (setq response nil)
-                                      t)
-                                     ((eq response ??)
-                                      (message
-                                       "`r' means `yes, then reclose'")
-                                      nil)
-                                     (t (message "Please answer y, n, or r")
-                                        (sit-for 1)
-                                        nil)))))
-                        response)
-                    ('quit nil))
-                                        ; Continue:
-                  (if (eq response 'reclose)
-                      (save-excursion
-                        (if rehide-place (goto-char rehide-place))
-                        (if rehide-completely
-                            (allout-hide-current-entry-completely)
-                          (allout-hide-current-entry)))
-                    (if (allout-ascend-to-depth (1- (allout-recent-depth)))
-                        (allout-show-children)
-                      (allout-show-to-offshoot)))
-                                        ; Prevent:
-                (if rehide-completely
-                    (save-excursion
-                      (if rehide-place (goto-char rehide-place))
-                      (allout-hide-current-entry-completely))
-                  (allout-hide-current-entry))
-                (error "Change within concealed region prevented"))))))
-    )   ; if
-  )     ; defun
 ;;;_   = allout-post-goto-bullet
 (defvar allout-post-goto-bullet nil
   "Outline internal var, for `allout-pre-command-business' hot-spot operation.
@@ -2236,24 +2416,20 @@ are mapped to the command of the corresponding control-key on the
 (defun allout-post-command-business ()
   "Outline `post-command-hook' function.
 
-- Null `allout-override-protect', so it's not left open.
-
 - Implement (and clear) `allout-post-goto-bullet', for hot-spot
   outline commands.
 
-- Massages `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.
+
+- 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."
 
                                         ; Apply any external change func:
   (if (not (allout-mode-p))             ; In allout-mode.
       nil
-    (setq allout-override-protect nil)
     (if allout-isearch-dynamic-expose
         (allout-isearch-rectification))
-    (if allout-during-write-cue
-        ;; Was used by allout-before-change-protect, done with it now:
-        (setq allout-during-write-cue nil))
     ;; Undo bunching business:
     (if (and (listp buffer-undo-list)   ; Undo history being kept.
              (equal this-command 'self-insert-command)
@@ -2282,6 +2458,11 @@ are mapped to the command of the corresponding control-key on the
               (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)
     (if (and allout-post-goto-bullet
              (allout-current-bullet-pos))
@@ -2304,8 +2485,9 @@ outline maneuvering operations by positioning the cursor on the bullet
 char.  When in this mode you can use regular cursor-positioning
 command/keystrokes to relocate the cursor off of a bullet character to
 return to regular interpretation of self-insert characters."
+
   (if (not (allout-mode-p))
-      ;; Shouldn't be invoked if not in allout allout-mode, but just in case:
+      ;; Shouldn't be invoked if not in allout-mode, but just in case:
       nil
     ;; Register isearch status:
     (if (and (boundp  'isearch-mode) isearch-mode)
@@ -2317,7 +2499,9 @@ return to regular interpretation of self-insert characters."
         (let* ((this-key-num (cond
                               ((numberp last-command-char)
                                last-command-char)
-                              ((fboundp 'char-to-int)
+                              ;; Only xemacs has characterp.
+                              ((and (fboundp 'characterp)
+                                    (characterp last-command-char))
                                (char-to-int last-command-char))
                               (t 0)))
                mapped-binding)
@@ -2340,7 +2524,7 @@ return to regular interpretation of self-insert characters."
                       this-command mapped-binding)))))))
 ;;;_   > allout-find-file-hook ()
 (defun allout-find-file-hook ()
-  "Activate `allout-mode' when `allout-auto-activation' & `allout-layout' are non-nil.
+  "Activate `allout-mode' when `allout-auto-activation', `allout-layout' non-nil.
 
 See `allout-init' for setup instructions."
   (if (and allout-auto-activation
@@ -2353,7 +2537,7 @@ See `allout-init' for setup instructions."
 
 Called as part of `allout-post-command-business'."
 
-  (let ((isearching isearch-mode))
+  (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)
@@ -2361,24 +2545,11 @@ Called as part of `allout-post-command-business'."
           ((and (not isearching) allout-pre-was-isearching)
            (allout-isearch-expose 'final))
           ;; Not and wasn't isearching:
-          (t (setq allout-isearch-prior-pos nil)))))
+          (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-flag-region (from to flag)
-(defmacro 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."
-  `(let ((buffer-read-only nil)
-           (allout-override-protect t))
-       (subst-char-in-region ,from ,to
-                             (if (= ,flag ?\n) ?\r ?\n)
-                             ,flag t)))
-
 ;;;_   > allout-isearch-expose (mode)
 (defun allout-isearch-expose (mode)
   "MODE is either 'clear, 'start, 'continue, or 'final."
@@ -2403,21 +2574,56 @@ Returns the endpoint of the region."
       (setq allout-isearch-prior-pos nil)
     (if (not (eq mode 'final))
         (setq allout-isearch-prior-pos (cons (point) (allout-show-entry)))
-      (if isearch-mode-end-hook-quit
+      (if allout-isearch-did-quit
           nil
         (setq allout-isearch-prior-pos nil)
-        (allout-show-children)))))
+        (allout-show-children))))
+  (setq allout-isearch-did-quit nil))
 ;;;_   > allout-enwrap-isearch ()
 (defun allout-enwrap-isearch ()
-  "Impose `isearch-abort' wrapper for dynamic exposure in 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))
+
+  (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-mode' while isearching - for use on `isearch-mode-hook'."
+  "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)))
@@ -2465,6 +2671,14 @@ Offer one suitable for current depth DEPTH as default."
                  (if prefix
                      (allout-get-prefix-bullet prefix)
                    (allout-get-bullet)))))
+;;;_   > allout-encrypted-type-prefix (&optional prefix)
+(defun allout-encrypted-type-prefix (&optional prefix)
+  "True if current header prefix bullet is for an encrypted entry \(body)."
+  (and allout-topic-encryption-bullet
+        (string= allout-topic-encryption-bullet
+                 (if prefix
+                     (allout-get-prefix-bullet prefix)
+                   (allout-get-bullet)))))
 ;;;_   > allout-bullet-for-depth (&optional depth)
 (defun allout-bullet-for-depth (&optional depth)
   "Return outline topic bullet suited to optional DEPTH, or current depth."
@@ -2625,15 +2839,15 @@ index for each successive sibling)."
                                    ((allout-sibling-index))))))
     )
   )
-;;;_   > allout-open-topic (relative-depth &optional before use-sib-bullet)
-(defun allout-open-topic (relative-depth &optional before use-sib-bullet)
-  "Open a new topic at depth RELATIVE-DEPTH.
+;;;_   > allout-open-topic (relative-depth &optional before use_recent_bullet)
+(defun allout-open-topic (relative-depth &optional before use_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.
 
-If USE-SIB-BULLET is true, use the bullet of the prior sibling.
+If USE_RECENT_BULLET is true, offer to use the bullet of the prior sibling.
 
 Nuances:
 
@@ -2660,9 +2874,11 @@ Nuances:
   (let* ((depth (+ (allout-current-depth) relative-depth))
          (opening-on-blank (if (looking-at "^\$")
                                (not (setq before nil))))
-         opening-numbered       ; Will get while computing ref-topic, below
-         ref-depth              ; Will get while computing ref-topic, below
-         ref-bullet             ; Will get while computing ref-topic, next
+         ;; bunch o vars set while computing ref-topic
+         opening-numbered
+         opening-encrypted
+         ref-depth
+         ref-bullet
          (ref-topic (save-excursion
                       (cond ((< relative-depth 0)
                              (allout-ascend-to-depth depth))
@@ -2680,6 +2896,13 @@ 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)
@@ -2718,19 +2941,24 @@ Nuances:
                             (if (not (bobp))
                                 (allout-previous-heading)))
             (if (and before (bobp))
-                (allout-unprotected (open-line 1))))
+                (allout-unprotected (allout-open-line-not-read-only))))
 
           (if (<= relative-depth 0)
               ;; Not going inwards, don't snug up:
               (if doing-beginning
-                  (allout-unprotected (open-line (if dbl-space 2 1)))
+                  (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 before
                     (progn (end-of-line)
                            (allout-pre-next-preface)
                            (while (= ?\r (following-char))
                              (forward-char 1))
                            (if (not (looking-at "^$"))
-                               (allout-unprotected (open-line 1))))
+                               (allout-unprotected
+                                (allout-open-line-not-read-only))))
                   (allout-end-of-current-subtree)))
             ;; Going inwards - double-space if first offspring is,
             ;; otherwise snug up.
@@ -2748,38 +2976,47 @@ Nuances:
                       (progn (forward-line -1)
                              (looking-at "^\\s-*$"))))
                 (progn (forward-line 1)
-                       (allout-unprotected (open-line 1))))
+                       (allout-unprotected
+                        (allout-open-line-not-read-only))
+                       (forward-line 1)))
             (end-of-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 (open-line 1))
+                         (allout-unprotected
+                          (allout-open-line-not-read-only))
                        (if (> depth ref-depth)
-                           (allout-unprotected (newline 1))
+                         (allout-unprotected
+                          (allout-open-line-not-read-only))
                          (if dbl-space
-                             (allout-unprotected (open-line 1))
+                             (allout-unprotected
+                              (allout-open-line-not-read-only))
                            (if (not before)
                                (allout-unprotected (newline 1))))))
                      (if dbl-space
-                         (allout-unprotected (newline  1)))
+                         (allout-unprotected (newline 1)))
                      (if (and (not (eobp))
                               (not (bolp)))
                          (forward-char 1))))
           ))
     (insert (concat (allout-make-topic-prefix opening-numbered
-                                               t
-                                               depth)
-                    " "))
+                                              t
+                                              depth)
+                           " "))
 
     ;;(if doing-beginning (save-excursion (newline (if dbl-space 2 1))))
 
 
-    (allout-rebullet-heading (and use-sib-bullet ref-bullet);;; solicit
+    (allout-rebullet-heading (and use_recent_bullet         ;;; solicit
+                                   ref-bullet)
                               depth                          ;;; depth
                               nil                            ;;; number-control
                               nil                            ;;; index
-                              t)     (end-of-line)
+                              t)
+    (end-of-line)
     )
   )
 ;;;_    . open-topic contingencies
@@ -2795,6 +3032,13 @@ Nuances:
 ;;;_     ; 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.
@@ -2802,7 +3046,7 @@ Nuances:
 Negative universal arg means to open deeper, but place the new topic
 prior to the current one."
   (interactive "p")
-  (allout-open-topic 1 (> 0 arg)))
+  (allout-open-topic 1 (> 0 arg) (< 1 arg)))
 ;;;_   > allout-open-sibtopic (arg)
 (defun allout-open-sibtopic (arg)
   "Open new topic header at same level as the current one.
@@ -2812,7 +3056,7 @@ Positive universal arg means to use the bullet of the prior sibling.
 Negative universal arg means to place the new topic prior to the current
 one."
   (interactive "p")
-  (allout-open-topic 0 (> 0 arg) (< 1 arg)))
+  (allout-open-topic 0 (> 0 arg) (not (= 1 arg))))
 ;;;_   > allout-open-supertopic (arg)
 (defun allout-open-supertopic (arg)
   "Open new topic header at shallower level than the current one.
@@ -2821,7 +3065,7 @@ Negative universal arg means to open shallower, but place the new
 topic prior to the current one."
 
   (interactive "p")
-  (allout-open-topic -1 (> 0 arg)))
+  (allout-open-topic -1 (> 0 arg) (< 1 arg)))
 
 ;;;_  - Outline Alteration
 ;;;_   : Topic Modification
@@ -2877,15 +3121,15 @@ Note that refill of indented paragraphs is not done."
                   (setq old-indent-begin (match-beginning 1)
                         old-indent-end (match-end 1))
                   (not (looking-at allout-regexp)))
-           (if (> 0 (setq excess (- (current-column)
-                                     old-margin)))
+           (if (> 0 (setq excess (- (- old-indent-end old-indent-begin)
+                                    old-margin)))
                ;; Text starts left of old margin - don't adjust:
                nil
              ;; Text was hanging at or right of old left margin -
              ;; reindent it, preserving its existing indentation
              ;; beyond the old margin:
              (delete-region old-indent-begin old-indent-end)
-             (indent-to (+ new-margin excess)))))))))
+             (indent-to (+ new-margin excess (current-column))))))))))
 ;;;_    > allout-rebullet-current-heading (arg)
 (defun allout-rebullet-current-heading (arg)
   "Solicit new bullet for current visible heading."
@@ -2922,28 +3166,30 @@ Note that refill of indented paragraphs is not done."
 
   "Adjust bullet of current topic prefix.
 
+All args are optional.
+
 If SOLICIT is non-nil, then the choice of bullet is solicited from
 user.  If it's a character, then that character is offered as the
 default, otherwise the one suited to the context \(according to
 distinction or depth) is offered.  If non-nil, then the
 context-specific bullet is just used.
 
-Second arg NEW-DEPTH forces the topic prefix to that depth, regardless
+Second arg DEPTH forces the topic prefix to that depth, regardless
 of the topic's current depth.
 
 Third arg NUMBER-CONTROL can force the prefix to or away from
 numbered form.  It has effect only if `allout-numbered-bullet' is
 non-nil and soliciting was not explicitly invoked (via first arg).
 Its effect, numbering or denumbering, then depends on the setting
-of the fourth arg, INDEX.
+of the forth arg, INDEX.
 
-If NUMBER-CONTROL is non-nil and fourth arg INDEX is nil, then the
+If NUMBER-CONTROL is non-nil and forth arg INDEX is nil, then the
 prefix of the topic is forced to be non-numbered.  Null index and
 non-nil NUMBER-CONTROL forces denumbering.  Non-nil INDEX (and
 non-nil NUMBER-CONTROL) forces a numbered-prefix form.  If non-nil
 INDEX is a number, then that number is used for the numbered
 prefix.  Non-nil and non-number means that the index for the
-numbered prefix will be derived by `allout-make-topic-prefix'.
+numbered prefix will be derived by allout-make-topic-prefix.
 
 Fifth arg DO-SUCCESSORS t means re-resolve count on succeeding
 siblings.
@@ -2986,9 +3232,10 @@ this function."
                                         ; Put in new prefix:
       (allout-unprotected (insert new-prefix))
 
-      ;; Reindent the body if elected and margin changed:
+      ;; Reindent the body if elected, margin changed, and not encrypted body:
       (if (and allout-reindent-bodies
-               (not (= new-depth current-depth)))
+               (not (= new-depth current-depth))
+               (not (allout-encrypted-topic-p)))
           (allout-reindent-body current-depth new-depth))
 
       ;; Recursively rectify successive siblings of orig topic if
@@ -3010,7 +3257,7 @@ this function."
   ) ; defun
 ;;;_    > allout-rebullet-topic (arg)
 (defun allout-rebullet-topic (arg)
-  "Like `allout-rebullet-topic-grunt', but start from topic visible at point.
+  "Rebullet the visible topic containing point and all contained subtopics.
 
 Descends into invisible as well as visible topics, however.
 
@@ -3036,18 +3283,18 @@ With repeat count, shift topic depth by that amount."
                                                starting-point
                                                index
                                                do-successors)
+  "Like `allout-rebullet-topic', but on nearest containing topic
+\(visible or not).
 
-  "Rebullet the topic at point, visible or invisible, and all
-contained subtopics.  See `allout-rebullet-heading' for rebulleting
-behavior.
+See `allout-rebullet-heading' for rebulleting behavior.
 
-Arg RELATIVE-DEPTH means to shift the depth of the entire
-topic that amount.
+All arguments are optional.
 
-\(fn &optional RELATIVE-DEPTH)"
+First arg RELATIVE-DEPTH means to shift the depth of the entire
+topic that amount.
 
-  ;; All args except the first one are for internal recursive use by the
-  ;; function itself.
+The rest of the args are for internal recursive use by the function
+itself.  The are STARTING-DEPTH, STARTING-POINT, and INDEX."
 
   (let* ((relative-depth (or relative-depth 0))
          (new-depth (allout-depth))
@@ -3177,13 +3424,42 @@ rebulleting each topic at this level."
         (setq more (allout-next-sibling depth nil))))))
 ;;;_    > allout-shift-in (arg)
 (defun allout-shift-in (arg)
-  "Increase depth of current heading and any topics collapsed within it."
+  "Increase depth of current heading and any topics collapsed within it.
+
+We disallow shifts that would result in the topic having a depth more than
+one level greater than the immediately previous topic, to avoid containment
+discontinuity.  The first topic in the file can be adjusted to any positive
+depth, however."
   (interactive "p")
+  (if (> arg 0)
+      (save-excursion
+        (allout-back-to-current-heading)
+        (if (not (bobp))
+            (let* ((current-depth (allout-recent-depth))
+                   (start-point (point))
+                   (predecessor-depth (progn
+                                        (forward-char -1)
+                                        (allout-goto-prefix)
+                                        (if (< (point) start-point)
+                                            (allout-recent-depth)
+                                          0))))
+              (if (and (> predecessor-depth 0)
+                       (> (+ current-depth arg)
+                          (1+ predecessor-depth)))
+                  (error (concat "May not shift deeper than offspring depth"
+                                 " of previous topic")))))))
   (allout-rebullet-topic arg))
 ;;;_    > allout-shift-out (arg)
 (defun allout-shift-out (arg)
-  "Decrease depth of current heading and any topics collapsed within it."
+  "Decrease depth of current heading and any topics collapsed within it.
+
+We disallow shifts that would result in the topic having a depth more than
+one level greater than the immediately previous topic, to avoid containment
+discontinuity.  The first topic in the file can be adjusted to any positive
+depth, however."
   (interactive "p")
+  (if (< arg 0)
+      (allout-shift-in (* arg -1)))
   (allout-rebullet-topic (* arg -1)))
 ;;;_   : Surgery (kill-ring) functions with special provisions for outlines:
 ;;;_    > allout-kill-line (&optional arg)
@@ -3191,24 +3467,56 @@ rebulleting each topic at this level."
   "Kill line, adjusting subsequent lines suitably for outline mode."
 
   (interactive "*P")
-  (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)))
-                                        ; Do the kill:
-      (kill-line arg)
+
+  (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)
                                         ; Provide some feedback:
-      (sit-for 0)
-      (save-excursion
+          (sit-for 0)
+          (save-excursion
                                         ; Start with the topic
                                         ; following killed line:
-        (if (not (looking-at allout-regexp))
-            (allout-next-heading))
-        (allout-renumber-to-depth depth)))))
+            (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:
+           (pop kill-ring)
+         ;; 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-kill-topic ()
 (defun allout-kill-topic ()
   "Kill topic together with subtopics.
@@ -3236,14 +3544,14 @@ Leaves primary topic's trailing vertical whitespace, if any."
                        (>= (allout-recent-depth) depth))))
             (forward-char 1)))
 
-    (kill-region beg (point))
+    (allout-unprotected (kill-region beg (point)))
     (sit-for 0)
     (save-excursion
       (allout-renumber-to-depth depth))))
 ;;;_    > allout-yank-processing ()
 (defun allout-yank-processing (&optional arg)
 
-  "Incidental outline specific business to be done just after text yanks.
+  "Incidental outline-specific business to be done just after text yanks.
 
 Does depth adjustment of yanked topics, when:
 
@@ -3259,7 +3567,7 @@ header into which it's being yanked.
 
 The point is left in front of yanked, adjusted topics, rather than
 at the end (and vice-versa with the mark).  Non-adjusted yanks,
-however, are left exactly like normal, not outline specific yanks."
+however, are left exactly like normal, non-allout-specific yanks."
 
   (interactive "*P")
                                         ; Get to beginning, leaving
@@ -3463,6 +3771,60 @@ by pops to non-distinctive yanks.  Bug..."
 ;;;_ #6 Exposure Control
 
 ;;;_  - 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)
+     )
+    )
+  )
 ;;;_   > allout-flag-current-subtree (flag)
 (defun allout-flag-current-subtree (flag)
   "Hide or show subtree of currently-visible topic.
@@ -3471,9 +3833,9 @@ See `allout-flag-region' for more details."
 
   (save-excursion
     (allout-back-to-current-heading)
-    (allout-flag-region (point)
-                         (progn (allout-end-of-current-subtree) (1- (point)))
-                         flag)))
+    (let ((from (point))
+          (to (progn (allout-end-of-current-subtree) (1- (point)))))
+      (allout-flag-region from to flag))))
 
 ;;;_  - Topic-specific
 ;;;_   > allout-show-entry ()
@@ -3482,7 +3844,7 @@ See `allout-flag-region' for more details."
 
 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-to-offshoot'
+exposure.  `allout-hide-current-entry-completely' or `allout-show-offshoot'
 should be used after the peek to rectify the exposure."
 
   (interactive)
@@ -3602,7 +3964,7 @@ aberrant exposure states produced by `allout-show-entry'."
   (allout-back-to-current-heading)
   (save-excursion
    (allout-flag-region (point)
-                        (progn (allout-end-of-current-entry) (point))
+                        (progn (allout-end-of-entry) (point))
                         ?\r)))
 ;;;_   > allout-show-current-entry (&optional arg)
 (defun allout-show-current-entry (&optional arg)
@@ -3614,8 +3976,9 @@ aberrant exposure states produced by `allout-show-entry'."
       (allout-hide-current-entry)
     (save-excursion
       (allout-flag-region (point)
-                           (progn (allout-end-of-current-entry) (point))
-                           ?\n))))
+                           (progn (allout-end-of-entry) (point))
+                           ?\n)
+      )))
 ;;;_   > allout-hide-current-entry-completely ()
 ; ... allout-hide-current-entry-completely also for isearch dynamic exposure:
 (defun allout-hide-current-entry-completely ()
@@ -3846,7 +4209,11 @@ Examples:
       max-pos)))
 ;;;_   > allout-old-expose-topic (spec &rest followers)
 (defun allout-old-expose-topic (spec &rest followers)
-  "Dictate wholesale exposure scheme for current topic, according to SPEC.
+
+  "Deprecated.  Use `allout-expose-topic' \(with different schema
+format) instead.
+
+Dictate wholesale exposure scheme for current topic, according to SPEC.
 
 SPEC is either a number or a list.  Optional successive args
 dictate exposure for subsequent siblings of current topic.
@@ -3918,9 +4285,6 @@ Optional FOLLOWERS arguments dictate exposure for succeeding siblings."
       (allout-old-expose-topic (car followers))
       (setq followers (cdr followers)))
     max-pos))
-(make-obsolete 'allout-old-expose-topic
-               "use `allout-expose-topic' (with different schema format) instead."
-               "19.23")
 ;;;_   > allout-new-exposure '()
 (defmacro allout-new-exposure (&rest spec)
   "Literal frontend for `allout-expose-topic', doesn't evaluate arguments.
@@ -3929,6 +4293,8 @@ need not be quoted in `allout-new-exposure'.
 
 Cursor is left at start position.
 
+Use this instead of obsolete `allout-exposure'.
+
 Examples:
 \(allout-new-exposure (-1 () () () 1) 0)
         Close current topic at current level so only the immediate
@@ -4151,13 +4517,20 @@ header and body.  The elements of that list are:
                                  (cdr format)))))))
       ;; Put the list with first at front, to last at back:
       (nreverse result))))
+;;;_   > my-region-active-p ()
+(defmacro my-region-active-p ()
+  (if (fboundp 'region-active-p)
+      '(region-active-p)
+    'mark-active))
 ;;;_   > allout-process-exposed (&optional func from to frombuf
 ;;;                                         tobuf format)
 (defun allout-process-exposed (&optional func from to frombuf tobuf
-                                          format start-num)
+                                          format &optional start-num)
   "Map function on exposed parts of current topic; results to another buffer.
 
-Apply FUNC to exposed portions FROM position TO position in buffer
+All args are options; default values itemized below.
+
+Apply FUNCTION to exposed portions FROM position TO position in buffer
 FROMBUF to buffer TOBUF.  Sixth optional arg, FORMAT, designates an
 alternate presentation form:
 
@@ -4170,7 +4543,7 @@ alternate presentation form:
                        except for distinctive bullets.
 
 Defaults:
-  FUNC:         `allout-insert-listified'
+  FUNCTION:     `allout-insert-listified'
   FROM:         region start, if region active, else start of buffer
   TO:           region end, if region active, else end of buffer
   FROMBUF:      current buffer
@@ -4219,9 +4592,7 @@ LISTIFIED is a list representing each topic header and body:
 
  \`(depth prefix text)'
 
-or
-
- \`(depth prefix text bullet-plus)'
+or \`(depth prefix text bullet-plus)'
 
 If `bullet-plus' is specified, it is inserted just after the entire prefix."
   (setq listified (cdr listified))
@@ -4237,7 +4608,7 @@ If `bullet-plus' is specified, it is inserted just after the entire prefix."
     (while text
       (insert (car text))
       (if (setq text (cdr text))
-          (insert "\n")))
+          (insert-string "\n")))
     (insert "\n")))
 ;;;_   > allout-copy-exposed-to-buffer (&optional arg tobuf format)
 (defun allout-copy-exposed-to-buffer (&optional arg tobuf format)
@@ -4440,14 +4811,14 @@ BULLET string, and a list of TEXT strings for the body."
          body-content bop)
                                         ; Do the head line:
     (insert (concat "\\OneHeadLine{\\verb\1 "
-                    (allout-latex-verb-quote bullet)
-                    "\1}{"
-                    depth
-                    "}{\\verb\1 "
-                    (if head-line
-                        (allout-latex-verb-quote head-line)
-                      "")
-                    "\1}\n"))
+                    (allout-latex-verb-quote bullet)
+                    "\1}{"
+                    depth
+                    "}{\\verb\1 "
+                    (if head-line
+                        (allout-latex-verb-quote head-line)
+                      "")
+                    "\1}\n"))
     (if (not body-lines)
         nil
       ;;(insert "\\beginlines\n")
@@ -4509,7 +4880,615 @@ With repeat count, copy the exposed portions of entire buffer."
     (pop-to-buffer buf)
     (goto-char start-pt)))
 
-;;;_ #8 miscellaneous
+;;;_ #8 Encryption
+;;;_  > allout-toggle-current-subtree-encryption (&optional fetch-key)
+(defun allout-toggle-current-subtree-encryption (&optional fetch-key)
+  "Encrypt clear text or decrypt encoded contents of a topic.
+
+Contents includes body and subtopics.
+
+Currently only GnuPG encryption is supported.
+
+\**NOTE WELL** that the encrypted text must be ascii-armored.  For gnupg
+encryption, include the option ``armor'' in your ~/.gnupg/gpg.conf file.
+
+Both symmetric-key and key-pair encryption is implemented.  Symmetric is
+the default, use a single \(x4) universal argument for keypair mode.
+
+Encrypted topic's bullet is set to a `~' to signal that the contents of the
+topic \(body and subtopics, but not heading) is pending encryption or
+encrypted.  An `*' asterisk immediately after the bullet signals that the
+body is encrypted, its absence means it's meant to be encrypted but is not
+- it's \"disclosed\".  When a file with disclosed topics is saved, the user
+prompted for an ok to \(symmetric-key) encrypt the disclosed topics.  NOTE
+WELL that you must explicitly \(re)encrypt key-pair encrypted topics if you
+want them to continue to be in key-pair mode.
+
+Level-1 topics, with prefix consisting solely of an `*' asterisk, cannot be
+encrypted.  If you want to encrypt the contents of a top-level topic, use
+\\[allout-shift-in] to increase its depth.
+
+Failed transformation does not change the an entry being encrypted -
+instead, the key is re-solicited and the transformation is retried.
+\\[keyboard-quit] to abort.
+
+Decryption does symmetric or key-pair key mode depending on how the text
+was encrypted.  The encryption key is solicited if not currently available
+from the key cache from a recent prior encryption action.
+
+Optional FETCH-KEY universal argument is used for two purposes - to provoke
+key-pair instead of symmetric encryption, or to provoke clearing of the key
+cache so keys are freshly fetched.
+
+ - Without any universal arguments, then the appropriate key for the is
+   obtained from the cache, if available, else from the user.
+
+ - If FETCH-KEY is the result of one universal argument - ie, equal to 4 -
+   then key-pair encryption is used.
+
+ - With repeated universal argument - equal to 16 - then the key cache is
+   cleared before any encryption transformations, to force prompting of the
+   user for the key.
+
+The solicited key is retained for reuse in a buffer-specific cache for some
+set period of time \(default, 60 seconds), after which the string is
+nulled.  `mailcrypt' provides the key caching functionality.  You can
+adjust the key cache timeout by ajdusting the setting of the elisp variable
+`mc-passwd-timeout'.
+
+If the file previously had no associated key, or had a different key than
+specified, the user is prompted to repeat the new one for corroboration.  A
+random string encrypted by the new key is set on the buffer-specific
+variable `allout-key-verifier-string', for confirmation of the key when
+next obtained, before encrypting or decrypting anything with it.  This
+helps avoid mistakenly shifting between keys.
+
+If allout customization var `allout-key-verifier-handling' is non-nil, an
+entry for `allout-key-verifier-string' and its value is added to an Emacs
+'local variables' section at the end of the file, which is created if
+necessary.  That setting is for retention of the key verifier across emacs
+sessions.
+
+Similarly, `allout-key-hint-string' stores a user-provided reminder about
+their key, and `allout-key-hint-handling' specifies when the hint is
+presented, or if key hints are disabled.  If enabled \(see the
+`allout-key-hint-handling' docstring for details), the hint string is
+stored in the local-variables section of the file, and solicited whenever
+the key is changed."
+
+;;; This routine handles allout-specific business, dispatching
+;;; encryption-specific business to allout-encrypt-string.
+
+  (interactive "P")
+  (save-excursion
+    (allout-end-of-prefix t)
+
+    (if (= (allout-recent-depth) 1)
+        (error (concat "Cannot encrypt or decrypt level 1 topics -"
+                       " shift it in to make it encryptable")))
+
+    (if (and fetch-key
+             (not (equal fetch-key '(4))))
+        (mc-deactivate-passwd))
+
+    (let* ((allout-buffer (current-buffer))
+           ;; Asses location:
+           (after-bullet-pos (point))
+           (was-encrypted
+            (progn (if (= (point-max) after-bullet-pos)
+                       (error "no body to encrypt"))
+                   (looking-at "\\*")))
+           (was-collapsed (if (not (re-search-forward "[\n\r]" nil t))
+                              nil
+                            (backward-char 1)
+                            (looking-at "\r")))
+           (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"))))
+           ;; Assess key parameters:
+           (key-type (or
+                      ;; detect the type by which it is already encrypted
+                      (and was-encrypted
+                           (allout-encrypted-text-type subject-text))
+                      (and (member fetch-key '(4 (4)))
+                           (yes-or-no-p "Use key-pair encryption instead? ")
+                           'keypair)
+                      'symmetric))
+           (fetch-key (and fetch-key (not (member fetch-key '(16 (16))))))
+           result-text)
+
+      (setq result-text
+            (allout-encrypt-string subject-text was-encrypted
+                                    (current-buffer) key-type fetch-key))
+
+       ;; Replace the subtree with the processed product.
+      (allout-unprotected
+       (progn
+         (set-buffer allout-buffer)
+         (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:
+         (if (not was-encrypted)
+             (if (and (member subtree-end-char '(?\r ?\n))
+                      (member subtree-trailling-char '(?\r ?\n)))
+                 (insert subtree-trailling-char)))
+         ;; Ensure that the item has an encrypted-entry bullet:
+         (if (not (string= (buffer-substring-no-properties
+                            (1- after-bullet-pos) after-bullet-pos)
+                           allout-topic-encryption-bullet))
+             (progn (goto-char (1- after-bullet-pos))
+                    (delete-char 1)
+                    (insert allout-topic-encryption-bullet)))
+         (if was-encrypted
+             ;; Remove the is-encrypted bullet qualifier:
+             (progn (goto-char after-bullet-pos)
+                    (delete-char 1))
+           ;; Add the is-encrypted bullet qualifier:
+           (goto-char after-bullet-pos)
+           (insert "*"))
+         )
+       )
+      )
+    )
+  )
+;;;_  > allout-encrypt-string (text decrypt allout-buffer key-type rekey
+;;;                                  &optional retried verifying)
+(defun allout-encrypt-string (text decrypt allout-buffer key-type rekey
+                                    &optional retried verifying)
+  "Encrypt or decrypt a string TEXT using KEY.
+
+If optional DECRYPT is true (default false), then decrypt instead of
+encrypt.
+
+Optional REKEY (default false) provokes clearing of the key cache to force
+fresh prompting for the key.
+
+Optional RETRIED is for internal use - conveys the number of failed keys have
+been solicited in sequence leading to this current call.
+
+Optional VERIFYING is for internal use, signifying processing of text
+solely for verification of the cached key.
+
+Returns the resulting string, or nil if the transformation fails."
+
+  ;; Ensure that we have an alternate handle on the real mc-activate-passwd:
+  (if (not (fboundp 'real-mc-activate-passwd))
+      ;; Force loads of the primary mailcrypt packages, so flet below holds.
+      (progn (require 'mailcrypt)
+             (load "mc-toplev")
+             (fset 'real-mc-activate-passwd
+                   (symbol-function 'mc-activate-passwd))))
+
+  (if (and rekey (not verifying)) (mc-deactivate-passwd))
+
+  (catch 'encryption-failed
+    (save-excursion
+
+      (let* ((mc-default-scheme (or allout-encryption-scheme
+                                    allout-default-encryption-scheme))
+             (id (format "%s-%s" key-type
+                         (or (buffer-file-name allout-buffer)
+                             (buffer-name allout-buffer))))
+             (cached (real-mc-activate-passwd id nil))
+             (comment "Processed by allout driving mailcrypt")
+             key work-buffer result result-text encryption-process-status)
+
+        (unwind-protect
+
+            ;; Interject our mc-activate-passwd wrapper:
+            (flet ((mc-activate-passwd (id &optional prompt)
+                                       (allout-mc-activate-passwd id prompt)))
+
+              (setq work-buffer
+                    (set-buffer (allout-encryption-produce-work-buffer text)))
+
+              (cond
+
+               ;; symmetric:
+               ((equal key-type 'symmetric)
+                (setq key (if verifying
+                              (real-mc-activate-passwd id nil)
+                            (allout-mc-activate-passwd id)))
+                (setq encryption-process-status
+                      (crypt-encrypt-buffer key decrypt))
+                (if (zerop encryption-process-status)
+                    t
+                  (if verifying
+                      (throw 'encryption-failed nil)
+                    (mc-deactivate-passwd)
+                    (error "Symmetric-key encryption failed (%s) - wrong key?"
+                           encryption-process-status))))
+
+               ;; encrypt 'keypair:
+               ((not decrypt)
+                (condition-case result
+                    (mailcrypt-encrypt 1)
+                  (error (mc-deactivate-passwd)
+                         (error "encryption failed: %s"
+                                (cadr result)))))
+
+               ;; decrypt 'keypair:
+               (t (condition-case result
+                      (mc-decrypt)
+                    (error (mc-deactivate-passwd)
+                           (error "decryption failed: %s"
+                                  (cadr result))))))
+
+              (setq result-text (if (or (equal key-type 'keypair)
+                                        (not decrypt))
+                                    (buffer-substring 1 (1- (point-max)))
+                                  (buffer-string)))
+              ;; validate result - non-empty
+              (cond ((not result-text)
+                     (if verifying
+                         nil
+                       ;; Transformation was fruitless - retry with new key.
+                       (mc-deactivate-passwd)
+                       (allout-encrypt-string text allout-buffer decrypt nil
+                                               (if retried (1+ retried) 1)
+                                               verifying)))
+
+                    ;; Barf if encryption yields extraordinary control chars:
+                    ((and (not decrypt)
+                          (string-match "[\C-a\C-k\C-o-\C-z\C-@]" result-text))
+                     (error (concat "encryption produced unusable"
+                                    " non-armored text - reconfigure!")))
+
+                    ;; valid result and just verifying or non-symmetric:
+                    ((or verifying (not (equal key-type 'symmetric)))
+                     result-text)
+
+                    ;; valid result and regular symmetric - situate validator:
+                    (t
+                     ;; valid result and verifier needs to be situated in
+                     ;; allout-buffer:
+                     (set-buffer allout-buffer)
+                     (if (and (or rekey (not cached))
+                              (not (allout-verify-key key allout-buffer)))
+                         (allout-situate-encryption-key-verifier key id))
+                     result-text)
+                    )
+              )
+
+          ;; unwind-protect emergence:
+          (if work-buffer
+              (kill-buffer work-buffer))
+          )
+        )
+      )
+    )
+  )
+;;;_  > allout-mc-activate-passwd (id &optional prompt)
+(defun allout-mc-activate-passwd (id &optional prompt)
+  "Substituted for mc-activate-passwd during allout outline encryption.
+
+We add key-verification to vanilla mc-activate-passwd.
+
+We depend in some cases on values of the following allout-encrypt-string
+internal or prevailing variables:
+  - key-type - 'symmetric or 'keypair
+  - id - id associated with current key in key cache
+  - allout-buffer - where subject text resides
+  - retried - number of current attempts to obtain this key
+  - rekey - user asked to present a new key - needs to be confirmed"
+
+;;  - if we're doing non-symmetric key, just do normal mc-activate-passwd
+;;  - otherwise, if we are have a cached version of the key, then assume
+;;    it's verified and return it
+;;  - otherwise, prompt for a key, and:
+;;    - if we have a key verifier \(a string value which should decrypt
+;;      against a symmetric key), validate against the verifier
+;;      - if successful, return the verified key
+;;      - if unsuccessful:
+;;        - offer to use the new key
+;;          - if accepted, do confirm process
+;;          - if refused, try again until we get a correctly spelled one or the
+;;            user quits
+;;    - if no key verifier, resolicit the key to get corroboration and return
+;;      the corroborated key if spelled identically, or error if not.
+
+  (if (not (equal key-type 'symmetric))
+      ;; do regular mc-activate-passwd on non-symmetric key
+      (real-mc-activate-passwd id prompt)
+
+    ;; Symmetric hereon:
+
+    (save-excursion
+      (set-buffer allout-buffer)
+      (let* ((hint (if (and (not (string= allout-key-hint-string ""))
+                            (or (equal allout-key-hint-handling 'always)
+                                (and (equal allout-key-hint-handling 'needed)
+                                     retried)))
+                       (format " [%s]" allout-key-hint-string)
+                     ""))
+             (retry-message (if retried (format " (%s retry)" retried) ""))
+             (prompt-sans-hint (format "'%s' symmetric key%s: "
+                                       (buffer-name allout-buffer)
+                                       retry-message))
+             (full-prompt (format "'%s' symmetric key%s%s: "
+                                  (buffer-name allout-buffer)
+                                  hint retry-message))
+             (prompt full-prompt)
+             (verifier-string (allout-get-encryption-key-verifier))
+             ;; force retention of cached passwords for five minutes while
+             ;; we're in this particular routine:
+             (mc-passwd-timeout 300)
+             (cached (real-mc-activate-passwd id nil))
+             (got (or cached (real-mc-activate-passwd id full-prompt)))
+             confirmation)
+
+        (if (not got)
+            nil
+
+          ;; Duplicate our handle on the key so it's not clobbered by
+          ;; deactivate-passwd memory clearing:
+          (setq got (format "%s" got))
+
+          (cond (verifier-string
+                 (if (and (not (allout-encrypt-string
+                                verifier-string 'decrypt allout-buffer
+                                'symmetric nil 0 'verifying))
+                          (if (yes-or-no-p
+                               (concat "Key differs from established"
+                                       " - use new one instead? "))
+                              ;; deactivate password for subsequent
+                              ;; confirmation:
+                              (progn (mc-deactivate-passwd)
+                                     (setq prompt prompt-sans-hint)
+                                     nil)
+                            t))
+                     (progn (mc-deactivate-passwd)
+                            (error "Wrong key."))))
+                ;; Force confirmation by repetition for new key:
+                ((or rekey (not cached)) (mc-deactivate-passwd))))
+        ;; we have a key and it's either verified and cached.
+        ;; confirmation vs new input - doing mc-activate-passwd will do the
+        ;; right thing, in either case:
+        (setq confirmation
+              (real-mc-activate-passwd id (concat prompt
+                                                  " ... confirm spelling: ")))
+        (prog1
+            (if (equal got confirmation)
+                confirmation
+              (if (yes-or-no-p (concat "spelling of original and"
+                                       " confirmation differ - retry? "))
+                  (progn (setq retried (if retried (1+ retried) 1))
+                         (mc-deactivate-passwd)
+                         ;; recurse to this routine:
+                         (mc-activate-passwd id prompt-sans-hint))
+                (mc-deactivate-passwd)
+                (error "Confirmation failed.")))
+          ;; reduce opportunity for memory cherry-picking by zeroing duplicate:
+          (dotimes (i (length got))
+            (aset got i 0))
+          )
+        )
+      )
+    )
+  )
+;;;_  > allout-encryption-produce-work-buffer (text)
+(defun allout-encryption-produce-work-buffer (text)
+  "Establish a new buffer filled with TEXT, for outline encrypion processing.
+
+TEXT is massaged so outline collapsing, if any, is removed."
+  (let ((work-buffer (generate-new-buffer " *allout encryption*")))
+    (save-excursion
+      (set-buffer work-buffer)
+      (insert (subst-char-in-string ?\r ?\n text)))
+    work-buffer))
+;;;_  > allout-encrypted-topic-p ()
+(defun allout-encrypted-topic-p ()
+  "True if the current topic is encryptable and encrypted."
+  (save-excursion
+    (allout-end-of-prefix t)
+    (and (string= (buffer-substring-no-properties (1- (point)) (point))
+                  allout-topic-encryption-bullet)
+         (looking-at "\\*"))
+    )
+  )
+;;;_  > allout-encrypted-text-type (text)
+;;; XXX gpg-specific, not generic!
+(defun allout-encrypted-text-type (text)
+  "For gpg encrypted text, return 'symmetric or 'keypair."
+
+  ;; Ensure mc-gpg-path has a value:
+  (if (not (boundp 'mc-gpg-path))
+      (load-library "mc-gpg"))
+
+  (save-excursion
+    (let* ((work-buffer (set-buffer
+                         (allout-encryption-produce-work-buffer text)))
+           (result (mc-gpg-process-region (point-min) (point-max)
+                                          nil mc-gpg-path
+                                          '("--batch" "--decrypt")
+                                          'mc-gpg-decrypt-parser
+                                          work-buffer nil)))
+      (cond ((equal (nth 0 result) 'symmetric)
+             'symmetric)
+            ((equal (nth 0 result) t)
+             'keypair)
+            (t (error "Unrecognized/unsupported encryption type %S"
+                      (nth 0 result))))
+      )
+    )
+  )
+;;;_  > allout-create-encryption-key-verifier (key id)
+(defun allout-create-encryption-key-verifier (key id)
+  "Encrypt a random message for later validation of symmetric key."
+  ;; use 20 random ascii characters, across the entire ascii range.
+  (random t)
+  (let ((spew (make-string 20 ?\0)))
+    (dotimes (i (length spew))
+      (aset spew i (1+ (random 254))))
+    (allout-encrypt-string spew nil nil 'symmetric nil nil t))
+  )
+;;;_  > allout-situate-encryption-key-verifier (key id)
+(defun allout-situate-encryption-key-verifier (key id)
+  "Establish key verifier string on file variable.
+
+We also prompt for and situate a new reminder, if reminders are enabled.
+
+We massage the string to simplify programmatic adjustment.  File variable
+is `allout-file-key-verifier-string'."
+  (let ((verifier-string
+         ;; Collapse to a single line and enclose in string quotes:
+         (subst-char-in-string ?\n ?\C-a
+                               (allout-create-encryption-key-verifier
+                                key id)))
+        (reminder (if (not (equal allout-key-hint-handling 'disabled))
+                      (read-from-minibuffer
+                       "Key hint to jog your memory next time: "
+                       allout-key-hint-string))))
+    (setq allout-key-verifier-string verifier-string)
+    (allout-adjust-file-variable "allout-key-verifier-string"
+                                  verifier-string)
+    (cond ((equal allout-key-hint-handling 'disabled)
+           nil)
+          ((not (string= reminder allout-key-hint-string))
+           (setq allout-key-hint-string reminder)
+           (allout-adjust-file-variable "allout-key-hint-string"
+                                         reminder)))
+    )
+  )
+;;;_  > allout-get-encryption-key-verifier ()
+(defun allout-get-encryption-key-verifier ()
+  "Return the text of the encrypt key verifier, unmassaged, or nil if none.
+
+Derived from value of `allout-file-key-verifier-string'."
+
+  (let ((verifier-string (and (boundp 'allout-key-verifier-string)
+                              allout-key-verifier-string)))
+    (if verifier-string
+        ;; Return it uncollapsed
+        (subst-char-in-string ?\C-a ?\n verifier-string)
+      nil)
+   )
+  )
+;;;_  > allout-verify-key (key)
+(defun allout-verify-key (key allout-buffer)
+  "True if key successfully decrypts key verifier, nil otherwise.
+
+\"Otherwise\" includes absence of key verifier."
+  (save-excursion
+    (set-buffer allout-buffer)
+    (and (boundp 'allout-key-verifier-string)
+         allout-key-verifier-string
+         (allout-encrypt-string (allout-get-encryption-key-verifier)
+                                 'decrypt allout-buffer 'symmetric
+                                 nil nil 'verifying)
+         t)))
+;;;_  > allout-next-topic-pending-encryption (&optional except-mark)
+(defun allout-next-topic-pending-encryption (&optional except-mark)
+  "Return the point of the next topic pending encryption, or nil if none.
+
+EXCEPT-MARK identifies a point whose containing topics should be excluded
+from encryption.  This supports 'except-current mode of
+`allout-encrypt-unencrypted-on-saves'.
+
+Such a topic has the allout-topic-encryption-bullet without an
+immediately following '*' that would mark the topic as being encrypted.  It
+must also have content."
+  (let (done got content-beg)
+    (while (not done)
+
+      (if (not (re-search-forward
+                (format "\\(\\`\\|[\n\r]\\)%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]")
+            (forward-char 1))
+        (setq got (point)))
+
+      (cond ((not got)
+             (setq done t))
+
+            ((not (re-search-forward "[\n\r]"))
+             (setq got nil
+                   done t))
+
+            ((eobp)
+             (setq got nil
+                   done t))
+
+            (t
+             (setq content-beg (point))
+             (backward-char 1)
+             (allout-end-of-subtree)
+             (if (or (<= (point) content-beg)
+                     (and except-mark
+                          (<= content-beg except-mark)
+                          (>= (point) except-mark)))
+                 ;; Continue looking
+                 (setq got nil)
+               ;; Got it!
+               (setq done t)))
+            )
+      )
+    (if got
+        (goto-char got))
+    )
+  )
+;;;_  > allout-encrypt-decrypted (&optional except-mark)
+(defun allout-encrypt-decrypted (&optional except-mark)
+  "Encrypt topics pending encryption except those containing exemption point.
+
+EXCEPT-MARK identifies a point whose containing topics should be excluded
+from encryption.  This supports 'except-current mode of
+`allout-encrypt-unencrypted-on-saves'.
+
+If a topic that is currently being edited was encrypted, we return a list
+containing the location of the topic and the location of the cursor just
+before the topic was encrypted.  This can be used, eg, to decrypt the topic
+and exactly resituate the cursor if this is being done as part of a file
+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)
+      (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))))
+            (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)))
+        (allout-toggle-current-subtree-encryption)
+        (if (not was-modified)
+            (set-buffer-modified-p nil))
+        )
+      (if (not was-modified)
+         (set-buffer-modified-p nil))
+      (if editing-topic (list editing-topic editing-point))
+      )
+    )
+  )
+
+;;;_ #9 miscellaneous
 ;;;_  > allout-mark-topic ()
 (defun allout-mark-topic ()
   "Put the region around topic currently containing point."
@@ -4538,22 +5517,100 @@ setup for auto-startup."
         t
       (allout-open-topic 2)
       (insert (concat "Dummy outline topic header - see"
-                      "`allout-mode' docstring: `^Hm'."))
-      (forward-line 1)
+                      "`allout-mode' docstring: `^Hm'."))
+      (allout-adjust-file-variable
+       "allout-layout" (format "%s" (or allout-layout '(-1 : 0)))))))
+;;;_  > allout-file-vars-section-data ()
+(defun allout-file-vars-section-data ()
+  "Return data identifying the file-vars section, or nil if none.
+
+Returns list `(beginning-point prefix-string suffix-string)'."
+  ;; minimally gleaned from emacs 21.4 files.el hack-local-variables function.
+  (let (beg prefix suffix)
+    (save-excursion
       (goto-char (point-max))
-      (open-line 1)
-      (allout-open-topic 0)
-      (insert "Local emacs vars.\n")
-      (allout-open-topic 1)
-      (insert "(`allout-layout' is for allout.el allout-mode)\n")
-      (allout-open-topic 0)
-      (insert "Local variables:\n")
-      (allout-open-topic 0)
-      (insert (format "allout-layout: %s\n"
-                             (or allout-layout
-                                 '(-1 : 0))))
-      (allout-open-topic 0)
-      (insert "End:\n"))))
+      (search-backward "\n\^L" (max (- (point-max) 3000) (point-min)) 'move)
+      (if (let ((case-fold-search t))
+            (not (search-forward "Local Variables:" nil t)))
+          nil
+        (setq beg (- (point) 16))
+        (setq suffix (buffer-substring-no-properties
+                      (point)
+                      (progn (if (re-search-forward "[\n\r]" nil t)
+                                 (forward-char -1))
+                             (point))))
+        (setq prefix (buffer-substring-no-properties
+                      (progn (if (re-search-backward "[\n\r]" nil t)
+                                 (forward-char 1))
+                             (point))
+                      beg))
+        (list beg prefix suffix))
+      )
+    )
+  )
+;;;_  > allout-adjust-file-variable (varname value)
+(defun allout-adjust-file-variable (varname value)
+  "Adjust the setting of an emacs file variable named VARNAME to VALUE.
+
+This activity is inhibited if either `enable-local-variables'
+`allout-enable-file-variable-adjustment' are nil.
+
+When enabled, an entry for the variable is created if not already present,
+or changed if established with a different value.  The section for the file
+variables, itself, is created if not already present.  When created, the
+section lines \(including the section line) exist as second-level topics in
+a top-level topic at the end of the file.
+
+enable-local-variables must be true for any of this to happen."
+  (if (not (and enable-local-variables
+                allout-enable-file-variable-adjustment))
+      nil
+    (save-excursion
+      (let ((section-data (allout-file-vars-section-data))
+            beg prefix suffix)
+        (if section-data
+            (setq beg (car section-data)
+                  prefix (cadr section-data)
+                  suffix (car (cddr section-data)))
+          ;; create the section
+          (goto-char (point-max))
+          (open-line 1)
+          (allout-open-topic 0)
+          (end-of-line)
+          (insert "Local emacs vars.\n")
+          (allout-open-topic 1)
+          (setq beg (point)
+                suffix ""
+                prefix (buffer-substring-no-properties (progn
+                                                         (beginning-of-line)
+                                                         (point))
+                                                       beg))
+          (goto-char beg)
+          (insert "Local variables:\n")
+          (allout-open-topic 0)
+          (insert "End:\n")
+          )
+        ;; look for existing entry or create one, leaving point for insertion
+        ;; of new value:
+        (goto-char beg)
+        (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)
+                                        (forward-char -1))
+                                    (point)))
+                   (value-end (- line-end (length suffix))))
+              (if (> value-end value-beg)
+                  (delete-region value-beg value-end)))
+          (end-of-line)
+          (open-line 1)
+          (forward-line 1)
+          (insert (concat prefix varname ":")))
+        (insert (format " %S%s" value suffix))
+        )
+      )
+    )
+  )
 ;;;_  > solicit-char-in-string (prompt string &optional do-defaulting)
 (defun solicit-char-in-string (prompt string &optional do-defaulting)
   "Solicit (with first arg PROMPT) choice of a character from string STRING.
@@ -4594,8 +5651,7 @@ Optional arg DO-DEFAULTING indicates to accept empty input (CR)."
 Representations of actual backslashes - '\\\\\\\\' - are left as a
 single backslash.
 
-\(fn REGEXP)"
-;; Optional arg SUCCESSIVE-BACKSLASHES is used internally for recursion.
+Optional arg SUCCESSIVE-BACKSLASHES is used internally for recursion."
 
   (if (string= regexp "")
       ""
@@ -4611,11 +5667,6 @@ single backslash.
                 (regexp-sans-escapes (substring regexp 1)))
       ;; Exclude first char, but maintain count:
       (regexp-sans-escapes (substring regexp 1) successive-backslashes))))
-;;;_  > my-region-active-p ()
-(defmacro my-region-active-p ()
-  (if (fboundp 'region-active-p)
-      '(region-active-p)
-    'mark-active))
 ;;;_  - add-hook definition for divergent emacsen
 ;;;_   > add-hook (hook function &optional append)
 (if (not (fboundp 'add-hook))
@@ -4636,17 +5687,30 @@ function.  If HOOK is void, it is first set to nil."
                (if append
                    (nconc (symbol-value hook) (list function))
                  (cons function (symbol-value hook)))))))
+;;;_  > subst-char-in-string if necessary
+(if (not (fboundp 'subst-char-in-string))
+    (defun subst-char-in-string (fromchar tochar string &optional inplace)
+      "Replace FROMCHAR with TOCHAR in STRING each time it occurs.
+Unless optional argument INPLACE is non-nil, return a new string."
+      (let ((i (length string))
+            (newstr (if inplace string (copy-sequence string))))
+        (while (> i 0)
+          (setq i (1- i))
+          (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 GNU Emacs does not,
+XEmacs takes two optional args, while mainline GNU Emacs does not,
 so pass them along when appropriate."
-  (if (featurep 'xemacs)
+  (if (string-match " XEmacs " emacs-version)
       (mark-marker force buffer)
     (mark-marker)))
 
-;;;_ #9 Under development
+;;;_ #10 Under development
 ;;;_  > allout-bullet-isearch (&optional bullet)
 (defun allout-bullet-isearch (&optional bullet)
   "Isearch \(regexp) for topic with bullet BULLET."
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 75228288fff..86fa6e489f0 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -198,6 +198,13 @@ following in your `.emacs' file:
   :group 'bookmark)
 
 
+(defface bookmark-menu-heading
+  '((t (:inherit font-lock-type-face)))
+  "Face used to highlight the heading in bookmark menu buffers."
+  :group 'bookmark
+  :version "22.1")
+
+
 ;;; No user-serviceable parts beyond this point.
 
 ;; Is it XEmacs?
@@ -211,12 +218,6 @@ following in your `.emacs' file:
 ;; suggested for lucid compatibility by david hughes:
 (or (fboundp 'frame-height)  (defalias 'frame-height 'screen-height))
 
-;; This variable is probably obsolete now...
-(or (boundp 'baud-rate)
-    ;; some random value higher than 9600
-    (setq baud-rate 19200))
-
-
 
 ;;; Keymap stuff:
 
@@ -1555,6 +1556,8 @@ deletion, or > if it is flagged for displaying."
   (let ((inhibit-read-only t))
     (erase-buffer)
     (insert "% Bookmark\n- --------\n")
+    (add-text-properties (point-min) (point)
+                         '(font-lock-face bookmark-menu-heading))
     (bookmark-maybe-sort-alist)
     (mapcar
      (lambda (full-record)
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 8fcbe7c0943..c1673508897 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -43,200 +43,208 @@
 ;;; for CODATA 1998 see one of
 ;;; - Journal of Physical and Chemical Reference Data, 28(6), 1713-1852, 1999.
 ;;; - Reviews of Modern Physics, 72(2), 351-495, 2000.
+;;; for CODATA 2005 see
 ;;; - http://physics.nist.gov/cuu/Constants/index.html
 
 (defvar math-standard-units
   '( ;; Length
-    ( m       nil                    "*Meter" )
-    ( in      "2.54 cm"             "Inch" )
-    ( ft      "12 in"                "Foot" )
-    ( yd      "3 ft"                 "Yard" )
-    ( mi      "5280 ft"      "Mile" )
-    ( au      "149597870691 m"      "Astronomical Unit" ) ;; NASA JPL (http://neo.jpl.nasa.gov/glossary/au.html)
-    ( lyr     "9460536207068016 m"  "Light Year" )
-    ( pc      "206264.80625 au"     "Parsec" )
-    ( nmi     "1852 m"               "Nautical Mile" )
-    ( fath    "6 ft"                 "Fathom" )
-    ( u       "1 um"                 "Micron" )
-    ( mil     "in/1000"      "Mil" )
-    ( point   "in/72"                "Point (1/72 inch)" )
-    ( tpt     "in/72.27"             "Point (TeX conventions)" )
-    ( Ang     "1e-10 m"      "Angstrom" )
-    ( mfi     "mi+ft+in"             "Miles + feet + inches" )
+    ( m       nil                    "*Meter" )
+    ( in      "2.54 cm"           "Inch" )
+    ( ft      "12 in"                "Foot" )
+    ( yd      "3 ft"                 "Yard" )
+    ( mi      "5280 ft"              "Mile" )
+    ( au      "149597870691 m"       "Astronomical Unit" ) ;; NASA JPL (http://neo.jpl.nasa.gov/glossary/au.html)
+    ( lyr     "9460536207068016 m"   "Light Year" )
+    ( pc      "206264.80625 au"      "Parsec" )
+    ( nmi     "1852 m"               "Nautical Mile" )
+    ( fath    "6 ft"                 "Fathom" )
+    ( mu      "1 um"                 "Micron" )
+    ( mil     "in/1000"              "Mil" )
+    ( point   "in/72"                "Point (1/72 inch)" )
+    ( Ang     "1e-10 m"              "Angstrom" )
+    ( mfi     "mi+ft+in"             "Miles + feet + inches" )
+    ;; TeX lengths
+    ( texpt   "in/72.27"             "Point (TeX conventions)" )
+    ( texpc   "12 texpt"             "Pica" )
+    ( texbp   "point"                "Big point (TeX conventions)" )
+    ( texdd   "1238/1157 texpt"      "Didot point" )
+    ( texcc   "12 texdd"             "Cicero" )
+    ( texsp   "1/66536 texpt"        "Scaled TeX point" )
 
     ;; Area
-    ( hect    "10000 m^2"            "*Hectare" )
-    ( acre    "mi^2 / 640"           "Acre" )
-    ( b       "1e-28 m^2"            "Barn" )
+    ( hect    "10000 m^2"            "*Hectare" )
+    ( a       "100 m^2"              "Are")
+    ( acre    "mi^2 / 640"           "Acre" )
+    ( b       "1e-28 m^2"            "Barn" )
 
     ;; Volume
-    ( l       "1e-3 m^3"             "*Liter" )
-    ( L       "1e-3 m^3"             "Liter" )
-    ( gal     "4 qt"                 "US Gallon" )
-    ( qt      "2 pt"                 "Quart" )
-    ( pt      "2 cup"                "Pint" )
-    ( cup     "8 ozfl"               "Cup" )
-    ( ozfl    "2 tbsp"               "Fluid Ounce" )
-    ( floz    "2 tbsp"               "Fluid Ounce" )
-    ( tbsp    "3 tsp"                "Tablespoon" )
-    ( tsp     "4.92892159375 ml"    "Teaspoon" )
+    ( L       "1e-3 m^3"             "*Liter" )
+    ( l       "L"                    "Liter" )
+    ( gal     "4 qt"                 "US Gallon" )
+    ( qt      "2 pt"                 "Quart" )
+    ( pt      "2 cup"                "Pint" )
+    ( cup     "8 ozfl"               "Cup" )
+    ( ozfl    "2 tbsp"               "Fluid Ounce" )
+    ( floz    "2 tbsp"               "Fluid Ounce" )
+    ( tbsp    "3 tsp"                "Tablespoon" )
+    ( tsp     "4.92892159375 ml"     "Teaspoon" )
     ( vol     "tsp+tbsp+ozfl+cup+pt+qt+gal" "Gallons + ... + teaspoons" )
-    ( galC    "4.54609 l"            "Canadian Gallon" )
-    ( galUK   "4.546092 l"           "UK Gallon" )
+    ( galC    "4.54609 L"            "Canadian Gallon" )
+    ( galUK   "4.546092 L"           "UK Gallon" )
 
     ;; Time
-    ( s       nil                    "*Second" )
-    ( sec     "s"                    "Second" )
-    ( min     "60 s"                 "Minute" )
-    ( hr      "60 min"               "Hour" )
-    ( day     "24 hr"                "Day" )
-    ( wk      "7 day"                "Week" )
-    ( hms     "wk+day+hr+min+s"     "Hours, minutes, seconds" )
-    ( yr      "365.25 day"           "Year" )
-    ( Hz      "1/s"                  "Hertz" )
+    ( s       nil                    "*Second" )
+    ( sec     "s"                    "Second" )
+    ( min     "60 s"                 "Minute" )
+    ( hr      "60 min"               "Hour" )
+    ( day     "24 hr"                "Day" )
+    ( wk      "7 day"                "Week" )
+    ( hms     "wk+day+hr+min+s"      "Hours, minutes, seconds" )
+    ( yr      "365.25 day"           "Year" )
+    ( Hz      "1/s"                  "Hertz" )
 
     ;; Speed
-    ( mph     "mi/hr"                "*Miles per hour" )
-    ( kph     "km/hr"                "Kilometers per hour" )
-    ( knot    "nmi/hr"               "Knot" )
-    ( c       "2.99792458e8 m/s"    "Speed of light" )
+    ( mph     "mi/hr"                "*Miles per hour" )
+    ( kph     "km/hr"                "Kilometers per hour" )
+    ( knot    "nmi/hr"               "Knot" )
+    ( c       "299792458 m/s"        "Speed of light" ) ;;; CODATA 2005
 
     ;; Acceleration
-    ( ga      "9.80665 m/s^2"        "*\"g\" acceleration" )
+    ( ga      "9.80665 m/s^2"        "*\"g\" acceleration" ) ;; CODATA 2005
 
     ;; Mass
-    ( g       nil                   "*Gram" )
-    ( lb      "16 oz"                "Pound (mass)" )
-    ( oz      "28.349523125 g"       "Ounce (mass)" )
-    ( ton     "2000 lb"      "Ton" )
-    ( tpo     "ton+lb+oz"            "Tons + pounds + ounces (mass)" )
-    ( t       "1000 kg"      "Metric ton" )
-    ( tonUK   "1016.0469088 kg"     "UK ton" )
-    ( lbt     "12 ozt"               "Troy pound" )
-    ( ozt     "31.103475 g"          "Troy ounce" )
-    ( ct      ".2 g"                 "Carat" )
-    ( amu     "1.66053873e-27 kg"   "Unified atomic mass" ) ;; CODATA 1998
+    ( g       nil                    "*Gram" )
+    ( lb      "16 oz"                "Pound (mass)" )
+    ( oz      "28.349523125 g"       "Ounce (mass)" )
+    ( ton     "2000 lb"              "Ton" )
+    ( tpo     "ton+lb+oz"            "Tons + pounds + ounces (mass)" )
+    ( t       "1000 kg"              "Metric ton" )
+    ( tonUK   "1016.0469088 kg"      "UK ton" )
+    ( lbt     "12 ozt"               "Troy pound" )
+    ( ozt     "31.103475 g"          "Troy ounce" )
+    ( ct      ".2 g"                 "Carat" )
+    ( u       "1.66053886e-27 kg"    "Unified atomic mass" ) ;; CODATA 2005
 
     ;; Force
-    ( N       "m kg/s^2"             "*Newton" )
-    ( dyn     "1e-5 N"               "Dyne" )
-    ( gf      "ga g"                 "Gram (force)" )
-    ( lbf     "4.44822161526 N"     "Pound (force)" )
-    ( kip     "1000 lbf"             "Kilopound (force)" )
-    ( pdl     "0.138255 N"           "Poundal" )
+    ( N       "m kg/s^2"             "*Newton" )
+    ( dyn     "1e-5 N"               "Dyne" )
+    ( gf      "ga g"                 "Gram (force)" )
+    ( lbf     "4.44822161526 N"      "Pound (force)" )
+    ( kip     "1000 lbf"             "Kilopound (force)" )
+    ( pdl     "0.138255 N"           "Poundal" )
 
     ;; Energy
-    ( J       "N m"                  "*Joule" )
-    ( erg     "1e-7 J"               "Erg" )
-    ( cal     "4.1868 J"             "International Table Calorie" )
-    ( Btu     "1055.05585262 J"     "International Table Btu" )
-    ( eV      "ech V"               "Electron volt" )
-    ( ev      "eV"                  "Electron volt" )
-    ( therm   "105506000 J"          "EEC therm" )
-    ( invcm   "h c/cm"               "Energy in inverse centimeters" )
-    ( Kayser  "invcm"                "Kayser (inverse centimeter energy)" )
-    ( men     "100/invcm"            "Inverse energy in meters" )
-    ( Hzen    "h Hz"                 "Energy in Hertz")
-    ( Ken     "k K"                  "Energy in Kelvins")
+    ( J       "N m"                  "*Joule" )
+    ( erg     "1e-7 J"               "Erg" )
+    ( cal     "4.1868 J"             "International Table Calorie" )
+    ( Btu     "1055.05585262 J"      "International Table Btu" )
+    ( eV      "ech V"                "Electron volt" )
+    ( ev      "eV"                   "Electron volt" )
+    ( therm   "105506000 J"          "EEC therm" )
+    ( invcm   "h c/cm"               "Energy in inverse centimeters" )
+    ( Kayser  "invcm"                "Kayser (inverse centimeter energy)" )
+    ( men     "100/invcm"            "Inverse energy in meters" )
+    ( Hzen    "h Hz"                 "Energy in Hertz")
+    ( Ken     "k K"                  "Energy in Kelvins")
     ( Wh      "W hr"                 "Watt hour")
-    ( Ws      "W s"                 "Watt second")
+    ( Ws      "W s"                  "Watt second")
 
     ;; Power
-    ( W       "J/s"                  "*Watt" )
-    ( hp      "745.7 W"      "Horsepower" )
+    ( W       "J/s"                  "*Watt" )
+    ( hp      "745.7 W"              "Horsepower" )
 
     ;; Temperature
-    ( K       nil                   "*Degree Kelvin"     K )
-    ( dK      "K"                    "Degree Kelvin"      K )
-    ( degK    "K"                    "Degree Kelvin"      K )
-    ( dC      "K"                    "Degree Celsius"     C )
-    ( degC    "K"            "Degree Celsius"     C )
-    ( dF      "(5/9) K"      "Degree Fahrenheit"  F )
-    ( degF    "(5/9) K"      "Degree Fahrenheit"  F )
+    ( K       nil                    "*Degree Kelvin"     K )
+    ( dK      "K"                    "Degree Kelvin"      K )
+    ( degK    "K"                    "Degree Kelvin"      K )
+    ( dC      "K"                    "Degree Celsius"     C )
+    ( degC    "K"                    "Degree Celsius"     C )
+    ( dF      "(5/9) K"              "Degree Fahrenheit"  F )
+    ( degF    "(5/9) K"              "Degree Fahrenheit"  F )
 
     ;; Pressure
-    ( Pa      "N/m^2"                "*Pascal" )
-    ( bar     "1e5 Pa"               "Bar" )
-    ( atm     "101325 Pa"            "Standard atmosphere" )
-    ( torr    " 1.333224e2 Pa"       "Torr" ) ;; NIST (http://physics.nist.gov/Pubs/SP811/appenB9.html)
-    ( mHg     "1000 torr"            "Meter of mercury" )
-    ( inHg    "25.4 mmHg"            "Inch of mercury" )
-    ( inH2O   "2.490889e2 Pa"        "Inch of water" ) ;; NIST (http://physics.nist.gov/Pubs/SP811/appenB9.html)
-    ( psi     "6894.75729317 Pa"    "Pound per square inch" )
+    ( Pa      "N/m^2"                "*Pascal" )
+    ( bar     "1e5 Pa"               "Bar" )
+    ( atm     "101325 Pa"            "Standard atmosphere" ) ;; CODATA 2005
+    ( Torr    " 1.333224e2 Pa"       "Torr" ) ;; NIST (http://physics.nist.gov/Pubs/SP811/appenB9.html)
+    ( mHg     "1000 Torr"            "Meter of mercury" )
+    ( inHg    "25.4 mmHg"            "Inch of mercury" )
+    ( inH2O   "2.490889e2 Pa"        "Inch of water" ) ;; NIST (http://physics.nist.gov/Pubs/SP811/appenB9.html)
+    ( psi     "6894.75729317 Pa"     "Pound per square inch" )
 
     ;; Viscosity
-    ( P       "0.1 Pa s"             "*Poise" )
-    ( St      "1e-4 m^2/s"           "Stokes" )
+    ( P       "0.1 Pa s"              "*Poise" )
+    ( St      "1e-4 m^2/s"            "Stokes" )
 
     ;; Electromagnetism
-    ( A       nil                   "*Ampere" )
-    ( C       "A s"                  "Coulomb" )
-    ( Fdy     "ech Nav"              "Faraday" )
-    ( e       "1.602176462e-19 C"   "Elementary charge" ) ;; CODATA 1998
-    ( ech     "1.602176462e-19 C"   "Elementary charge" ) ;; CODATA 1998
-    ( V       "W/A"                  "Volt" )
-    ( ohm     "V/A"                  "Ohm" )
-    ( mho     "A/V"                  "Mho" )
-    ( S       "A/V"                  "Siemens" )
-    ( F       "C/V"                  "Farad" )
-    ( H       "Wb/A"                 "Henry" )
-    ( T       "Wb/m^2"               "Tesla" )
-    ( G       "1e-4 T"               "Gauss" )
-    ( Wb      "V s"                  "Weber" )
+    ( A       nil                     "*Ampere" )
+    ( C       "A s"                   "Coulomb" )
+    ( Fdy     "ech Nav"               "Faraday" )
+    ( e       "1.60217653e-19 C"      "Elementary charge" ) ;; CODATA 2005
+    ( ech     "1.60217653e-19 C"      "Elementary charge" ) ;; CODATA 2005
+    ( V       "W/A"                   "Volt" )
+    ( ohm     "V/A"                   "Ohm" )
+    ( mho     "A/V"                   "Mho" )
+    ( S       "A/V"                   "Siemens" )
+    ( F       "C/V"                   "Farad" )
+    ( H       "Wb/A"                  "Henry" )
+    ( T       "Wb/m^2"                "Tesla" )
+    ( Gs      "1e-4 T"                "Gauss" )
+    ( Wb      "V s"                   "Weber" )
 
     ;; Luminous intensity
-    ( cd      nil                   "*Candela" )
-    ( sb      "1e4 cd/m^2"           "Stilb" )
-    ( lm      "cd sr"                "Lumen" )
-    ( lx      "lm/m^2"               "Lux" )
-    ( ph      "1e4 lx"               "Phot" )
-    ( fc      "10.76391 lx"          "Footcandle" ) ;; NIST (http://physics.nist.gov/Pubs/SP811/appenB9.html)
-    ( lam     "1e4 lm/m^2"           "Lambert" )
-    ( flam    "3.426259 cd/m^2"     "Footlambert" ) ;; NIST (http://physics.nist.gov/Pubs/SP811/appenB9.html)
+    ( cd      nil                     "*Candela" )
+    ( sb      "1e4 cd/m^2"            "Stilb" )
+    ( lm      "cd sr"                 "Lumen" )
+    ( lx      "lm/m^2"                "Lux" )
+    ( ph      "1e4 lx"                "Phot" )
+    ( fc      "10.76391 lx"           "Footcandle" ) ;; NIST (http://physics.nist.gov/Pubs/SP811/appenB9.html)
+    ( lam     "1e4 lm/m^2"            "Lambert" )
+    ( flam    "3.426259 cd/m^2"       "Footlambert" ) ;; NIST (http://physics.nist.gov/Pubs/SP811/appenB9.html)
 
     ;; Radioactivity
-    ( Bq      "1/s"                  "*Becquerel" )
-    ( Ci      "3.7e10 Bq"            "Curie" )
-    ( Gy      "J/kg"                 "Gray" )
-    ( Sv      "Gy"                   "Sievert" )
-    ( R       "2.58e-4 C/kg"         "Roentgen" )
-    ( rd      ".01 Gy"               "Rad" )
-    ( rem     "rd"                   "Rem" )
+    ( Bq      "1/s"                    "*Becquerel" )
+    ( Ci      "3.7e10 Bq"              "Curie" )
+    ( Gy      "J/kg"                   "Gray" )
+    ( Sv      "Gy"                     "Sievert" )
+    ( R       "2.58e-4 C/kg"           "Roentgen" )
+    ( rd      ".01 Gy"                 "Rad" )
+    ( rem     "rd"                     "Rem" )
 
     ;; Amount of substance
-    ( mol     nil                   "*Mole" )
+    ( mol     nil                      "*Mole" )
 
     ;; Plane angle
-    ( rad     nil                   "*Radian" )
-    ( circ    "2 pi rad"             "Full circle" )
-    ( rev     "circ"                 "Full revolution" )
-    ( deg     "circ/360"            "Degree" )
-    ( arcmin  "deg/60"               "Arc minute" )
-    ( arcsec  "arcmin/60"            "Arc second" )
-    ( grad    "circ/400"            "Grade" )
-    ( rpm     "rev/min"      "Revolutions per minute" )
+    ( rad     nil                      "*Radian" )
+    ( circ    "2 pi rad"               "Full circle" )
+    ( rev     "circ"                   "Full revolution" )
+    ( deg     "circ/360"               "Degree" )
+    ( arcmin  "deg/60"                 "Arc minute" )
+    ( arcsec  "arcmin/60"              "Arc second" )
+    ( grad    "circ/400"               "Grade" )
+    ( rpm     "rev/min"                "Revolutions per minute" )
 
     ;; Solid angle
-    ( sr      nil                    "*Steradian" )
+    ( sr      nil                      "*Steradian" )
 
-    ;; Other physical quantities (CODATA 1998)
-    ( h       "6.62606876e-34 J s"     "*Planck's constant" )
+    ;; Other physical quantities
+    ( h       "6.6260693e-34 J s"     "*Planck's constant" ) ;; CODATA 2005
     ( hbar    "h / 2 pi"               "Planck's constant" )
     ( mu0     "4 pi 1e-7 H/m"          "Permeability of vacuum" )
-    ( Grav    "6.673e-11 m^3/kg^1/s^2" "Gravitational constant" )
-    ( Nav     "6.02214199e23 / mol"    "Avagadro's constant" )
-    ( me      "9.10938188e-31 kg"      "Electron rest mass" )
-    ( mp      "1.67262158e-27 kg"      "Proton rest mass" )
-    ( mn      "1.67492716e-27 kg"      "Neutron rest mass" )
-    ( mu      "1.88353109e-28 kg"      "Muon rest mass" )
-    ( Ryd     "10973731.568549 /m"     "Rydberg's constant" )
-    ( k       "1.3806503e-23 J/K"      "Boltzmann's constant" )
-    ( fsc     "7.297352533e-3"         "Fine structure constant" )
-    ( muB     "927.400899e-26 J/T"     "Bohr magneton" )
-    ( muN     "5.05078317e-27 J/T"     "Nuclear magneton" )
-    ( mue     "-928.476362e-26 J/T"    "Electron magnetic moment" )
-    ( mup     "1.410606633e-26 J/T"    "Proton magnetic moment" )
-    ( R0      "8.314472 J/mol/K"       "Molar gas constant" )
+    ( G       "6.6742e-11 m^3/kg^1/s^2" "Gravitational constant" ) ;; CODATA 2005
+    ( Nav     "6.02214115e23 / mol"    "Avagadro's constant" ) ;; CODATA 2005
+    ( me      "9.1093826e-31 kg"       "Electron rest mass" ) ;; CODATA 2005
+    ( mp      "1.67262171e-27 kg"      "Proton rest mass" ) ;; CODATA 2005
+    ( mn      "1.67492728e-27 kg"      "Neutron rest mass" ) ;; CODATA 2005
+    ( mmu     "1.88353140e-28 kg"      "Muon rest mass" ) ;; CODATA 2005
+    ( Ryd     "10973731.568525 /m"     "Rydberg's constant" ) ;; CODATA 2005
+    ( k       "1.3806505e-23 J/K"      "Boltzmann's constant" ) ;; CODATA 2005
+    ( alpha   "7.297352568e-3"         "Fine structure constant" ) ;; CODATA 2005
+    ( muB     "927.400949e-26 J/T"     "Bohr magneton" ) ;; CODATA 2005
+    ( muN     "5.05078343e-27 J/T"     "Nuclear magneton" ) ;; CODATA 2005
+    ( mue     "-928.476412e-26 J/T"    "Electron magnetic moment" ) ;; CODATA 2005
+    ( mup     "1.41060671e-26 J/T"     "Proton magnetic moment" ) ;; CODATA 2005
+    ( R0      "8.314472 J/mol/K"       "Molar gas constant" ) ;; CODATA 2005
     ( V0      "22.710981e-3 m^3/mol"   "Standard volume of ideal gas" )))
 
 
@@ -247,7 +255,9 @@ If this is changed, be sure to set math-units-table to nil to ensure
 that the combined units table will be rebuilt.")
 
 (defvar math-unit-prefixes
-  '( ( ?E  (float 1 18)  "Exa"    )
+  '( ( ?Y  (float 1 24)  "Yotta"  )
+     ( ?Z  (float 1 21)  "Zetta"  )
+     ( ?E  (float 1 18)  "Exa"    )
      ( ?P  (float 1 15)  "Peta"   )
      ( ?T  (float 1 12)  "Tera"   )
      ( ?G  (float 1 9)   "Giga"   )
@@ -265,7 +275,9 @@ that the combined units table will be rebuilt.")
      ( ?n  (float 1 -9)  "Nano"   )
      ( ?p  (float 1 -12) "Pico"   )
      ( ?f  (float 1 -15) "Femto"  )
-     ( ?a  (float 1 -18) "Atto"   )))
+     ( ?a  (float 1 -18) "Atto"   )
+     ( ?z  (float 1 -21) "zepto"  )
+     ( ?y  (float 1 -24) "yocto"  )))
 
 (defvar math-standard-units-systems
   '( ( base  nil )
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 5dba9f7de5d..449efa5fe66 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -47,7 +47,7 @@
           ;; Create frame-local faces
           (dolist (frame (frame-list))
             (face-spec-set face value frame)
-            (when (memq (window-system frame) '(x w32))
+            (when (memq (window-system frame) '(x w32 mac))
               (setq have-window-system t)))
           ;; When making a face after frames already exist
           (if have-window-system
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 0d5d18da191..087cb77f39d 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -293,9 +293,8 @@ modes are restored automatically; they should not be listed here."
 
 ;; We skip .log files because they are normally temporary.
 ;;         (ftp) files because they require passwords and whatnot.
-;;         TAGS files to save time (tags-file-name is saved instead).
 (defcustom desktop-buffers-not-to-save
-  "\\(^nn\\.a[0-9]+\\|\\.log\\|(ftp)\\|^tags\\|^TAGS\\)$"
+  "\\(^nn\\.a[0-9]+\\|\\.log\\|(ftp)\\)$"
   "Regexp identifying buffers that are to be excluded from saving."
   :type 'regexp
   :group 'desktop)
@@ -307,7 +306,9 @@ modes are restored automatically; they should not be listed here."
   :type 'regexp
   :group 'desktop)
 
-(defcustom desktop-modes-not-to-save nil
+;; We skip TAGS files to save time (tags-file-name is saved instead).
+(defcustom desktop-modes-not-to-save
+  '(tags-table-mode)
   "List of major modes whose buffers should not be saved."
   :type '(repeat symbol)
   :group 'desktop)
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 778ea092e43..3c862bcc421 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -145,7 +145,7 @@ Valid symbols are `truncation', `wrap', `escape', `control',
   "Display character C as character SC in the g1 character set.
 This function assumes that your terminal uses the SO/SI characters;
 it is meaningless for an X frame."
-  (if (memq window-system '(x w32))
+  (if (memq window-system '(x w32 mac))
       (error "Cannot use string glyphs in a windowing system"))
   (or standard-display-table
       (setq standard-display-table (make-display-table)))
@@ -157,7 +157,7 @@ it is meaningless for an X frame."
   "Display character C as character GC in graphics character set.
 This function assumes VT100-compatible escapes; it is meaningless for an
 X frame."
-  (if (memq window-system '(x w32))
+  (if (memq window-system '(x w32 mac))
       (error "Cannot use string glyphs in a windowing system"))
   (or standard-display-table
       (setq standard-display-table (make-display-table)))
@@ -217,7 +217,7 @@ for users who call this function in `.emacs'."
                (equal (aref standard-display-table 161) [161])))
       (progn
         (standard-display-default 160 255)
-        (unless (or (memq window-system '(x w32)))
+        (unless (or (memq window-system '(x w32 mac)))
           (and (terminal-coding-system)
                (set-terminal-coding-system nil))))
 
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index dea72fc7567..0cebeeb6f7f 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -141,7 +141,7 @@ See the functions `find-function' and `find-variable'."
       (unless (string-match "elc" suffix) (push suffix suffixes)))))
 
 (defun find-library-name (library)
-  "Return the full name of the elisp source of LIBRARY."
+  "Return the absolute file name of the Lisp source of LIBRARY."
   ;; If the library is byte-compiled, try to find a source library by
   ;; the same name.
   (if (string-match "\\.el\\(c\\(\\..*\\)?\\)\\'" library)
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index 126c8d50dd9..9c2ac336b9b 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -83,10 +83,14 @@ point (where the PPSS is equivalent to nil).")
     (setq syntax-ppss-cache (cdr syntax-ppss-cache)))
   ;; Throw away `last' value if made invalid.
   (when (< beg (or (car syntax-ppss-last) 0))
-    (if (< beg (or (car (nth 10 syntax-ppss-last))
-                   (nth 9 syntax-ppss-last)
-                   (nth 2 syntax-ppss-last)
-                   0))
+    ;; If syntax-begin-function jumped to BEG, then the old state at BEG can
+    ;; depend on the text after BEG (which is presumably changed).  So if
+    ;; BEG=(car (nth 10 syntax-ppss-last)) don't reuse that data because the
+    ;; assumed nil state at BEG may not be valid any more.
+    (if (<= beg (or (car (nth 10 syntax-ppss-last))
+                    (nth 9 syntax-ppss-last)
+                    (nth 3 syntax-ppss-last)
+                    0))
         (setq syntax-ppss-last nil)
       (setcar syntax-ppss-last nil)))
   ;; Unregister if there's no cache left.  Sadly this doesn't work
@@ -293,5 +297,5 @@ Point is at POS when this function returns."
 
 (provide 'syntax)
 
-;;; arch-tag: 302f1eeb-e77c-4680-a8c5-c543e01161a5
+;; arch-tag: 302f1eeb-e77c-4680-a8c5-c543e01161a5
 ;;; syntax.el ends here
diff --git a/lisp/font-core.el b/lisp/font-core.el
index 4af6e1c41f0..27212f9fc68 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -118,17 +118,14 @@ of `font-lock-global-modes'.  For example, put in your ~/.emacs:
 
  (global-font-lock-mode t)
 
-There are a number of support modes that may be used to speed up Font Lock mode
-in various ways, specified via the variable `font-lock-support-mode'.  Where
-major modes support different levels of fontification, you can use the variable
-`font-lock-maximum-decoration' to specify which level you generally prefer.
-When you turn Font Lock mode on/off the buffer is fontified/defontified, though
-fontification occurs only if the buffer is less than `font-lock-maximum-size'.
+Where major modes support different levels of fontification, you can use
+the variable `font-lock-maximum-decoration' to specify which level you
+generally prefer.  When you turn Font Lock mode on/off the buffer is
+fontified/defontified, though fontification occurs only if the buffer is
+less than `font-lock-maximum-size'.
 
-For example, to specify that Font Lock mode uses Lazy Lock mode as a support
-mode and use maximum levels of fontification, put in your ~/.emacs:
+For example, to use maximum levels of fontification, put in your ~/.emacs:
 
- (setq font-lock-support-mode 'lazy-lock-mode)
  (setq font-lock-maximum-decoration t)
 
 To add your own highlighting for some major mode, and modify the highlighting
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index fceb3e17f78..c0e9e9ab16b 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1048,8 +1048,7 @@ a very meaningful entity to highlight.")
           (setq beg (line-beginning-position (- 1 font-lock-lines-before)))
           ;; check to see if we should expand the beg/end area for
           ;; proper multiline matches
-          (when (and font-lock-multiline
-                     (> beg (point-min))
+          (when (and (> beg (point-min))
                      (get-text-property (1- beg) 'font-lock-multiline))
             ;; We are just after or in a multiline match.
             (setq beg (or (previous-single-property-change
@@ -1057,10 +1056,9 @@ a very meaningful entity to highlight.")
                           (point-min)))
             (goto-char beg)
             (setq beg (line-beginning-position)))
-          (when font-lock-multiline
-            (setq end (or (text-property-any end (point-max)
-                                             'font-lock-multiline nil)
-                          (point-max))))
+          (setq end (or (text-property-any end (point-max)
+                                           'font-lock-multiline nil)
+                        (point-max)))
           (goto-char end)
           ;; Round up to a whole line.
           (unless (bolp) (setq end (line-beginning-position 2)))
@@ -1184,35 +1182,35 @@ Optional argument OBJECT is the string or buffer containing the text."
 
 ;; For completeness: this is to `remove-text-properties' as `put-text-property'
 ;; is to `add-text-properties', etc.
-;(defun remove-text-property (start end property &optional object)
-;  "Remove a property from text from START to END.
-;Argument PROPERTY is the property to remove.
-;Optional argument OBJECT is the string or buffer containing the text.
-;Return t if the property was actually removed, nil otherwise."
-;  (remove-text-properties start end (list property) object))
+;;(defun remove-text-property (start end property &optional object)
+;;  "Remove a property from text from START to END.
+;;Argument PROPERTY is the property to remove.
+;;Optional argument OBJECT is the string or buffer containing the text.
+;;Return t if the property was actually removed, nil otherwise."
+;;  (remove-text-properties start end (list property) object))
 
 ;; For consistency: maybe this should be called `remove-single-property' like
 ;; `next-single-property-change' (not `next-single-text-property-change'), etc.
-;(defun remove-single-text-property (start end prop value &optional object)
-;  "Remove a specific property value from text from START to END.
-;Arguments PROP and VALUE specify the property and value to remove.  The
-;resulting property values are not equal to VALUE nor lists containing VALUE.
-;Optional argument OBJECT is the string or buffer containing the text."
-;  (let ((start (text-property-not-all start end prop nil object)) next prev)
-;    (while start
-;      (setq next (next-single-property-change start prop object end)
-;           prev (get-text-property start prop object))
-;      (cond ((and (symbolp prev) (eq value prev))
-;            (remove-text-property start next prop object))
-;           ((and (listp prev) (memq value prev))
-;            (let ((new (delq value prev)))
-;              (cond ((null new)
-;                     (remove-text-property start next prop object))
-;                    ((= (length new) 1)
-;                     (put-text-property start next prop (car new) object))
-;                    (t
-;                     (put-text-property start next prop new object))))))
-;      (setq start (text-property-not-all next end prop nil object)))))
+;;(defun remove-single-text-property (start end prop value &optional object)
+;;  "Remove a specific property value from text from START to END.
+;;Arguments PROP and VALUE specify the property and value to remove.  The
+;;resulting property values are not equal to VALUE nor lists containing VALUE.
+;;Optional argument OBJECT is the string or buffer containing the text."
+;;  (let ((start (text-property-not-all start end prop nil object)) next prev)
+;;    (while start
+;;      (setq next (next-single-property-change start prop object end)
+;;          prev (get-text-property start prop object))
+;;      (cond ((and (symbolp prev) (eq value prev))
+;;           (remove-text-property start next prop object))
+;;          ((and (listp prev) (memq value prev))
+;;           (let ((new (delq value prev)))
+;;             (cond ((null new)
+;;                    (remove-text-property start next prop object))
+;;                   ((= (length new) 1)
+;;                    (put-text-property start next prop (car new) object))
+;;                   (t
+;;                    (put-text-property start next prop new object))))))
+;;      (setq start (text-property-not-all next end prop nil object)))))
 
 ;;; End of Additional text property functions.
 
@@ -1534,7 +1532,8 @@ If REGEXP is non-nil, it means these keywords are used for
                    (if (memq (get-text-property (match-beginning 0) 'face)
                              '(font-lock-string-face font-lock-doc-face
                                font-lock-comment-face))
-                       font-lock-warning-face)
+                       (list 'face font-lock-warning-face
+                             'help-echo "Looks like a toplevel defun: escape the parenthesis"))
                    prepend)))))
     keywords))
 
@@ -1602,7 +1601,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
     (let* ((defaults (or font-lock-defaults
                          (cdr (assq major-mode
                                     (with-no-warnings
-                                     font-lock-defaults-alist)))))
+                                      font-lock-defaults-alist)))))
            (keywords
             (font-lock-choose-keywords (nth 0 defaults)
                                        (font-lock-value-in-major-mode font-lock-maximum-decoration)))
@@ -1854,95 +1853,95 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
 ;; buttons and when they are on or off needs tweaking.  I have assumed that the
 ;; mechanism is via `menu-toggle' and `menu-selected' symbol properties.  sm.
 
-;;;;###autoload
-;(progn
-;  ;; Make the Font Lock menu.
-;  (defvar font-lock-menu (make-sparse-keymap "Syntax Highlighting"))
-;  ;; Add the menu items in reverse order.
-;  (define-key font-lock-menu [fontify-less]
-;    '("Less In Current Buffer" . font-lock-fontify-less))
-;  (define-key font-lock-menu [fontify-more]
-;    '("More In Current Buffer" . font-lock-fontify-more))
-;  (define-key font-lock-menu [font-lock-sep]
-;    '("--"))
-;  (define-key font-lock-menu [font-lock-mode]
-;    '("In Current Buffer" . font-lock-mode))
-;  (define-key font-lock-menu [global-font-lock-mode]
-;    '("In All Buffers" . global-font-lock-mode)))
-;
-;;;;###autoload
-;(progn
-;  ;; We put the appropriate `menu-enable' etc. symbol property values on when
-;  ;; font-lock.el is loaded, so we don't need to autoload the three variables.
-;  (put 'global-font-lock-mode 'menu-toggle t)
-;  (put 'font-lock-mode 'menu-toggle t)
-;  (put 'font-lock-fontify-more 'menu-enable '(identity))
-;  (put 'font-lock-fontify-less 'menu-enable '(identity)))
-;
-; ;; Put the appropriate symbol property values on now.  See above.
-;(put 'global-font-lock-mode 'menu-selected 'global-font-lock-mode)
-;(put 'font-lock-mode 'menu-selected 'font-lock-mode)
-;(put 'font-lock-fontify-more 'menu-enable '(nth 2 font-lock-fontify-level))
-;(put 'font-lock-fontify-less 'menu-enable '(nth 1 font-lock-fontify-level))
-;
-;(defvar font-lock-fontify-level nil)   ; For less/more fontification.
-;
-;(defun font-lock-fontify-level (level)
-;  (let ((font-lock-maximum-decoration level))
-;    (when font-lock-mode
-;      (font-lock-mode))
-;    (font-lock-mode)
-;    (when font-lock-verbose
-;      (message "Fontifying %s... level %d" (buffer-name) level))))
-;
-;(defun font-lock-fontify-less ()
-;  "Fontify the current buffer with less decoration.
-;See `font-lock-maximum-decoration'."
-;  (interactive)
-;  ;; Check in case we get called interactively.
-;  (if (nth 1 font-lock-fontify-level)
-;      (font-lock-fontify-level (1- (car font-lock-fontify-level)))
-;    (error "No less decoration")))
-;
-;(defun font-lock-fontify-more ()
-;  "Fontify the current buffer with more decoration.
-;See `font-lock-maximum-decoration'."
-;  (interactive)
-;  ;; Check in case we get called interactively.
-;  (if (nth 2 font-lock-fontify-level)
-;      (font-lock-fontify-level (1+ (car font-lock-fontify-level)))
-;    (error "No more decoration")))
-;
-; ;; This should be called by `font-lock-set-defaults'.
-;(defun font-lock-set-menu ()
-;  ;; Activate less/more fontification entries if there are multiple levels for
-;  ;; the current buffer.  Sets `font-lock-fontify-level' to be of the form
-;  ;; (CURRENT-LEVEL IS-LOWER-LEVEL-P IS-HIGHER-LEVEL-P) for menu activation.
-;  (let ((keywords (or (nth 0 font-lock-defaults)
-;                     (nth 1 (assq major-mode font-lock-defaults-alist))))
-;       (level (font-lock-value-in-major-mode font-lock-maximum-decoration)))
-;    (make-local-variable 'font-lock-fontify-level)
-;    (if (or (symbolp keywords) (= (length keywords) 1))
-;       (font-lock-unset-menu)
-;      (cond ((eq level t)
-;            (setq level (1- (length keywords))))
-;           ((or (null level) (zerop level))
-;            ;; The default level is usually, but not necessarily, level 1.
-;            (setq level (- (length keywords)
-;                           (length (member (eval (car keywords))
-;                                           (mapcar 'eval (cdr keywords))))))))
-;      (setq font-lock-fontify-level (list level (> level 1)
-;                                         (< level (1- (length keywords))))))))
-;
-; ;; This should be called by `font-lock-unset-defaults'.
-;(defun font-lock-unset-menu ()
-;  ;; Deactivate less/more fontification entries.
-;  (setq font-lock-fontify-level nil))
+;;;;;###autoload
+;;(progn
+;;  ;; Make the Font Lock menu.
+;;  (defvar font-lock-menu (make-sparse-keymap "Syntax Highlighting"))
+;;  ;; Add the menu items in reverse order.
+;;  (define-key font-lock-menu [fontify-less]
+;;    '("Less In Current Buffer" . font-lock-fontify-less))
+;;  (define-key font-lock-menu [fontify-more]
+;;    '("More In Current Buffer" . font-lock-fontify-more))
+;;  (define-key font-lock-menu [font-lock-sep]
+;;    '("--"))
+;;  (define-key font-lock-menu [font-lock-mode]
+;;    '("In Current Buffer" . font-lock-mode))
+;;  (define-key font-lock-menu [global-font-lock-mode]
+;;    '("In All Buffers" . global-font-lock-mode)))
+;;
+;;;;;###autoload
+;;(progn
+;;  ;; We put the appropriate `menu-enable' etc. symbol property values on when
+;;  ;; font-lock.el is loaded, so we don't need to autoload the three variables.
+;;  (put 'global-font-lock-mode 'menu-toggle t)
+;;  (put 'font-lock-mode 'menu-toggle t)
+;;  (put 'font-lock-fontify-more 'menu-enable '(identity))
+;;  (put 'font-lock-fontify-less 'menu-enable '(identity)))
+;;
+;; ;; Put the appropriate symbol property values on now.  See above.
+;;(put 'global-font-lock-mode 'menu-selected 'global-font-lock-mode)
+;;(put 'font-lock-mode 'menu-selected 'font-lock-mode)
+;;(put 'font-lock-fontify-more 'menu-enable '(nth 2 font-lock-fontify-level))
+;;(put 'font-lock-fontify-less 'menu-enable '(nth 1 font-lock-fontify-level))
+;;
+;;(defvar font-lock-fontify-level nil)  ; For less/more fontification.
+;;
+;;(defun font-lock-fontify-level (level)
+;;  (let ((font-lock-maximum-decoration level))
+;;    (when font-lock-mode
+;;      (font-lock-mode))
+;;    (font-lock-mode)
+;;    (when font-lock-verbose
+;;      (message "Fontifying %s... level %d" (buffer-name) level))))
+;;
+;;(defun font-lock-fontify-less ()
+;;  "Fontify the current buffer with less decoration.
+;;See `font-lock-maximum-decoration'."
+;;  (interactive)
+;;  ;; Check in case we get called interactively.
+;;  (if (nth 1 font-lock-fontify-level)
+;;      (font-lock-fontify-level (1- (car font-lock-fontify-level)))
+;;    (error "No less decoration")))
+;;
+;;(defun font-lock-fontify-more ()
+;;  "Fontify the current buffer with more decoration.
+;;See `font-lock-maximum-decoration'."
+;;  (interactive)
+;;  ;; Check in case we get called interactively.
+;;  (if (nth 2 font-lock-fontify-level)
+;;      (font-lock-fontify-level (1+ (car font-lock-fontify-level)))
+;;    (error "No more decoration")))
+;;
+;; ;; This should be called by `font-lock-set-defaults'.
+;;(defun font-lock-set-menu ()
+;;  ;; Activate less/more fontification entries if there are multiple levels for
+;;  ;; the current buffer.  Sets `font-lock-fontify-level' to be of the form
+;;  ;; (CURRENT-LEVEL IS-LOWER-LEVEL-P IS-HIGHER-LEVEL-P) for menu activation.
+;;  (let ((keywords (or (nth 0 font-lock-defaults)
+;;                    (nth 1 (assq major-mode font-lock-defaults-alist))))
+;;      (level (font-lock-value-in-major-mode font-lock-maximum-decoration)))
+;;    (make-local-variable 'font-lock-fontify-level)
+;;    (if (or (symbolp keywords) (= (length keywords) 1))
+;;      (font-lock-unset-menu)
+;;      (cond ((eq level t)
+;;           (setq level (1- (length keywords))))
+;;          ((or (null level) (zerop level))
+;;           ;; The default level is usually, but not necessarily, level 1.
+;;           (setq level (- (length keywords)
+;;                          (length (member (eval (car keywords))
+;;                                          (mapcar 'eval (cdr keywords))))))))
+;;      (setq font-lock-fontify-level (list level (> level 1)
+;;                                        (< level (1- (length keywords))))))))
+;;
+;; ;; This should be called by `font-lock-unset-defaults'.
+;;(defun font-lock-unset-menu ()
+;;  ;; Deactivate less/more fontification entries.
+;;  (setq font-lock-fontify-level nil))
 
 ;;; End of Menu support.
 
 ;;; Various regexp information shared by several modes.
-; ;; Information specific to a single mode should go in its load library.
+;; ;; Information specific to a single mode should go in its load library.
 
 ;; Font Lock support for C, C++, Objective-C and Java modes is now in
 ;; cc-fonts.el (and required by cc-mode.el).  However, the below function
diff --git a/lisp/frame.el b/lisp/frame.el
index c8085762d2a..8342d8e6aac 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1132,9 +1132,9 @@ frame's display)."
   "Return the number of screens associated with DISPLAY."
   (let ((frame-type (framep-on-display display)))
     (cond
-     ((memq frame-type '(x w32))
+     ((memq frame-type '(x w32 mac))
       (x-display-screens display))
-     (t ;; FIXME: is this correct for the Mac?
+     (t
       1))))
 
 (defun display-pixel-height (&optional display)
@@ -1342,7 +1342,7 @@ cursor display.  On a text-only terminal, this is not implemented."
   :init-value (not (or noninteractive
                        no-blinking-cursor
                        (eq system-type 'ms-dos)
-                       (not (memq initial-window-system '(x w32)))))
+                       (not (memq initial-window-system '(x w32 mac)))))
   :initialize 'custom-initialize-safe-default
   :group 'cursor
   :global t
diff --git a/lisp/ido.el b/lisp/ido.el
index b234795d3be..cc4eab4bb4d 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1084,9 +1084,9 @@ it doesn't interfere with other minibuffer usage.")
           (setq truncate-lines t)))))
 
 (defun ido-is-tramp-root (&optional dir)
-  (setq dir (or dir ido-current-directory))
   (and ido-enable-tramp-completion
-       (string-match "\\`/[^/][^/]+:\\([^/:@]+@\\)?\\'" dir)))
+       (string-match "\\`/[^/]+[@:]\\'"
+                     (or dir ido-current-directory))))
 
 (defun ido-is-root-directory (&optional dir)
   (setq dir (or dir ido-current-directory))
@@ -1507,11 +1507,16 @@ With ARG, turn ido speed-up on if arg is positive, off otherwise."
 
 (defun ido-set-current-directory (dir &optional subdir no-merge)
   ;; Set ido's current directory to DIR or DIR/SUBDIR
-  (setq dir (ido-final-slash dir t))
+  (unless (and ido-enable-tramp-completion
+               (string-match "\\`/[^/]*@\\'" dir))
+    (setq dir (ido-final-slash dir t)))
   (setq ido-use-merged-list nil
         ido-try-merged-list (not no-merge))
-  (if subdir
-      (setq dir (ido-final-slash (concat dir subdir) t)))
+  (when subdir
+    (setq dir (concat dir subdir))
+    (unless (and ido-enable-tramp-completion
+                 (string-match "\\`/[^/]*@\\'" dir))
+      (setq dir (ido-final-slash dir t))))
   (if (equal dir ido-current-directory)
       nil
     (ido-trace "cd" dir)
@@ -3102,27 +3107,29 @@ for first matching file."
    ((ido-nonreadable-directory-p dir) '())
    ;; do not check (ido-directory-too-big-p dir) here.
    ;; Caller must have done that if necessary.
+
    ((and ido-enable-tramp-completion
-         (string-match "\\`/\\([^/:]+:\\([^/:@]+@\\)?\\)\\'" dir))
-
-    ;; Trick tramp's file-name-all-completions handler to DTRT, as it
-    ;; has some pretty obscure requirements.  This seems to work...
-    ;; /ftp:            => (f-n-a-c "/ftp:" "")
-    ;; /ftp:kfs:        => (f-n-a-c "" "/ftp:kfs:")
-    ;; /ftp:kfs@      => (f-n-a-c "ftp:kfs@" "/")
-    ;; /ftp:kfs@kfs:  => (f-n-a-c "" "/ftp:kfs@kfs:")
-    ;; Currently no attempt is made to handle multi: stuff.
-
-    (let* ((prefix (match-string 1 dir))
-           (user-flag (match-beginning 2))
-           (len (and prefix (length prefix)))
-           compl)
-      (if user-flag
-          (setq dir (substring dir 1)))
-      (require 'tramp nil t)
-      (ido-trace "tramp complete" dir)
-      (setq compl (file-name-all-completions dir (if user-flag "/" "")))
-      (if (> len 0)
+         (or (fboundp 'tramp-completion-mode)
+             (require 'tramp nil t))
+         (string-match "\\`/[^/]+[:@]\\'" dir))
+    ;; Strip method:user@host: part of tramp completions.
+    ;; Tramp completions do not include leading slash.
+    (let ((len (1- (length dir)))
+          (compl
+           (or (file-name-all-completions "" dir)
+               ;; work around bug in ange-ftp.
+               ;; /ftp:user@host: => nil
+               ;; /ftp:user@host:./ => ok
+               (and
+                (not (string= "/ftp:" dir))
+                (tramp-tramp-file-p dir)
+                (fboundp 'tramp-ftp-file-name-p)
+                (funcall 'tramp-ftp-file-name-p dir)
+                (string-match ":\\'" dir)
+                (file-name-all-completions "" (concat dir "./"))))))
+      (if (and compl
+               (> (length (car compl)) len)
+               (string= (substring (car compl) 0 len) (substring dir 1)))
           (mapcar (lambda (c) (substring c len)) compl)
         compl)))
    (t
@@ -3193,13 +3200,14 @@ for first matching file."
                               (if ido-file-extensions-order
                                   #'ido-file-extension-lessp
                                 #'ido-file-lessp)))
-    (let ((default-directory ido-current-directory))
-      (ido-to-end ;; move ftp hosts and visited files to end
-       (delq nil (mapcar
-                  (lambda (x) (if (or (string-match "..:\\'" x)
-                                      (and (not (ido-final-slash x))
-                                           (get-file-buffer x))) x))
-                  ido-temp-list))))
+    (unless (ido-is-tramp-root ido-current-directory)
+      (let ((default-directory ido-current-directory))
+        (ido-to-end ;; move ftp hosts and visited files to end
+         (delq nil (mapcar
+                    (lambda (x) (if (or (string-match "..:\\'" x)
+                                        (and (not (ido-final-slash x))
+                                             (get-file-buffer x))) x))
+                    ido-temp-list)))))
     (ido-to-end  ;; move . files to end
      (delq nil (mapcar
                 (lambda (x) (if (string-equal (substring x 0 1) ".") x))
diff --git a/lisp/image.el b/lisp/image.el
index ee188677517..72e6ee8e633 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -33,7 +33,7 @@
   :group 'multimedia)
 
 
-(defconst image-type-regexps
+(defconst image-type-header-regexps
   '(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm)
     ("\\`P[1-6]" . pbm)
     ("\\`GIF8" . gif)
@@ -49,6 +49,21 @@ IMAGE-TYPE must be a pair (PREDICATE . TYPE).  PREDICATE is called
 with one argument, a string containing the image data.  If PREDICATE returns
 a non-nil value, TYPE is the image's type.")
 
+(defconst image-type-file-name-regexps
+  '(("\\.png\\'" . png)
+    ("\\.gif\\'" . gif)
+    ("\\.jpe?g\\'" . jpeg)
+    ("\\.bmp\\'" . bmp)
+    ("\\.xpm\\'" . xpm)
+    ("\\.pbm\\'" . pbm)
+    ("\\.xbm\\'" . xbm)
+    ("\\.ps\\'" . postscript)
+    ("\\.tiff?\\'" . tiff))
+  "Alist of (REGEXP . IMAGE-TYPE) pairs used to identify image files.
+When the name of an image file match REGEXP, it is assumed to
+be of image type IMAGE-TYPE.")
+
+
 (defvar image-load-path
   (list (file-name-as-directory (expand-file-name "images" data-directory))
         'data-directory 'load-path)
@@ -87,18 +102,50 @@ We accept the tag Exif because that is the same format."
   "Determine the image type from image data DATA.
 Value is a symbol specifying the image type or nil if type cannot
 be determined."
-  (let ((types image-type-regexps)
+  (let ((types image-type-header-regexps)
         type)
-    (while (and types (null type))
+    (while types
       (let ((regexp (car (car types)))
             (image-type (cdr (car types))))
-        (when (or (and (symbolp image-type)
-                       (string-match regexp data))
-                  (and (consp image-type)
-                       (funcall (car image-type) data)
-                       (setq image-type (cdr image-type))))
-          (setq type image-type))
-        (setq types (cdr types))))
+        (if (or (and (symbolp image-type)
+                     (string-match regexp data))
+                (and (consp image-type)
+                     (funcall (car image-type) data)
+                     (setq image-type (cdr image-type))))
+            (setq type image-type
+                  types nil)
+          (setq types (cdr types)))))
+    type))
+
+
+;;;###autoload
+(defun image-type-from-buffer ()
+  "Determine the image type from data in the current buffer.
+Value is a symbol specifying the image type or nil if type cannot
+be determined."
+  (let ((types image-type-header-regexps)
+        type
+        (opoint (point)))
+    (goto-char (point-min))
+    (while types
+      (let ((regexp (car (car types)))
+            (image-type (cdr (car types)))
+            data)
+        (if (or (and (symbolp image-type)
+                     (looking-at regexp))
+                (and (consp image-type)
+                     (funcall (car image-type)
+                              (or data
+                                  (setq data
+                                        (buffer-substring
+                                         (point-min)
+                                         (min (point-max)
+                                              (+ (point-min) 256))))))
+                     (setq image-type (cdr image-type))))
+            (setq type image-type
+                  types nil)
+          (setq types (cdr types)))))
+    (goto-char opoint)
     type))
 
 
@@ -107,14 +154,30 @@ be determined."
   "Determine the type of image file FILE from its first few bytes.
 Value is a symbol specifying the image type, or nil if type cannot
 be determined."
-  (unless (file-name-directory file)
-    (setq file (expand-file-name file data-directory)))
-  (setq file (expand-file-name file))
-  (let ((header (with-temp-buffer
-                  (set-buffer-multibyte nil)
-                  (insert-file-contents-literally file nil 0 256)
-                  (buffer-string))))
-    (image-type-from-data header)))
+  (unless (or (file-readable-p file)
+              (file-name-absolute-p file))
+    (setq file (image-search-load-path file)))
+  (and file
+       (file-readable-p file)
+       (with-temp-buffer
+         (set-buffer-multibyte nil)
+         (insert-file-contents-literally file nil 0 256)
+         (image-type-from-buffer))))
+
+
+;;;###autoload
+(defun image-type-from-file-name (file)
+  "Determine the type of image file FILE from its name.
+Value is a symbol specifying the image type, or nil if type cannot
+be determined."
+  (let ((types image-type-file-name-regexps)
+        type)
+    (while types
+      (if (string-match (car (car types)) file)
+          (setq type (cdr (car types))
+                types nil)
+        (setq types (cdr types))))
+    type))
 
 
 ;;;###autoload
@@ -124,6 +187,7 @@ Image types are symbols like `xbm' or `jpeg'."
   (and (fboundp 'init-image-library)
        (init-image-library type image-library-alist)))
 
+
 ;;;###autoload
 (defun create-image (file-or-data &optional type data-p &rest props)
   "Create an image.
@@ -135,7 +199,9 @@ use its file extension as image type.
 Optional DATA-P non-nil means FILE-OR-DATA is a string containing image data.
 Optional PROPS are additional image attributes to assign to the image,
 like, e.g. `:mask MASK'.
-Value is the image created, or nil if images of type TYPE are not supported."
+Value is the image created, or nil if images of type TYPE are not supported.
+
+Images should not be larger than specified by `max-image-size'."
   (when (and (not data-p) (not (stringp file-or-data)))
     (error "Invalid image file name `%s'" file-or-data))
   (cond ((null data-p)
@@ -279,27 +345,29 @@ BUFFER nil or omitted means use the current buffer."
           (delete-overlay overlay)))
       (setq overlays (cdr overlays)))))
 
-(defun image-search-load-path (file path)
-  (let (element found pathname)
+(defun image-search-load-path (file &optional path)
+  (unless path
+    (setq path image-load-path))
+  (let (element found filename)
     (while (and (not found) (consp path))
       (setq element (car path))
       (cond
        ((stringp element)
         (setq found
               (file-readable-p
-               (setq pathname (expand-file-name file element)))))
+               (setq filename (expand-file-name file element)))))
        ((and (symbolp element) (boundp element))
         (setq element (symbol-value element))
         (cond
          ((stringp element)
           (setq found
                 (file-readable-p
-                 (setq pathname (expand-file-name file element)))))
+                 (setq filename (expand-file-name file element)))))
          ((consp element)
-          (if (setq pathname (image-search-load-path file element))
+          (if (setq filename (image-search-load-path file element))
               (setq found t))))))
       (setq path (cdr path)))
-    (if found pathname)))
+    (if found filename)))
 
 ;;;###autoload
 (defun find-image (specs)
@@ -317,7 +385,9 @@ is supported, and FILE exists, is used to construct the image
 specification to be returned.  Return nil if no specification is
 satisfied.
 
-The image is looked for in `image-load-path'."
+The image is looked for in `image-load-path'.
+
+Image files should not be larger than specified by `max-image-size'."
   (let (image)
     (while (and specs (null image))
       (let* ((spec (car specs))
@@ -327,8 +397,7 @@ The image is looked for in `image-load-path'."
              found)
         (when (image-type-available-p type)
           (cond ((stringp file)
-                 (if (setq found (image-search-load-path
-                                  file image-load-path))
+                 (if (setq found (image-search-load-path file))
                      (setq image
                            (cons 'image (plist-put (copy-sequence spec)
                                                    :file found)))))
diff --git a/lisp/info.el b/lisp/info.el
index 6594d76fa03..c94e4121dc8 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2819,7 +2819,8 @@ Give a blank topic name to go to the Index node itself."
            (car (car Info-index-alternatives))
            (nth 2 (car Info-index-alternatives))
            (if (cdr Info-index-alternatives)
-               "(`,' tries to find next)"
+               (format "(%s total; use `,' for next)"
+                       (length Info-index-alternatives))
              "(Only match)")))
 
 (defun Info-find-index-name (name)
diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el
index 7c10a10d35a..9849fd0c538 100644
--- a/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@ -266,6 +266,7 @@
    (valid-codes (0 . 255))))
 
 (define-coding-system-alias 'tcvn 'vietnamese-tcvn)
+(define-coding-system-alias 'tcvn-5712 'vietnamese-tcvn)
 
 ;; (make-coding-system
 ;;  'vietnamese-vps 4 ?p
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 61c4192387d..f23715f3825 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -53,24 +53,23 @@ a buffer with no associated file, or an `eval-region', return nil."
     (car (feature-symbols feature))))
 
 (defun file-loadhist-lookup (file)
-  "Return the `load-history' element for FILE."
+  "Return the `load-history' element for FILE.
+FILE can be a file name, or a library name.
+A library name is equivalent to the file name that `load-library' would load."
   ;; First look for FILE as given.
   (let ((symbols (assoc file load-history)))
     ;; Try converting a library name to an absolute file name.
     (and (null symbols)
-         (let ((absname (find-library-name file)))
-           (if (not (equal absname file))
-               (setq symbols (cdr (assoc absname load-history))))))
-    ;; Try converting an absolute file name to a library name.
-    (and (null symbols) (string-match "[.]el\\'" file)
-         (let ((libname (file-name-nondirectory file)))
-           (string-match "[.]el\\'" libname)
-           (setq libname (substring libname 0 (match-beginning 0)))
-           (setq symbols (cdr (assoc libname load-history)))))
+         (let ((absname 
+                (locate-file file load-path load-suffixes)))
+           (and absname (not (equal absname file))
+                (setq symbols (cdr (assoc absname load-history))))))
     symbols))
 
 (defun file-provides (file)
-  "Return the list of features provided by FILE."
+  "Return the list of features provided by FILE as it was loaded.
+FILE can be a file name, or a library name.
+A library name is equivalent to the file name that `load-library' would load."
   (let ((symbols (file-loadhist-lookup file))
         provides)
     (mapc (lambda (x)
@@ -80,7 +79,9 @@ a buffer with no associated file, or an `eval-region', return nil."
     provides))
 
 (defun file-requires (file)
-  "Return the list of features required by FILE."
+  "Return the list of features required by FILE as it was loaded.
+FILE can be a file name, or a library name.
+A library name is equivalent to the file name that `load-library' would load."
   (let ((symbols (file-loadhist-lookup file))
         requires)
     (mapc (lambda (x)
@@ -98,7 +99,9 @@ a buffer with no associated file, or an `eval-region', return nil."
 
 (defun file-dependents (file)
   "Return the list of loaded libraries that depend on FILE.
-This can include FILE itself."
+This can include FILE itself.
+FILE can be a file name, or a library name.
+A library name is equivalent to the file name that `load-library' would load."
   (let ((provides (file-provides file))
         (dependents nil))
     (dolist (x load-history dependents)
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 81afe688c10..8e7a71d65ab 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -185,6 +185,7 @@ This file need not actually exist."
   :type '(choice (const nil) file)
   :group 'sendmail)
 
+;;;###autoload
 (defcustom mail-setup-hook nil
   "Normal hook, run each time a new outgoing mail message is initialized.
 The function `mail-setup' runs this hook."
@@ -192,6 +193,7 @@ The function `mail-setup' runs this hook."
   :options '(fortune-to-signature spook mail-abbrevs-setup)
   :group 'sendmail)
 
+;;;###autoload
 (defvar mail-aliases t
   "Alist of mail address aliases,
 or t meaning should be initialized from your mail aliases file.
@@ -203,17 +205,20 @@ The alias definitions in the file have this form:
 (defvar mail-alias-modtime nil
   "The modification time of your mail alias file when it was last examined.")
 
+;;;###autoload
 (defcustom mail-yank-prefix nil
   "*Prefix insert on lines of yanked message being replied to.
 nil means use indentation."
   :type '(choice (const nil) string)
   :group 'sendmail)
 
+;;;###autoload
 (defcustom mail-indentation-spaces 3
   "*Number of spaces to insert at the beginning of each cited line.
 Used by `mail-yank-original' via `mail-indent-citation'."
   :type 'integer
   :group 'sendmail)
+
 (defvar mail-yank-hooks nil
   "Obsolete hook for modifying a citation just inserted in the mail buffer.
 Each hook function can find the citation between (point) and (mark t).
@@ -242,6 +247,7 @@ instead of no action."
 This enables the hook functions to see the whole message header
 regardless of what part of it (if any) is included in the cited text.")
 
+;;;###autoload
 (defcustom mail-citation-prefix-regexp "[ \t]*[-a-z0-9A-Z]*>+[ \t]*\\|[ \t]*"
   "*Regular expression to match a citation prefix plus whitespace.
 It should match whatever sort of citation prefixes you want to handle,
@@ -281,6 +287,7 @@ and should insert whatever you want to insert."
   :group 'sendmail)
 (put 'mail-signature 'risky-local-variable t)
 
+;;;###autoload
 (defcustom mail-signature-file "~/.signature"
   "*File containing the text inserted at end of mail buffer."
   :type 'file
@@ -301,6 +308,7 @@ This directory is used for auto-save files of mail buffers."
 (put 'mail-reply-action 'permanent-local t)
 (put 'mail-send-actions 'permanent-local t)
 
+;;;###autoload
 (defcustom mail-default-headers nil
   "*A string containing header lines, to be inserted in outgoing messages.
 It is inserted before you edit the message,
@@ -308,6 +316,7 @@ so you can edit or delete these lines."
   :type '(choice (const nil) string)
   :group 'sendmail)
 
+;;;###autoload
 (defcustom mail-bury-selects-summary t
   "*If non-nil, try to show RMAIL summary buffer after returning from mail.
 The functions \\[mail-send-on-exit] or \\[mail-dont-send] select
@@ -316,6 +325,7 @@ is non-nil."
   :type 'boolean
   :group 'sendmail)
 
+;;;###autoload
 (defcustom mail-send-nonascii 'mime
   "*Specify whether to allow sending non-ASCII characters in mail.
 If t, that means do allow it.  nil means don't allow it.
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index d909c909b10..059351cf4be 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -306,6 +306,7 @@ $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
            -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
            --eval "(setq generated-autoload-file \"$(lisp)/mh-e/mh-loaddefs.el\")" \
+           --eval "(setq find-file-suppress-same-file-warnings t)" \
            --eval "(setq make-backup-files nil)" \
            -f batch-update-autoloads $(lisp)/mh-e
 
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index bf3b1427ac2..f50ca07a488 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -2686,7 +2686,12 @@ away in the internal cache."
          ;; Require the previous column to end in a digit.
          ;; This avoids recognizing `1 may 1997' as a date in the line:
          ;; -r--r--r--   1 may      1997        1168 Oct 19 16:49 README
-    (concat "[0-9]" s "\\(" western "\\|" japanese "\\)" s))
+         ;; albinus:
+         ;; Require also the following column to start in a digit.
+         ;; This avoids recognizing `kfs 10' as a date in the line:
+         ;; -rw-------   1 kfs                    10 May 27  2003 .autorun.lck
+;;  (concat "[0-9]" s "\\(" western "\\|" japanese "\\)" s))
+    (concat "[0-9]" s "\\(" western "\\|" japanese "\\)" s "+[0-9]"))
   "Regular expression to match up to the column before the file name in a
 directory listing.  This regular expression is designed to recognize dates
 regardless of the language.")
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
new file mode 100644
index 00000000000..4448043056c
--- /dev/null
+++ b/lisp/net/rcirc.el
@@ -0,0 +1,1720 @@
+;;; rcirc.el --- default, simple IRC client.
+
+;; Copyright (C) 2005 Free Software Foundation, Inc.
+
+;; Author: Ryan Yeske
+;; URL: http://www.nongnu.org/rcirc
+;; Keywords: comm
+
+;; This file is part of GNU Emacs.
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; rcirc is an Internet Relay Chat (IRC) client for Emacs
+
+;; IRC is a form of instant communication over the Internet. It is
+;; mainly designed for group (many-to-many) communication in
+;; discussion forums called channels, but also allows one-to-one
+;; communication.
+
+;; Open a new irc connection with:
+;; M-x irc RET
+
+;;; Code:
+
+(require 'ring)
+(require 'time-date)
+(eval-when-compile (require 'cl))
+
+(defvar rcirc-server "irc.freenode.net"
+  "The default server to connect to.")
+
+(defvar rcirc-port 6667
+  "The default port to connect to.")
+
+(defvar rcirc-nick (user-login-name)
+  "Your nick.")
+
+(defvar rcirc-user-name (user-login-name)
+  "Your user name sent to the server when connecting.")
+
+(defvar rcirc-user-full-name (if (string= (user-full-name) "")
+                                 rcirc-user-name
+                               (user-full-name))
+  "The full name sent to the server when connecting.")
+
+(defvar rcirc-startup-channels-alist nil
+  "Alist of channels to join at startup.
+Each element looks like (REGEXP . CHANNEL-LIST).")
+
+(defvar rcirc-fill-flag t
+  "*Non-nil means fill messages printed in channel buffers.")
+
+(defvar rcirc-fill-column nil
+  "*If non-nil, fill to this column, otherwise use value of `fill-column'.")
+
+(defvar rcirc-fill-prefix nil
+  "*Text to insert before filled lines.
+If nil, calculate the prefix dynamically to line up text
+underneath each nick.")
+
+(defvar rcirc-ignore-channel-activity nil
+  "If non-nil, ignore activity in this channel.")
+(make-variable-buffer-local 'rcirc-ignore-channel-activity)
+
+(defvar rcirc-ignore-all-activity-flag nil
+  "*Non-nil means track activity, but do not display it in the modeline.")
+
+(defvar rcirc-time-format "%H:%M "
+  "*Describes how timestamps are printed.
+Used as the first arg to `format-time-string'.")
+
+(defvar rcirc-input-ring-size 1024
+  "*Size of input history ring.")
+
+(defvar rcirc-read-only-flag t
+  "*Non-nil means make text in irc buffers read-only.")
+
+(defvar rcirc-buffer-maximum-lines nil
+  "*The maximum size in lines for rcirc buffers.
+Channel buffers are truncated from the top to be no greater than this
+number.  If zero or nil, no truncating is done.")
+
+(defvar rcirc-authinfo-file-name
+  "~/.rcirc-authinfo"
+  "File containing rcirc authentication passwords.
+The file consists of a single list, with each element itself a
+list with a SERVER-REGEXP string, a NICK-REGEXP string, a METHOD
+and the remaining method specific ARGUMENTS.  The valid METHOD
+symbols are `nickserv', `chanserv' and `bitlbee'.
+
+The required ARGUMENTS for each METHOD symbol are:
+  `nickserv': PASSWORD
+  `chanserv': CHANNEL PASSWORD
+  `bitlbee': PASSWORD
+
+Example:
+ ((\"freenode\" \"bob\" nickserv \"p455w0rd\")
+  (\"freenode\" \"bob\" chanserv \"#bobland\" \"passwd99\")
+  (\"bitlbee\" \"robert\" bitlbee \"sekrit\"))")
+
+(defvar rcirc-auto-authenticate-flag (file-readable-p rcirc-authinfo-file-name)
+  "*Non-nil means automatically send authentication string to server.
+See also `rcirc-authinfo-file-name'.")
+
+(defvar rcirc-print-hooks nil
+  "Hook run after text is printed.
+Called with 5 arguments, PROCESS, SENDER, RESPONSE, TARGET and TEXT.")
+
+(defvar rcirc-prompt "%n> "
+  "Prompt string to use in irc buffers.
+
+The following replacements are made:
+%n is your nick.
+%s is the server.
+%t is the buffer target, a channel or a user.
+
+Setting this alone will not affect the prompt; 
+use `rcirc-update-prompt' after changing this variable.")
+
+(defvar rcirc-prompt-start-marker nil)
+(defvar rcirc-prompt-end-marker nil)
+
+(defvar rcirc-nick-table nil)
+
+(defvar rcirc-activity nil
+  "List of channels with unviewed activity.")
+
+(defvar rcirc-activity-string ""
+  "String displayed in modeline representing `rcirc-activity'.")
+(put 'rcirc-activity-string 'risky-local-variable t)
+
+(defvar rcirc-process nil
+  "The server process associated with this buffer.")
+
+(defvar rcirc-target nil
+  "The channel or user associated with this buffer.")
+
+(defvar rcirc-channels nil
+  "Joined channels.")
+
+(defvar rcirc-private-chats nil
+  "Private chats open.")
+
+(defvar rcirc-urls nil
+  "List of urls seen in the current buffer.")
+
+(defvar rcirc-keepalive-seconds 60
+  "Number of seconds between keepalive pings.")
+
+
+(defun rcirc-version (&optional here)
+  "Return rcirc version string.
+If optional argument HERE is non-nil, insert string at point."
+  (interactive "P")
+  (let ((version "rcirc.el 0.9 $Revision: 1.5 $"))
+    (if here
+        (insert version)
+      (if (interactive-p)
+          (message "%s" version)
+        version))))
+
+(defvar rcirc-startup-channels nil)
+;;;###autoload
+(defun rcirc (&optional server port nick channels)
+  "Connect to IRC.
+
+If any of the the optional SERVER, PORT, NICK or CHANNELS are not
+supplied, they are taken from the variables `rcirc-server',
+`rcirc-port', `rcirc-nick', and `rcirc-startup-channels',
+respectively."
+  (interactive (list (read-string "IRC Server: " rcirc-server)
+                     (read-string "IRC Port: " (number-to-string rcirc-port))
+                     (read-string "IRC Nick: " rcirc-nick)))
+  (or server (setq server rcirc-server))
+  (or port (setq port rcirc-port))
+  (or nick (setq nick rcirc-nick))
+  (or channels
+      (setq channels
+            (if (interactive-p)
+                (delete ""
+                        (split-string
+                         (read-string "Channels: "
+                                     (mapconcat 'identity
+                                                (rcirc-startup-channels server)
+                                                " "))
+                         "[, ]+"))
+              (rcirc-startup-channels server))))
+  (or global-mode-string (setq global-mode-string '("")))
+  (and (not (memq 'rcirc-activity-string global-mode-string))
+       (setq global-mode-string
+             (append global-mode-string '(rcirc-activity-string))))
+  (add-hook 'window-configuration-change-hook 'rcirc-update-activity)
+  (rcirc-connect server port nick rcirc-user-name rcirc-user-full-name
+                 channels))
+
+;;;###autoload
+(defalias 'irc 'rcirc)
+
+
+(defvar rcirc-process-output nil)
+(defvar rcirc-last-buffer nil)
+(defvar rcirc-topic nil)
+(defvar rcirc-keepalive-timer nil)
+(make-variable-buffer-local 'rcirc-topic)
+(defun rcirc-connect (server port nick user-name full-name startup-channels)
+  "Return a connection to SERVER on PORT.
+
+User will identify using the values of NICK, USER-NAME and
+FULL-NAME.  The variable list of channel names in
+STARTUP-CHANNELS will automatically be joined on startup."
+  (save-excursion
+    (message "Connecting to %s..." server)
+    (let* ((inhibit-eol-conversion)
+           (port-number (if (stringp port)
+                            (string-to-number port)
+                          port))
+           (process (open-network-stream server nil server port-number)))
+      ;; set up process
+      (set-process-coding-system process 'raw-text 'raw-text)
+      (set-process-filter process 'rcirc-filter)
+      (switch-to-buffer (concat "*" (process-name process) "*"))
+      (set-process-buffer process (current-buffer))
+      (set-process-sentinel process 'rcirc-sentinel)
+      (rcirc-mode process nil)
+      (make-local-variable 'rcirc-nick-table)
+      (setq rcirc-nick-table (make-hash-table :test 'equal))
+      (make-local-variable 'rcirc-server)
+      (setq rcirc-server server)
+      (make-local-variable 'rcirc-nick)
+      (setq rcirc-nick nick)
+      (make-local-variable 'rcirc-process-output)
+      (setq rcirc-process-output nil)
+      (make-local-variable 'rcirc-last-buffer)
+      (setq rcirc-last-buffer (current-buffer))
+      (make-local-variable 'rcirc-channels)
+      (setq rcirc-channels nil)
+      (make-local-variable 'rcirc-private-chats)
+      (setq rcirc-private-chats nil)
+      (make-local-variable 'rcirc-startup-channels)
+      (setq rcirc-startup-channels startup-channels)
+
+      ;; identify
+      (rcirc-send-string process (concat "NICK " nick))
+      (rcirc-send-string process (concat "USER " user-name
+                                      " hostname servername :"
+                                      full-name))
+
+      ;; setup ping timer if necessary
+      (unless rcirc-keepalive-timer
+        (setq rcirc-keepalive-timer
+              (run-at-time 0 rcirc-keepalive-seconds 'rcirc-keepalive)))
+
+      (message "Connecting to %s...done" server)
+
+      ;; return process object
+      process)))
+
+(defun rcirc-keepalive ()
+  "Send keep alive pings to active rcirc processes."
+  (if (rcirc-process-list)
+      (mapc (lambda (process)
+              (with-current-buffer (process-buffer process)
+                (rcirc-send-string process (concat "PING " rcirc-server))))
+            (rcirc-process-list))
+    (cancel-timer rcirc-keepalive-timer)
+    (setq rcirc-keepalive-timer nil)))
+
+(defvar rcirc-log-buffer "*rcirc log*")
+(defvar rcirc-log-p nil
+  "If non-nil, write information to `rcirc-log-buffer'.")
+(defun rcirc-log (process text)
+  "Add an entry to the debug log including PROCESS and TEXT.
+Debug text is written to `rcirc-log-buffer' if `rcirc-log-p' is
+non-nil."
+  (when rcirc-log-p
+    (save-excursion
+      (save-window-excursion
+        (set-buffer (get-buffer-create rcirc-log-buffer))
+        (goto-char (point-max))
+        (insert (concat
+                 "["
+                 (format-time-string "%Y-%m-%dT%T ") (process-name process)
+                 "] "
+                 text))))))
+               
+(defvar rcirc-sentinel-hooks nil
+  "Hook functions called when the process sentinel is called.
+Functions are called with PROCESS and SENTINEL arguments.")
+
+(defun rcirc-sentinel (process sentinel)
+  "Called when PROCESS receives SENTINEL."
+  (let ((sentinel (replace-regexp-in-string "\n" "" sentinel)))
+    (rcirc-log process (format "SENTINEL: %S %S\n" process sentinel))
+    (with-current-buffer (process-buffer process)
+      (dolist (target (append rcirc-channels
+                              rcirc-private-chats
+                              (list (current-buffer))))
+        (rcirc-print process "rcirc.el" "ERROR" target
+                     (format "%s: %s (%S)"
+                             (process-name process)
+                             sentinel
+                             (process-status process)) t)
+        ;; remove the prompt from buffers
+        (with-current-buffer (if (eq target (current-buffer))
+                                 (current-buffer)
+                               (rcirc-get-buffer process target))
+          (let ((inhibit-read-only t))
+            (delete-region rcirc-prompt-start-marker
+                           rcirc-prompt-end-marker)))))
+    (run-hook-with-args 'rcirc-sentinel-hooks process sentinel)))
+
+(defun rcirc-process-list ()
+  "Return a list of rcirc processes."
+  (let (ps)
+    (mapc (lambda (p)
+            (when (process-buffer p)
+              (with-current-buffer (process-buffer p)
+                (when (eq major-mode 'rcirc-mode)
+                  (setq ps (cons p ps))))))
+          (process-list))
+    ps))
+
+(defvar rcirc-receive-message-hooks nil
+  "Hook functions run when a message is recieved from server.
+Function is called with PROCESS COMMAND SENDER ARGS and LINE.")
+(defun rcirc-filter (process output)
+  "Called when PROCESS receives OUTPUT."
+  (rcirc-log process output)
+  (with-current-buffer (process-buffer process)
+    (setq rcirc-process-output (concat rcirc-process-output output))
+    (when (= (aref rcirc-process-output
+                   (1- (length rcirc-process-output))) ?\n)
+      (mapc (lambda (line)
+              (rcirc-process-server-response process line))
+            (delete "" (split-string rcirc-process-output "[\n\r]")))
+      (setq rcirc-process-output nil))))
+
+(defvar rcirc-trap-errors nil)
+(defun rcirc-process-server-response (process text)
+  (if rcirc-trap-errors
+      (condition-case err
+          (rcirc-process-server-response-1 process text)
+        (error
+         (rcirc-print process "RCIRC" "ERROR" nil
+                      (format "rcirc: error processing: \"%s\" %s" text err))))
+    (rcirc-process-server-response-1 process text)))
+
+(defun rcirc-process-server-response-1 (process text)
+  (if (string-match "^\\(:\\([^ ]+\\) \\)?\\([^ ]+\\) \\(.+\\)$" text)
+      (let* ((sender (match-string 2 text))
+             (cmd (match-string 3 text))
+             (args (match-string 4 text))
+             (handler (intern-soft (concat "rcirc-handler-" cmd))))
+        (string-match "^\\([^:]*\\):?\\(.+\\)?$" args)
+        (let* ((args1 (match-string 1 args))
+               (args2 (match-string 2 args))
+               (args (append (delete "" (split-string args1 " "))
+                             (list args2))))
+        (if (not (fboundp handler))
+            (rcirc-handler-generic process cmd sender args text)
+          (funcall handler process sender args text))
+        (run-hook-with-args 'rcirc-receive-message-hooks
+                            process cmd sender args text)))
+    (message "UNHANDLED: %s" text)))
+
+(defun rcirc-handler-generic (process command sender args text)
+  "Generic server response handler."
+  (rcirc-print process sender command nil
+               (mapconcat 'identity (cdr args) " ")))
+
+(defun rcirc-send-string (process string)
+  "Send PROCESS a STRING plus a newline."
+  (let ((string (concat (encode-coding-string string
+                                              buffer-file-coding-system)
+                        "\n")))
+    (rcirc-log process string)
+    (process-send-string process string)))
+
+(defun rcirc-server (process)
+  "Return PROCESS server, given by the 001 response."
+  (with-current-buffer (process-buffer process)
+    rcirc-server))
+
+(defun rcirc-nick (process)
+  "Return PROCESS nick."
+  (with-current-buffer (process-buffer process)
+    rcirc-nick))
+
+(defvar rcirc-max-message-length 450
+  "Messages longer than this value will be split.")
+
+(defun rcirc-send-message (process target message &optional noticep)
+  "Send TARGET associated with PROCESS a privmsg with text MESSAGE.
+If NOTICEP is non-nil, send a notice instead of privmsg."
+  ;; max message length is 512 including CRLF
+  (let* ((response (if noticep "NOTICE" "PRIVMSG"))
+         (oversize (> (length message) rcirc-max-message-length))
+         (text (if oversize
+                   (substring message 0 rcirc-max-message-length)
+                 message))
+         (text (if (string= text "")
+                   " "
+                 text))
+         (more (if oversize
+                   (substring message rcirc-max-message-length))))
+    (rcirc-print process (rcirc-nick process) response target text)
+    (rcirc-send-string process (concat response " " target " :" text))
+    (if more
+        (rcirc-send-message process target more noticep))))
+
+(defvar rcirc-input-ring nil)
+(defvar rcirc-input-ring-index 0)
+(defun rcirc-prev-input-string (arg)
+  (ring-ref rcirc-input-ring (+ rcirc-input-ring-index arg)))
+
+(defun rcirc-insert-prev-input (arg)
+  (interactive "p")
+  (when (<= rcirc-prompt-end-marker (point))
+    (delete-region rcirc-prompt-end-marker (point-max))
+    (insert (rcirc-prev-input-string 0))
+    (setq rcirc-input-ring-index (1+ rcirc-input-ring-index))))
+
+(defun rcirc-insert-next-input (arg)
+  (interactive "p")
+  (when (<= rcirc-prompt-end-marker (point))
+    (delete-region rcirc-prompt-end-marker (point-max))
+    (setq rcirc-input-ring-index (1- rcirc-input-ring-index))
+    (insert (rcirc-prev-input-string -1))))
+
+(defvar rcirc-nick-completions nil)
+(defvar rcirc-nick-completion-start-offset nil)
+(defun rcirc-complete-nick ()
+  "Cycle through nick completions from list of nicks in channel."
+  (interactive)
+  (if (eq last-command 'rcirc-complete-nick)
+      (setq rcirc-nick-completions
+            (append (cdr rcirc-nick-completions)
+                    (list (car rcirc-nick-completions))))
+    (setq rcirc-nick-completion-start-offset
+          (- (save-excursion
+               (if (re-search-backward " " rcirc-prompt-end-marker t)
+                   (1+ (point))
+                 rcirc-prompt-end-marker))
+             rcirc-prompt-end-marker))
+    (setq rcirc-nick-completions
+          (let ((completion-ignore-case t))
+            (all-completions 
+             (buffer-substring 
+              (+ rcirc-prompt-end-marker
+                 rcirc-nick-completion-start-offset)
+              (point))
+             (mapcar (lambda (x) (cons x nil))
+                     (rcirc-channel-nicks rcirc-process
+                                          (rcirc-buffer-target)))))))
+  (let ((completion (car rcirc-nick-completions)))
+    (when completion
+      (delete-region (+ rcirc-prompt-end-marker 
+                        rcirc-nick-completion-start-offset)
+                     (point))
+      (insert (concat completion
+                      (if (= (+ rcirc-prompt-end-marker 
+                                rcirc-nick-completion-start-offset)
+                             rcirc-prompt-end-marker)
+                          ": "))))))
+
+(defun rcirc-buffer-target (&optional buffer)
+  "Return the name of target for BUFFER.
+If buffer is nil, return the target of the current buffer."
+  (with-current-buffer (or buffer (current-buffer))
+    rcirc-target))
+
+(defvar rcirc-mode-map (make-sparse-keymap)
+  "Keymap for rcirc mode.")
+
+(define-key rcirc-mode-map (kbd "RET") 'rcirc-send-input)
+(define-key rcirc-mode-map (kbd "M-p") 'rcirc-insert-prev-input)
+(define-key rcirc-mode-map (kbd "M-n") 'rcirc-insert-next-input)
+(define-key rcirc-mode-map (kbd "TAB") 'rcirc-complete-nick)
+(define-key rcirc-mode-map (kbd "C-c C-b") 'rcirc-browse-url)
+(define-key rcirc-mode-map (kbd "C-c C-c") 'rcirc-edit-multiline)
+(define-key rcirc-mode-map (kbd "C-c C-j") 'rcirc-cmd-join)
+(define-key rcirc-mode-map (kbd "C-c C-k") 'rcirc-cmd-kick)
+(define-key rcirc-mode-map (kbd "C-c C-l") 'rcirc-cmd-list)
+(define-key rcirc-mode-map (kbd "C-c C-d") 'rcirc-cmd-mode)
+(define-key rcirc-mode-map (kbd "C-c C-m") 'rcirc-cmd-msg)
+(define-key rcirc-mode-map (kbd "C-c C-r") 'rcirc-cmd-nick) ; rename
+(define-key rcirc-mode-map (kbd "C-c C-o") 'rcirc-cmd-oper)
+(define-key rcirc-mode-map (kbd "C-c C-p") 'rcirc-cmd-part)
+(define-key rcirc-mode-map (kbd "C-c C-q") 'rcirc-cmd-query)
+(define-key rcirc-mode-map (kbd "C-c C-t") 'rcirc-cmd-topic)
+(define-key rcirc-mode-map (kbd "C-c C-n") 'rcirc-cmd-names)
+(define-key rcirc-mode-map (kbd "C-c C-w") 'rcirc-cmd-whois)
+(define-key rcirc-mode-map (kbd "C-c C-x") 'rcirc-cmd-quit)
+(define-key rcirc-mode-map (kbd "C-c TAB") ; C-i
+  'rcirc-toggle-ignore-channel-activity)
+(define-key rcirc-mode-map (kbd "C-c C-s") 'rcirc-switch-to-server-buffer)
+(define-key rcirc-mode-map (kbd "C-c C-a") 'rcirc-jump-to-first-unread-line)
+
+(define-key global-map (kbd "C-c `") 'rcirc-next-active-buffer)
+(define-key global-map (kbd "C-c C-@") 'rcirc-next-active-buffer)
+(define-key global-map (kbd "C-c C-SPC") 'rcirc-next-active-buffer)
+
+(defvar rcirc-mode-hook nil
+  "Hook run when setting up rcirc buffer.")
+
+(defun rcirc-mode (process target)
+  "Major mode for irc channel buffers.
+
+\\{rcirc-mode-map}"
+  (kill-all-local-variables)
+  (use-local-map rcirc-mode-map)
+  (setq mode-name "rcirc")
+  (setq major-mode 'rcirc-mode)
+
+  (make-local-variable 'rcirc-input-ring)
+  (setq rcirc-input-ring (make-ring rcirc-input-ring-size))
+  (make-local-variable 'rcirc-process)
+  (setq rcirc-process process)
+  (make-local-variable 'rcirc-target)
+  (setq rcirc-target target)
+  (make-local-variable 'rcirc-urls)
+  (setq rcirc-urls nil)
+  (setq use-hard-newlines t)
+  (when (rcirc-channel-p rcirc-target)
+    (setq header-line-format 'rcirc-topic))
+
+  ;; setup the prompt and markers
+  (make-local-variable 'rcirc-prompt-start-marker)
+  (setq rcirc-prompt-start-marker (make-marker))
+  (set-marker rcirc-prompt-start-marker (point-max))
+  (make-local-variable 'rcirc-prompt-end-marker)
+  (setq rcirc-prompt-end-marker (make-marker))
+  (set-marker rcirc-prompt-end-marker (point-max))
+  (rcirc-update-prompt)
+  (goto-char rcirc-prompt-end-marker)
+  (make-local-variable 'overlay-arrow-position)
+  (setq overlay-arrow-position (make-marker))
+  (set-marker overlay-arrow-position nil)
+
+  (run-hooks 'rcirc-mode-hook))
+
+(defmacro with-rcirc-process-buffer (process &rest body)
+  (declare (indent 1) (debug t))
+  `(with-current-buffer (process-buffer ,process)
+     ,@body))
+
+(defun rcirc-update-prompt ()
+  "Reset the prompt string in the current buffer."
+  (let ((inhibit-read-only t)
+        (prompt (or rcirc-prompt "")))
+    (mapc (lambda (rep)
+            (setq prompt 
+                  (replace-regexp-in-string (car rep) (cdr rep) prompt)))
+          (list (cons "%n" (with-rcirc-process-buffer rcirc-process
+                             rcirc-nick))
+                (cons "%s" (with-rcirc-process-buffer rcirc-process 
+                             rcirc-server))
+                (cons "%t" (or rcirc-target ""))))
+    (save-excursion
+      (delete-region rcirc-prompt-start-marker rcirc-prompt-end-marker)
+      (goto-char rcirc-prompt-start-marker)
+      (let ((start (point)))
+        (insert-before-markers prompt)
+        (set-marker rcirc-prompt-start-marker start)
+        (when (not (zerop (- rcirc-prompt-end-marker
+                             rcirc-prompt-start-marker)))
+          (add-text-properties rcirc-prompt-start-marker
+                               rcirc-prompt-end-marker
+                               (list 'face 'rcirc-prompt-face
+                                     'read-only t 'field t
+                                     'front-sticky t 'rear-nonsticky t)))))))
+
+(defun rcirc-channel-p (target)
+  "Return t if TARGET is a channel name."
+  (and target
+       (not (zerop (length target)))
+       (or (eq (aref target 0) ?#)
+           (eq (aref target 0) ?&))))
+
+(defun rcirc-kill-buffer-hook ()
+  "Part the channel when killing an rcirc buffer."
+  (when (eq major-mode 'rcirc-mode)
+    (rcirc-clear-activity (current-buffer))
+    (when (and rcirc-process
+               (eq (process-status rcirc-process) 'open))
+      (if (rcirc-channel-p rcirc-target)
+          (rcirc-cmd-part "" rcirc-process rcirc-target)
+        ;; remove target from privchat list
+        (when rcirc-target
+          (let ((target (downcase rcirc-target)))
+            (with-rcirc-process-buffer rcirc-process
+              (setq rcirc-private-chats
+                    (delete target rcirc-private-chats)))))))))
+(add-hook 'kill-buffer-hook 'rcirc-kill-buffer-hook)
+
+(defun rcirc-get-buffer-name (process target)
+  "Return buffer name based on PROCESS and TARGET."
+  (concat (and target (downcase target)) "@" (process-name process)))
+
+(defun rcirc-get-buffer (process target &optional error)
+  "Return the buffer associated with the PROCESS and TARGET.
+If TARGET is nil and ERROR is nil, return the process buffer."
+  (let ((buffer (and target 
+                     (get-buffer (rcirc-get-buffer-name process target)))))
+    (if (and buffer (buffer-live-p buffer))
+        buffer
+      (if error
+          (error "Buffer associated with %s does not exist" target)
+        (process-buffer process)))))
+
+(defun rcirc-get-buffer-create (process target)
+  "Return the buffer named associated with the PROCESS and TARGET.
+Create the buffer if it doesn't exist.  If TARGET is nil, return
+the process buffer."
+  (with-current-buffer (process-buffer process)
+    (if (not target)
+        (current-buffer)
+      (let ((target (downcase target)))
+        ;; add private chats to list.  we dont add channels here, they
+        ;; are managed by the join/part/quit handlers
+        (when (and (not (rcirc-channel-p target))
+                   (not (member target rcirc-private-chats)))
+          (with-rcirc-process-buffer process
+            (setq rcirc-private-chats (cons target rcirc-private-chats))))
+        ;; create and setup a buffer, or return the existing one
+        (let ((bufname (rcirc-get-buffer-name process target)))
+          (with-current-buffer (get-buffer-create bufname)
+            (if (or (not rcirc-process)
+                    (not (equal (process-status rcirc-process) 'open)))
+                (rcirc-mode process target)
+              (setq rcirc-target target))
+            (current-buffer)))))))
+
+(defun rcirc-send-input ()
+  "Send input to target associated with the current buffer."
+  (interactive)
+  (if (not (eq (process-status rcirc-process) 'open))
+      (error "Network connection to %s is not open" 
+             (process-name rcirc-process))
+    ;; update last buffer
+    (rcirc-set-last-buffer rcirc-process (current-buffer))
+    (if (< (point) rcirc-prompt-end-marker)
+        ;; copy the line down to the input area
+        (progn
+          (forward-line 0)
+          (let ((start (if (eq (point) (point-min))
+                           (point)
+                         (if (get-text-property (1- (point)) 'hard)
+                             (point)
+                           (previous-single-property-change (point) 'hard))))
+                (end (next-single-property-change (1+ (point)) 'hard)))
+            (goto-char (point-max))
+            (insert (replace-regexp-in-string
+                     "\n\\s-+" " "
+                     (buffer-substring-no-properties start end)))))
+      ;; assume text has been read
+      (when (marker-position overlay-arrow-position)
+        (set-marker overlay-arrow-position nil))
+      ;; process input
+      (goto-char (point-max))
+      (let ((target (rcirc-buffer-target))
+            (start rcirc-prompt-end-marker))
+        (when (not (equal 0 (- (point) start)))
+          ;; delete a trailing newline
+          (when (eq (point) (point-at-bol))
+            (delete-backward-char 1))
+          (let ((input (buffer-substring-no-properties
+                        rcirc-prompt-end-marker (point))))
+            ;; process a /cmd
+            (if (string-match "^/\\([^ ]+\\) ?\\(.*\\)$" input)
+                (let* ((command (match-string 1 input))
+                       (fun (intern-soft (concat "rcirc-cmd-" command)))
+                       (args (match-string 2 input)))
+                  (newline)
+                  (with-current-buffer (current-buffer)
+                    (delete-region rcirc-prompt-end-marker (point))
+                    (if (string= command "me")
+                        (rcirc-print rcirc-process (rcirc-nick rcirc-process) 
+                                     "ACTION" target args)
+                      (rcirc-print rcirc-process (rcirc-nick rcirc-process) 
+                                   "COMMAND" target input))
+                    (set-marker rcirc-prompt-end-marker (point))
+                    (if (fboundp fun)
+                        (funcall fun args rcirc-process target)
+                      (rcirc-send-string rcirc-process
+                                         (concat command " " args)))))
+              ;; send message to server
+              (if (not rcirc-target)
+                  (message "Not joined")
+                (delete-region rcirc-prompt-end-marker (point))
+                (mapc (lambda (message)
+                        (rcirc-send-message rcirc-process target message))
+                      (split-string input "\n"))))
+            ;; add to input-ring
+            (save-excursion
+              (ring-insert rcirc-input-ring input)
+              (setq rcirc-input-ring-index 0))))))))
+
+(defvar rcirc-parent-buffer nil)
+(defvar rcirc-window-configuration nil)
+(defun rcirc-edit-multiline ()
+  "Move current edit to a dedicated buffer."
+  (interactive)
+  (let ((pos (1+ (- (point) rcirc-prompt-end-marker))))
+    (goto-char (point-max))
+    (let ((text (buffer-substring rcirc-prompt-end-marker (point)))
+          (parent (buffer-name))
+          (process rcirc-process))
+      (delete-region rcirc-prompt-end-marker (point))
+      (setq rcirc-window-configuration (current-window-configuration))
+      (pop-to-buffer (concat "*multiline " parent "*"))
+      (rcirc-multiline-edit-mode)
+      (setq rcirc-parent-buffer parent)
+      (setq rcirc-process process)
+      (insert text)
+      (and (> pos 0) (goto-char pos)))))
+
+(define-derived-mode rcirc-multiline-edit-mode
+  text-mode "rcirc multi"
+  "Major mode for multiline edits
+\\{rcirc-multiline-edit-mode-map}"
+  (make-local-variable 'rcirc-parent-buffer)
+  (make-local-variable 'rcirc-process))
+
+(define-key rcirc-multiline-edit-mode-map
+  (kbd "C-c C-c") 'rcirc-multiline-edit-submit)
+(define-key rcirc-multiline-edit-mode-map
+  (kbd "C-x C-s") 'rcirc-multiline-edit-submit)
+(define-key rcirc-multiline-edit-mode-map
+  (kbd "C-c C-k") 'rcirc-multiline-edit-cancel)
+(define-key rcirc-multiline-edit-mode-map
+  (kbd "ESC ESC ESC") 'rcirc-multiline-edit-cancel)
+
+(defun rcirc-multiline-edit-submit ()
+  "Send the text in buffer back to parent buffer."
+  (interactive)
+  (assert (and (eq major-mode 'rcirc-multiline-edit-mode)))
+  (assert rcirc-parent-buffer)
+  (let ((text (buffer-substring (point-min) (point-max)))
+        (buffer (current-buffer))
+        (pos (point)))
+    (set-buffer rcirc-parent-buffer)
+    (goto-char (point-max))
+    (insert text)
+    (goto-char (+ rcirc-prompt-end-marker (1- pos)))
+    (kill-buffer buffer)
+    (set-window-configuration rcirc-window-configuration)))
+
+(defun rcirc-multiline-edit-cancel ()
+  "Cancel the multiline edit."
+  (interactive)
+  (assert (and (eq major-mode 'rcirc-multiline-edit-mode)))
+  (kill-buffer (current-buffer))
+  (set-window-configuration rcirc-window-configuration))
+
+(defun rcirc-last-buffer (process)
+  "Return the last working buffer for PROCESS.
+Used for displaying messages that don't have an explicit destination."
+  (with-current-buffer (process-buffer process)
+    (or (and rcirc-last-buffer
+             (buffer-live-p rcirc-last-buffer)
+             rcirc-last-buffer)
+        (current-buffer))))
+
+(defun rcirc-set-last-buffer (process buffer)
+  "Set the last working buffer for PROCESS to BUFFER."
+  (with-current-buffer (process-buffer process)
+    (setq rcirc-last-buffer buffer)))
+
+(defun rcirc-format-response-string (process sender response target text)
+  (concat (when rcirc-time-format
+            (format-time-string rcirc-time-format (current-time)))
+          (cond ((or (string= response "PRIVMSG")
+                     (string= response "NOTICE")
+                     (string= response "ACTION"))
+                 (let (first middle end)
+                   (cond ((string= response "PRIVMSG")
+                          (setq first "<" middle "> "))
+                         ((string= response "NOTICE")
+                          (setq first "-" middle "- "))
+                         (t
+                          (setq first "[" middle " " end "]")))
+                   (concat first 
+                           (rcirc-facify (rcirc-user-nick sender)
+                                         (if (string= sender
+                                                      (rcirc-nick process))
+                                             'rcirc-my-nick-face
+                                           'rcirc-other-nick-face))
+                           middle
+                           (rcirc-mangle-text process text)
+                           end)))
+                ((string= response "COMMAND")
+                 text)
+                ((string= response "ERROR")
+                 (propertize text 'face 'font-lock-warning-face))
+                (t
+                 (rcirc-mangle-text
+                  process
+                  (rcirc-facify
+                   (concat "*** "
+                           (when (not (string= sender (rcirc-server process)))
+                             (concat (rcirc-user-nick sender) " "))
+                           (when (zerop (string-to-number response))
+                             (concat response " "))
+                           (when (and target (not (string= target rcirc-target)))
+                             (concat target " "))
+                           text)
+                   'rcirc-server-face))))))
+
+(defvar rcirc-activity-type nil)
+(make-variable-buffer-local 'rcirc-activity-type)
+(defun rcirc-print (process sender response target text &optional activity)
+  "Print TEXT in the buffer associated with TARGET.
+Format based on SENDER and RESPONSE.  If ACTIVITY is non-nil,
+record activity."
+  (let* ((buffer (cond ((bufferp target) 
+                        target)
+                       ((not target)
+                        (rcirc-last-buffer process))
+                       ((not (rcirc-channel-p target)) 
+                        (rcirc-get-buffer-create process target))
+                       ((rcirc-get-buffer process target))
+                       (t (process-buffer process))))
+         (inhibit-read-only t))
+    (with-current-buffer buffer
+      (let ((moving (= (point) rcirc-prompt-end-marker))
+            (old-point (point-marker))
+            (fill-start (marker-position rcirc-prompt-start-marker)))
+
+        (unless (string= sender (rcirc-nick process))
+          ;; only decode text from other senders, not ours
+          (setq text (decode-coding-string text buffer-file-coding-system))
+          ;; mark the line with overlay arrow
+          (unless (or (marker-position overlay-arrow-position)
+                      (get-buffer-window (current-buffer)))
+            (set-marker overlay-arrow-position 
+                        (marker-position rcirc-prompt-start-marker))))
+
+        ;; temporarily set the marker insertion-type because
+        ;; insert-before-markers results in hidden text in new buffers
+        (goto-char rcirc-prompt-start-marker)
+        (set-marker-insertion-type rcirc-prompt-start-marker t)
+        (set-marker-insertion-type rcirc-prompt-end-marker t)
+        (insert
+         (rcirc-format-response-string process sender response target text)
+         (propertize "\n" 'hard t))
+        (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
+                      (+ (if rcirc-time-format
+                             (length (format-time-string 
+                                      rcirc-time-format))
+                           0)
+                         (cond ((or (string= response "PRIVMSG")
+                                    (string= response "NOTICE"))
+                                (+ (length (rcirc-user-nick sender))
+                                   2))  ; <>
+                               ((string= response "ACTION")
+                                (+ (length (rcirc-user-nick sender))
+                                   1))          ; [
+                               (t 3))           ; ***
+                         1)
+                      ? )))
+                (fill-column (or rcirc-fill-column fill-column)))
+            (fill-region fill-start rcirc-prompt-start-marker 'left t)))
+
+        ;; truncate buffer if it is very long
+        (save-excursion
+          (when (and rcirc-buffer-maximum-lines
+                     (> rcirc-buffer-maximum-lines 0)
+                     (= (forward-line (- rcirc-buffer-maximum-lines)) 0))
+            (delete-region (point-min) (point))))
+
+        ;; set inserted text to be read-only
+        (when rcirc-read-only-flag
+          (put-text-property rcirc-prompt-start-marker fill-start 'read-only t)
+          (let ((inhibit-read-only t))
+            (put-text-property rcirc-prompt-start-marker fill-start 
+                               'front-sticky t)
+            (put-text-property (1- (point)) (point) 'rear-nonsticky t)))
+
+        ;; set the window point for buffers show in windows
+        (walk-windows (lambda (w)
+                        (unless (eq (selected-window) w)
+                          (when (and (eq (current-buffer) 
+                                         (window-buffer w))
+                                     (>= (window-point w) 
+                                         rcirc-prompt-end-marker))
+                            (set-window-point w (point-max)))))
+                      nil t)
+
+        ;; restore the point
+        (goto-char (if moving rcirc-prompt-end-marker old-point))
+
+        ;; flush undo (can we do something smarter here?)
+        (buffer-disable-undo)
+        (buffer-enable-undo))
+
+      ;; record modeline activity
+      (when activity
+        (let ((nick-match
+               (string-match (concat "\\b"
+                                     (regexp-quote (rcirc-nick process))
+                                     "\\b")
+                             text)))
+          (when (or (not rcirc-ignore-channel-activity)
+                    ;; always notice when our nick is mentioned, even
+                    ;; if ignoring channel activity
+                    nick-match)
+            (rcirc-record-activity
+             (current-buffer) 
+             (when (or nick-match (not (rcirc-channel-p rcirc-target)))
+               'nick)))))
+
+      (run-hook-with-args 'rcirc-print-hooks
+                          process sender response target text))))
+
+(defun rcirc-startup-channels (server)
+  "Return the list of startup channels for server."
+  (let (channels)
+    (dolist (i rcirc-startup-channels-alist)
+      (if (string-match (car i) server)
+          (setq channels (append channels (cdr i)))))
+    channels))
+
+(defun rcirc-join-channels (process channels)
+  "Join CHANNELS."
+  (save-window-excursion
+    (mapc (lambda (channel)
+            (with-current-buffer (process-buffer process)
+              (let (rcirc-last-buffer)  ; make sure /join text is
+                                        ; printed in server buffer
+                (rcirc-print process (rcirc-nick process) "COMMAND"
+                             nil (concat "/join " channel)))
+              (rcirc-cmd-join channel process)))
+          channels)))
+
+;;; nick management
+(defun rcirc-user-nick (user)
+  "Return the nick from USER.  Remove any non-nick junk."
+  (if (string-match "^[@%+]?\\([^! ]+\\)!?" (or user ""))
+      (match-string 1 user)
+    user))
+
+(defun rcirc-user-non-nick (user)
+  "Return the non-nick portion of USER."
+  (if (string-match "^[@+]?[^! ]+!?\\(.*\\)" (or user ""))
+      (match-string 1 user)
+    user))
+
+(defun rcirc-nick-channels (process nick)
+  "Return list of channels for NICK."
+  (let ((nick (rcirc-user-nick nick)))
+    (with-current-buffer (process-buffer process)
+      (mapcar (lambda (x) (car x))
+              (gethash nick rcirc-nick-table)))))
+
+(defun rcirc-put-nick-channel (process nick channel)
+  "Add CHANNEL to list associated with NICK."
+  (with-current-buffer (process-buffer process)
+    (let* ((nick (rcirc-user-nick nick))
+           (chans (gethash nick rcirc-nick-table))
+           (record (assoc channel chans)))
+      (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."
+  (with-current-buffer (process-buffer process)
+    (remhash nick rcirc-nick-table)))
+
+(defun rcirc-remove-nick-channel (process nick channel)
+  "Remove the CHANNEL from list associated with NICK."
+  (with-current-buffer (process-buffer process)
+    (let* ((nick (rcirc-user-nick nick))
+           (chans (gethash nick rcirc-nick-table))
+           (newchans (assq-delete-all channel chans)))
+      (if newchans
+          (puthash nick newchans rcirc-nick-table)
+        (remhash nick rcirc-nick-table)))))
+
+(defun rcirc-channel-nicks (process channel)
+  "Return the list of nicks in CHANNEL sorted by last activity."
+  (with-current-buffer (process-buffer process)
+    (let (nicks)
+      (maphash
+       (lambda (k v)
+         (let ((record (assoc channel v)))
+           (if record
+               (setq nicks (cons (cons k (cdr record)) nicks)))))
+       rcirc-nick-table)
+      (mapcar (lambda (x) (car x))
+              (sort nicks (lambda (x y) (time-less-p (cdr y) (cdr x))))))))
+
+;;; activity tracking
+(or (assq 'rcirc-ignore-channel-activity minor-mode-alist)
+    (setq minor-mode-alist
+          (cons '(rcirc-ignore-channel-activity " Ignore") minor-mode-alist)))
+
+(defun rcirc-toggle-ignore-channel-activity (&optional all)
+  "Toggle the value of `rcirc-ignore-channel-activity'.
+If ALL is non-nil, instead toggle the value of
+`rcirc-ignore-all-activity-flag'."
+  (interactive "P")
+  (if all
+      (progn
+        (setq rcirc-ignore-all-activity-flag
+              (not rcirc-ignore-all-activity-flag))
+        (message (concat "Global activity "
+                         (if rcirc-ignore-all-activity-flag
+                             "hidden"
+                           "displayed")))
+        (rcirc-update-activity-string))
+    (setq rcirc-ignore-channel-activity
+          (not rcirc-ignore-channel-activity)))
+  (force-mode-line-update))
+
+(defvar rcirc-switch-to-buffer-function 'switch-to-buffer
+  "Function to use when switching buffers.
+Possible values are `switch-to-buffer', `pop-to-buffer', and
+`display-buffer'.")
+
+(defun rcirc-switch-to-server-buffer ()
+  "Switch to the server buffer associated with current channel buffer."
+  (interactive)
+  (funcall rcirc-switch-to-buffer-function (process-buffer rcirc-process)))
+
+(defun rcirc-jump-to-first-unread-line ()
+  "Move the point to the first unread line in this buffer."
+  (interactive)
+  (when (marker-position overlay-arrow-position)
+    (goto-char overlay-arrow-position)))
+
+(defvar rcirc-last-non-irc-buffer nil
+  "The buffer to switch to when there is no more activity.")
+
+(defun rcirc-next-active-buffer (arg)
+  "Go to the ARGth rcirc buffer with activity.
+The function given by `rcirc-switch-to-buffer-function' is used to
+show the buffer."
+  (interactive "p")
+  (if rcirc-activity
+      (progn
+        (unless (eq major-mode 'rcirc-mode)
+          (setq rcirc-last-non-irc-buffer (current-buffer)))
+        (if (and (> arg 0)
+                 (<= arg (length rcirc-activity)))
+            (funcall rcirc-switch-to-buffer-function 
+                     (nth (1- arg) rcirc-activity))
+          (message "Invalid arg: %d" arg)))
+    (if (eq major-mode 'rcirc-mode)
+        (if (not (and rcirc-last-non-irc-buffer
+                      (buffer-live-p rcirc-last-non-irc-buffer)))
+            (message "No last buffer.")
+          (funcall rcirc-switch-to-buffer-function rcirc-last-non-irc-buffer)
+          (setq rcirc-last-non-irc-buffer nil))
+      (message "No channel activity.  Go start something."))))
+
+(defvar rcirc-activity-hooks nil
+  "Hook to be run when there is channel activity.
+
+Functions are called with a single argument, the buffer with the
+activity.  Only run if the buffer is not visible and
+`rcirc-ignore-channel-activity' is non-nil.")
+
+(defun rcirc-record-activity (buffer type)
+  "Record BUFFER activity with TYPE."
+  (with-current-buffer buffer
+    (when (not (get-buffer-window (current-buffer) t))
+      (add-to-list 'rcirc-activity (current-buffer) 'append)
+      (if (not rcirc-activity-type)
+          (setq rcirc-activity-type type))
+      (rcirc-update-activity-string)))
+  (run-hook-with-args 'rcirc-activity-hooks buffer))
+
+(defun rcirc-clear-activity (buffer)
+  "Clear the BUFFER activity."
+  (setq rcirc-activity (delete buffer rcirc-activity))
+  (with-current-buffer buffer
+    (setq rcirc-activity-type nil)))
+
+(defun rcirc-update-activity-string ()
+  "Update mode-line string."
+  (setq rcirc-activity-string
+        (if (or rcirc-ignore-all-activity-flag
+                (not rcirc-activity))
+            ""
+          (concat " [" (mapconcat 
+                        (lambda (b)
+                          (let ((s (rcirc-short-buffer-name b)))
+                            (with-current-buffer b
+                              (if (not (eq rcirc-activity-type 'nick))
+                                  s
+                                (rcirc-facify s 
+                                              'rcirc-mode-line-nick-face)))))
+                        rcirc-activity ",") "]"))))
+
+(defun rcirc-short-buffer-name (buffer)
+  "Return a short name for BUFFER to use in the modeline indicator."
+  (with-current-buffer buffer
+    (or rcirc-target (process-name rcirc-process))))
+
+(defun rcirc-update-activity ()
+  "Go through visible windows and remove buffers from activity list."
+  (walk-windows (lambda (w) (rcirc-clear-activity (window-buffer w))))
+  (rcirc-update-activity-string))
+
+
+;;; /commands these are called with 3 args: PROCESS, TARGET, which is
+;; the current buffer/channel/user, and ARGS, which is a string
+;; containing the text following the /cmd.
+
+(defmacro defun-rcirc-command (command argument docstring interactive-form 
+                                       &rest body)
+  "Define a command."
+  `(defun ,(intern (concat "rcirc-cmd-" (symbol-name command)))
+     (,@argument &optional process target)
+     ,(concat docstring "\n\nNote: If PROCESS or TARGET are nil, the values of"
+              "\nbuffer local variables `rcirc-process' and `rcirc-target',"
+              "\nwill be used.")
+     ,interactive-form
+     (let ((process (or process rcirc-process))
+           (target (or target rcirc-target)))
+       ,@body)))
+
+(defun-rcirc-command msg (message)
+  "Send private MESSAGE to TARGET."
+  (interactive "i")
+  (if (null message)
+      (progn
+        (setq target (completing-read "Message nick: "
+                                      (with-current-buffer
+                                          (process-buffer rcirc-process)
+                                        rcirc-nick-table)))
+        (when (> (length target) 0)
+          (setq message (read-string (format "Message %s: " target)))
+          (when (> (length message) 0)
+            (rcirc-send-message process target message))))
+    (if (not (string-match "\\([^ ]+\\) \\(.+\\)" message))
+        (message "Not enough args, or something.")
+      (setq target (match-string 1 message)
+            message (match-string 2 message))
+      (rcirc-send-message process target message))))
+
+(defun-rcirc-command query (nick)
+  "Open a private chat buffer to NICK."
+  (interactive (list (completing-read "Query nick: "
+                                      (with-current-buffer
+                                          (process-buffer rcirc-process)
+                                        rcirc-nick-table))))
+  (let ((new-buffer (eq (rcirc-get-buffer rcirc-process nick)
+                        (process-buffer rcirc-process))))
+    (switch-to-buffer (rcirc-get-buffer-create process nick))
+    (when new-buffer
+      (rcirc-cmd-whois nick))))
+
+(defun-rcirc-command join (args)
+  "Join CHANNEL."
+  (interactive "sJoin channel: ")
+  (let* ((channel (car (split-string args)))
+         (buffer (rcirc-get-buffer-create process channel)))
+    (when (not (eq (selected-window) (minibuffer-window)))
+      (funcall rcirc-switch-to-buffer-function buffer))
+    (rcirc-send-string process (concat "JOIN " args))
+    (rcirc-set-last-buffer process buffer)))
+
+(defun-rcirc-command part (channel)
+  "Part CHANNEL."
+  (interactive "sPart channel: ")
+  (let ((channel (if (> (length channel) 0) channel target)))
+    (rcirc-send-string process (concat "PART " channel " :" (rcirc-version)))))
+
+(defun-rcirc-command quit (reason)
+  "Send a quit message to server with REASON."
+  (interactive "sQuit reason: ")
+  (rcirc-send-string process (concat "QUIT :" reason)))
+
+(defun-rcirc-command nick (nick)
+  "Change nick to NICK."
+  (interactive "i")
+  (when (null nick)
+    (setq nick (read-string "New nick: " (rcirc-nick process))))
+  (rcirc-send-string process (concat "NICK " nick)))
+
+(defun-rcirc-command names (channel)
+  "Display list of names in CHANNEL or in current channel if CHANNEL is nil.
+If called interactively, prompt for a channel when prefix arg is supplied."
+  (interactive "P")
+  (if (interactive-p)
+      (if channel
+          (setq channel (read-string "List names in channel: " target))))
+  (let ((channel (if (> (length channel) 0)
+                     channel
+                   target)))
+    (rcirc-send-string process (concat "NAMES " channel))))
+
+(defun-rcirc-command topic (topic)
+  "List TOPIC for the TARGET channel.
+With a prefix arg, prompt for new topic."
+  (interactive "P")
+  (if (and (interactive-p) topic)
+      (setq topic (read-string "New Topic: " rcirc-topic)))
+  (rcirc-send-string process (concat "TOPIC " target
+                                     (when (> (length topic) 0)
+                                       (concat " :" topic)))))
+
+(defun-rcirc-command whois (nick)
+  "Request information from server about NICK."
+  (interactive (list
+                (completing-read "Whois: "
+                                 (with-current-buffer
+                                     (process-buffer rcirc-process)
+                                   rcirc-nick-table))))
+  (rcirc-set-last-buffer rcirc-process (current-buffer))
+  (rcirc-send-string process (concat "WHOIS " nick)))
+
+(defun-rcirc-command mode (args)
+  "Set mode with ARGS."
+  (interactive (list (concat (read-string "Mode nick or channel: ")
+                             " " (read-string "Mode: "))))
+  (rcirc-send-string process (concat "MODE " args)))
+
+(defun-rcirc-command list (channels)
+  "Request information on CHANNELS from server."
+  (interactive "sList Channels: ")
+  (rcirc-send-string process (concat "LIST " channels)))
+
+(defun-rcirc-command oper (args)
+  "Send operator command to server."
+  (interactive "sOper args: ")
+  (rcirc-send-string process (concat "OPER " args)))
+
+(defun-rcirc-command quote (message)
+  "Send MESSAGE literally to server."
+  (interactive "sServer message: ")
+  (rcirc-send-string process message))
+
+(defun-rcirc-command kick (arg)
+  "Kick NICK from current channel."
+  (interactive (list
+                (concat (completing-read "Kick nick: "
+                                         (rcirc-channel-nicks rcirc-process
+                                                              rcirc-target))
+                        (read-from-minibuffer "Kick reason: "))))
+  (let* ((arglist (split-string arg))
+         (argstring (concat (car arglist) " :" 
+                            (mapconcat 'identity (cdr arglist) " "))))
+    (rcirc-send-string process (concat "KICK " target " " argstring))))
+
+(defun rcirc-cmd-ctcp (args &optional process target)
+  (if (string-match "^\\([^ ]+\\)\\s-+\\(.+\\)$" args)
+      (let ((target (match-string 1 args))
+            (request (match-string 2 args)))
+        (rcirc-send-message process target 
+                            (concat "\C-a" (upcase request) "\C-a")))
+    (rcirc-print process (rcirc-nick process) "ERROR" target
+                 "usage: /ctcp NICK REQUEST")))
+
+(defun rcirc-cmd-me (args &optional process target)
+  (rcirc-send-string process (format "PRIVMSG %s :\C-aACTION %s\C-a"
+                                     target args)))
+
+(defun rcirc-message-leader (sender face)
+  "Return a string with SENDER propertized with FACE."
+  (rcirc-facify (concat "<" (rcirc-user-nick sender) "> ") face))
+  
+(defun rcirc-facify (string face)
+  "Return a copy of STRING with FACE property added."
+  (propertize (or string "") 'face face 'rear-nonsticky t))
+
+;; shy grouping must be used within this regexp
+(defvar rcirc-url-regexp
+  "\\b\\(?:\\(?:www\\.\\|\\(?:s?https?\\|ftp\\|file\\|gopher\\|news\\|telnet\
+\\|wais\\|mailto\\):\\)\\(?://[-a-zA-Z0-9_.]+:[0-9]*\\)?\\(?:[-a-zA-Z0-9_=!?#$\
+@~`%&*+|\\/:;.,]\\|\\w\\)+\\(?:[-a-zA-Z0-9_=#$@~`%&*+|\\/]\\|\\w\\)\\)"
+  "Regexp matching URL's.  Set to nil to disable URL features in rcirc.")
+
+(defun rcirc-browse-url (&optional arg)
+  "Prompt for url to browse based on urls in buffer."
+  (interactive)
+  (let ((completions (mapcar (lambda (x) (cons x nil)) rcirc-urls))
+        (initial-input (car rcirc-urls))
+        (history (cdr rcirc-urls)))
+    (browse-url (completing-read "rcirc browse-url: "
+                                 completions nil nil initial-input 'history)
+                arg)))
+
+(defun rcirc-map-regexp (function regexp string)
+  "Return a copy of STRING after calling FUNCTION for each REGEXP match.
+FUNCTION takes 3 arguments, MATCH-START, MATCH-END, and STRING."
+  (let ((start 0))
+    (while (string-match regexp string start)
+      (setq start (match-end 0))
+      (funcall function (match-beginning 0) (match-end 0) string)))
+  string)
+
+(defvar rcirc-nick-syntax-table
+  (let ((table (make-syntax-table text-mode-syntax-table)))
+    (mapc (lambda (c) (modify-syntax-entry c "w" table))
+          "[]\\`_^{|}-")
+    (modify-syntax-entry ?' "_" table)
+    table)
+  "Syntax table which includes all nick characters as word constituents.")
+
+(defun rcirc-mangle-text (process text)
+  "Return TEXT with properties added based on various patterns."
+  ;; ^B
+  (setq text
+        (rcirc-map-regexp (lambda (start end string)
+                            (add-text-properties
+                             start end
+                             (list 'face 'bold 'rear-nonsticky t)
+                             string))
+                          ".*?"
+                          text))
+  (while (string-match "\\(.*\\)[
]\\(.*\\)" text) ; deal with 
+    (setq text (concat (match-string 1 text)
+                       (match-string 2 text))))
+  ;; my nick
+  (setq text
+        (with-syntax-table rcirc-nick-syntax-table
+          (rcirc-map-regexp (lambda (start end string)
+                              (add-text-properties
+                               start end
+                               (list 'face 'rcirc-nick-in-message-face
+                                     'rear-nonsticky t)
+                               string))
+                            (concat "\\b"
+                                    (regexp-quote (rcirc-nick process))
+                                    "\\b")
+                            text)))
+  ;; urls
+  (setq text
+        (rcirc-map-regexp
+         (lambda (start end string)
+           (let ((orig-face (get-text-property start 'face string)))
+             (add-text-properties start end
+                                  (list 'face (list orig-face 'bold)
+                                        'rear-nonsticky t)
+                                  string))
+             (push (substring string start end) rcirc-urls))
+           rcirc-url-regexp
+           text))
+  text)
+
+
+;;; handlers
+;; these are called with the server PROCESS, the SENDER, which is a
+;; server or a user, depending on the command, the ARGS, which is a
+;; list of strings, and the TEXT, which is the original server text,
+;; verbatim
+(defun rcirc-handler-001 (process sender args text)
+  (rcirc-handler-generic process "001" sender args text)
+  ;; set the real server name
+  (with-current-buffer (process-buffer process)
+    (setq rcirc-server sender)
+    (setq rcirc-nick (car args))
+    (rcirc-update-prompt)
+    (when rcirc-auto-authenticate-flag (rcirc-authenticate))
+    (let (rcirc-last-buffer)
+      (rcirc-join-channels process rcirc-startup-channels))))
+
+(defun rcirc-handler-PRIVMSG (process sender args text)
+  (let ((target (if (rcirc-channel-p (car args))
+                    (car args)
+                  (rcirc-user-nick sender)))
+        (message (or (cadr args) "")))
+    (if (string-match "^\C-a\\(.*\\)\C-a$" message)
+        (rcirc-handler-CTCP process target sender (match-string 1 message))
+      (rcirc-print process sender "PRIVMSG" target message t))
+    ;; update nick timestamp
+    (if (member target (rcirc-nick-channels process sender))
+        (rcirc-put-nick-channel process sender target))))
+
+(defun rcirc-handler-NOTICE (process sender args text)
+  (let ((target (car args))
+        (message (cadr args)))
+    (rcirc-print process sender "NOTICE"
+                 (cond ((rcirc-channel-p target)
+                        target)
+                       ((string-match "^\\[\\(#[^ ]+\\)\\]" message)
+                        (match-string 1 message))
+                       (sender
+                        (if (string= sender (rcirc-server process))
+                            (process-buffer process)
+                          (rcirc-user-nick sender))))
+                 message t)
+    (and sender (rcirc-put-nick-channel process sender target))))
+
+(defun rcirc-handler-WALLOPS (process sender args text)
+  (let ((target (rcirc-user-nick sender)))
+    (rcirc-print process sender "WALLOPS" target (car args) t)))
+
+(defun rcirc-handler-JOIN (process sender args text)
+  (let ((channel (downcase (car args)))
+        (nick (rcirc-user-nick sender)))
+    (rcirc-get-buffer-create process channel)
+    (rcirc-print process sender "JOIN" channel "")
+
+    ;; print in private chat buffer if it exists
+    (if (not (eq (process-buffer rcirc-process)
+                 (rcirc-get-buffer rcirc-process nick)))
+        (rcirc-print process sender "JOIN" nick channel))
+
+    (rcirc-put-nick-channel process sender channel)
+    (if (string= nick (rcirc-nick process))
+        (setq rcirc-channels (cons channel rcirc-channels)))))
+
+;; PART and KICK are handled the same way
+(defun rcirc-handler-PART-or-KICK (process response channel sender nick args)
+  (rcirc-print process sender response channel (concat channel " " args))
+
+  ;; print in private chat buffer if it exists
+  (when (not (eq (process-buffer rcirc-process)
+                 (rcirc-get-buffer rcirc-process nick)))
+    (rcirc-print process sender response nick (concat channel " " args)))
+
+  (if (not (string= nick (rcirc-nick process)))
+      ;; this is someone else leaving
+  (rcirc-remove-nick-channel process nick channel)
+  ;; this is us leaving
+  (mapc (lambda (n)
+          (rcirc-remove-nick-channel process n channel))
+        (rcirc-channel-nicks process channel))
+  (setq rcirc-channels (delete channel rcirc-channels))
+  (with-current-buffer (rcirc-get-buffer process channel)
+    (setq rcirc-target nil))))
+
+(defun rcirc-handler-PART (process sender args text)
+  (rcirc-handler-PART-or-KICK process "PART"
+                              (car args) sender (rcirc-user-nick sender)
+                              (cadr args)))
+
+(defun rcirc-handler-KICK (process sender args text)
+  (rcirc-handler-PART-or-KICK process "KICK" (car args) sender (cadr args) 
+                              (caddr args)))
+
+(defun rcirc-handler-QUIT (process sender args text)
+  (let ((nick (rcirc-user-nick sender)))
+    (mapc (lambda (channel)
+            (rcirc-print process sender "QUIT" channel (apply 'concat args)))
+          (rcirc-nick-channels process nick))
+
+    ;; print in private chat buffer if it exists
+    (if (not (eq (process-buffer rcirc-process)
+                 (rcirc-get-buffer rcirc-process nick)))
+        (rcirc-print process sender "QUIT" nick (apply 'concat args)))
+
+    (rcirc-nick-remove process nick)))
+
+(defun rcirc-handler-NICK (process sender args text)
+  (let* ((old-nick (rcirc-user-nick sender))
+         (new-nick (car args))
+         (channels (rcirc-nick-channels process old-nick)))
+    ;; print message to nick's channels
+    (dolist (target channels)
+      (rcirc-print process sender "NICK" target new-nick))
+    ;; update private chat buffer, if it exists
+    (with-current-buffer (rcirc-get-buffer process old-nick)
+      (when (not (equal (process-buffer rcirc-process)
+                        (current-buffer)))
+        (rcirc-print process sender "NICK" old-nick new-nick)
+        (setq rcirc-target new-nick)
+        (rename-buffer (rcirc-get-buffer-name process new-nick))))
+    ;; remove old nick and add new one
+    (with-current-buffer (process-buffer process)
+      (let ((v (gethash old-nick rcirc-nick-table)))
+        (remhash old-nick rcirc-nick-table)
+        (puthash new-nick v rcirc-nick-table))
+      ;; if this is our nick...
+      (when (string= old-nick rcirc-nick)
+        (setq rcirc-nick new-nick)
+        ;; update prompts
+        (mapc (lambda (target)
+                (with-current-buffer (rcirc-get-buffer process target)
+                  (rcirc-update-prompt)))
+              (append rcirc-channels rcirc-private-chats))
+        ;; reauthenticate
+        (when rcirc-auto-authenticate-flag (rcirc-authenticate))))))
+
+(defun rcirc-handler-PING (process sender args text)
+  (rcirc-send-string process (concat "PONG " (car args))))
+
+(defun rcirc-handler-PONG (process sender args text)
+  ;; do nothing
+  )
+
+(defun rcirc-handler-TOPIC (process sender args text)
+  (let ((topic (cadr args)))
+    (rcirc-print process sender "TOPIC" (car args) topic)
+    (with-current-buffer (rcirc-get-buffer process (car args))
+      (setq rcirc-topic topic))))
+
+(defun rcirc-handler-332 (process sender args text)
+  "RPL_TOPIC"
+  (with-current-buffer (rcirc-get-buffer process (cadr args))
+    (setq rcirc-topic (caddr args))))
+
+(defun rcirc-handler-333 (process sender args text)
+  "Not in rfc1459.txt"
+  (with-current-buffer (rcirc-get-buffer process (cadr args))
+    (let ((setter (caddr args))
+          (time (current-time-string
+                 (seconds-to-time
+                  (string-to-number (cadddr args))))))
+      (rcirc-print process sender "TOPIC" (cadr args)
+                   (format "%s (%s on %s)" rcirc-topic setter time)))))
+
+(defun rcirc-handler-477 (process sender args text)
+  "ERR_NOCHANMODES"
+  (rcirc-print process sender "477" (cadr args) (caddr args)))
+
+(defun rcirc-handler-MODE (process sender args text)
+  (let ((target (car args))
+        (msg (mapconcat 'identity (cdr args) " ")))
+    (rcirc-print process sender "MODE"
+                 (if (string= target (rcirc-nick process))
+                     nil
+                   target)
+                 msg)
+
+    ;; print in private chat buffers if they exist
+    (mapc (lambda (nick)
+            (when (not (eq (process-buffer rcirc-process)
+                           (rcirc-get-buffer rcirc-process nick)))
+              (rcirc-print process sender "MODE" nick msg)))
+          (cddr args))))
+
+(defun rcirc-get-temp-buffer-create (process channel)
+  "Return a buffer based on PROCESS and CHANNEL."
+  (let ((tmpnam (concat " " (downcase channel) "TMP" (process-name process))))
+    (get-buffer-create tmpnam)))
+
+(defun rcirc-handler-353 (process sender args text)
+  "RPL_NAMREPLY"
+  (let ((channel (downcase (caddr args))))
+    (mapc (lambda (nick)
+            (rcirc-put-nick-channel process nick channel))
+          (delete "" (split-string (cadddr args) " ")))
+    (with-current-buffer (rcirc-get-temp-buffer-create process channel)
+      (goto-char (point-max))
+      (insert (car (last args)) " "))))
+
+(defun rcirc-handler-366 (process sender args text)
+  "RPL_ENDOFNAMES"
+  (let* ((channel (cadr args))
+         (buffer (rcirc-get-temp-buffer-create process channel)))
+    (with-current-buffer buffer
+      (rcirc-print process sender "NAMES" channel
+                   (buffer-substring (point-min) (point-max))))
+    (kill-buffer buffer)))
+
+(defun rcirc-handler-433 (process sender args text)
+  "ERR_NICKNAMEINUSE"
+  (rcirc-handler-generic process "433" sender args text)
+  (let* ((new-nick (concat (cadr args) "`")))
+    (with-current-buffer (process-buffer process)
+      (rcirc-cmd-nick new-nick nil process))))
+
+(defun rcirc-authenticate ()
+  "Send authentication to process associated with current buffer.
+Passwords are read from `rcirc-authinfo-file-name' (which see)."
+  (interactive)
+  (let ((password-alist
+         (with-temp-buffer
+           (insert-file-contents-literally rcirc-authinfo-file-name)
+           (goto-char (point-min))
+           (read (current-buffer)))))
+    (with-current-buffer (process-buffer rcirc-process)
+      (dolist (i password-alist)
+        (let ((server (car i))
+              (nick (cadr i))
+              (method (caddr i))
+              (args (cdddr i)))
+          (when (and (string-match server rcirc-server)
+                     (string-match nick rcirc-nick))
+            (cond ((equal method 'nickserv)
+                   (rcirc-send-string
+                    rcirc-process
+                    (concat
+                     "PRIVMSG nickserv :identify " 
+                     (car args))))
+                  ((equal method 'chanserv)
+                   (rcirc-send-string
+                    rcirc-process
+                    (concat
+                     "PRIVMSG chanserv :identify " 
+                     (car args) " " (cadr args))))
+                  ((equal method 'bitlbee)
+                   (rcirc-send-string
+                    rcirc-process
+                    (concat "PRIVMSG #bitlbee :identify " (car args))))
+                  (t
+                   (message "No %S authentication method defined" 
+                            method)))))))))
+ 
+(defun rcirc-handler-INVITE (process sender args text)
+  (rcirc-print process sender "INVITE" nil (mapconcat 'identity args " ") t))
+
+(defun rcirc-handler-ERROR (process sender args text)
+  (rcirc-print process sender "ERROR" nil (mapconcat 'identity args " ")))
+
+(defun rcirc-handler-CTCP (process target sender text)
+  (if (string-match "^\\([^ ]+\\) *\\(.*\\)$" text)
+      (let* ((request (upcase (match-string 1 text)))
+             (args (match-string 2 text))
+             (nick (rcirc-user-nick sender))
+             (handler (intern-soft (concat "rcirc-handler-ctcp-" request))))
+        (if (not (fboundp handler))
+            (rcirc-print process sender "ERROR" target 
+                         (format "unhandled ctcp: %s" text))
+          (funcall handler process target sender args)
+          (if (not (string= request "ACTION"))
+              (rcirc-print process sender "CTCP" target
+                           (format "%s" text)))))))
+
+(defun rcirc-handler-ctcp-VERSION (process target sender args)
+  (rcirc-send-string process
+                     (concat "NOTICE " (rcirc-user-nick sender)
+                             " :\C-aVERSION " (rcirc-version)
+                             " - http://www.nongnu.org/rcirc"
+                             "\C-a")))
+
+(defun rcirc-handler-ctcp-ACTION (process target sender args)
+  (rcirc-print process sender "ACTION" target args t))
+
+(defun rcirc-handler-ctcp-TIME (process target sender args)
+  (rcirc-send-string process
+                     (concat "NOTICE " (rcirc-user-nick sender)
+                             " :\C-aTIME " (current-time-string) "\C-a")))
+
+(defface rcirc-my-nick-face
+  '((((type tty) (class color)) (:foreground "blue" :weight bold))
+    (((class color) (background light)) (:foreground "Blue"))
+    (((class color) (background dark)) (:foreground "LightSkyBlue"))
+    (t (:inverse-video t :bold t)))
+  "The rcirc face used to highlight my messages."
+  :group 'rcirc)
+
+(defface rcirc-other-nick-face
+  '((((type tty) (class color)) (:foreground "yellow" :weight light))
+    (((class grayscale) (background light))
+     (:foreground "Gray90" :bold t :italic t))
+    (((class grayscale) (background dark))
+     (:foreground "DimGray" :bold t :italic t))
+    (((class color) (background light)) (:foreground "DarkGoldenrod"))
+    (((class color) (background dark)) (:foreground "LightGoldenrod"))
+    (t (:bold t :italic t)))
+  "The rcirc face used to highlight other messages."
+  :group 'rcirc)
+
+(defface rcirc-server-face
+  '((((type tty pc) (class color) (background light)) (:foreground "red"))
+    (((type tty pc) (class color) (background dark)) (:foreground "red1"))
+    (((class grayscale) (background light))
+     (:foreground "DimGray" :bold t :italic t))
+    (((class grayscale) (background dark))
+     (:foreground "LightGray" :bold t :italic t))
+    (((class color) (background light)) (:foreground "gray40"))
+    (((class color) (background dark)) (:foreground "chocolate1"))
+    (t (:bold t :italic t)))
+  "The rcirc face used to highlight server messages."
+  :group 'rcirc)
+
+(defface rcirc-nick-in-message-face
+  '((((type tty) (class color)) (:foreground "cyan" :weight bold))
+    (((class grayscale) (background light)) (:foreground "LightGray" :bold t))
+    (((class grayscale) (background dark)) (:foreground "DimGray" :bold t))
+    (((class color) (background light)) (:foreground "Purple"))
+    (((class color) (background dark)) (:foreground "Cyan"))
+    (t (:bold t)))
+  "The rcirc face used to highlight instances of nick within messages."
+  :group 'rcirc)
+
+(defface rcirc-prompt-face
+  '((((background dark)) (:foreground "cyan"))
+    (t (:foreground "dark blue")))
+  "The rcirc face to use to highlight prompts."
+  :group 'rcirc)
+
+(defface rcirc-mode-line-nick-face
+  '((t (:bold t)))
+  "The rcirc face used indicate activity directed at you."
+  :group 'rcirc)
+
+;; When using M-x flyspell-mode, only check words past the input marker
+(put 'rcirc-mode 'flyspell-mode-predicate 'rcirc-looking-at-input)
+(defun rcirc-looking-at-input ()
+  "Returns true if point is past the input marker."
+  (>= (point) rcirc-prompt-end-marker))
+
+
+(provide 'rcirc)
+
+;; arch-tag: b471b7e8-6b5a-4399-b2c6-a3c78dfc8ffb
+;;; rcirc.el ends here
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index ac2cc23048a..d9f4698ecf7 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -274,6 +274,14 @@ One argument, the tag info returned by `snarf-tag-function'.")
   (run-hook-with-args-until-success 'tags-table-format-functions))
 
 ;;;###autoload
+(defun tags-table-mode ()
+  "Major mode for tags table file buffers."
+  (interactive)
+  (setq major-mode 'tags-table-mode)
+  (setq mode-name "Tags Table")
+  (initialize-new-tags-table))
+
+;;;###autoload
 (defun visit-tags-table (file &optional local)
   "Tell tags commands to use tags table file FILE.
 FILE should be the name of a file created with the `etags' program.
@@ -415,7 +423,7 @@ Returns non-nil iff it is a valid table."
       ;; having changed since we last used it.
       (let (win)
         (set-buffer (get-file-buffer file))
-        (setq win (or verify-tags-table-function (initialize-new-tags-table)))
+        (setq win (or verify-tags-table-function (tags-table-mode)))
         (if (or (verify-visited-file-modtime (current-buffer))
                 ;; Decide whether to revert the file.
                 ;; revert-without-query can say to revert
@@ -434,7 +442,7 @@ Returns non-nil iff it is a valid table."
             (and verify-tags-table-function
                  (funcall verify-tags-table-function))
           (revert-buffer t t)
-          (initialize-new-tags-table)))
+          (tags-table-mode)))
     (and (file-exists-p file)
          (progn
            (set-buffer (find-file-noselect file))
@@ -446,7 +454,7 @@ Returns non-nil iff it is a valid table."
                      (setcar tail buffer-file-name))
                  (if (eq file tags-file-name)
                      (setq tags-file-name buffer-file-name))))
-           (initialize-new-tags-table)))))
+           (tags-table-mode)))))
 
 ;; Subroutine of visit-tags-table-buffer.  Search the current tags tables
 ;; for one that has tags for THIS-FILE (or that includes a table that
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index b8c425428b5..2c4543a72fc 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -869,7 +869,15 @@ See `sh-feature'.")
 (defconst sh-st-symbol (string-to-syntax "_"))
 (defconst sh-here-doc-syntax (string-to-syntax "|")) ;; generic string
 
-(defconst sh-here-doc-open-re "<<-?\\s-*\\\\?\\(\\(?:['\"][^'\"]+['\"]\\|\\sw\\)+\\).*\\(\n\\)")
+(defconst sh-escaped-line-re
+  ;; Should match until the real end-of-continued line, but if that is not
+  ;; possible (because we bump into EOB or the search bound), then we should
+  ;; match until the search bound.
+  "\\(?:\\(?:.*[^\\\n]\\)?\\(?:\\\\\\\\\\)*\\\\\n\\)*.*")
+
+(defconst sh-here-doc-open-re
+  (concat "<<-?\\s-*\\\\?\\(\\(?:['\"][^'\"]+['\"]\\|\\sw\\)+\\)"
+          sh-escaped-line-re "\\(\n\\)"))
 
 (defvar sh-here-doc-markers nil)
 (make-variable-buffer-local 'sh-here-doc-markers)
@@ -883,7 +891,9 @@ If non-nil INDENTED indicates that the EOF was indented."
          ;; A rough regexp that should find the opening <<EOF back.
          (sre (concat "<<\\(-?\\)\\s-*['\"\\]?"
                       ;; Use \s| to cheaply check it's an open-heredoc.
-                      eof-re "['\"]?\\([ \t|;&)<>].*\\)?\\s|"))
+                      eof-re "['\"]?\\([ \t|;&)<>]"
+                      sh-escaped-line-re
+                      "\\)?\\s|"))
          ;; A regexp that will find other EOFs.
          (ere (concat "^" (if indented "[ \t]*") eof-re "\n"))
          (start (save-excursion
@@ -922,7 +932,8 @@ If non-nil INDENTED indicates that the EOF was indented."
 START is the position of <<.
 STRING is the actual word used as delimiter (f.ex. \"EOF\").
 INDENTED is non-nil if the here document's content (and the EOF mark) can
-be indented (i.e. a <<- was used rather than just <<)."
+be indented (i.e. a <<- was used rather than just <<).
+Point is at the beginning of the next line."
   (unless (or (memq (char-before start) '(?< ?>))
               (sh-in-comment-or-string start))
     ;; We're looking at <<STRING, so we add "^STRING$" to the syntactic
@@ -933,6 +944,20 @@ be indented (i.e. a <<- was used rather than just <<)."
         (setq sh-here-doc-re
               (concat sh-here-doc-open-re "\\|^\\([ \t]*\\)"
                       (regexp-opt sh-here-doc-markers t) "\\(\n\\)"))))
+    (let ((ppss (save-excursion (syntax-ppss (1- (point))))))
+      (if (nth 4 ppss)
+          ;; The \n not only starts the heredoc but also closes a comment.
+          ;; Let's close the comment just before the \n.
+          (put-text-property (1- (point)) (point) 'syntax-table '(12))) ;">"
+      (if (or (nth 5 ppss) (> (count-lines start (point)) 1))
+          ;; If the sh-escaped-line-re part of sh-here-doc-re has matched
+          ;; several lines, make sure we refontify them together.
+          ;; Furthermore, if (nth 5 ppss) is non-nil (i.e. the \n is
+          ;; escaped), it means the right \n is actually further down.
+          ;; Don't bother fixing it now, but place a multiline property so
+          ;; that when jit-lock-context-* refontifies the rest of the
+          ;; buffer, it also refontifies the current line with it.
+          (put-text-property start (point) 'font-lock-multiline t)))
     sh-here-doc-syntax))
 
 (defun sh-font-lock-here-doc (limit)
@@ -972,6 +997,8 @@ be indented (i.e. a <<- was used rather than just <<)."
   ;; The list of special chars is taken from the single-unix spec
   ;; of the shell command language (under `quoting') but with `$' removed.
   `(("[^|&;<>()`\\\"' \t\n]\\(#+\\)" 1 ,sh-st-symbol)
+    ;; Make sure $@ and @? are correctly recognized as sexps.
+    ("\\$\\([?@]\\)" 1 ,sh-st-symbol)
     ;; Find HEREDOC starters and add a corresponding rule for the ender.
     (sh-font-lock-here-doc
      (2 (sh-font-lock-open-heredoc
diff --git a/lisp/replace.el b/lisp/replace.el
index e2562ed3469..2d79754b4f0 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1157,7 +1157,8 @@ See also `multi-occur'."
                             (insert "-------\n"))
                           (add-text-properties
                            beg end
-                           `(occur-target ,marker help-echo "mouse-2: go to this occurrence")))))
+                           `(occur-target ,marker follow-link t
+                                          help-echo "mouse-2: go to this occurrence")))))
                     (goto-char endpt))
                   (if endpt
                       (progn
diff --git a/lisp/savehist.el b/lisp/savehist.el
index de0f1504ff8..efbc1e934a6 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -138,7 +138,12 @@ the user's privacy."
   :type 'integer
   :group 'savehist)
 
-(defvar savehist-coding-system (if (coding-system-p 'utf-8) 'utf-8 'iso-2022-8)
+(defvar savehist-coding-system
+  ;; UTF-8 is usually preferable to ISO-2022-8 when available, but under
+  ;; XEmacs, UTF-8 is provided by external packages, and may not always be
+  ;; available, so even if it currently is available, we prefer not to
+  ;; use is.
+  (if (featurep 'xemacs) 'iso-2022-8 'utf-8)
   "The coding system savehist uses for saving the minibuffer history.
 Changing this value while Emacs is running is supported, but considered
 unwise, unless you know what you are doing.")
diff --git a/lisp/simple.el b/lisp/simple.el
index be5844fa794..16b6ee28953 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4576,10 +4576,10 @@ in the definition is used to check that VALUE is valid.
 With a prefix argument, set VARIABLE to VALUE buffer-locally."
   (interactive
    (let* ((default-var (variable-at-point))
-          (var (if (symbolp default-var)
-                        (read-variable (format "Set variable (default %s): " default-var)
-                                       default-var)
-                      (read-variable "Set variable: ")))
+          (var (if (user-variable-p default-var)
+                   (read-variable (format "Set variable (default %s): " default-var)
+                                  default-var)
+                 (read-variable "Set variable: ")))
           (minibuffer-help-form '(describe-variable var))
           (prop (get var 'variable-interactive))
           (obsolete (car (get var 'byte-obsolete-variable)))
@@ -4604,7 +4604,8 @@ With a prefix argument, set VARIABLE to VALUE buffer-locally."
                                             arg))
                    (read
                     (read-string prompt nil
-                                 'set-variable-value-history))))))
+                                 'set-variable-value-history
+                                 (format "%S" (symbol-value var))))))))
      (list var val current-prefix-arg)))
 
   (and (custom-variable-p variable)
diff --git a/lisp/startup.el b/lisp/startup.el
index c7bd6b323e9..f474c692240 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -647,6 +647,17 @@ opening the first frame (e.g. open a connection to an X server).")
 
   (set-locale-environment nil)
 
+  ;; Convert preloaded file names to absolute.
+  (setq load-history
+        (mapcar (lambda (elt)
+                  (if (and (stringp (car elt))
+                           (not (file-name-absolute-p (car elt))))
+                      (cons (locate-file (car elt) load-path
+                                         load-suffixes)
+                            (cdr elt))
+                    elt))
+                load-history))
+
   ;; Convert the arguments to Emacs internal representation.
   (let ((args (cdr command-line-args)))
     (while args
diff --git a/lisp/subr.el b/lisp/subr.el
index 87d58799dc7..48ac3c7e672 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1017,9 +1017,7 @@ The return value is the new value of LIST-VAR."
 
 (defun symbol-file (symbol &optional type)
   "Return the input source in which SYMBOL was defined.
-The value is normally a string that was passed to `load':
-either an absolute file name, or a library name
-\(with no directory name and no `.el' or `.elc' at the end).
+The value is an absolute file name.
 It can also be nil, if the definition is not associated with any file.
 
 If TYPE is nil, then any kind of definition is acceptable.
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index 4362e97af0b..0e57d541dfe 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -735,7 +735,9 @@ appear on disk when you save the tar-file's buffer."
                              (and set-auto-coding-function
                                   (save-excursion
                                     (funcall set-auto-coding-function
-                                             name (- (point-max) (point)))))))
+                                             name (- (point-max) (point)))))
+                             (car (find-operation-coding-system
+                                   'insert-file-contents name t))))
                         (multibyte enable-multibyte-characters)
                         (detected (detect-coding-region
                                    (point-min)
@@ -747,13 +749,7 @@ appear on disk when you save the tar-file's buffer."
                                           coding
                                           (coding-system-eol-type detected))))
                       (setq coding
-                            (or (find-new-buffer-file-coding-system detected)
-                                (let ((file-coding
-                                       (find-operation-coding-system
-                                        'insert-file-contents buffer-file-name)))
-                                  (if (consp file-coding)
-                                      (setq file-coding (car file-coding))
-                                    file-coding)))))
+                            (find-new-buffer-file-coding-system detected)))
                     (if (or (eq coding 'no-conversion)
                             (eq (coding-system-type coding) 5))
                         (setq multibyte (set-buffer-multibyte nil)))
diff --git a/lisp/term.el b/lisp/term.el
index 9d6ee5a4e93..471d7830de0 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1393,7 +1393,7 @@ The main purpose is to get rid of the local keymap."
 
 ;;; Name to use for TERM.
 ;;; Using "emacs" loses, because bash disables editing if TERM == emacs.
-(defvar term-term-name "eterm")
+(defvar term-term-name "eterm-color")
 ; Format string, usage:
 ; (format term-termcap-string emacs-term-name "TERMCAP=" 24 80)
 (defvar term-termcap-format
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 11ddfc0e967..ce95c6f026f 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -344,13 +344,14 @@ and `fill-nobreak-invisible'."
      ;; it at the end of the line.
      (and sentence-end-double-space
           (save-excursion
-            (skip-chars-backward ". ")
-            (looking-at "\\. \\([^ ]\\|$\\)")))
+            (skip-chars-backward " ")
+            (and (eq (preceding-char) ?.)
+                 (looking-at " \\([^ ]\\|$\\)"))))
      ;; Another approach to the same problem.
      (save-excursion
-       (skip-chars-backward ". ")
-       (and (looking-at "\\.")
-            (not (looking-at (sentence-end)))))
+       (skip-chars-backward " ")
+       (and (eq (preceding-char) ?.)
+            (not (progn (forward-char -1) (looking-at (sentence-end))))))
      ;; Don't split a line if the rest would look like a new paragraph.
      (unless use-hard-newlines
        (save-excursion
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 7f0d257e5f6..a84f2be28ae 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
 ;; Keywords: outlines, hypermedia, calendar
 ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
-;; Version: 3.17
+;; Version: 3.18
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -80,6 +80,10 @@
 ;;
 ;; Changes:
 ;; -------
+;; Version 3.18
+;;    - Export of calendar information in the standard iCalendar format.
+;;    - Some bug fixes.
+;;
 ;; Version 3.17
 ;;    - HTML export specifies character set depending on coding-system.
 ;;
@@ -213,7 +217,7 @@
 
 ;;; Customization variables
 
-(defvar org-version "3.17"
+(defvar org-version "3.18"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -777,7 +781,7 @@ as possible."
 (defcustom org-level-color-stars-only nil
   "Non-nil means fontify only the stars in each headline.
 When nil, the entire headline is fontified.
-After changin this, requires restart of Emacs to become effective."
+After changing this, requires restart of Emacs to become effective."
   :group 'org-structure
   :type 'boolean)
 
@@ -1490,6 +1494,23 @@ Otherwise, the buffer will just be saved to a file and stay hidden."
   :group 'org-export
   :type 'boolean)
 
+(defcustom org-combined-agenda-icalendar-file "~/org.ics"
+  "The file name for the iCalendar file covering all agenda files.
+This file is created with the command \\[org-export-icalendar-all-agenda-files]."
+  :group 'org-export
+  :type 'file)
+
+(defcustom org-icalendar-include-todo nil
+  "Non-nil means, export to iCalendar files should also cover TODO items."
+  :group 'org-export
+  :type 'boolean)
+
+;; FIXME: not yet used.
+(defcustom org-icalendar-combined-name "OrgMode"
+  "Calendar name for the combined iCalendar representing all agenda files."
+  :group 'org-export
+  :type 'string)
+
 (defgroup org-faces nil
   "Faces for highlighting in Org-mode."
   :tag "Org Faces"
@@ -3179,7 +3200,8 @@ used to insert the time stamp into the buffer to include the time."
         ;; Copied (with modifications) from planner.el by John Wiegley
         (save-excursion
           (save-window-excursion
-            (calendar)
+            (let ((view-diary-entries-initially nil))
+              (calendar))
             (calendar-forward-day (- (time-to-days default-time)
                                      (calendar-absolute-from-gregorian
                                       (calendar-current-date))))
@@ -3523,7 +3545,8 @@ A prefix ARG can be used force the current date."
               (d2 (time-to-days
                    (org-time-string-to-time (match-string 1)))))
           (setq diff (- d2 d1))))
-    (calendar)
+    (let ((view-diary-entries-initially nil))
+      (calendar))
     (calendar-goto-today)
     (if (and diff (not arg)) (calendar-forward-day diff))))
 
@@ -3628,7 +3651,7 @@ The following commands are available:
 (define-key org-agenda-mode-map [?\C-c ?\C-x (down)] 'org-agenda-priority-down)
 (define-key org-agenda-mode-map [(right)] 'org-agenda-later)
 (define-key org-agenda-mode-map [(left)] 'org-agenda-earlier)
-
+(define-key org-agenda-mode-map "\C-c\C-x\C-c" 'org-export-icalendar-combine-agenda-files)
 (defvar org-agenda-keymap (copy-keymap org-agenda-mode-map)
   "Local keymap for agenda entries from Org-mode.")
 
@@ -3681,6 +3704,7 @@ The following commands are available:
      ["Sunrise/Sunset" org-agenda-sunrise-sunset t]
      ["Holidays" org-agenda-holidays t]
      ["Convert" org-agenda-convert-date t])
+    ["Create iCalendar file" org-export-icalendar-combine-agenda-files t]
     "--"
     ["Quit" org-agenda-quit t]
     ["Exit and Release Buffers" org-agenda-exit t]
@@ -4253,6 +4277,9 @@ Optional argument FILE means, use this file instead of the current."
 
 (defun org-file-menu-entry (file)
   (vector file (list 'find-file file) t))
+;; FIXME: Maybe removed a buffer visited through the menu from
+;; org-agenda-new-buffers, so that the buffer will not be removed
+;; when exiting the agenda????
 
 (defun org-get-all-dates (beg end &optional no-ranges force-today)
   "Return a list of all relevant day numbers from BEG to END buffer positions.
@@ -5222,7 +5249,8 @@ argument, latitude and longitude will be prompted for."
   (let* ((day (or (get-text-property (point) 'day)
                   (error "Don't know which date to open in calendar")))
          (date (calendar-gregorian-from-absolute day)))
-    (calendar)
+    (let ((view-diary-entries-initially nil))
+      (calendar))
     (calendar-goto-date date)))
 
 (defun org-calendar-goto-agenda ()
@@ -8031,10 +8059,10 @@ to execute outside of tables."
          "--"
          ["Insert Hline" org-table-insert-hline :active (org-at-table-p) :keys "C-c -"])
         ("Rectangle"
-         ["Copy Rectangle" org-copy-special :active (org-at-table-p) :keys "C-c C-x M-w"]
-         ["Cut Rectangle" org-cut-special :active (org-at-table-p) :keys "C-c C-x C-w"]
-         ["Paste Rectangle" org-paste-special :active (org-at-table-p) :keys "C-c C-x C-y"]
-         ["Fill Rectangle" org-table-wrap-region :active (org-at-table-p) :keys "C-c C-q"])
+         ["Copy Rectangle" org-copy-special :active (org-at-table-p)]
+         ["Cut Rectangle" org-cut-special :active (org-at-table-p)]
+         ["Paste Rectangle" org-paste-special :active (org-at-table-p)]
+         ["Fill Rectangle" org-table-wrap-region :active (org-at-table-p)])
         "--"
         ["Set Column Formula" org-table-eval-formula :active (org-at-table-p) :keys "C-c ="]
         ["Set Named Field Formula" (org-table-eval-formula '(4)) :active (org-at-table-p) :keys "C-u C-c ="]
@@ -8834,6 +8862,8 @@ headlines.  The default is 3.  Lower levels will become bulleted lists."
          (coding-system (and (fboundp 'coding-system-get)
                              (boundp 'buffer-file-coding-system)
                              buffer-file-coding-system))
+         (coding-system-for-write (or coding-system coding-system-for-write))
+         (save-buffer-coding-system (or coding-system save-buffer-coding-system))
          (charset (and coding-system
                        (coding-system-get coding-system 'mime-charset)))
          table-open type
@@ -9066,6 +9096,7 @@ headlines.  The default is 3.  Lower levels will become bulleted lists."
         (if org-export-html-with-timestamp
             (insert org-export-html-html-helper-timestamp))
         (insert "</body>\n</html>\n")
+        (debug)
         (normal-mode)
         (save-buffer)
         (goto-char (point-min)))))
@@ -9409,6 +9440,172 @@ When LEVEL is non-nil, increase section numbers on that level."
     string))
 
 
+
+
+
+(defun org-export-icalendar-this-file ()
+  "Export current file as an iCalendar file.
+The iCalendar file will be located in the same directory as the Org-mode
+file, but with extension `.ics'."
+  (interactive)
+  (org-export-icalendar nil (buffer-file-name)))
+
+;;;###autoload
+(defun org-export-icalendar-all-agenda-files ()
+  "Export all files in `org-agenda-files' to iCalendar .ics files.
+Each iCalendar file will be located in the same directory as the Org-mode
+file, but with extension `.ics'."
+  (interactive)
+  (apply 'org-export-icalendar nil org-agenda-files))
+
+;;;###autoload
+(defun org-export-icalendar-combine-agenda-files ()
+  "Export all files in `org-agenda-files' to a single combined iCalendar file.
+The file is stored under the name `org-combined-agenda-icalendar-file'."
+  (interactive)
+  (apply 'org-export-icalendar t org-agenda-files))
+
+(defun org-export-icalendar (combine &rest files)
+  "Create iCalendar files for all elements of FILES.
+If COMBINE is non-nil, combine all calendar entries into a single large
+file and store it under the name `org-combined-agenda-icalendar-file'."
+  (save-excursion
+    (let* (file ical-file ical-buffer category started org-agenda-new-buffers)
+      (when combine
+        (setq ical-file org-combined-agenda-icalendar-file
+              ical-buffer (org-get-agenda-file-buffer ical-file))
+        (set-buffer ical-buffer) (erase-buffer))
+      (while (setq file (pop files))
+        (catch 'nextfile
+          (org-check-agenda-file file)
+          (unless combine
+            (setq ical-file (concat (file-name-sans-extension file) ".ics"))
+            (setq ical-buffer (org-get-agenda-file-buffer ical-file))
+            (set-buffer ical-buffer) (erase-buffer))
+          (set-buffer (org-get-agenda-file-buffer file))
+          (setq category (or org-category
+                             (file-name-sans-extension
+                              (file-name-nondirectory (buffer-file-name)))))
+          (if (symbolp category) (setq category (symbol-name category)))
+          (let ((standard-output ical-buffer))
+            (if combine
+                (and (not started) (setq started t)
+                     (org-start-icalendar-file "OrgMode"))
+              (org-start-icalendar-file category))
+            (org-print-icalendar-entries combine category)
+            (when (or (and combine (not files)) (not combine))
+              (org-finish-icalendar-file)
+              (set-buffer ical-buffer)
+              (save-buffer)
+              (run-hooks 'org-after-save-iCalendar-file-hook)))))
+      (org-release-buffers org-agenda-new-buffers))))
+
+(defvar org-after-save-iCalendar-file-hook nil
+  "Hook run after an iCalendar file has been saved.
+The iCalendar buffer is still current when this hook is run.
+A good way to use this is to tell a desktop calenndar application to re-read
+the iCalendar file.")
+
+(defun org-print-icalendar-entries (&optional combine category)
+  "Print iCalendar entries for the current Org-mode file to `standard-output'.
+When COMBINE is non nil, add the category to each line."
+  (let ((re2 (concat "--?-?\\(" org-ts-regexp "\\)"))
+        (dts (org-ical-ts-to-string
+              (format-time-string (cdr org-time-stamp-formats) (current-time))
+              "DTSTART"))
+        hd ts ts2 state (inc t) pos scheduledp deadlinep donep tmp pri)
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward org-ts-regexp nil t)
+        (setq pos (match-beginning 0)
+              ts (match-string 0)
+              inc t
+              hd (org-get-heading))
+        (if (looking-at re2)
+            (progn
+              (goto-char (match-end 0))
+              (setq ts2 (match-string 1) inc nil))
+          (setq ts2 ts
+                tmp (buffer-substring (max (point-min)
+                                             (- pos org-ds-keyword-length))
+                                      pos)
+                deadlinep (string-match org-deadline-regexp tmp)
+                scheduledp (string-match org-scheduled-regexp tmp)
+                donep (org-entry-is-done-p)))
+        (if (or (string-match org-tr-regexp hd)
+                (string-match org-ts-regexp hd))
+            (setq hd (replace-match "" t t hd)))                
+        (if combine
+            (setq hd (concat hd " (category " category ")")))
+        (if deadlinep (setq hd (concat "DL: " hd " This is a deadline")))
+        (if scheduledp (setq hd (concat "S: " hd " Scheduled for this date")))
+        (princ (format "BEGIN:VEVENT
+%s
+%s
+SUMMARY:%s
+END:VEVENT\n"
+                       (org-ical-ts-to-string ts "DTSTART")
+                       (org-ical-ts-to-string ts2 "DTEND" inc)
+                       hd)))
+      (when org-icalendar-include-todo
+        (goto-char (point-min))
+        (while (re-search-forward org-todo-line-regexp nil t)
+          (setq state (match-string 1))
+          (unless (equal state org-done-string)
+            (setq hd (match-string 3))
+            (if (string-match org-priority-regexp hd)
+                (setq pri (string-to-char (match-string 2 hd))
+                      hd (concat (substring hd 0 (match-beginning 1))
+                                 (substring hd (- (match-end 1)))))
+              (setq pri org-default-priority))
+            (setq pri (floor (1+ (* 8. (/ (float (- org-lowest-priority pri))
+                                          (- org-lowest-priority ?A))))))
+
+            (princ (format "BEGIN:VTODO
+%s
+SUMMARY:%s
+SEQUENCE:1
+PRIORITY:%d
+END:VTODO\n"
+                           dts hd pri))))))))
+
+(defun org-start-icalendar-file (name)
+  "Start an iCalendar file by inserting the header."
+  (let ((user user-full-name)
+        (calname "something")
+        (name (or name "unknown"))
+        (timezone "FIXME"))
+    (princ
+     (format "BEGIN:VCALENDAR
+VERSION:2.0
+X-WR-CALNAME:%s
+PRODID:-//%s//Emacs with Org-mode//EN
+X-WR-TIMEZONE:Europe/Amsterdam
+CALSCALE:GREGORIAN\n" name user timezone))))
+
+(defun org-finish-icalendar-file ()
+  "Finish an iCalendar file by inserting the END statement."
+  (princ "END:VCALENDAR\n"))
+
+(defun org-ical-ts-to-string (s keyword &optional inc)
+  "Take a time string S and convert it to iCalendar format.
+KEYWORD is added in front, to make a complete line like DTSTART....
+When INC is non-nil, increase the hour by two (if time string contains
+a time), or the day by one (if it does not contain a time)."
+  (let ((t1 (org-parse-time-string s 'nodefault))
+        t2 fmt have-time time)
+    (if (and (car t1) (nth 1 t1) (nth 2 t1))
+        (setq t2 t1 have-time t)
+      (setq t2 (org-parse-time-string s)))
+    (let ((s (car t2))   (mi (nth 1 t2)) (h (nth 2 t2))
+          (d (nth 3 t2)) (m  (nth 4 t2)) (y (nth 5 t2)))
+      (when inc
+        (if have-time (setq h (+ 2 h)) (setq d (1+ d))))
+      (setq time (encode-time s mi h d m y)))
+    (setq fmt (if have-time ":%Y%m%dT%H%M%S" ";VALUE=DATE:%Y%m%d"))
+    (concat keyword (format-time-string fmt time))))
+
+
 ;;; Key bindings
 
 ;; - Bindings in Org-mode map are currently
@@ -9510,9 +9707,13 @@ When LEVEL is non-nil, increase section numbers on that level."
 (define-key org-mode-map "\C-c\C-x\C-a"   'org-export-as-ascii)
 (define-key org-mode-map "\C-c\C-xv"      'org-export-copy-visible)
 (define-key org-mode-map "\C-c\C-x\C-v"   'org-export-copy-visible)
-;; OPML support is only planned
+;; OPML support is only an option for the future
 ;(define-key org-mode-map "\C-c\C-xo"      'org-export-as-opml)
 ;(define-key org-mode-map "\C-c\C-x\C-o"   'org-export-as-opml)
+(define-key org-mode-map "\C-c\C-xi"      'org-export-icalendar-this-file)
+(define-key org-mode-map "\C-c\C-x\C-i"   'org-export-icalendar-all-agenda-files)
+(define-key org-mode-map "\C-c\C-xc"      'org-export-icalendar-combine-agenda-files)
+(define-key org-mode-map "\C-c\C-x\C-c"   'org-export-icalendar-combine-agenda-files)
 (define-key org-mode-map "\C-c\C-xt"      'org-insert-export-options-template)
 (define-key org-mode-map "\C-c:"          'org-toggle-fixed-width-section)
 (define-key org-mode-map "\C-c\C-xh"      'org-export-as-html)
@@ -9945,6 +10146,11 @@ See the individual commands for more information."
      ["HTML and Open" org-export-as-html-and-open t]
 ;     ["OPML" org-export-as-opml nil]
      "--"
+     ["iCalendar this file" org-export-icalendar-this-file t]
+     ["iCalendar all agenda files" org-export-icalendar-all-agenda-files
+      :active t :keys "C-c C-x C-i"]
+     ["iCalendar combined" org-export-icalendar-combine-agenda-files t]
+     "--"
      ["Option Template" org-insert-export-options-template t]
      ["Toggle Fixed Width" org-toggle-fixed-width-section t])
     "--"
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index f4af34fdabf..1ed43279c3d 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -159,23 +159,32 @@ to obtain the value of this variable."
   :group 'paragraphs
   :type '(choice regexp (const :tag "Use default value" nil)))
 
+(defcustom sentence-end-base "[.?!][]\"'\xd0c9\x5397d)}]*"
+  "*Regexp matching the basic end of a sentence, not including following space."
+  :group 'paragraphs
+  :type 'string
+  :version "22.1")
+
 (defun sentence-end ()
   "Return the regexp describing the end of a sentence.
 
 This function returns either the value of the variable `sentence-end'
 if it is non-nil, or the default value constructed from the
-variables `sentence-end-double-space', `sentence-end-without-period'
-and `sentence-end-without-space'.  The default value specifies
-that in order to be recognized as the end of a sentence, the
-ending period, question mark, or exclamation point must be
-followed by two spaces, unless it's inside some sort of quotes or
-parenthesis.  See Info node `(elisp)Standard Regexps'."
+variables `sentence-end-base', `sentence-end-double-space',
+`sentence-end-without-period' and `sentence-end-without-space'.
+
+The default value specifies that in order to be recognized as the
+end of a sentence, the ending period, question mark, or exclamation point
+must be followed by two spaces, with perhaps some closing delimiters
+in between.  See Info node `(elisp)Standard Regexps'."
   (or sentence-end
       (concat (if sentence-end-without-period "\\w  \\|")
-              "\\([.?!][]\"'\xd0c9\x5397d)}]*"
+              "\\("
+              sentence-end-base
               (if sentence-end-double-space
                   "\\($\\| $\\|\t\\|  \\)" "\\($\\|[\t ]\\)")
-              "\\|[" sentence-end-without-space "]+\\)"
+              "\\|[" sentence-end-without-space "]+"
+              "\\)"
               "[ \t\n]*")))
 
 (defcustom page-delimiter "^\014"
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index a0dec653165..3507f6e57cf 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -593,6 +593,9 @@ value of `texinfo-mode-hook'."
         (concat "\b\\|@[a-zA-Z]*[ \n]\\|" paragraph-separate))
   (make-local-variable 'paragraph-start)
   (setq paragraph-start (concat "\b\\|@[a-zA-Z]*[ \n]\\|" paragraph-start))
+  (make-local-variable 'sentence-end-base)
+  (setq sentence-end-base
+        "\\(@\\(end\\)?dots{}\\|[.?!]\\)[]\"'\xd0c9\x5397d)}]*")
   (make-local-variable 'adaptive-fill-mode)
   (setq adaptive-fill-mode nil)
   (make-local-variable 'fill-column)
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index d7a822e105a..f45c73216f7 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-20  CHENG Gao  <chenggao@gmail.com>  (tiny change)
+
+        * url-nfs.el (top level): 
+        * url-handlers.el (directory-files): 
+        * url-file.el (top level):
+        * url-dired.el (url-dired-minor-mode-map): 
+        * url-http.el (url-http-chunked-encoding-after-change-function):
+        Remove XEmacs support.
+
 2005-10-15  Richard M. Stallman  <rms@gnu.org>
 
         * url.el: Don't try to autoload hash table functions.
diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el
index 7c635d13e3b..b5ff892721e 100644
--- a/lisp/url/url-dired.el
+++ b/lisp/url/url-dired.el
@@ -31,9 +31,7 @@
 (defvar url-dired-minor-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map "\C-m" 'url-dired-find-file)
-    (if (featurep 'xemacs)
-        (define-key map [button2] 'url-dired-find-file-mouse)
-      (define-key map [mouse-2] 'url-dired-find-file-mouse))
+    (define-key map [mouse-2] 'url-dired-find-file-mouse)
     map)
   "Keymap used when browsing directories.")
 
diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index 44a4f8bd9f4..64766930c43 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -230,12 +230,8 @@ to them."
 (url-file-create-wrapper file-readable-p (url))
 (url-file-create-wrapper file-writable-p (url))
 (url-file-create-wrapper file-executable-p (url))
-(if (featurep 'xemacs)
-    (progn
-      (url-file-create-wrapper directory-files (url &optional full match nosort files-only))
-      (url-file-create-wrapper file-truename (url &optional default)))
-  (url-file-create-wrapper directory-files (url &optional full match nosort))
-  (url-file-create-wrapper file-truename (url &optional counter prev-dirs)))
+(url-file-create-wrapper directory-files (url &optional full match nosort))
+(url-file-create-wrapper file-truename (url &optional counter prev-dirs))
 
 (provide 'url-file)
 
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index bbbf19f53fc..4fa52572a94 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -246,19 +246,8 @@ accessible."
 (url-handlers-create-wrapper file-writable-p (url))
 (url-handlers-create-wrapper file-directory-p (url))
 (url-handlers-create-wrapper file-executable-p (url))
-
-(if (featurep 'xemacs)
-    (progn
-      ;; XEmacs specific prototypes
-      (url-handlers-create-wrapper
-       directory-files (url &optional full match nosort files-only))
-      (url-handlers-create-wrapper
-       file-truename (url &optional default)))
-  ;; Emacs specific prototypes
-  (url-handlers-create-wrapper
-   directory-files (url &optional full match nosort))
-  (url-handlers-create-wrapper
-   file-truename (url &optional counter prev-dirs)))
+(url-handlers-create-wrapper directory-files (url &optional full match nosort))
+(url-handlers-create-wrapper file-truename (url &optional counter prev-dirs))
 
 (add-hook 'find-file-hook 'url-handlers-set-buffer-mode)
 
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 89b7be42c47..39db321c080 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -840,9 +840,7 @@ the end of the document."
                                  (list 'start-open t
                                        'end-open t
                                        'chunked-encoding t
-                                       'face (if (featurep 'xemacs)
-                                                 'text-cursor
-                                               'cursor)
+                                       'face 'cursor
                                        'invisible t))
             (setq url-http-chunked-length (string-to-number (buffer-substring
                                                              (match-beginning 1)
diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el
index 858cd029a85..e6822efc242 100644
--- a/lisp/url/url-nfs.el
+++ b/lisp/url/url-nfs.el
@@ -87,12 +87,8 @@ Each can be used any number of times.")
 (url-nfs-create-wrapper file-readable-p (url))
 (url-nfs-create-wrapper file-writable-p (url))
 (url-nfs-create-wrapper file-executable-p (url))
-(if (featurep 'xemacs)
-    (progn
-      (url-nfs-create-wrapper directory-files (url &optional full match nosort files-only))
-      (url-nfs-create-wrapper file-truename (url &optional default)))
-  (url-nfs-create-wrapper directory-files (url &optional full match nosort))
-  (url-nfs-create-wrapper file-truename (url &optional counter prev-dirs)))
+(url-nfs-create-wrapper directory-files (url &optional full match nosort))
+(url-nfs-create-wrapper file-truename (url &optional counter prev-dirs))
 
 (provide 'url-nfs)