Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-413
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-414
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-415
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-416
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-417
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-418
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-419
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-420
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-421
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-422
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-423
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-424
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-425
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-426
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-427
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-428
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-429
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-430
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-431
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-432
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-433
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-434
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-435
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-436
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-437
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-438
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-439
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-440
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-441
   lisp/url/url-methods.el: Fix format error when http_proxy is empty string

 * emacs@sv.gnu.org/emacs--devo--0--patch-442
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-443
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-444
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-445
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-446
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-447
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-448
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-449
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-450
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-451
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-452
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-453
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-454
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-455
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-456
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-457
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-458
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-459
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-460
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-461
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-462
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-463
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-464
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-465
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-466
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-467
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-468
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-469
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-470
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-471
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-472
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-473
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-128
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-129
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-130
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-131
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-132
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-133
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-134
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-135
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-136
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-137
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-138
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-139
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-140
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-141
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-142
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-143
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-144
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-145
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-146
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-147
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-148
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-149
   Update from CVS


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

157 files changed, 10236 insertions, 4653 deletions

diff --git a/lisp/COPYING b/lisp/COPYING
index 3912109b5cd..d511905c164 100644
--- a/lisp/COPYING
+++ b/lisp/COPYING
@@ -1,8 +1,8 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
                     GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
                      END OF TERMS AND CONDITIONS
-
+
             How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
     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 this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 187f2ff3fae..8dd343fc8ee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,1755 @@
+2006-10-13  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
+
+        * apropos.el (apropos-pattern-quoted): Fix a typo in a doc
+        string.
+
+2006-10-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * subr.el (start-process-shell-command): Doc fix.
+
+2006-10-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc-hooks.el (vc-ignore-dir-regexp): Make it into a defcustom.
+        (vc-find-root): Don't walk higher up than ~.
+
+2006-10-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * international/utf-8.el (utf-translate-cjk-load-tables):
+        Avoid clobbering last-coding-system-used during load.
+
+2006-10-12  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/reftex-global.el (reftex-create-tags-file): Quote file
+        arguments.
+
+2006-10-12  Andreas Schwab  <schwab@suse.de>
+
+        * files.el (auto-mode-alist): Match change log file name also with
+        a dash before a numeric extension.
+
+2006-10-11  Ilya Zakharevich  <ilyaz@cpan.org>
+
+        * progmodes/cperl-mode.el: Merge from upstream, upto version 5.22.
+        After 5.0:
+        (cperl-add-tags-recurse-noxs-fullpath): New function (for -batch mode).
+
+        After 5.1: Major edit.  Summary of most visible changes:
+
+        - Multiple <<HERE per line allowed.
+        - Handles multiline subroutine declaration headers (with comments).
+          (The exception is `cperl-etags' - but it is not used in the rest
+          of the mode.)
+        - Fontifies multiline my/our declarations (even with comments,
+          and with legacy `font-lock').
+        - Major speedup of syntaxification, both immediate and postponed
+          (3.5x to 15x [for different CPUs and versions of Emacs] on the
+          huge real-life document I tested).
+        - New bindings, edits to imenu.
+        - "_" is made into word-char during fontification/syntaxification;
+          some attempts to recognize non-word "_" during other operations too.
+        - Detect bug in Emacs with `looking-at' inside `narrow' and bulk out.
+        - autoload some more perldoc-related stuff
+        - New convenience features: ISpell POD/HEREDOCs, narrow-to-HEREDOC.
+        - Attempt to incorporate XEmacs edits which reached me.
+
+        Fine-grained changelog:
+        (cperl-hook-after-change): New configuration variable.
+        (cperl-vc-sccs-header): Likewise.
+        (cperl-vc-sccs-header): Likewise.
+        (cperl-vc-header-alist): Default via two preceding variables.
+        (cperl-invalid-face): Remove double quoting under XEmacs
+                (still needed under 21.2).
+        (cperl-tips): Update URLs for resources.
+        (cperl-problems): Likewise.
+        (cperl-praise): Mention new features.
+        New C-c key bindings: for `cperl-find-bad-style',
+        `cperl-pod-spell', `cperl-here-doc-spell', `cperl-narrow-to-here-doc',
+        `cperl-perdoc', and `cperl-perldoc-at-point'.
+        CPerl Mode menu changes:        "Fix style by spaces", "Imenu on Perl Info"
+        moved, new submenu of Tools with Ispell entries and narrowing.
+        (cperl-after-sub-regexp): New defsubst.
+        (cperl-imenu--function-name-regexp-perl): Use `cperl-after-sub-regexp'.
+                Allows heads up to head4.
+                Allow "package;".
+        (defun-prompt-regexp): Use `cperl-after-sub-regexp'.
+        (paren-backwards-message): ??? Something for XEmacs???
+        (cperl-mode): Never auto-switch abbrev-mode off.
+                Try to allow '_' be non-word char.
+                Do not use `font-lock-unfontify-region-function' on XEmacs.
+                Reset syntax cache on mode start.
+                Support multiline facification (even on legacy `font-lock').
+        (cperl-facemenu-add-face-function): ??? Some contributed code ???
+        (cperl-after-change-function): Since `font-lock' and `lazy-lock'
+                refuse to inform us whether the fontification is due to lazy
+                calling or due to edit to a buffer, install our own hook
+                (controlled by `cperl-hook-after-change').
+        (cperl-electric-pod): =cut may have been recognized as start.
+        (cperl-block-p): Move, updatedfor attributes.
+        (cperl-calculate-indent): Try to allow '_' be non-word char
+                Support subs with attributes.
+        (cperl-where-am-i): Queit (?) a warning.
+        (cperl-cached-syntax-table)     New function.
+        (cperl-forward-re): Use `cperl-cached-syntax-table'.
+        (cperl-unwind-to-safe): Recognize `syntax-type' property
+                changing in a middle of line.
+        (cperl-find-sub-attrs): New function.
+        (cperl-find-pods-heres): Allow many <<EOP per line.
+                Allow subs with attributes.
+                Major speedups (3.5x..15x on a real-life test file nph-proxy.pl).
+                Recognize "extproc " (OS/2) case-folded and only at start.
+                /x on s///x with empty replacement was not recognized.
+                Better comments.
+        (cperl-after-block-p): Remarks on diff with `cperl-block-p'.
+                Allow subs with attributes, labels.
+                Do not confuse "else::foo" with "else".
+                Minor optimizations...
+        (cperl-after-expr-p): Try to allow '_' be non-word char.
+        (cperl-fill-paragraph): Try to detect a major bug in Emacs
+                with `looking-at' inside `narrow' and bulk out if found.
+        (cperl-imenu--create-perl-index): Updates for new
+                `cperl-imenu--function-name-regexp-perl'.
+        (cperl-outline-level): Likewise.
+        (cperl-init-faces): Allow multiline subroutine headers
+                and my/our declarations, and ones with comments.
+                Allow subroutine attributes.
+        (cperl-imenu-on-info): Better docstring.
+        (cperl-etags): Rudimentary support for attributes.
+                Support for packages and "package;".
+        (cperl-add-tags-recurse-noxs): Better (?) docstring.
+        (cperl-add-tags-recurse-noxs-fullpath): Likewise.
+        (cperl-tags-hier-init): Misprint for `fboundp' fixed.
+        (cperl-not-bad-style-regexp): Try to allow '_' be non-word char.
+        (cperl-perldoc): Add autoload.
+        (cperl-perldoc-at-point): Likewise.
+        (cperl-here-doc-spell): New function.
+        (cperl-pod-spell): Likewise.
+        (cperl-map-pods-heres): Likewise.
+        (cperl-get-here-doc-region): Likewise.
+        (cperl-font-lock-fontify-region-function): Likewise (backward
+                compatibility for legacy `font-lock').
+        (cperl-font-lock-unfontify-region-function): Fix style.
+        (cperl-fontify-syntaxically): Recognize and optimize away deferred
+                calls with no-change.  Governed by `cperl-hook-after-change'.
+        (cperl-fontify-update): Recognize that syntaxification region
+                can be larger than fontification one.
+                XXXX we leave `cperl-postpone' property, so this is quadratic...
+        (cperl-fontify-update-bad): Temporary placeholder until
+                it is clear how to implement `cperl-fontify-update'.
+        (cperl-time-fontification): New function.
+        (attrib-group): New text attribute.
+        (multiline): New value: `syntax-type' text attribute.
+
+        After 5.2:
+        (cperl-emulate-lazy-lock): New function.
+        (cperl-fontify-syntaxically): Would skip large regions.
+        Add `cperl-time-fontification', `cperl-emulate-lazy-lock' to menu.
+        Some globals were declared, but uninitialized.
+
+        After 5.3, 5.4:
+        (cperl-facemenu-add-face-function): Add docs, fix U<>.
+        Copyright message updated.
+        (cperl-init-faces): Work around a bug in `font-lock'. May slow
+                        facification down a bit.
+                Misprint for my|our|local for old `font-lock'
+                        "our" was not fontified same as "my|local".
+                Highlight variables after "my" etc even in
+                        a middle of an expression.
+                Do not facify multiple variables after my etc
+                        unless parentheses are present.
+
+        After 5.5, 5.6
+        (cperl-fontify-syntaxically): after-change hook could reset.
+        (cperl-syntax-done-to) to a middle of line; unwind to BOL.
+
+        After 5.7:
+        (cperl-init-faces): Allow highlighting of local ($/).
+        (cperl-problems-old-emaxen): New variable (for the use of DOCSTRING).
+        (cperl-problems): Remove fixed problems.
+        (cperl-find-pods-heres): Recognize #-comments in m##x too.
+                Recognize charclasses (unless delimiter is \).
+        (cperl-fontify-syntaxically): Unwinding to safe was done in wrong order.
+        (cperl-regexp-scan): Update docs.
+        (cperl-beautify-regexp-piece): Use information got from regexp scan.
+
+        After 5.8:
+        Major user visible changes:
+        Recognition and fontification of character classes in RExen.
+        Variable indentation of RExen according to groups.
+
+        (cperl-find-pods-heres): Recognize POSIX classes in REx charclasses.
+                Fontify REx charclasses in variable-name face.
+                Fontify POSIX charclasses in "type" face.
+                Fontify unmatched "]" in function-name face.
+                Mark first-char of HERE-doc as `front-sticky'.
+                Reset `front-sticky' property when needed.
+        (cperl-calculate-indent): Indents //x -RExen accordning to parens level.
+        (cperl-to-comment-or-eol): Recognize ends of `syntax-type' constructs.
+        (cperl-backward-to-noncomment): Recognize stringy `syntax-type'
+                constructs.  Support `narrow'ed buffers.
+        (cperl-praise): Remove a reservation.
+        (cperl-make-indent): New function.
+        (cperl-indent-for-comment): Use `cperl-make-indent'.
+        (cperl-indent-line): Likewise.
+        (cperl-lineup): Likewise.
+        (cperl-beautify-regexp-piece): Likewise.
+        (cperl-contract-level): Likewise.
+        (cperl-toggle-set-debug-unwind): New function.
+                New menu entry for this.
+        (fill-paragraph-function): Use when `boundp'.
+        (cperl-calculate-indent): Take into account groups when indenting RExen.
+        (cperl-to-comment-or-eol): Recognize # which end a string.
+        (cperl-modify-syntax-type): Make only syntax-table property non-sticky.
+        (cperl-fill-paragraph): Return t: needed for `fill-paragraph-function'.
+        (cperl-fontify-syntaxically): More clear debugging message.
+        (cperl-pod2man-build-command): Check (XEmacs) `Man-filter-list'.
+        (cperl-init-faces): More complicated highlight even on XEmacs (new).
+        Merge cosmetic changes from XEmacs.
+
+        After 5.9:
+        (cperl-1+): Move to before the first use.
+        (cperl-1-): Likewise.
+
+        After 5.10:
+
+        This code may lock Emacs hard!!!  Use on your own risk!
+
+        (cperl-font-locking): New internal variable.
+        (cperl-beginning-of-property): New function.
+        (cperl-calculate-indent): Use `cperl-beginning-of-property'
+        instead of `previous-single-property-change'.
+        (cperl-unwind-to-safe): Likewise.
+        (cperl-after-expr-p): Likewise.
+        (cperl-get-here-doc-region): Likewise.
+        (cperl-font-lock-fontify-region-function): Likewise.
+        (cperl-to-comment-or-eol): Do not call `cperl-update-syntaxification'
+                        recursively.
+                Bound `next-single-property-change' via `point-max'.
+        (cperl-unwind-to-safe): Bound likewise
+        (cperl-font-lock-fontify-region-function): Likewise
+        (cperl-find-pods-heres): Mark as recursive for `cperl-to-comment-or-eol'
+                Initialization of `cperl-font-lock-multiline-start' could be
+                missed if the "main" fontification did not run due to the
+                keyword being already fontified.
+        (cperl-pod-spell): Return t from do-one-chunk function.
+        (cperl-map-pods-heres): Stop when the worker returns nil.
+                Call `cperl-update-syntaxification'.
+        (cperl-get-here-doc-region): Call `cperl-update-syntaxification'.
+        (cperl-get-here-doc-delim): Remove unused function.
+
+        After 5.11:
+
+        The possible lockup of Emacs (introduced in 5.10) fixed.
+
+        (cperl-unwind-to-safe): `cperl-beginning-of-property' won't return nil.
+        (cperl-syntaxify-for-menu): New customization variable.
+        (cperl-select-this-pod-or-here-doc): New function.
+        (cperl-get-here-doc-region): Extra argument.
+                Do not adjust pos by 1.
+
+        New menu entries
+                (Perl/Tools): Selection of current POD or HERE-DOC section.
+                (Debugging CPerl:) backtrace on fontification.
+
+        After 5.12:
+        (cperl-cached-syntax-table): Use `car-safe'.
+        (cperl-forward-re): Remove spurious argument SET-ST.
+                Add documentation.
+        (cperl-forward-group-in-re): New function.
+        (cperl-find-pods-heres): Find and highlight (?{}) blocks in RExen
+        (XXXX Temporary (?) hack is to syntax-mark them as comment).
+
+        After 5.13:
+        (cperl-string-syntax-table): Make { and } not-grouping
+          (Sometimes they ARE grouping in RExen, but matching them would only
+           confuse in many situations when they are not)
+        (beginning-of-buffer): Replace two occurences with goto-char...
+        (cperl-calculate-indent): `char-after' could be nil...
+        (cperl-find-pods-heres): REx can start after "[" too.
+                Hightlight (??{}) in RExen too.
+        (cperl-maybe-white-and-comment-rex): New constant
+        (cperl-white-and-comment-rex): Likewise.
+                XXXX Not very efficient, but hard to make
+                better while keeping 1 group.
+
+        After 5.13:
+        (cperl-find-pods-heres): $foo << identifier() is not a HERE-DOC.
+                Likewise for 1 << identifier.
+
+        After 5.14:
+        (cperl-find-pods-heres): Different logic for $foo .= <<EOF etc.
+                Error-less condition-case could fail.
+        (cperl-font-lock-fontify-region-function): Likewise.
+        (cperl-init-faces): Likewise.
+
+        After 5.15:
+        (cperl-find-pods-heres): Support property REx-part2.
+        (cperl-calculate-indent): Likewise.
+                Don't special-case REx with non-empty 1st line.
+        (cperl-find-pods-heres): In RExen, highlight non-literal backslashes.
+                Invert highlighting of charclasses:
+                        now the envelop is highlighted.
+                Highlight many others 0-length builtins.
+        (cperl-praise): Mention indenting and highlight in RExen.
+
+        After 5.15:
+        (cperl-find-pods-heres): Highlight capturing parens in REx.
+
+        After 5.16:
+        (cperl-find-pods-heres): Highlight '|' for alternation
+        Initialize `font-lock-warning-face' if not present.
+        (cperl-find-pods-heres): Use `font-lock-warning-face' instead of
+                         `font-lock-function-name-face'.
+        (cperl-look-at-leading-count): Likewise.
+        (cperl-find-pods-heres): Localize `font-lock-variable-name-face',
+                        `font-lock-keyword-face' (needed for
+                        batch processing), etc...
+                Use `font-lock-builtin-face' for builtin in REx
+                        Now `font-lock-variable-name-face'
+                        is used for interpolated variables
+                Use "talking aliases" for faces inside REx
+                Highlight parts of REx (except in charclasses)
+                        according to the syntax and/or semantic
+                Syntax-mark a {}-part of (?{}) as "comment"
+                        (it was the ()-part)
+                Better logic to distinguish what is what in REx
+        (cperl-tips-faces): Document REx highlighting
+        (cperl-praise): Mention REx syntax highlight etc.
+
+        After 5.17:
+        (cperl-find-sub-attrs): Would not always manage to print error message.
+        (cperl-find-pods-heres): Localize `font-lock-constant-face'.
+
+        After 5.18:
+        (cperl-find-pods-heres): Misprint in REx for parsing REx.
+                Very minor optimization.
+                `my-cperl-REx-modifiers-face' got quoted.
+                Recognize "print $foo <<END" as HERE-doc.
+                Put `REx-interpolated' text attribute if needed.
+        (cperl-invert-if-unless-modifiers): New function.
+        (cperl-backward-to-start-of-expr): Likewise.
+        (cperl-forward-to-end-of-expr): Likewise.
+        (cperl-invert-if-unless): Works in "the opposite way" too.
+                Cursor position on return is on the switch-word.
+                Indents comments better.
+        (REx-interpolated): New text attribute.
+        (cperl-next-interpolated-REx): New function.
+        (cperl-next-interpolated-REx-0): Likewise.
+        (cperl-next-interpolated-REx-1): Likewise.
+        "\C-c\C-x", "\C-c\C-y", "\C-c\C-v":     New keybinding for these functions.
+        Perl/Regexp menu: 3 new entries for `cperl-next-interpolated-REx'.
+        (cperl-praise): Mention finded interpolated RExen.
+
+        After 5.19:
+        (cperl-init-faces): Highlight %$foo, @$foo too.
+        (cperl-short-docs): Better docs for system, exec.
+        (cperl-find-pods-heres): Better detect << after print {FH} <<EOF etc.
+                Would not find HERE-doc ended by EOF without NL.
+        (cperl-short-docs): Correct not-doubled \-escapes.
+        start block: Put some `defvar' for stuff gone from XEmacs.
+
+        After 5.20:
+        initial comment: Extend copyright, fix email address.
+        (cperl-indent-comment-at-column-0): New customization variable.
+        (cperl-comment-indent): Indentation after $#a would increasy by 1.
+        (cperl-mode): Make `defun-prompt-regexp' grok BEGIN/END etc.
+        (cperl-find-pods-heres): Mark CODE of s///e as `syntax-type' `multiline'
+        (cperl-at-end-of-expr): Would fail if @BAR=12 follows after ";".
+        (cperl-init-faces): If `cperl-highlight-variables-indiscriminately'
+                        highlight $ in $foo too (UNTESTED).
+        (cperl-set-style): Docstring missed some available styles.
+        toplevel: Menubar/Perl/Indent-Styles had FSF, now K&R.
+                Change "Current" to "Memorize Current".
+        (cperl-indent-wrt-brace): New customization variable; the default is
+                as for pre-5.2 version.
+        (cperl-styles-entries): Keep `cperl-extra-newline-before-brace-multiline'.
+        (cperl-style-alist): Likewise.
+        (cperl-fix-line-spacing): Support `cperl-merge-trailing-else' being nil,
+                and `cperl-extra-newline-before-brace' etc
+                being t
+        (cperl-indent-exp): Plans B and C to find continuation blocks even
+                if `cperl-extra-newline-before-brace' is t.
+
+        After 5.21:
+        Improve some docstrings concerning indentation.
+        (cperl-indent-rules-alist): New variable.
+        (cperl-sniff-for-indent): New function name
+                (separated from `cperl-calculate-indent').
+        (cperl-calculate-indent): Separate the sniffer and the indenter;
+                uses `cperl-sniff-for-indent' now.
+        (cperl-comment-indent): Test for `cperl-indent-comment-at-column-0'
+                was inverted;
+                Support `comment-column' = 0.
+
+2006-10-11  Martin Rudalics <rudalics@gmx.at>
+
+        * dnd.el (dnd-handle-one-url): Fix typo in doc-string.
+        * help-at-pt.el (scan-buf-move-to-region): Likewise.
+        * longlines.el (longlines-window-change-function): Likewise.
+        * simple.el (undo-ask-before-discard): Likewise.
+        * wid-edit.el (widget-field-prompt-internal)
+        (widget-documentation-link-p): Likewise.
+
+2006-10-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/sh-script.el (sh-get-kw): | is not among the allowed chars
+        for a keyword.
+
+2006-10-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * newcomment.el (comment-valid-prefix-p): Make the check
+        more thorough.  From an idea by Martin Rudalics <rudalics@gmx.at>.
+        (comment-indent-new-line): Adjust call.
+
+2006-10-09  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el (allout-back-to-current-heading): Base on lower-level
+        routines to get proper disqualification of aberrant topics.
+
+2006-10-09  Richard Stallman  <rms@gnu.org>
+
+        * textmodes/two-column.el (2C-two-columns): Doc fix.
+
+2006-10-09  Kim F. Storm  <storm@cua.dk>
+
+        * shell.el (explicit-csh-args, explicit-bash-args): Add comment
+        about implicit use.
+
+2006-10-08  Richard Stallman  <rms@gnu.org>
+
+        * textmodes/two-column.el (2C-two-columns): Doc fix.
+
+2006-10-08  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * files.el: Mark `buffer-read-only' as safe-local-variable.
+
+2006-10-08  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-speedbar-expand-node): Burp if
+        GUD buffer has been killed.
+
+2006-10-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * completion.el (add-completions-from-c-buffer):
+        Don't presume an error's second element is a string.
+        Use looking-at rather than buffer-substring + member.
+
+2006-10-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * mail/rmail.el (rmail-redecode-body): If the old encoding is
+        `undecided', call find-coding-systems-region to find a proper
+        non-trivial encoding.
+        (rmail-mime-charset-pattern): Allow a TAB between "Content-Type"
+        and "text/plain".
+
+2006-10-07  Kevin Ryde  <user42@zip.com.au>
+
+        * textmodes/reftex-vars.el (defgroup reftex): Update home page
+        url-link.
+
+        * strokes.el (defgroup strokes): Remove invalid url-link.
+
+2006-10-07  Magnus Henoch  <mange@freemail.hu>
+
+        * autoinsert.el (auto-insert-alist): Doc fix.
+
+2006-10-07  Johan Bockg,be(Brd  <bojohan@dd.chalmers.se>
+
+        * mouse-sel.el (mouse-insert-selection-internal):
+        Use insert-for-yank, so that yank handlers are run.
+
+2006-10-07  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-file-extension-aux): Fix comparison.
+
+2006-10-06  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-wide-find-dirs-or-files): Use shell-quote-argument.
+
+2006-10-05  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacs-lisp/advice.el (ad-remove-advice, ad-parse-arglist)
+        (ad-make-mapped-call): Use `let', not `let*'.
+
+2006-10-05  Chong Yidong  <cyd@stupidchicken.com>
+
+        * international/mule-cmds.el (coding-system-change-eol-conversion):
+        Ensure the coding system is initialized before calling
+        coding-system-eol-type.
+
+2006-10-04  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-rm-props, org-activate-plain-links)
+        (org-activate-angle-links, org-activate-dates)
+        (org-activate-target-links, org-activate-camels)
+        (org-activate-tags): Add `rear-nonsticky' text property to avoid
+        textproperty keymaps from being active beyond the end of a line.
+        (org-unfontify-region): Also remove `rear-nonsticky' property.
+
+2006-10-04  Kenichi Handa  <handa@m17n.org>
+
+        * international/code-pages.el (next): Table fixed.
+
+2006-10-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/sh-script.el (sh-prev-thing): Remove (forward-char 1) now
+        that it's been made unnecessary by removing narrowing.
+
+2006-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/sh-script.el (sh-prev-thing): Massage to untangle the
+        control flow a bit, simplify another bit, and add comments.
+
+2006-10-03  David Kastrup  <dak@gnu.org>
+
+        * help.el (describe-mode): For clicks on mode-line, use "@"
+        interactive argument to get the major mode of the click instead of
+        the current buffer.
+
+        * isearch.el (isearch-mouse-2): Use new semantics of `key-binding'
+        in order to better redirect mouse-2 clicks.  Also allow default
+        bindings to apply.
+
+2006-10-03  Kim F. Storm  <storm@cua.dk>
+
+        * emacs-lisp/cl.el (pushnew-internal): Remove defvar.
+        (pushnew): Fix last change.
+
+2006-10-03  Denis St,A|(Bnkel  <dstuenkel@googlemail.com>  (tiny change)
+
+        * ibuf-ext.el (eval, view-and-eval) <define-ibuffer-op>:
+        Use the interactive spec of `eval-expression'.
+
+2006-10-02  Michael Welsh Duggan  <md5i@cs.cmu.edu>
+
+        * progmodes/sh-script.el (sh-prev-thing): Fix last change.
+
+2006-10-02  MIYOSHI Masanori  <miyoshi@meadowy.org>  (tiny change)
+
+        * mail/smtpmail.el (smtpmail-try-auth-methods): Fix typo in
+        2006-09-28 commit.
+
+2006-10-02  Kenichi Handa  <handa@m17n.org>
+
+        * international/code-pages.el (iso-8859-6): Table fixed.
+
+2006-10-01  Chris Moore  <christopher.ian.moore@gmail.com>  (tiny change)
+
+        * dired.el (dired-build-subdir-alist): Fix previous change.
+
+2006-10-01  Johan Bockg,Ae(Brd  <bojohan+mail@dd.chalmers.se>
+
+        * simple.el (undo-elt-crosses-region): Fix the inequalities.
+
+2006-10-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/find-func.el (find-function-regexp): Don't match
+        "define-button-type".
+
+        * pcvs.el (cvs-update-header): Fix handling of extra newlines so that
+        they don't keep accumulating.
+
+2006-10-01  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>  (tiny change)
+
+        * ffap.el (ffap-rfc-path): Change the address of the RFC
+        repository to ftp.rfc-editor.org, as ds.internic.net seems to be gone.
+
+2006-10-01  Stephen Berman  <Stephen.Berman@gmx.net>
+
+        * allout.el (allout-expose-topic): Rectify implementation of "+"
+        spec, so that bodies are not exposed with headlines.
+
+2006-10-01  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el (allout-current-depth): Do aberrent check only at or
+        below doublecheck depth.
+        (allout-chart-subtree): Make it explicit that LEVELS being nil
+        means unlimited depth.  Drop undocumented support for LEVELS value
+        t meaning unlimited depth.  (This is consistent with
+        allout-chart-to-reveal, but contrary to allout-show-children,
+        which needs to use nil to default to depth of 1.)
+        (allout-goto-prefix-doublechecked): Wrap long docstring line.
+        (allout-chart-to-reveal): Be explicit in docstring about meaning
+        of nil LEVELS, and drop support for LEVELS value t.
+        (allout-show-children): Translate the level spec used by this
+        routine to that used by allout-chart-subtree and
+        allout-chart-to-reveal.
+        (allout-show-to-offshoot): Retry once when stuck, after opening
+        subtree - improvements in discontinuity handling likely will
+        enable progress.
+
+2006-09-30  Chong Yidong  <cyd@stupidchicken.com>
+
+        * wid-edit.el (widget-button-click-moves-point): New variable.
+        (widget-button-click): If widget-button-click-moves-point is
+        non-nil, set point after performing the button action
+
+        * cus-edit.el (custom-mode): Set widget-button-click-moves-point.
+
+2006-09-30  Martin Rudalics  <rudalics@gmx.at>
+
+        * files.el (find-file-existing): Modify to not allow wildcards.
+
+2006-09-30  Johan Bockg,Ae(Brd  <bojohan@dd.chalmers.se>
+
+        * simple.el (undo-more): When undo information for the region is
+        exhausted, say "No further undo information FOR REGION".
+
+2006-09-30  Michael Welsh Duggan  <md5i@cs.cmu.edu>
+
+        * progmodes/sh-script.el (sh-prev-thing):
+        Take `sh-leading-keywords' into account.
+
+2006-09-29  Glenn Morris  <rgm@gnu.org>
+
+        * custom.el (defcustom): Doc fix.
+
+        * calendar/calendar.el (european-calendar-style):
+        Call european-calendar or american-calendar as needed when set.
+        (diary-view-entries, list-calendar-holidays): Move autoloads
+        before use.
+
+2006-09-29  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/cperl-mode.el (cperl-after-expr-p): Don't move point
+        to nil if there is no previous property change.
+
+2006-09-26  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org>
+
+        * cus-edit.el (custom-save-all): Switch to emacs-lisp mode before
+        saving anything to be sure that `forward-sexp' behaves correctly.
+
+2006-09-29  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (line-move-finish): Ignore field boundaries if the
+        initial and final points have the same `field' property.
+
+2006-09-29  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-file-internal): Only bind minibuffer-completing-file-name
+        to t while calling ido-read-internal.
+
+2006-09-29  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-file-remote-p): Get regexp from list.
+        (org-archive-subtree): Remove erraneous `]' from character list.
+
+2006-09-28  Jonathan Yavner  <jyavner@member.fsf.org>
+
+        * ses.el (ses-in-print-area, ses-goto-data, ses-load)
+        (ses-reconstruct-all): Make undo of "insert row" work by keeping
+        markers for data-area and parameters-area.
+
+2006-09-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/make-mode.el (makefile-mode): Don't disable jit-lock.
+
+        * font-lock.el (font-lock-after-change-function): Refontify next line
+        as well if end is at BOL.
+        (font-lock-extend-jit-lock-region-after-change): Be more careful to
+        only extend the region as much as needed.
+
+2006-09-28  Richard Stallman  <rms@gnu.org>
+
+        * comint.el (comint-mode): Bind font-lock-defaults non-nil.
+
+        * subr.el (insert-for-yank-1): Handle `font-lock-face' specially.
+
+        * international/mule.el (after-insert-file-set-coding):
+        If VISIT, don't let set-buffer-multibyte make undo info.
+
+2006-09-28  Osamu Yamane  <yamane@green.ocn.ne.jp>  (tiny change)
+
+        * mail/smtpmail.el (smtpmail-try-auth-methods): Do not break long
+        lines in base64-encoded authentication response.
+
+2006-09-26  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * progmode/ebnf2ps.el: Doc fix. Implement arrow spacing and scaling.
+        (ebnf-version): New version 4.3.
+        (ebnf-arrow-extra-width, ebnf-arrow-scale): New options.
+        (ebnf-prologue): Adjust PostScript programming.
+        (ebnf-begin-file, ebnf-insert-ebnf-prologue, ebnf-terminal-dimension1)
+        (ebnf-repeat-dimension, ebnf-except-dimension): Adjust code.
+
+2006-09-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * jit-lock.el (jit-lock-force-redisplay): Rename from
+        jit-lock-fontify-again, and undo the mistaken change I've just done.
+
+        * jit-lock.el (jit-lock-fontify-now): Don't fontify the empty text.
+        (jit-lock-fontify-again): Don't refontify text that's not displayed.
+
+2006-09-26  Kenichi Handa  <handa@m17n.org>
+
+        * startup.el (display-splash-screen): Allow a prefix argument.
+
+2006-09-25  Jason Rumney  <jasonr@gnu.org>
+
+        * subr.el (shell-quote-argument): Use DOS logic for Windows
+        shells with DOS semantics.
+
+2006-09-24  Richard Stallman  <rms@gnu.org>
+
+        * progmodes/compile.el (compilation-goto-locus-delete-o): New fn.
+        (compilation-goto-locus): Use compilation-goto-locus-delete-o
+        to delete the overlay.  Put it on pre-command-hook.
+
+        * emacs-lisp/timer.el (timer-max-repeats): Doc fix.
+
+        * startup.el (fancy-splash-screens, normal-splash-screen):
+        Call the splash buffer *About GNU Emacs*.
+
+        * simple.el (next-error-highlight, next-error-highlight-no-select):
+        Default to 0.5.
+        (yank-excluded-properties): Add `fontified'.
+
+        * font-lock.el (font-lock-compile-keywords): Allow value of
+        syntax-begin-function to enable paren-column-0 highlighting.
+
+2006-09-24  Chris Moore  <christopher.ian.moore@gmail.com>  (tiny change)
+
+        * dired.el (dired-build-subdir-alist): When file ends in colon,
+        don't exit the loop, just disregard that file.
+
+2006-09-24  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (line-move-finish): Handle corner case for fields in
+        continued lines.
+        (line-move-1): Remove flawed test for that case.
+
+2006-09-24  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * icomplete.el (icomplete-simple-completing-p): Use the correct
+        name for the new variable, `icomplete-with-completion-tables'.
+        (file local variables): Remove superfluous setting.
+
+2006-09-23  Jeff Miller  <jmiller@cablespeed.com>  (tiny change)
+
+        * calendar/appt.el (appt-check): Fix typo for appointments just
+        after midnight.
+
+2006-09-23  Chong Yidong  <cyd@stupidchicken.com>
+
+        * help.el (describe-key-briefly, describe-key): Don't expect an
+        extra up event if a down-event is generated by a popup menu.
+
+2006-09-23  Michal Nazarewicz  <mnazarewicz@gmail.com>  (tiny change)
+
+        * textmodes/ispell.el (ispell-change-dictionary): Don't check the
+        local dictionary when changing the global dictionary.
+
+2006-09-23  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * icomplete.el (icomplete-with-completion-tables): List of
+        specialized completion tables with which icomplete should
+        operate.  Include the new `internal-complete-buffer', so icomplete
+        works with interactive buffer-selection.
+        (icomplete-simple-completing-p): Add acceptance of specialized
+        completion tables listed in icomplete-with-completion-tables.
+
+2006-09-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * frame.el (focus-follows-mouse): Set default to nil on Mac.
+
+        * startup.el (command-line): Use `custom-reevaluate-setting' for
+        `focus-follows-mouse'.
+
+2006-09-22  Richard Stallman  <rms@gnu.org>
+
+        * cus-edit.el (custom-buffer-create-internal): In `emacs -q',
+        explain why Save is not available.
+
+2006-09-22  Juanma Barranquero  <lekktu@gmail.com>
+
+        * woman.el (woman0-so): Use `let*', not `let'.
+        (woman-horizontal-line): Remove unbalanced parenthesis.
+
+2006-09-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * woman.el: Make sure all the end-of-region markers we use have
+        a non-nil insertion-type.
+        (woman0-so): Move things around so we can use copy-marker.
+        (woman0-roff-buffer, woman2-process-escapes-to-eol, woman2-roff-buffer):
+        Adjust marker type.
+        (woman2-process-escapes): Check marker type.
+        (woman-horizontal-line): Dispense with the use of a marker.
+
+2006-09-22  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-lang.el: Add Greek letters to math-variable-table
+        property of tex.
+
+2006-09-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * files.el (save-some-buffers-action-alist): Display diff in view-mode.
+
+2006-09-22  Masatake YAMATO  <jet@gyve.org>
+
+        * add-log.el (add-log-current-defun): Use `forward-sexp'
+        instead of `forward-word' to pick c++::symbol.
+        Reported by Herbert Euler <herberteuler@hotmail.com>.
+
+2006-09-22  Kenichi Handa  <handa@m17n.org>
+
+        * bindings.el: Fix setting self-insert-command for multibyte
+        characters in global-map.
+
+2006-09-21  David Kastrup  <dak@gnu.org>
+
+        * mouse.el (mouse-posn-property): Fix typo for `event-start' in
+        doc string.
+
+2006-09-21  Kenichi Handa  <handa@m17n.org>
+
+        * language/european.el ("Latin-1"): Add windows-1252 to
+        coding-priority.
+        ("German"): Likewise.
+
+2006-09-21  Kim F. Storm  <storm@cua.dk>
+
+        * emacs-lisp/cl-macs.el (member*): Use memql instead of complex code.
+        Suggested by Miles Bader.
+
+        * emacs-lisp/cl.el (pushnew): Rework 2006-09-10 change.  Use memql
+        instead of add-to-list in the simple case.
+
+2006-09-20  Kenichi Handa  <handa@m17n.org>
+
+        * isearch.el (isearch-process-search-char): Cancel the previous change.
+        (isearch-search-string): New function.
+        (isearch-search): Use isearch-search-string.
+        (isearch-lazy-highlight-search): Likewise.
+
+2006-09-20  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * lpr.el (lpr-page-header-switches): Insert `*' at beginning of doc
+        string to become an option.
+
+2006-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * files.el (find-buffer-visiting): Don't get fooled by a nil inode.
+
+2006-09-20  Kim F. Storm  <storm@cua.dk>
+
+        * simple.el (line-move-partial): Call pos-visible-in-window-p with
+        position t instead of trying both window-end and window-end - 1.
+
+2006-09-20  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-scan-tags): Find end of subtrees also in
+        hidden trees.
+
+2006-09-20  David Kastrup  <dak@gnu.org>
+
+        * mouse.el (mouse-posn-property): Improve doc string.
+        (mouse-on-link-p): Change buffers for function calls on links.
+
+        * menu-bar.el (clipboard-yank): Bomb out in interactive use if
+        buffer is read-only.
+
+2006-09-20  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el (allout-unprotected): Let inhibit-read-only only when
+        buffer-read-only isn't set.
+        (allout-annotate-hidden): Enable topic annotation during copies even
+        when the buffer is read-only, eg for topic copies.  Ensure that the loop
+        advances, even when the span extends beyond the deletion region.
+        (allout-toggle-subtree-encryption): Use allout-structure-added-hook
+        rather than allout-exposure-changed-hook, as a stronger assertion.
+        (allout-keybindings-list): Add bindings for
+        allout-copy-line-as-kill and allout-copy-topic-as-kill.
+        (allout-copy-line-as-kill, allout-copy-topic-as-kill):
+        Copy wrappers for allout-kill-line and allout-kill-topic.
+        (allout-listify-exposed): Position correctly to accumulate lines.
+
+2006-09-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (line-move-1): Escape field boundaries occurring
+        exactly at point.  Update goal column if constrained to a field.
+        (line-move-finish): Escape field boundaries occurring exactly at point.
+
+2006-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mouse.el (mouse-on-link-p): Tentatively fix last change.
+        (mouse-drag-vertical-line): Remove unused var `wconfig'.
+
+2006-09-19  Kim F. Storm  <storm@cua.dk>
+
+        * help.el (describe-key-briefly, describe-key): Simplify printing
+        of descriptions by using format and %S.  Fix "is undefined"
+        messages to say "at that spot" for mouse events.
+
+        * simple.el (line-move-partial): Optimize.  Try window-line-height
+        before posn-at-point to get vpos of current line.
+
+2006-09-18  Michael Kifer  <kifer@cs.stonybrook.edu>
+
+        * viper.el: Bump up version/date of update to reflect the substantial
+        changes done in August 2006.
+
+        * viper-cmd (viper-next-line-at-bol): Make sure button-at, push-button
+        are defined.
+
+        * ediff-util.el (ediff-add-to-history): New function.
+
+        * ediff.el: Use ediff-add-to-history instead of add-to-history.
+
+2006-09-18  Wolfgang Jenkner  <wjenkner@inode.at>  (tiny change)
+
+        * textmodes/conf-mode.el (conf-space-mode): Doc fix.
+        Delete duplicate make-local-variable form.
+        (conf-space-keywords): Add autoload cookie.
+        Fix typo (`keywords', not `keyword').
+
+2006-09-18  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * cus-start.el (all): Rename x-gtk-show-chooser-help-text to
+        x-gtk-file-dialog-help-text.  Rename x-use-old-gtk-file-dialog
+        to x-gtk-use-old-file-dialog
+
+2006-09-18  Richard Stallman  <rms@gnu.org>
+
+        * wid-edit.el (widget-button-click): Handle non-mouse-motion events
+        that might come in during mouse tracking.
+
+2006-09-18  Kim F. Storm  <storm@cua.dk>
+
+        * simple.el (line-move-partial): Rework 2006-09-15 change to use
+        new window-line-height function.  Further optimize by not calling
+        pos-visible-in-window-p for window-end when window-line-height
+        returns useful information.
+
+2006-09-16  Richard Stallman  <rms@gnu.org>
+
+        * textmodes/conf-mode.el (conf-mode-map): Use conf-space-keywords cmd.
+        (conf-space-mode): Don't handle prefix arg.
+        Delete conf-space-keywords-override code.
+        Use add-hook.
+        (conf-space-keywords): New command.
+        (conf-space-mode-internal): Be careful with imenu-generic-expression.
+        Delete conf-space-keywords-override code.
+        (conf-space-keywords-alist): Doc fix.
+        (conf-space-font-lock-keywords): Doc fix.
+        (conf-space-keywords-override): Var deleted.
+
+2006-09-16  Chong Yidong  <cyd@stupidchicken.com>
+
+        * startup.el (fancy-splash-screens): Don't switch to the scratch
+        buffer; it may not be the next buffer.
+
+2006-09-16  Romain Francoise  <romain@orebokech.com>
+
+        * saveplace.el (load-save-place-alist-from-file): Use expanded name
+        in both messages.
+
+2006-09-16  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>
+
+        * progmodes/python.el (python-preoutput-filter):
+        Fix arg order to string-match.
+
+2006-09-16  Richard Stallman  <rms@gnu.org>
+
+        * obsolete/fast-lock.el (fast-lock-cache-data): Provide 2nd arg to
+        font-lock-compile-keywords.
+
+        * font-lock.el (font-lock-compile-keywords): Rename optional arg
+        to SYNTACTIC-KEYWORDS and reverse the sense.  All callers changed.
+
+2006-09-16  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * cus-start.el (all): Add x-gtk-show-chooser-help-text.
+
+        * select.el (xselect-convert-to-string): If UTF8_STRING is requested
+        and the data doesn't look like UTF8, send STRING instead.
+
+2006-09-16  Agustin Martin <agustin.martin@hispalinux.es>
+
+        * textmodes/flyspell.el (flyspell-check-region-doublons):
+        New function to detect duplicated words.
+        (flyspell-large-region): Use it.
+
+2006-09-16  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (line-move-to-column): Revert 2006-08-03 change.
+
+2006-09-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * help.el (describe-prefix-bindings): Use let, not let*.
+
+2006-09-16  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el (allout-regexp, allout-line-boundary-regexp)
+        (allout-bob-regexp): Correct grouping and boundaries to fix
+        backwards traversal.
+        (allout-depth-specific-regexp, allout-depth-one-regexp):
+        New versions that exploit \\{M\\} regexp syntax, to avoid geometric or
+        worse time in allout-ascend.
+        (allout-doublecheck-at-and-shallower): Identify depth threshold
+        below which topics are checked for and disqualified by containment
+        discontinuities.
+        (allout-hotspot-key-handler): Correctly handle multiple-key
+        strokes.  Remove some unused variables.
+        (allout-mode-leaders): Clarify that mode-specific comment-start
+        will be used.
+        (set-allout-regexp): Correctly regexp-quote allout regexps to
+        properly accept alternative header-leads and primary bullets with
+        regexp-specific characters (eg, C "/*", mathematica "(*").
+        Include new regular expressions among those configured.
+        (allout-infer-header-lead-and-primary-bullet):
+        Rename allout-infer-header-lead.
+        (allout-recent-depth): Manifest as a variable as well as a function.
+        (allout-prefix-data): Simplify into an inline instead of a macro,
+        assuming current match data rather than being explicitly passed
+        it.  Establish allout-recent-depth value as well as
+        allout-recent-prefix-beginning and allout-recent-prefix-end.
+        (allout-aberrant-container-p): True when an item's immediate
+        offspring discontinuously contained.  Useful for disqualifying
+        unintended topic prefixes, likely at low depths.
+        (allout-goto-prefix-doublechecked): Elaborate version of
+        allout-goto-prefix which disqualifies aberrant pseudo-items.
+        (allout-pre-next-prefix): Layer on top of lower-level routines, to
+        get disqualification of aberrant containers.
+        (allout-end-of-prefix, allout-end-of-subtree): Disqualify aberrant
+        containers.
+        (allout-beginning-of-current-entry): Position at start of buffer
+        when in container (depth 0) entry.
+        (nullify-allout-prefix-data): Invalidate allout-recent-* prefix data.
+        (allout-current-bullet): Strip text properties.
+        (allout-get-prefix-bullet): Use right match groups.
+        (allout-beginning-of-line, allout-next-heading):
+        Disqualify aberrant containers.
+        (allout-previous-heading): Disqualify aberrant containers, and
+        change to regular (rather than inline) function, to allow
+        self-recursion.
+        (allout-get-invisibility-overlay): Increment so progress is made
+        when the first overlay is not the sought one.
+        (allout-end-of-prefix): Disqualify aberrant containers.
+        (allout-end-of-line): Cycle something like allout-beginning-of-line.
+        (allout-mode): Make allout-old-style-prefixes (ie, enabling use with
+        outline.el outlines) functional again.  Change the primary bullet
+        along with the header-lead - level 1 new-style bullets now work.
+        Engage allout-before-change-handler in mainline emacs, not just
+        xemacs, to do undo handling.
+        (allout-before-change-handler): Expose undo changes occurring in
+        hidden regions.  Use allout-get-invisibility-overlay instead of
+        reimplementing it inline.
+        (allout-chart-subtree): Use start rather than end of prefix in
+        charts.  Use allout-recent-depth variable.
+        (allout-chart-siblings): Disqualify aberrant topics.
+        (allout-beginning-of-current-entry): Position correctly.
+        (allout-ascend): Use new allout-depth-specific-regexp and
+        allout-depth-one-regexp for linear instead of O(N^2) or worse
+        behavior.
+        (allout-ascend-to-depth): Depend on allout-ascend, rather than
+        reimplementing an algorithm.
+        (allout-up-current-level): Depend on allout-ascend, rather than
+        reimplementing an algorithm.  Return to start-point if we fail.
+        (allout-descend-to-depth): Use allout-recent-depth variable
+        instead of function.
+        (allout-next-sibling): On traversal of numerous intervening
+        topics, resort to economical allout-next-sibling-leap.
+        (allout-next-sibling-leap): Specialized version of
+        allout-next-sibling that uses allout-ascend cleverly, to depend on
+        a regexp search to leap large numbers of contained topics, rather
+        than arbitrarily many one-by-one traversals.
+        (allout-next-visible-heading): Disqualify aberrant topics.
+        (allout-previous-visible-heading): Position consistently when
+        interactive.
+        (allout-forward-current-level): Base on allout-previous-sibling
+        rather than (differently) reimplmenting the algorithm.  Remove some
+        unused variables.
+        (allout-solicit-alternate-bullet): Present default choice stripped
+        of text properties.
+        (allout-rebullet-heading): Use bullet stripped of text properties.
+        Register changes using allout-exposure-change-hook.
+        Disregard aberrant topics.
+        (allout-shift-in): With universal-argument, make topic a peer of
+        it's former offspring.  Simplify the code by separating out
+        allout-shift-out functionality.
+        (allout-shift-out): With universal-argument, make offspring peers
+        of their former container, and its siblings.  Implement the
+        functionality here, rather than inappropriately muddling the
+        implementation of allout-shift-in.
+        (allout-rebullet-topic): Respect additional argument for new
+        parent-child separation function.
+        (allout-yank-processing): Use allout-ascend directly.
+        (allout-show-entry): Disqualify aberrant topics.
+        (allout-show-children): Handle discontinuous children gracefully,
+        extending the depth being revealed to expose them and posting a
+        message indicating the situation.
+        (allout-show-to-offshoot): Remove obsolete and incorrect comment.
+        Leave cursor in correct position.
+        (allout-hide-current-subtree): Use allout-ascend directly.
+        Disqualify aberrant topics.
+        (allout-kill-line, allout-kill-topic): Preserve exposure layout in
+        a way that the yanks can restore it, as used to happen.
+        (allout-yank-processing): Restore exposure layout as recorded by
+        allout-kill-*, as used to happen.
+        (allout-annotate-hidden, allout-hide-by-annotation): New routines
+        for preseving and restoring exposure layout across kills.
+        (allout-toggle-subtree-encryption): Run allout-exposure-change-hook.
+        (allout-encrypt-string): Strip text properties.
+        Rearranged order and outline-headings for some of the
+        miscellaneous functions.
+        (allout-resolve-xref): No need to quote the error name in the
+        condition-case handler section.
+        (allout-flatten): Classic recursive (and recursively intensive,
+        without tail-recursion) list-flattener, needed by allout-shift-out
+        when confronted with discontinuous children.
+
+2006-09-16  Jason Rumney  <jasonr@gnu.org>
+
+        * dnd.el (dnd-open-remote-file-function): Use dnd-open-local-file
+        on ms-windows.
+        (dnd-open-unc-file): Remove.
+        (dnd-open-local-file): Mention in doc string that it also handles
+        remote files if the system natively supports unc file-names.
+
+2006-09-15  Kim F. Storm  <storm@cua.dk>
+
+        * help.el (describe-key): Handle C-h k in *Help* buffer; collect
+        all necessary information about the event before erasing *Help*.
+
+        * simple.el (line-move-partial): Use window-line-visiblity to
+        quickly check whether last line is partially visible, and only do
+        the hard (and slow) part in that case.
+
+2006-09-15  Jay Belanger  <belanger@truman.edu>
+
+        * COPYING: Replace "Library Public License" by "Lesser Public
+        License" throughout.
+
+2006-09-15  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * term/x-win.el (x-menu-bar-open): New function for F10.
+
+2006-09-15  Chong Yidong  <cyd@stupidchicken.com>
+
+        * progmodes/compile.el (compilation-error-regexp-alist-alist):
+        Disallow filenames containing " -" to avoid confusion with libtool
+        compilation messages.  Suggested by Stefan Monnier.
+
+2006-09-15  David Kastrup  <dak@gnu.org>
+
+        * mouse-sel.el (mouse-sel-follow-link-p): Use event position
+        instead of buffer position for `mouse-on-link-p'.
+
+        * mouse.el (mouse-posn-property): New function looking up the
+        properties at a click position in overlays and text properties in
+        either buffer or strings.
+        (mouse-on-link-p): Use `mouse-posn-property' to streamline lookup
+        of both `follow-link' as well as `mouse-face' properties.
+        (mouse-drag-track): Check `mouse-on-link-p' on event position, not
+        buffer position.
+
+        * help.el (describe-key-briefly): When reading a down-event on
+        mode lines or scroll bar, swallow the following up event, too.
+        Use the new mouse sensitity of `key-binding' for lookup.
+        (describe-key): The same here.
+
+2006-09-15  Juanma Barranquero  <lekktu@gmail.com>
+
+        * play/life.el (life-patterns): Add a few more interesting patterns.
+        (life-setup): Force `show-trailing-whitespace' to nil.
+
+2006-09-14  Richard Stallman  <rms@gnu.org>
+
+        * startup.el (fancy-splash-text): Change text to improve alignment.
+        (fancy-splash-screens): Don't set non-standard tab width.
+        Bind cursor-type temporarily, and make it easy to patch to
+        preserve the splash buffer.
+        (normal-splash-screen, fancy-splash-tail): Spell out "Meta-x".
+        (fancy-splash-screens): Display echo-area message explicitly.
+        Don't set fancy-splash-help-echo.
+
+        * simple.el (line-number-mode): Group mode-line instead of
+        editing-basics.
+        (column-number-mode, size-indication-mode): Likewise.
+
+        * faces.el (mode-line-faces): Group mode-line instead of modeline.
+
+        * time.el (display-time): Group mode-line instead of modeline.
+
+        * cus-edit.el (mode-line): Rename from modeline.  All uses changed.
+
+2006-09-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * startup.el (fancy-splash-text): Move editing instructions to
+        fancy-splash-head.
+        (fancy-splash-head): Issue editing instructions.
+        (fancy-splash-screens): Fixup whitespace.
+
+2006-09-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * bindings.el (mode-line-buffer-identification-keymap):
+        Remove duplicate line.
+
+2006-09-14  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org>
+
+        * ido.el (ido-ignore-item-p): Allow any kind of functions in
+        ignore lists.
+
+2006-09-14  Kim F. Storm  <storm@cua.dk>
+
+        * jit-lock.el (jit-lock-fontify-again): New function.
+        (jit-lock-fontify-now): Use it instead of lambda form.
+
+2006-09-13  Agustin Martin  <agustin.martin@hispalinux.es>
+
+        * textmodes/flyspell.el (flyspell-word, flyspell-correct-word)
+        (flyspell-auto-correct-word): Make ispell-filter local to these
+        functions.  Check that ispell-filter has new stuff before calling
+        ispell-parse-output.
+
+2006-09-13  Kim F. Storm  <storm@cua.dk>
+
+        * simple.el (line-move-partial): Optimize.
+
+2006-09-13  Richard Stallman  <rms@gnu.org>
+
+        * thingatpt.el (thing-at-point-bounds-of-url-at-point):
+        Delete spurious backquote.
+
+2006-09-07  Ryan Yeske  <rcyeske@gmail.com>
+
+        * net/rcirc.el (rcirc-print): Fix last change.
+
+2006-09-12  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc.el (calc-dispatch): Remove unnecessary `sit-for'.
+
+2006-09-07  Ryan Yeske  <rcyeske@gmail.com>
+
+        * net/rcirc.el (rcirc-scroll-show-maximum-output): Rename from
+        rcirc-show-maximum-output.
+        (rcirc-mode): Remove window-scroll-function hook.
+        (rcirc-scroll-to-bottom): Remove function.
+        (rcirc-print): Recenter so point stays at the bottom of the window
+        if point was already there.
+
+2006-09-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * comint.el (comint-exec-1): Set EMACS to the full name of Emacs,
+        not to "t".
+        * progmodes/compile.el (compilation-start): Likewise.
+        * progmodes/idlwave.el (idlwave-rescan-asynchronously):
+        Don't use expand-file-name on invocation-directory, since this
+        might mishandle special characters in invocation-directory.
+
+2006-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcvs-defs.el: Remove * in defcustom's docstrings.
+
+2006-09-12  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/compile.el (compilation-directory-properties):
+        Doc fix for help-echo.
+
+2006-09-12  Lars Hansen  <larsh@soem.dk>
+
+        * desktop.el (desktop-read): Add comment.
+
+2006-09-12  Kim F. Storm  <storm@cua.dk>
+
+        * simple.el (next-error-highlight, next-error-highlight-no-select):
+        Fix spelling error.
+
+        * subr.el (sit-for): Rework to use input-pending-p and cond.
+        Return nil input is pending on entry also for SECONDS <= 0.
+        (while-no-input): Use input-pending-p instead of sit-for.
+
+2006-09-11  Richard Stallman  <rms@gnu.org>
+
+        * simple.el (next-error-highlight, next-error-highlight-no-select):
+        Fix custom type and doc strings.
+
+2006-09-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * diff-mode.el (diff-apply-hunk-to-backup-file): New var.
+        (diff-apply-hunk): Use it to ask for confirmation.
+
+2006-09-11  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * emacs-lisp/cl.el (pushnew): Add missing `,'.
+
+2006-09-11  David Kastrup  <dak@gnu.org>
+
+        * help.el (string-key-binding, describe-key-briefly)
+        (describe-key): Remove `string-key-binding' and its callers since
+        `key-binding' already caters for the proper lookup now.
+
+2006-09-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/cfengine.el (cfengine-font-lock-syntactic-keywords): Newvar.
+        (cfengine-mode): Use it.  Fix \ syntax to be like /.
+
+        * bindings.el (mode-line-buffer-identification-keymap):
+        Move initialization into declaration.
+
+2006-09-10  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-edit-input, ido-complete, ido-take-first-match)
+        (ido-push-dir-first, ido-kill-buffer-at-head, ido-exhibit)
+        (ido-delete-file-at-head): Pass head of ido-matches through ido-name
+        in case of merged directories.  Reported by Micha,Ak(Bl Cadilhac.
+
+2006-09-10  Richard Stallman  <rms@gnu.org>
+
+        * dired-aux.el: Handle errors in recursive copy usefully.
+        (dired-create-files-failures): New variable.
+        (dired-copy-file): Remove condition-case.
+        (dired-copy-file-recursive): Check for errors on all file
+        operations, and add them to dired-create-files-failures.
+        Check file file-date-erorr here too.
+        (dired-create-files): Check dired-create-files-failures
+        and report those errors too.
+
+        * emacs-lisp/cl.el (pushnew): Use add-to-list when convenient.
+
+        * subr.el (add-to-list): New argument COMPARE-FN.
+
+2006-09-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * filecache.el (file-cache-add-directory)
+        (file-cache-add-directory-list, file-cache-add-file)
+        (file-cache-add-directory-using-find)
+        (file-cache-add-directory-using-locate)
+        (file-cache-add-directory-recursively): Add autoloads.
+
+2006-09-09  Richard Stallman  <rms@gnu.org>
+
+        * textmodes/conf-mode.el (conf-space-mode):
+        Use hack-local-variables-hook instead of calling hack-local-variables.
+        (conf-space-keywords-override): New variable.
+        (conf-space-mode-internal): New subroutine.  Reinit Font Lock mode.
+        (conf-space-mode): Always make conf-space-keywords and
+        conf-space-keywords-override local.
+        Call conf-space-mode-internal directly as well as via hook.
+
+2006-09-09  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>  (tiny change)
+
+        * progmodes/python.el (python-font-lock-keywords): Add `self' and other
+        quasi-keywords.
+
+2006-09-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/python.el: Quieten the compiler about hippie-expand vars.
+        (python-send-string): Be slightly more careful about adding \n.
+
+        * startup.el (normal-splash-screen): Don't display the buffer if we'll
+        kill it right away anyway.
+
+2006-09-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * international/codepage.el (cp850-decode-table): Fix a few codes.
+        (cp858-decode-table): New variable.
+
+2006-09-09  Toby Allsopp  <Toby.Allsopp@navman.com>  (tiny change)
+
+        * net/ldap.el (ldap-search-internal): Doc fix.
+
+2006-09-09  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org>
+
+        * play/life.el (life-display-generation): Test for input manually if
+        `sleeptime' is negative or null.
+
+        * lpr.el (lpr-page-header-switches): Page title switch is one of them.
+        (print-region-1): Substitute `%s' with the page title.
+
+2006-09-09  Matt Hodges  <MPHodges@member.fsf.org>
+
+        * locate.el (locate-current-search): New variable.
+        (locate): Set buffer local value.  Use current buffer if it is
+        in Locate mode.
+        (locate-mode): Disable undo here.
+        (locate-do-setup): Use locate-current-filter from buffer to be killed.
+        (locate-update): Use locate-current-search and locate-current-filter.
+
+2006-09-08  David Kastrup  <dak@gnu.org>
+
+        * desktop.el (desktop-read): When loading a desktop, disable
+        saving it while the load progresses, and switch off a pending lazy
+        load by calling `desktop-lazy-abort'.
+
+2006-08-27  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (mouse-autoselect-window-timer)
+        (mouse-autoselect-window-position)
+        (mouse-autoselect-window-window)
+        (mouse-autoselect-window-now): New vars.
+        (mouse-autoselect-window-cancel)
+        (mouse-autoselect-window-select)
+        (mouse-autoselect-window-start): New functions.
+        (handle-select-window): Call `mouse-autoselect-window-start' when
+        delayed window autoselection is enabled.
+
+        * cus-start.el (mouse-autoselect-window): Handle delayed window
+        autoselection.
+
+        * emacs-lisp/eldoc.el: Add `handle-select-window' to the set of
+        commands after which it is allowed to print in the echo area.
+
+2006-09-08  Richard Stallman  <rms@gnu.org>
+
+        * textmodes/fill.el (adaptive-fill-regexp): Don't match `(1)' or `1.'
+
+        * mail/rmail.el (rmail-get-new-mail): Say whether all msgs are spam.
+        (rmail-convert-to-babyl-format): Don't record undo, leave list empty.
+
+        * emacs-lisp/timer.el (timer-create, timer-activate): Doc fixes.
+        (cancel-timer-internal): Add doc string.
+        (cancel-function-timers): Doc fix.
+        (with-timeout-handler, timer-event-last*): Add doc strings.
+
+        * emacs-lisp/bindat.el (bindat-unpack): Doc fix.
+
+        * files.el (risky-local-variable-p): Match ...-bindat-spec.
+
+        * dired.el (dired-log-summary): Add doc string.
+
+        * cus-edit.el (custom-menu-create): Bind deactivate-mark here
+        (custom-group-menu-create): Not here.
+
+2006-09-08  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-dblock-write:clocktable): Avoid infinite loop.
+
+2006-09-08  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * term/mac-win.el: (show-hide-font-panel): New HI command ID symbol.
+        (mac-apple-event-map): Define its handler.
+
+2006-09-07  Toby Allsopp  <Toby.Allsopp@navman.com>  (tiny change)
+
+        * net/ldap.el (ldap-search-internal): Handle `auth' key.
+
+2006-09-07  Magnus Henoch <mange@freemail.hu>
+
+        * net/rcirc.el (rcirc-activity-string): Don't quote value in case
+        clause.
+
+2006-09-07  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org>
+
+        * info.el (Info-index): Bind completion-ignore-case.
+
+2006-09-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/prolog.el (inferior-prolog-flavor): New var left out of
+        previous commit.
+        (inferior-prolog-guess-flavor): New fun left out of previous commit.
+        (prolog-consult-region-and-go): Don't hard code "*prolog*" and don't
+        burp in dedicated windows.
+        (inferior-prolog-self-insert-command): New command.
+        (inferior-prolog-mode-map): Use it.
+
+2006-09-07  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * international/latexenc.el (latex-inputenc-coding-alist): Add cp858.
+
+        * international/code-pages.el: Add cp858.
+
+2006-09-07  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * dnd.el: Fix bootstrapping.
+
+2006-09-07  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * dnd.el (dnd-protocol-alist): Add what url-handler-mode can handle.
+        (dnd-open-remote-url): New function.
+        (dnd-open-remote-file-function): Set to dnd-open-remote-url if
+        not windows-nt.
+
+2006-09-07  Jason Rumney  <jasonr@gnu.org>
+
+        * dnd.el (dnd-open-remote-file-function): New variable.
+        (dnd-open-unc-file): New function.
+        (dnd-open-file): Call dnd-open-remote-file-function if set.
+
+2006-09-06  Daiki Ueno  <ueno@unixuser.org>
+
+        * pgg-gpg.el (pgg-gpg-process-region): Encode passphrase with
+        pgg-passphrase-coding-system rather than locale-coding-system.
+        * pgg-def.el (pgg-passphrase-coding-system): New user option.
+
+2006-09-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/prolog.el: Remove * in docstrings.
+        (prolog-program-name): Add SWI prolog.
+        (prolog-mode-menu): New menu.
+        (prolog-mode): Set comment-add.
+        (prolog-indent-line): Simplify.  Use indent-line-to.
+        (inferior-prolog-buffer): New var.
+        (inferior-prolog-run, inferior-prolog-process): New funs.
+        (run-prolog, switch-to-prolog): Rewrite, using them.
+        (prolog-consult-region): Use inferior-prolog-buffer.
+        (inferior-prolog-load-file): New function.
+        (prolog-mode-map): Add bindings for load-file and switch-to-prolog.
+
+        * textmodes/fill.el (fill-single-word-nobreak-p): Allow breaking before
+        last word, if it's not the end of the paragraph.
+
+        * files.el (abbreviate-file-name): Don't mistakenly match newlines in
+        file name.
+
+2006-09-06  Ralf Angeli  <angeli@caeruleus.net>
+
+        * frame.el (display-mm-dimensions-alist): New defcustom.
+        (display-mm-height, display-mm-width): Use it.
+
+2006-09-06  Simon Josefsson  <jas@extundo.com>
+
+        * mail/smtpmail.el (smtpmail-starttls-credentials): Doc fix.
+
+2006-09-06  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-var-list-children-regexp)
+        (gdb-var-list-children-regexp-1): Tweak regexps to catch full
+        string values.
+
+2006-09-06  Kim F. Storm  <storm@cua.dk>
+
+        * simple.el (line-move-partial): New function to do vscrolling for
+        partially visible images / tall lines.  Rewrite based on code
+        previously in line-move.  Simplify backwards vscrolling.
+        (line-move): Use it.  Simplify.
+
+2006-09-05  Kim F. Storm  <storm@cua.dk>
+
+        * emulation/cua-base.el (cua--pre-command-handler-1): Rewrite.
+
+2006-09-05  Chong Yidong  <cyd@stupidchicken.com>
+
+        * progmodes/compile.el (compilation-error-regexp-alist-alist):
+        Process the `gcc-include' after the `gnu' rule.
+
+2006-09-05  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-visit-buffer): Use buffer name if buffer arg is a buffer.
+
+2006-09-05  Daiki Ueno  <ueno@unixuser.org>
+
+        * pgg.el (pgg-clear-string): Alias to clear-string for backward
+        compatibility.
+
+        * pgg-gpg.el (pgg-gpg-process-region): Avoid display blinking with
+        inhibit-redisplay; encode passphrase with locale-coding-system.
+
+2006-09-04  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * term/xterm.el (terminal-init-xterm): Add more C-M- bindings.
+
+2006-09-05  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-var-list-children-regexp)
+        (gdb-var-list-children-regexp): Make type field optional.
+
+        * progmodes/gud.el (gud-speedbar-buttons): Allow for no type
+        e.g public, protected in C++.
+
+2006-09-04  John Paul Wallington  <jpw@pobox.com>
+
+        * simple.el (completion-show-help): New defcustom.
+        (completion-setup-function): Heed it.
+
+2006-09-04  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * term/xterm.el (terminal-init-xterm): Add C-M- bindings.
+
+2006-09-04  Richard Stallman  <rms@gnu.org>
+
+        * mail/rmail-spam-filter.el (rsf-scanning-messages-now): Doc fix.
+        (rsf-min-region-to-spam-list): Doc fix.
+        (rsf-add-content-type-field): Doc fix.
+
+        * simple.el (kill-region): Explicitly test there is a region.
+
+2006-09-04  Chong Yidong  <cyd@stupidchicken.com>
+
+        * mail/feedmail.el (feedmail-buffer-to-sendmail): Look for
+        sendmail in several common directories.
+
+        * mail/sendmail.el (sendmail-program): Moved here from paths.el.
+
+        * paths.el (sendmail-program): Removed.
+
+2006-09-04  Daiki Ueno  <ueno@unixuser.org>
+
+        * pgg-gpg.el (pgg-gpg-process-region): Revert two patches from Satyaki
+        Das.  http://article.gmane.org/gmane.emacs.gnus.general/49947
+        http://article.gmane.org/gmane.emacs.gnus.general/50457
+
+2006-09-03  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cus-edit.el (custom-group-menu-create): Avoid deactivating the
+        mark after running the menu filter.
+
+2006-09-03  Juri Linkov  <juri@jurta.org>
+
+        * international/quail.el (quail-defrule-internal): Add a check
+        if a key is a vector.
+
+2006-09-02  Juri Linkov  <juri@jurta.org>
+
+        * man.el (Man-topic-history): New variable.
+        (man): Use it.
+
+        * woman.el (woman-topic-history): Change defvar to defvaralias
+        for symbol `Man-topic-history'.
+
+        * shell.el (shell-filter-ctrl-a-ctrl-b): Check if
+        `comint-last-output-start' is a marker by using `markerp' and
+        check if it has a position by using `marker-position', and use
+        this position for `goto-char'.
+
+        * international/quail.el (quail-defrule-internal): Add missing
+        `error' call for null key.
+
+2006-09-02  Ryan Yeske  <rcyeske@gmail.com>
+
+        * rcirc.el (rcirc-keywords): New variable.
+        (rcirc-bright-nicks, rcirc-dim-nicks): New variables.
+        (rcirc-bright-nick-regexp, rcirc-dim-nick-regexp): Remove
+        variables.
+        (rcirc-responses-no-activity): New function.
+        (rcirc-handler-generic): Check for responses in above.
+        (rcirc-process-command): Add ?: character to arguments of raw
+        server commands.
+        (rcirc-format-response-string): Use `rcirc-bright-nicks' and
+        `rcirc-dim-nicks'.
+        (rcirc-gray-toggle): Remove unused variable.
+        (rcirc-print): Remove some tracking logic, which is moved into
+        markup functions.
+        (rcirc-activity-types): Was `rcirc-activity-type', now a list of
+        types.
+        (rcirc-activity-string): Look for 'keyword in activity-types.
+        (rcirc-window-configuration-change): Don't erase overlay-arrow
+        unnecessarily.
+        (rcirc-add-or-remove): New function.
+        (rcirc-cmd-ignore): Use it.
+        (rcirc-message-leader): Remove unused function.
+        (rcicr-cmd-bright, rcirc-cmd-dim, rcirc-cmd-keyword): New commands.
+        (rcirc-add-face): New function.
+        (rcirc-facify): Use rcirc-add-face.
+        (rcirc-url-regexp): Add parens.
+        (rcirc-map-regexp): Remove function.
+        (rcirc-mangle-regexp): Remove function.
+        (rcirc-markup-text-functions): New variable.
+        (rcirc-markup-text): New function (replaces `rcirc-mangle-text').
+        (rcirc-markup-body-text, rcirc-markup-attributes)
+        (rcirc-markup-my-nick, rcirc-markup-urls, rcirc-markup-keywords)
+        (rcirc-markup-bright-nicks): New markup handler functions.
+        (rcirc-nick-in-message-full-line): New face.
+        (rcirc-track-nick): Rename from `rcirc-mode-line-nick'.
+        (rcirc-track-keyword, rcirc-url, rcirc-keyword): New faces.
+
+2006-09-02  Martin Rudalics  <rudalics@gmx.at>
+
+        * cus-start.el (hscroll-margin, hscroll-step)
+        (mode-line-in-non-selected-windows, mouse-autoselect-window)
+        (x-use-underline-position-properties): Change version to "22.1"
+        since they will appear there for the first time.
+
+2006-09-01  Chong Yidong  <cyd@stupidchicken.com>
+
+        * imenu.el (imenu-update-menubar): Use buffer-chars-modified-tick.
+
+2006-08-31  Richard Stallman  <rms@gnu.org>
+
+        * cus-edit.el (custom-save-variables): Slight cleanup.
+        (Custom-no-edit): Renamed from custom-no-edit.
+        (Custom-newline): Renamed from custom-newline.
+        (custom-mode-map): Use new names.
+
+        * emacs-lisp/easy-mmode.el (define-minor-mode): Reference manual
+        about customization, rather than M-x customize, in the doc string
+        made for the defcustom.
+
+        * emacs-lisp/trace.el (trace-function-background): Doc fix.
+
+2006-08-31  Romain Francoise  <romain@orebokech.com>
+
+        * dired-x.el (dired-guess-shell-alist-default): Update.
+
+2006-08-31  Michael Mauger  <mmaug@yahoo.com>
+
+        * custom.el (custom-theme-set-variables): Autoload packages before
+        sorting the variables.
+
+2006-08-30  Michael Kifer  <kifer@cs.stonybrook.edu>
+
+        * viper-cmd.el (viper-special-read-and-insert-char): Convert events to
+        chars if XEmacs.
+        (viper-after-change-undo-hook): Check if undo-in-progress is bound.
+
+2006-08-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/python.el (python-eldoc-function): Re-enable quit while
+        waiting for process.
+
+2006-08-30  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * term/mac-win.el (mac-string-to-utxt): If adjustment for MacJapanese
+        results in ASCII-only string, encode original one directly.
+
+2006-08-29  Romain Francoise  <romain@orebokech.com>
+
+        * startup.el (normal-splash-screen, fancy-splash-screens):
+        Make buffer read-only and arrange to enter view mode if necessary.
+
+2006-08-29  Chong Yidong  <cyd@stupidchicken.com>
+
+        * hl-line.el (hl-line): New face.
+        (hl-line-face): Use it.
+
+        * image-mode.el (image-mode): Fix last fix.
+        Suggested by Kim F. Storm.
+
+2006-08-29  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.0.54.
+
+        * net/tramp.el (tramp-convert-file-attributes): Call `eql' instead
+        of `=', because `tramp-get-remote-gid' might not always return an
+        integer when expected.
+        (tramp-register-file-name-handlers): `partial-completion-mode' is
+        unknown to XEmacs.
+        (tramp-time-diff): Don't use `floor', it might fail for large
+        differences.
+        (tramp-handle-make-auto-save-file-name): For Emacs 21, set
+        `tramp-auto-save-directory' if unset in order to guarantee unique
+        auto-save file names.
+
+2006-08-28  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image-mode.el (image-mode): Display image as text on a terminal.
+
+2006-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/python.el (python-send-command): Simplify.
+        (run-python): Don't generate a new buffer unless `new' was specified.
+        Make sure we send `import emacs' to the proper process.
+
+        * progmodes/python.el (python-send-command): Don't wait for the command
+        to terminate.  Don't fiddle with compilation-parsing-end.
+
+2006-08-28  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs-lisp/checkdoc.el (checkdoc-file-comments-engine):
+        Insert commentary after first line summary.
+
+        * woman.el (woman-follow): New function, based on `man-follow'.
+        (woman-mode-map): Use it.
+
+        * ibuffer.el (ibuffer-do-sort-by-recency): Perform full update
+        since ibuffer-do-sort-by-recency does not define a sorter.
+
+2006-08-28  Kim F. Storm  <storm@cua.dk>
+
+        * find-dired.el (find-dired): Use shell-quote-argument to properly
+        escape ( and ) args.  Also use it on {} and ; args in default
+        value of find-ls-option string.
+        (find-grep-dired): Use shell-quote-argument on {} and ; args.
+
 2006-08-27  Michael Olson  <mwolson@gnu.org>
 
         * emacs-lisp/tq.el: Small grammar fix in comments.
@@ -96,7 +1848,8 @@
         * progmodes/grep.el (grep-find-use-xargs): Use explicit value `exec'
         to mean "use find -exec"; nil now unambiguously means auto-detect.
         (grep-compute-defaults): Set grep-find-use-xargs to `exec' if not `gnu'.
-        Use shell-quote-argument to build grep-find-command and grep-find-template.
+        Use shell-quote-argument to build grep-find-command and
+        grep-find-template.
         (rgrep): Use shell-quote-argument to properly quote arguments to find.
         Reported by Tom Seddon.
 
@@ -1088,7 +2841,7 @@
         repertoire of unit tests.  Called just before the provide iff user
         has customized `allout-run-unit-tests-on-load' non-nil.
 
-2006-07-14  K,Aa(Broly L,Bu(Brentey  <lorentey@elte.hu>
+2006-07-14  K,Aa(Broly L$,1 q(Brentey  <lorentey@elte.hu>
 
         * emacs-lisp/authors.el (authors-aliases): Update.
 
@@ -2948,7 +4701,7 @@
         compatibility function (Emacs 18/19).
         (idlwave-is-continuation-line): Always return point at start of
         previous non-blank continuation line.
-        `keyword-parameters': Fix continued comment font-lock matcher.
+        (keyword-parameters): Fix continued comment font-lock matcher.
         (idlwave-font-lock-fontify-region): Written, use as
         font-lock-fontify-region-function, to fix continued keyword
         fontification issues.
@@ -3201,7 +4954,7 @@
         (mac-TIFF-to-string): New functions.
         (x-get-selection, x-selection-value)
         (mac-select-convert-to-string): Use them.
-        (mac-text-encoding-mac-japanese-basic-variant): New constant.
+        (mac-text-encoding-mac-japanese-basic-variant): New constant.
         (mac-dnd-types-alist): New customization variable.
         (mac-dnd-handle-furl, mac-dnd-handle-hfs, mac-dnd-insert-utxt)
         (mac-dnd-insert-TEXT, mac-dnd-insert-TIFF, mac-dnd-drop-data)
@@ -3720,7 +5473,7 @@
         Sync with Tramp 2.0.53.
 
         * net/tramp.el (tramp-completion-mode): ?\t has event-modifier
-        'control.  Reported by Matthias F,bv(Brste <slashdevslashnull@gmx.net>.
+        'control.  Reported by Matthias F,Av(Brste <slashdevslashnull@gmx.net>.
         (tramp-completion-file-name-handler): Add autoload cookie for
         adding to `file-name-handler-alist'.
 
@@ -8314,7 +10067,7 @@
         Let term-handle-ansi-terminal-messages override what Bash says about
         its current directory.
 
-2005-12-16  L$,1 q(Brentey K,Aa(Broly  <lorentey@elte.hu>
+2005-12-16  K,Aa(Broly L$,1 q(Brentey  <lorentey@elte.hu>
 
         * bindings.el (last-buffer): Move to simple.el.
         * simple.el (last-buffer): Move here.
@@ -10071,7 +11824,7 @@
         prompts work for AUTH PLAIN.  Also reported by Steve Allan
         <seallan@verizon.net>.
 
-2005-12-06  L$,1 q(Brentey K,Aa(Broly  <lorentey@elte.hu>
+2005-12-06  K,Aa(Broly L$,1 q(Brentey  <lorentey@elte.hu>
 
         * frame.el (set-frame-parameter): Add doc string.
 
@@ -10455,7 +12208,7 @@
         (flyspell-post-command-hook): Check input-pending-p while processing
         the potentially long list of buffer changes.
 
-2005-11-28  L$,1 q(Brentey K,Aa(Broly  <lorentey@elte.hu>
+2005-11-28  K,Aa(Broly L$,1 q(Brentey  <lorentey@elte.hu>
 
         * buff-menu.el (list-buffers-noselect): Display the selected
         frame's buffer list, not the global one.
@@ -15598,8 +17351,9 @@
         Move to beginning of file.
         (scheme-interaction-mode-commands-alist)
         (scheme-interaction-mode-map, scheme-debugger-mode-map):
-        Declare them before use.  Note: the initialization code for the variables
-        has not been moved because it uses functions that reference the variables.
+        Declare them before use.  Note: the initialization code for the
+        variables has not been moved because it uses functions that reference
+        the variables.
         (xscheme-control-g-message-string, xscheme-process-filter-alist)
         (xscheme-prompt-for-expression-map): Declare them before use.
         (scheme-debugger-mode-commands): "?\ " -> "?\s".
diff --git a/lisp/add-log.el b/lisp/add-log.el
index 393a696d3f1..d60f920244a 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -914,7 +914,7 @@ Has a preference of looking backwards."
                                ;; Include certain keywords if they
                                ;; precede the name.
                                (setq middle (point))
-                               (forward-word -1)
+                               (forward-sexp -1)
                                ;; Is this C++ method?
                                (when (and (< 2 middle)
                                           (string= (buffer-substring (- middle 2)
diff --git a/lisp/allout.el b/lisp/allout.el
index 379f664d092..b38d38d9e87 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -698,9 +698,11 @@ unless optional third, non-nil element is present.")
         ("*" allout-rebullet-current-heading)
         ("#" allout-number-siblings)
         ("\C-k" allout-kill-line t)
+        ("\M-k" allout-copy-line-as-kill t)
         ("\C-y" allout-yank t)
         ("\M-y" allout-yank-pop t)
         ("\C-k" allout-kill-topic)
+        ("\M-k" allout-copy-topic-as-kill)
                                         ; Miscellaneous commands:
         ;([?\C-\ ] allout-mark-topic)
         ("@" allout-resolve-xref)
@@ -847,18 +849,37 @@ and `allout-distinctive-bullets-string'.")
 (defvar allout-bullets-string-len 0
   "Length of current buffers' `allout-plain-bullets-string'.")
 (make-variable-buffer-local 'allout-bullets-string-len)
+;;;_   = allout-depth-specific-regexp
+(defvar allout-depth-specific-regexp ""
+  "*Regular expression to match a heading line prefix for a particular depth.
+
+This expression is used to search for depth-specific topic
+headers at depth 2 and greater.  Use `allout-depth-one-regexp'
+for to seek topics at depth one.
+
+This var is set according to the user configuration vars by
+`set-allout-regexp'.  It is prepared with format strings for two
+decimal numbers, which should each be one less than the depth of the
+topic prefix to be matched.")
+(make-variable-buffer-local 'allout-depth-specific-regexp)
+;;;_   = allout-depth-one-regexp
+(defvar allout-depth-one-regexp ""
+  "*Regular expression to match a heading line prefix for depth one.
+
+This var is set according to the user configuration vars by
+`set-allout-regexp'.  It is prepared with format strings for two
+decimal numbers, which should each be one less than the depth of the
+topic prefix to be matched.")
+(make-variable-buffer-local 'allout-depth-one-regexp)
 ;;;_   = allout-line-boundary-regexp
 (defvar allout-line-boundary-regexp ()
   "`allout-regexp' with outline style beginning-of-line anchor.
 
-This is properly set when `allout-regexp' is produced by
-`set-allout-regexp', so that (match-beginning 2) and (match-end
-2) delimit the prefix.")
+This is properly set by `set-allout-regexp'.")
 (make-variable-buffer-local 'allout-line-boundary-regexp)
 ;;;_   = allout-bob-regexp
 (defvar allout-bob-regexp ()
-  "Like `allout-line-boundary-regexp', for headers at beginning of buffer.
-\(match-beginning 2) and \(match-end 2) delimit the prefix.")
+  "Like `allout-line-boundary-regexp', for headers at beginning of buffer.")
 (make-variable-buffer-local 'allout-bob-regexp)
 ;;;_   = allout-header-subtraction
 (defvar allout-header-subtraction (1- (length allout-header-prefix))
@@ -869,7 +890,14 @@ This is properly set when `allout-regexp' is produced by
   "Length of `allout-plain-bullets-string', updated by `set-allout-regexp'.")
 (make-variable-buffer-local 'allout-plain-bullets-string-len)
 
+;;;_   = allout-doublecheck-at-and-shallower
+(defconst allout-doublecheck-at-and-shallower 3
+  "Verify apparent topics of this depth and shallower as being non-aberrant.
 
+Verified with `allout-aberrant-container-p'.  This check's usefulness is
+limited to shallow prospects, because the determination of aberrance
+depends on the mistaken item being followed by a legitimate item of
+excessively greater depth.")
 ;;;_   X allout-reset-header-lead (header-lead)
 (defun allout-reset-header-lead (header-lead)
   "*Reset the leading string used to identify topic headers."
@@ -961,7 +989,9 @@ file is programming code."
   "Generate proper topic-header regexp form for outline functions.
 
 Works with respect to `allout-plain-bullets-string' and
-`allout-distinctive-bullets-string'."
+`allout-distinctive-bullets-string'.
+
+Also refresh various data structures that hinge on the regexp."
 
   (interactive)
   ;; Derive allout-bullets-string from user configured components:
@@ -996,19 +1026,84 @@ Works with respect to `allout-plain-bullets-string' and
   ;; Derive next for repeated use in allout-pending-bullet:
   (setq allout-plain-bullets-string-len (length allout-plain-bullets-string))
   (setq allout-header-subtraction (1- (length allout-header-prefix)))
-  ;; Produce the new allout-regexp:
-  (setq allout-regexp (concat "\\("
-                              (regexp-quote allout-header-prefix)
-                              "[ \t]*["
-                              allout-bullets-string
-                              "]\\)\\|"
-                              (regexp-quote allout-primary-bullet)
-                              "+\\|\^l"))
-  (setq allout-line-boundary-regexp
-        (concat "\\(\n\\)\\(" allout-regexp "\\)"))
-  (setq allout-bob-regexp
-        (concat "\\(\\`\\)\\(" allout-regexp "\\)"))
-  )
+
+  (let (new-part old-part)
+    (setq new-part (concat "\\("
+                           (regexp-quote allout-header-prefix)
+                           "[ \t]*"
+                           ;; already regexp-quoted in a custom way:
+                           "[" allout-bullets-string "]"
+                           "\\)")
+          old-part (concat "\\("
+                           (regexp-quote allout-primary-bullet)
+                           "\\|"
+                           (regexp-quote allout-header-prefix)
+                           "\\)"
+                           "+"
+                           " ?[^" allout-primary-bullet "]")
+          allout-regexp (concat new-part
+                                "\\|"
+                                old-part
+                                "\\|\^l")
+
+          allout-line-boundary-regexp (concat "\n" new-part
+                                              "\\|"
+                                              "\n" old-part)
+
+          allout-bob-regexp (concat "\\`" new-part
+                                    "\\|"
+                                    "\\`" old-part))
+
+    (setq allout-depth-specific-regexp
+          (concat "\\(^\\|\\`\\)"
+                  "\\("
+
+                  ;; new-style spacers-then-bullet string:
+                  "\\("
+                  (allout-format-quote (regexp-quote allout-header-prefix))
+                  " \\{%s\\}"
+                  "[" (allout-format-quote allout-bullets-string) "]"
+                  "\\)"
+
+                  ;; old-style all-bullets string, if primary not multi-char:
+                  (if (< 0 allout-header-subtraction)
+                      ""
+                    (concat "\\|\\("
+                            (allout-format-quote
+                             (regexp-quote allout-primary-bullet))
+                            (allout-format-quote
+                             (regexp-quote allout-primary-bullet))
+                            (allout-format-quote
+                             (regexp-quote allout-primary-bullet))
+                            "\\{%s\\}"
+                            ;; disqualify greater depths:
+                            "[^"
+                            (allout-format-quote allout-primary-bullet)
+                            "]\\)"
+                            ))
+                  "\\)"
+                  ))
+    (setq allout-depth-one-regexp
+          (concat "\\(^\\|\\`\\)"
+                  "\\("
+
+                  "\\("
+                  (regexp-quote allout-header-prefix)
+                  ;; disqualify any bullet char following any amount of
+                  ;; intervening whitespace:
+                  " *"
+                  (concat "[^ " allout-bullets-string "]")
+                  "\\)"
+                  (if (< 0 allout-header-subtraction)
+                      ;; Need not support anything like the old
+                      ;; bullet style if the prefix is multi-char.
+                      ""
+                    (concat "\\|"
+                            (regexp-quote allout-primary-bullet)
+                            ;; disqualify deeper primary-bullet sequences:
+                            "[^" allout-primary-bullet "]"))
+                  "\\)"
+                  ))))
 ;;;_  : Key bindings
 ;;;_   = allout-mode-map
 (defvar allout-mode-map nil "Keybindings for (allout) outline minor mode.")
@@ -1142,7 +1237,7 @@ The settings are stored on `allout-mode-prior-settings'."
       (if (not (symbolp name))
           (error "Pair's name, %S, must be a symbol, not %s"
                  name (type-of name)))
-      (setq prior-value (condition-case err
+      (setq prior-value (condition-case nil
                             (symbol-value name)
                           (void-variable nil)))
       (when (not (assoc name allout-mode-prior-settings))
@@ -1186,7 +1281,7 @@ their settings before allout-mode was started."
 ;;;_   > allout-unprotected (expr)
 (defmacro allout-unprotected (expr)
   "Enable internal outline operations to alter invisible text."
-  `(let ((inhibit-read-only t)
+  `(let ((inhibit-read-only (if (not buffer-read-only) t))
          (inhibit-field-text-motion t))
      ,expr))
 ;;;_   = allout-mode-hook
@@ -1600,7 +1695,9 @@ The bindings are dictated by the `allout-keybindings-list' and
         Topic-oriented Killing and Yanking:
         ----------------------------------
 \\[allout-kill-topic]   allout-kill-topic       Kill current topic, including offspring.
-\\[allout-kill-line]    allout-kill-line        Like kill-line, but reconciles numbering, etc.
+\\[allout-copy-topic-as-kill]   allout-copy-topic-as-kill Copy current topic, including offspring.
+\\[allout-kill-line]    allout-kill-line        kill-line, attending to outline structure.
+\\[allout-copy-line-as-kill]    allout-copy-line-as-kill Copy line but don't delete it.
 \\[allout-yank] allout-yank             Yank, adjusting depth of yanked topic to
                                 depth of heading if yanking into bare topic
                                 heading (ie, prefix sans text).
@@ -1792,8 +1889,7 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
       (remove-from-invisibility-spec '(allout . t))
       (remove-hook 'pre-command-hook 'allout-pre-command-business t)
       (remove-hook 'post-command-hook 'allout-post-command-business t)
-      (when (featurep 'xemacs)
-        (remove-hook 'before-change-functions 'allout-before-change-handler t))
+      (remove-hook 'before-change-functions 'allout-before-change-handler t)
       (remove-hook 'isearch-mode-end-hook 'allout-isearch-end-handler t)
       (remove-hook write-file-hook-var-name 'allout-write-file-hook-handler t)
       (remove-hook 'auto-save-hook 'allout-auto-save-hook-handler t)
@@ -1813,7 +1909,7 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
 
       (allout-overlay-preparations)     ; Doesn't hurt to redo this.
 
-      (allout-infer-header-lead)
+      (allout-infer-header-lead-and-primary-bullet)
       (allout-infer-body-reindent)
 
       (set-allout-regexp)
@@ -1854,9 +1950,8 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
       (allout-add-resumptions '(line-move-ignore-invisible t))
       (add-hook 'pre-command-hook 'allout-pre-command-business nil t)
       (add-hook 'post-command-hook 'allout-post-command-business nil t)
-      (when (featurep 'xemacs)
-        (add-hook 'before-change-functions 'allout-before-change-handler
-                  nil t))
+      (add-hook 'before-change-functions 'allout-before-change-handler
+                nil t)
       (add-hook 'isearch-mode-end-hook 'allout-isearch-end-handler nil t)
       (add-hook write-file-hook-var-name 'allout-write-file-hook-handler
                 nil t)
@@ -1996,18 +2091,20 @@ internal functions use this feature cohesively bunch changes."
 (defun allout-before-change-handler (beg end)
   "Protect against changes to invisible text.
 
-See allout-overlay-interior-modification-handler for details.
+See allout-overlay-interior-modification-handler for details."
+
+  (if (and (allout-mode-p) undo-in-progress (allout-hidden-p))
+      (allout-show-to-offshoot))
 
-This before-change handler is used only where modification-hooks
-overlay property is not supported."
   ;; allout-overlay-interior-modification-handler on an overlay handles
   ;; this in other emacs, via `allout-exposure-category's 'modification-hooks.
   (when (and (featurep 'xemacs) (allout-mode-p))
     ;; process all of the pending overlays:
-    (dolist (overlay (overlays-in beg end))
-      (if (eq (overlay-get ol 'invisible) 'allout)
-          (allout-overlay-interior-modification-handler
-             overlay nil beg end nil)))))
+    (save-excursion
+      (got-char beg)
+      (let ((overlay (allout-get-invisibility-overlay)))
+        (allout-overlay-interior-modification-handler
+         overlay nil beg end nil)))))
 ;;;_  > allout-isearch-end-handler (&optional overlay)
 (defun allout-isearch-end-handler (&optional overlay)
   "Reconcile allout outline exposure on arriving in hidden text after isearch.
@@ -2035,19 +2132,35 @@ function can also be used as an `isearch-mode-end-hook'."
 (defvar allout-recent-prefix-end 0
   "Buffer point of the end of the last topic prefix encountered.")
 (make-variable-buffer-local 'allout-recent-prefix-end)
+;;;_  = allout-recent-depth
+(defvar allout-recent-depth 0
+  "Depth of the last topic prefix encountered.")
+(make-variable-buffer-local 'allout-recent-depth)
 ;;;_  = allout-recent-end-of-subtree
 (defvar allout-recent-end-of-subtree 0
   "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 (beg end)
-  "Register allout-prefix state data - BEGINNING and END of prefix.
+;;;_  > allout-prefix-data ()
+(defsubst allout-prefix-data ()
+  "Register allout-prefix state data.
 
 For reference by `allout-recent' funcs.  Returns BEGINNING."
-  `(setq allout-recent-prefix-end ,end
-         allout-recent-prefix-beginning ,beg))
+  (setq allout-recent-prefix-end (or (match-end 1) (match-end 2))
+        allout-recent-prefix-beginning (or (match-beginning 1)
+                                           (match-beginning 2))
+        allout-recent-depth (max 1 (- allout-recent-prefix-end
+                                      allout-recent-prefix-beginning
+                                      allout-header-subtraction)))
+  allout-recent-prefix-beginning)
+;;;_  > nullify-allout-prefix-data ()
+(defsubst nullify-allout-prefix-data ()
+  "Mark allout prefix data as being uninformative."
+  (setq allout-recent-prefix-end (point)
+        allout-recent-prefix-beginning (point)
+        allout-recent-depth 0)
+  allout-recent-prefix-beginning)
 ;;;_  > allout-recent-depth ()
-(defmacro allout-recent-depth ()
+(defsubst allout-recent-depth ()
   "Return depth of last heading encountered by an outline maneuvering function.
 
 All outline functions which directly do string matches to assess
@@ -2055,19 +2168,17 @@ headings set the variables `allout-recent-prefix-beginning' and
 `allout-recent-prefix-end' if successful.  This function uses those settings
 to return the current depth."
 
-  '(max 1 (- allout-recent-prefix-end
-             allout-recent-prefix-beginning
-             allout-header-subtraction)))
+  allout-recent-depth)
 ;;;_  > allout-recent-prefix ()
-(defmacro allout-recent-prefix ()
+(defsubst allout-recent-prefix ()
   "Like `allout-recent-depth', but returns text of last encountered prefix.
 
 All outline functions which directly do string matches to assess
 headings set the variables `allout-recent-prefix-beginning' and
 `allout-recent-prefix-end' if successful.  This function uses those settings
-to return the current depth."
-  '(buffer-substring allout-recent-prefix-beginning
-                     allout-recent-prefix-end))
+to return the current prefix."
+  (buffer-substring-no-properties allout-recent-prefix-beginning
+                                  allout-recent-prefix-end))
 ;;;_  > allout-recent-bullet ()
 (defmacro allout-recent-bullet ()
   "Like allout-recent-prefix, but returns bullet of last encountered prefix.
@@ -2076,8 +2187,8 @@ All outline functions which directly do string matches to assess
 headings set the variables `allout-recent-prefix-beginning' and
 `allout-recent-prefix-end' if successful.  This function uses those settings
 to return the current depth of the most recently matched topic."
-  '(buffer-substring (1- allout-recent-prefix-end)
-                     allout-recent-prefix-end))
+  '(buffer-substring-no-properties (1- allout-recent-prefix-end)
+                                   allout-recent-prefix-end))
 
 ;;;_ #4 Navigation
 
@@ -2091,7 +2202,9 @@ Actually, returns prefix beginning point."
   (save-excursion
     (allout-beginning-of-current-line)
     (and (looking-at allout-regexp)
-         (allout-prefix-data (match-beginning 0) (match-end 0)))))
+         (allout-prefix-data)
+         (or (> allout-recent-depth allout-doublecheck-at-and-shallower)
+             (not (allout-aberrant-container-p))))))
 ;;;_    > allout-on-heading-p ()
 (defalias 'allout-on-heading-p 'allout-on-current-heading-p)
 ;;;_    > allout-e-o-prefix-p ()
@@ -2101,6 +2214,51 @@ Actually, returns prefix beginning point."
                          (beginning-of-line))
                        (looking-at allout-regexp))
        (= (point)(save-excursion (allout-end-of-prefix)(point)))))
+;;;_    > allout-aberrant-container-p ()
+(defun allout-aberrant-container-p ()
+  "True if topic, or next sibling with children, contains them discontinuously.
+
+Discontinuous means an immediate offspring that is nested more
+than one level deeper than the topic.
+
+If topic has no offspring, then the next sibling with offspring will
+determine whether or not this one is determined to be aberrant.
+
+If true, then the allout-recent-* settings are calibrated on the
+offspring that qaulifies it as aberrant, ie with depth that
+exceeds the topic by more than one."
+
+  ;; This is most clearly understood when considering standard-prefix-leader
+  ;; low-level topics, which can all too easily match text not intended as
+  ;; headers.  For example, any line with a leading '.' or '*' and lacking a
+  ;; following bullet qualifies without this protection.  (A sequence of
+  ;; them can occur naturally, eg a typical textual bullet list.)  We
+  ;; disqualify such low-level sequences when they are followed by a
+  ;; discontinuously contained child, inferring that the sequences are not
+  ;; actually connected with their prospective context.
+
+  (let ((depth (allout-depth))
+        (start-point (point))
+        done aberrant)
+    (save-excursion
+      (while (and (not done)
+                  (re-search-forward allout-line-boundary-regexp nil 0))
+        (allout-prefix-data)
+        (goto-char allout-recent-prefix-beginning)
+        (cond
+         ;; sibling - continue:
+         ((eq allout-recent-depth depth)) 
+         ;; first offspring is excessive - aberrant:
+         ((> allout-recent-depth (1+ depth))
+          (setq done t aberrant t))
+         ;; next non-sibling is lower-depth - not aberrant:
+         (t (setq done t)))))
+    (if aberrant
+        aberrant
+      (goto-char start-point)
+      ;; recalibrate allout-recent-*
+      (allout-depth)
+      nil)))
 ;;;_   : Location attributes
 ;;;_    > allout-depth ()
 (defun allout-depth ()
@@ -2113,10 +2271,10 @@ Like `allout-current-depth', but respects hidden as well as visible topics."
     (let ((start-point (point)))
       (if (and (allout-goto-prefix)
                (not (< start-point (point))))
-          (allout-recent-depth)
+          allout-recent-depth
         (progn
-          ;; Oops, no prefix, zero prefix data:
-          (allout-prefix-data (point)(point))
+          ;; Oops, no prefix, nullify it:
+          (nullify-allout-prefix-data)
           ;; ... and return 0:
           0)))))
 ;;;_    > allout-current-depth ()
@@ -2149,10 +2307,10 @@ Return zero if point is not within any topic."
   (condition-case nil
       (save-excursion
         (allout-back-to-current-heading)
-        (buffer-substring (- allout-recent-prefix-end 1)
-                          allout-recent-prefix-end))
+        (buffer-substring-no-properties (- allout-recent-prefix-end 1)
+                                        allout-recent-prefix-end))
     ;; Quick and dirty provision, ostensibly for missing bullet:
-    ('args-out-of-range nil))
+    (args-out-of-range nil))
   )
 ;;;_    > allout-get-prefix-bullet (prefix)
 (defun allout-get-prefix-bullet (prefix)
@@ -2160,7 +2318,7 @@ Return zero if point is not within any topic."
   ;; Doesn't make sense if we're old-style prefixes, but this just
   ;; oughtn't be called then, so forget about it...
   (if (string-match allout-regexp prefix)
-      (substring prefix (1- (match-end 0)) (match-end 0))))
+      (substring prefix (1- (match-end 2)) (match-end 2))))
 ;;;_    > allout-sibling-index (&optional depth)
 (defun allout-sibling-index (&optional depth)
   "Item number of this prospective topic among its siblings.
@@ -2172,12 +2330,12 @@ If less than this depth, ascend to that depth and count..."
 
   (save-excursion
     (cond ((and depth (<= depth 0) 0))
-          ((or (not depth) (= depth (allout-depth)))
+          ((or (null depth) (= depth (allout-depth)))
            (let ((index 1))
-             (while (allout-previous-sibling (allout-recent-depth) nil)
+             (while (allout-previous-sibling allout-recent-depth nil)
                (setq index (1+ index)))
              index))
-          ((< depth (allout-recent-depth))
+          ((< depth allout-recent-depth)
            (allout-ascend-to-depth depth)
            (allout-sibling-index))
           (0))))
@@ -2229,11 +2387,17 @@ Outermost is first."
   (if (or (not allout-beginning-of-line-cycles)
           (not (equal last-command this-command)))
       (move-beginning-of-line 1)
-    (let ((beginning-of-body (save-excursion
-                               (allout-beginning-of-current-entry)
-                               (point))))
+    (allout-depth)
+    (let ((beginning-of-body
+           (save-excursion
+             (while (and (<= allout-recent-depth
+                             allout-doublecheck-at-and-shallower)
+                         (allout-aberrant-container-p)
+                         (allout-previous-visible-heading 1)))
+             (allout-beginning-of-current-entry)
+             (point))))
       (cond ((= (current-column) 0)
-             (allout-beginning-of-current-entry))
+             (goto-char beginning-of-body))
             ((< (point) beginning-of-body)
              (allout-beginning-of-current-line))
             ((= (point) beginning-of-body)
@@ -2241,7 +2405,7 @@ Outermost is first."
             (t (allout-beginning-of-current-line)
                (if (< (point) beginning-of-body)
                    ;; we were on the headline after its start:
-                   (allout-beginning-of-current-entry)))))))
+                   (goto-char beginning-of-body)))))))
 ;;;_   > allout-end-of-line ()
 (defun allout-end-of-line ()
   "End-of-line with `allout-end-of-line-cycles' behavior, if set."
@@ -2261,6 +2425,7 @@ Outermost is first."
                                      (allout-hidden-p)))
              (allout-back-to-current-heading)
              (allout-show-current-entry)
+             (allout-show-children)
              (allout-end-of-entry))
             ((>= (point) end-of-entry)
              (allout-back-to-current-heading)
@@ -2270,40 +2435,49 @@ Outermost is first."
 (defsubst allout-next-heading ()
   "Move to the heading for the topic \(possibly invisible) after this one.
 
-Returns the location of the heading, or nil if none found."
+Returns the location of the heading, or nil if none found.
 
-  (if (and (bobp) (not (eobp)) (looking-at allout-regexp))
+We skip anomolous low-level topics, a la `allout-aberrant-container-p'."
+  (if (looking-at allout-regexp)
       (forward-char 1))
 
-  (if (re-search-forward allout-line-boundary-regexp nil 0)
-      (allout-prefix-data               ; Got valid location state - set vars:
-       (goto-char (or (match-beginning 2)
-                      allout-recent-prefix-beginning))
-       (or (match-end 2) allout-recent-prefix-end))))
+  (when (re-search-forward allout-line-boundary-regexp nil 0)
+    (allout-prefix-data)
+    (and (<= allout-recent-depth allout-doublecheck-at-and-shallower)
+         ;; this will set allout-recent-* on the first non-aberrant topic,
+         ;; whether it's the current one or one that disqualifies it:
+         (allout-aberrant-container-p))
+    (goto-char allout-recent-prefix-beginning)))
 ;;;_   > allout-this-or-next-heading
 (defun allout-this-or-next-heading ()
   "Position cursor on current or next heading."
   ;; A throwaway non-macro that is defined after allout-next-heading
   ;; and usable by allout-mode.
-  (if (not (allout-goto-prefix)) (allout-next-heading)))
+  (if (not (allout-goto-prefix-doublechecked)) (allout-next-heading)))
 ;;;_   > allout-previous-heading ()
-(defmacro allout-previous-heading ()
+(defun allout-previous-heading ()
   "Move to the prior \(possibly invisible) heading line.
 
-Return the location of the beginning of the heading, or nil if not found."
-
-  '(if (bobp)
-       nil
-     (allout-goto-prefix)
-     (if
-         ;; searches are unbounded and return nil if failed:
-         (or (re-search-backward allout-line-boundary-regexp nil 0)
-             (looking-at allout-bob-regexp))
-         (progn                         ; Got valid location state - set vars:
-           (allout-prefix-data
-            (goto-char (or (match-beginning 2)
-                           allout-recent-prefix-beginning))
-            (or (match-end 2) allout-recent-prefix-end))))))
+Return the location of the beginning of the heading, or nil if not found.
+
+We skip anomolous low-level topics, a la `allout-aberrant-container-p'."
+
+  (if (bobp)
+      nil
+    ;; allout-goto-prefix-doublechecked calls us, so we can't use it here.
+    (let ((start-point (point)))
+      (allout-goto-prefix)
+      (when (or (re-search-backward allout-line-boundary-regexp nil 0)
+                (looking-at allout-bob-regexp))
+        (goto-char (allout-prefix-data))
+        (if (and (<= allout-recent-depth allout-doublecheck-at-and-shallower)
+                 (allout-aberrant-container-p))
+            (or (allout-previous-heading)
+                (and (goto-char start-point)
+                     ;; recalibrate allout-recent-*:
+                     (allout-depth)
+                     nil))
+          (point))))))
 ;;;_   > allout-get-invisibility-overlay ()
 (defun allout-get-invisibility-overlay ()
   "Return the overlay at point that dictates allout invisibility."
@@ -2311,7 +2485,8 @@ Return the location of the beginning of the heading, or nil if not found."
         got)
     (while (and overlays (not got))
       (if (equal (overlay-get (car overlays) 'invisible) 'allout)
-          (setq got (car overlays))))
+          (setq got (car overlays))
+        (pop overlays)))
     got))
 ;;;_   > allout-back-to-visible-text ()
 (defun allout-back-to-visible-text ()
@@ -2324,23 +2499,20 @@ Return the location of the beginning of the heading, or nil if not found."
 ;;;_   " These routines either produce or assess charts, which are
 ;;; nested lists of the locations of topics within a subtree.
 ;;;
-;;; Use of charts enables efficient navigation of subtrees, by
-;;; requiring only a single regexp-search based traversal, to scope
-;;; out the subtopic locations.  The chart then serves as the basis
-;;; for assessment or adjustment of the subtree, without redundant
-;;; traversal of the structure.
+;;; Charts enable efficient subtree navigation by providing a reusable basis
+;;; for elaborate, compound assessment and adjustment of a subtree.
 
 ;;;_   > allout-chart-subtree (&optional levels visible orig-depth prev-depth)
 (defun allout-chart-subtree (&optional levels visible orig-depth prev-depth)
   "Produce a location \"chart\" of subtopics of the containing topic.
 
-Optional argument LEVELS specifies the depth \(relative to start
-depth) for the chart.
+Optional argument LEVELS specifies a depth limit \(relative to start
+depth) for the chart.  Null LEVELS means no limit.
 
 When optional argument VISIBLE is non-nil, the chart includes
 only the visible subelements of the charted subjects.
 
-The remaining optional args are not for internal use by the function.
+The remaining optional args are for internal use by the function.
 
 Point is left at the end of the subtree.
 
@@ -2348,12 +2520,12 @@ 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.
 
-Topics are entered in the chart so the last one is at the car.
-The entry for each topic consists of an integer indicating the point
-at the beginning of the topic.  Charts for offspring consists of a
-list containing, recursively, the charts for the respective subtopics.
-The chart for a topics' offspring precedes the entry for the topic
-itself.
+The chart entries for the topics are in reverse order, so the
+last topic is listed first.  The entry for each topic consists of
+an integer indicating the point at the beginning of the topic
+prefix.  Charts for offspring consists of a list containing,
+recursively, the charts for the respective subtopics.  The chart
+for a topics' offspring precedes the entry for the topic itself.
 
 The other function parameters are for internal recursion, and should
 not be specified by external callers.  ORIG-DEPTH is depth of topic at
@@ -2380,17 +2552,17 @@ starting point, and PREV-DEPTH is depth of prior topic."
 
     (while (and (not (eobp))
                                         ; Still within original topic?
-                (< orig-depth (setq curr-depth (allout-recent-depth)))
+                (< orig-depth (setq curr-depth allout-recent-depth))
                 (cond ((= prev-depth curr-depth)
                        ;; Register this one and move on:
-                       (setq chart (cons (point) chart))
+                       (setq chart (cons allout-recent-prefix-beginning chart))
                        (if (and levels (<= levels 1))
                            ;; At depth limit - skip sublevels:
                            (or (allout-next-sibling curr-depth)
                                ;; or no more siblings - proceed to
                                ;; next heading at lesser depth:
                                (while (and (<= curr-depth
-                                               (allout-recent-depth))
+                                               allout-recent-depth)
                                            (if visible
                                                (allout-next-visible-heading 1)
                                              (allout-next-heading)))))
@@ -2437,26 +2609,29 @@ starting point, and PREV-DEPTH is depth of prior topic."
 Effectively a top-level chart of siblings.  See `allout-chart-subtree'
 for an explanation of charts."
   (save-excursion
-    (if (allout-goto-prefix)
-        (let ((chart (list (point))))
-          (while (allout-next-sibling)
-            (setq chart (cons (point) chart)))
-          (if chart (setq chart (nreverse chart)))))))
+    (when (allout-goto-prefix-doublechecked)
+      (let ((chart (list (point))))
+        (while (allout-next-sibling)
+          (setq chart (cons (point) chart)))
+        (if chart (setq chart (nreverse chart)))))))
 ;;;_   > allout-chart-to-reveal (chart depth)
 (defun allout-chart-to-reveal (chart depth)
 
   "Return a flat list of hidden points in subtree CHART, up to DEPTH.
 
+If DEPTH is nil, include hidden points at any depth.
+
 Note that point can be left at any of the points on chart, or at the
 start point."
 
   (let (result here)
-    (while (and (or (eq depth t) (> depth 0))
+    (while (and (or (null depth) (> depth 0))
                 chart)
       (setq here (car chart))
       (if (listp here)
-          (let ((further (allout-chart-to-reveal here (or (eq depth t)
-                                                           (1- depth)))))
+          (let ((further (allout-chart-to-reveal here (if (null depth)
+                                                          depth
+                                                        (1- depth)))))
             ;; We're on the start of a subtree - recurse with it, if there's
             ;; more depth to go:
             (if further (setq result (append further result)))
@@ -2514,15 +2689,28 @@ Returns the point at the beginning of the prefix, or nil if none."
                 (search-backward "\n" nil 1))
       (forward-char 1)
       (if (looking-at allout-regexp)
-          (setq done (allout-prefix-data (match-beginning 0)
-                                          (match-end 0)))
+          (setq done (allout-prefix-data))
         (forward-char -1)))
     (if (bobp)
         (cond ((looking-at allout-regexp)
-               (allout-prefix-data (match-beginning 0)(match-end 0)))
+               (allout-prefix-data))
               ((allout-next-heading))
               (done))
       done)))
+;;;_   > allout-goto-prefix-doublechecked ()
+(defun allout-goto-prefix-doublechecked ()
+  "Put point at beginning of immediately containing outline topic.
+
+Like `allout-goto-prefix', but shallow topics \(according to
+`allout-doublecheck-at-and-shallower') are checked and
+disqualified for child containment discontinuity, according to
+`allout-aberrant-container-p'."
+  (allout-goto-prefix)
+  (if (and (<= allout-recent-depth allout-doublecheck-at-and-shallower)
+           (allout-aberrant-container-p))
+      (allout-previous-heading)
+    (point)))
+
 ;;;_   > allout-end-of-prefix ()
 (defun allout-end-of-prefix (&optional ignore-decorations)
   "Position cursor at beginning of header text.
@@ -2530,46 +2718,40 @@ Returns the point at the beginning of the prefix, or nil if none."
 If optional IGNORE-DECORATIONS is non-nil, put just after bullet,
 otherwise skip white space between bullet and ensuing text."
 
-  (if (not (allout-goto-prefix))
+  (if (not (allout-goto-prefix-doublechecked))
       nil
-    (let ((match-data (match-data)))
-      (goto-char (match-end 0))
-      (if ignore-decorations
-          t
-        (while (looking-at "[0-9]") (forward-char 1))
-        (if (and (not (eolp)) (looking-at "\\s-")) (forward-char 1)))
-      (store-match-data match-data))
+    (goto-char allout-recent-prefix-end)
+    (if ignore-decorations
+        t
+      (while (looking-at "[0-9]") (forward-char 1))
+      (if (and (not (eolp)) (looking-at "\\s-")) (forward-char 1)))
     ;; Reestablish where we are:
     (allout-current-depth)))
 ;;;_   > allout-current-bullet-pos ()
 (defun allout-current-bullet-pos ()
   "Return position of current \(visible) topic's bullet."
 
- (if (not (allout-current-depth))
+  (if (not (allout-current-depth))
       nil
-   (1- (match-end 0))))
+    (1- allout-recent-prefix-end)))
 ;;;_   > allout-back-to-current-heading ()
 (defun allout-back-to-current-heading ()
-  "Move to heading line of current topic, or beginning if already on the line.
+  "Move to heading line of current topic, or beginning if not in a topic.
+
+If interactive, we position at the end of the prefix.
 
-Return value of point, unless we started outside of (before any) topics,
-in which case we return nil."
+Return value of resulting point, unless we started outside
+of (before any) topics, in which case we return nil."
 
   (allout-beginning-of-current-line)
-  (if (or (allout-on-current-heading-p)
-          (and (re-search-backward (concat "^\\(" allout-regexp "\\)")
-                                   nil 'move)
-               (progn (while (allout-hidden-p)
-                        (allout-beginning-of-current-line)
-                        (if (not (looking-at allout-regexp))
-                            (re-search-backward (concat
-                                                 "^\\(" allout-regexp "\\)")
-                                                nil 'move)))
-                      (allout-prefix-data (match-beginning 1)
-                                          (match-end 1)))))
-      (if (interactive-p)
-          (allout-end-of-prefix)
-        (point))))
+  (let ((bol-point (point)))
+    (allout-goto-prefix-doublechecked)
+    (if (<= (point) bol-point)
+        (if (interactive-p)
+            (allout-end-of-prefix)
+          (point))
+      (goto-char (point-min))
+      nil)))
 ;;;_   > allout-back-to-heading ()
 (defalias 'allout-back-to-heading 'allout-back-to-current-heading)
 ;;;_   > allout-pre-next-prefix ()
@@ -2578,9 +2760,8 @@ in which case we return nil."
 
 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)))))
+  (if (allout-next-heading)
+      (goto-char (1- allout-recent-prefix-beginning))))
 ;;;_   > allout-end-of-subtree (&optional current include-trailing-blank)
 (defun allout-end-of-subtree (&optional current include-trailing-blank)
   "Put point at the end of the last leaf in the containing topic.
@@ -2596,11 +2777,11 @@ Returns the value of point."
   (interactive "P")
   (if current
       (allout-back-to-current-heading)
-    (allout-goto-prefix))
-  (let ((level (allout-recent-depth)))
+    (allout-goto-prefix-doublechecked))
+  (let ((level allout-recent-depth))
     (allout-next-heading)
     (while (and (not (eobp))
-                (> (allout-recent-depth) level))
+                (> allout-recent-depth level))
       (allout-next-heading))
     (if (eobp)
         (allout-end-of-entry)
@@ -2629,6 +2810,9 @@ If already there, move cursor to bullet for hot-spot operation.
   (interactive)
   (let ((start-point (point)))
     (move-beginning-of-line 1)
+    (if (< 0 (allout-current-depth))
+        (goto-char allout-recent-prefix-end)
+      (goto-char (point-min)))
     (allout-end-of-prefix)
     (if (and (interactive-p)
              (= (point) start-point))
@@ -2676,23 +2860,18 @@ collapsed."
 (defun allout-ascend-to-depth (depth)
   "Ascend to depth DEPTH, returning depth if successful, nil if not."
   (if (and (> depth 0)(<= depth (allout-depth)))
-      (let ((last-good (point)))
-        (while (and (< depth (allout-depth))
-                    (setq last-good (point))
-                    (allout-beginning-of-level)
-                    (allout-previous-heading)))
-        (if (= (allout-recent-depth) depth)
-            (progn (goto-char allout-recent-prefix-beginning)
-                   depth)
-          (goto-char last-good)
-          nil))
-    (if (interactive-p) (allout-end-of-prefix))))
+      (let (last-ascended)
+        (while (and (< depth allout-recent-depth)
+                    (setq last-ascended (allout-ascend))))
+        (goto-char allout-recent-prefix-beginning)
+        (if (interactive-p) (allout-end-of-prefix))
+        (and last-ascended allout-recent-depth))))
 ;;;_   > allout-ascend ()
 (defun allout-ascend ()
   "Ascend one level, returning t if successful, nil if not."
   (prog1
       (if (allout-beginning-of-level)
-          (allout-previous-heading))
+          (allout-previous-heading))
     (if (interactive-p) (allout-end-of-prefix))))
 ;;;_   > allout-descend-to-depth (depth)
 (defun allout-descend-to-depth (depth)
@@ -2703,47 +2882,24 @@ Returning depth if successful, nil if not."
         (start-depth (allout-depth)))
     (while
         (and (> (allout-depth) 0)
-             (not (= depth (allout-recent-depth))) ; ... not there yet
+             (not (= depth allout-recent-depth)) ; ... not there yet
              (allout-next-heading)     ; ... go further
-             (< start-depth (allout-recent-depth)))) ; ... still in topic
+             (< start-depth allout-recent-depth))) ; ... still in topic
     (if (and (> (allout-depth) 0)
-             (= (allout-recent-depth) depth))
+             (= allout-recent-depth depth))
         depth
       (goto-char start-point)
       nil))
   )
-;;;_   > allout-up-current-level (arg &optional dont-complain)
-(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."
+;;;_   > allout-up-current-level (arg)
+(defun allout-up-current-level (arg)
+  "Move out ARG levels from current visible topic."
   (interactive "p")
-  (allout-back-to-current-heading)
-  (let ((present-level (allout-recent-depth))
-        (last-good (point))
-        failed)
-    ;; Loop for iterating arg:
-    (while (and (> (allout-recent-depth) 1)
-                (> arg 0)
-                (not (bobp))
-                (not failed))
-      (setq last-good (point))
-      ;; Loop for going back over current or greater depth:
-      (while (and (not (< (allout-recent-depth) present-level))
-                  (or (allout-previous-visible-heading 1)
-                      (not (setq failed present-level)))))
-      (setq present-level (allout-current-depth))
-      (setq arg (- arg 1)))
-    (if (or failed
-            (> arg 0))
-        (progn (goto-char last-good)
-               (if (interactive-p) (allout-end-of-prefix))
-               (if (not dont-complain)
-                   (error "Can't ascend past outermost level")
-                 (if (interactive-p) (allout-end-of-prefix))
-                 nil))
+  (let ((start-point (point)))
+    (allout-back-to-current-heading)
+    (if (not (allout-ascend))
+        (progn (goto-char start-point)
+               (error "Can't ascend past outermost level"))
       (if (interactive-p) (allout-end-of-prefix))
       allout-recent-prefix-beginning)))
 
@@ -2756,24 +2912,101 @@ Traverse at optional DEPTH, or current depth if none specified.
 
 Go backward if optional arg BACKWARD is non-nil.
 
-Return depth if successful, nil otherwise."
+Return the start point of the new topic if successful, nil otherwise."
 
-  (if (and backward (bobp))
+  (if (if backward (bobp) (eobp))
       nil
-    (let ((start-depth (or depth (allout-depth)))
+    (let ((target-depth (or depth (allout-depth)))
           (start-point (point))
+          (count 0)
+          leaping
           last-depth)
-      (while (and (not (if backward (bobp) (eobp)))
-                  (if backward (allout-previous-heading)
-                    (allout-next-heading))
-                  (> (setq last-depth (allout-recent-depth)) start-depth)))
-      (if (and (not (eobp))
-               (and (> (or last-depth (allout-depth)) 0)
-                    (= (allout-recent-depth) start-depth)))
-          allout-recent-prefix-beginning
-        (goto-char start-point)
-        (if depth (allout-depth) start-depth)
-        nil))))
+      (while (and
+              ;; done too few single steps to resort to the leap routine:
+              (not leaping)
+              ;; not at limit:
+              (not (if backward (bobp) (eobp)))
+              ;; still traversable:
+              (if backward (allout-previous-heading) (allout-next-heading))
+              ;; we're below the target depth
+              (> (setq last-depth allout-recent-depth) target-depth))
+        (setq count (1+ count))
+        (if (> count 7)                 ; lists are commonly 7 +- 2, right?-)
+            (setq leaping t)))
+      (cond (leaping
+             (or (allout-next-sibling-leap target-depth backward)
+                 (progn
+                   (goto-char start-point)
+                   (if depth (allout-depth) target-depth)
+                   nil)))
+            ((and (not (eobp))
+                  (and (> (or last-depth (allout-depth)) 0)
+                       (= allout-recent-depth target-depth)))
+             allout-recent-prefix-beginning)
+            (t
+             (goto-char start-point)
+             (if depth (allout-depth) target-depth)
+             nil)))))
+;;;_   > allout-next-sibling-leap (&optional depth backward)
+(defun allout-next-sibling-leap (&optional depth backward)
+  "Like `allout-next-sibling', but by direct search for topic at depth.
+
+Traverse at optional DEPTH, or current depth if none specified.
+
+Go backward if optional arg BACKWARD is non-nil.
+
+Return the start point of the new topic if successful, nil otherwise.
+
+Costs more than regular `allout-next-sibling' for short traversals:
+
+ - we have to check the prior \(next, if travelling backwards)
+   item to confirm connectivity with the prior topic, and
+ - if confirmed, we have to reestablish the allout-recent-* settings with
+   some extra navigation
+ - if confirmation fails, we have to do more work to recover
+
+It is an increasingly big win when there are many intervening
+offspring before the next sibling, however, so
+`allout-next-sibling' resorts to this if it finds itself in that
+situation."
+
+  (if (if backward (bobp) (eobp))
+      nil
+    (let* ((start-point (point))
+           (target-depth (or depth (allout-depth)))
+           (search-whitespace-regexp nil)
+           (depth-biased (- target-depth 2))
+           (expression (if (<= target-depth 1)
+                           allout-depth-one-regexp
+                         (format allout-depth-specific-regexp
+                                 depth-biased depth-biased)))
+           found
+           done)
+      (while (not done)
+        (setq found (if backward
+                        (re-search-backward expression nil 'to-limit)
+                      (forward-char 1)
+                      (re-search-forward expression nil 'to-limit)))
+        (if (and found (allout-aberrant-container-p))
+            (setq found nil))
+        (setq done (or found (if backward (bobp) (eobp)))))
+      (if (not found)
+          (progn (goto-char start-point)
+                 nil)
+        ;; rationale: if any intervening items were at a lower depth, we
+        ;; would now be on the first offspring at the target depth - ie,
+        ;; the preceeding item (per the search direction) must be at a
+        ;; lesser depth.  that's all we need to check.
+        (if backward (allout-next-heading) (allout-previous-heading))
+        (if (< allout-recent-depth target-depth)
+            ;; return to start and reestablish allout-recent-*:
+            (progn
+              (goto-char start-point)
+              (allout-depth)
+              nil)
+          (goto-char found)
+          ;; locate cursor and set allout-recent-*:
+          (allout-goto-prefix))))))
 ;;;_   > allout-previous-sibling (&optional depth backward)
 (defun allout-previous-sibling (&optional depth backward)
   "Like `allout-forward-current-level' backwards, respecting invisible topics.
@@ -2807,7 +3040,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)
+    (prog1 allout-recent-depth
       (if (interactive-p) (allout-end-of-prefix)))))
 ;;;_   > allout-next-visible-heading (arg)
 (defun allout-next-visible-heading (arg)
@@ -2821,21 +3054,36 @@ Move to buffer limit in indicated direction if headings are exhausted."
          (step (if backward -1 1))
          prev got)
 
-    (while (> arg 0)                    ; limit condition
-      (while (and (not (if backward (bobp)(eobp))) ; boundary condition
-                  ;; Move, skipping over all those concealed lines:
-                  (prog1 (condition-case nil (or (line-move step) t)
-                           (error nil))
-                    (allout-beginning-of-current-line))
-                  (not (setq got (looking-at allout-regexp)))))
+    (while (> arg 0)
+      (while (and
+              ;; Boundary condition:
+              (not (if backward (bobp)(eobp)))
+              ;; Move, skipping over all concealed lines in one fell swoop:
+              (prog1 (condition-case nil (or (line-move step) t)
+                       (error nil))
+                (allout-beginning-of-current-line))
+              ;; Deal with apparent header line:
+              (if (not (looking-at allout-regexp))
+                  ;; not a header line, keep looking:
+                  t
+                (allout-prefix-data)
+                (if (and (<= allout-recent-depth
+                             allout-doublecheck-at-and-shallower)
+                         (allout-aberrant-container-p))
+                    ;; skip this aberrant prospective header line:
+                    t
+                  ;; this prospective headerline qualifies - register:
+                  (setq got allout-recent-prefix-beginning)
+                  ;; and break the loop:
+                  nil))))
       ;; Register this got, it may be the last:
       (if got (setq prev got))
       (setq arg (1- arg)))
     (cond (got                          ; Last move was to a prefix:
-           (allout-prefix-data (match-beginning 0) (match-end 0))
-           (allout-end-of-prefix))
+           (allout-end-of-prefix))
           (prev                         ; Last move wasn't, but prev was:
-           (allout-prefix-data (match-beginning 0) (match-end 0)))
+           (goto-char prev)
+           (allout-end-of-prefix))
           ((not backward) (end-of-line) nil))))
 ;;;_   > allout-previous-visible-heading (arg)
 (defun allout-previous-visible-heading (arg)
@@ -2845,7 +3093,8 @@ With argument, repeats or can move forward if negative.
 A heading line is one that starts with a `*' (or that `allout-regexp'
 matches)."
   (interactive "p")
-  (allout-next-visible-heading (- arg)))
+  (prog1 (allout-next-visible-heading (- arg))
+    (if (interactive-p) (allout-end-of-prefix))))
 ;;;_   > allout-forward-current-level (arg)
 (defun allout-forward-current-level (arg)
   "Position point at the next heading of the same level.
@@ -2856,38 +3105,25 @@ Returns resulting position, else nil if none found."
   (interactive "p")
   (let ((start-depth (allout-current-depth))
         (start-arg arg)
-        (backward (> 0 arg))
-        last-depth
-        (last-good (point))
-        at-boundary)
+        (backward (> 0 arg)))
     (if (= 0 start-depth)
         (error "No siblings, not in a topic..."))
     (if backward (setq arg (* -1 arg)))
-    (while (not (or (zerop arg)
-                    at-boundary))
-      (while (and (not (if backward (bobp) (eobp)))
-                  (if backward (allout-previous-visible-heading 1)
-                    (allout-next-visible-heading 1))
-                  (> (setq last-depth (allout-recent-depth)) start-depth)))
-      (if (and last-depth (= last-depth start-depth)
-               (not (if backward (bobp) (eobp))))
-          (setq last-good (point)
-                arg (1- arg))
-        (setq at-boundary t)))
-    (if (and (not (eobp))
-             (= arg 0)
-             (and (> (or last-depth (allout-depth)) 0)
-                  (= (allout-recent-depth) start-depth)))
-        allout-recent-prefix-beginning
-      (goto-char last-good)
-      (if (not (interactive-p))
-          nil
-        (allout-end-of-prefix)
-        (error "Hit %s level %d topic, traversed %d of %d requested"
-               (if backward "first" "last")
-               (allout-recent-depth)
-               (- (abs start-arg) arg)
-               (abs start-arg))))))
+    (allout-back-to-current-heading)
+    (while (and (not (zerop arg))
+                (if backward
+                    (allout-previous-sibling)
+                  (allout-next-sibling)))
+      (setq arg (1- arg)))
+    (if (not (interactive-p))
+        nil
+      (allout-end-of-prefix)
+      (if (not (zerop arg))
+          (error "Hit %s level %d topic, traversed %d of %d requested"
+                 (if backward "first" "last")
+                 allout-recent-depth
+                 (- (abs start-arg) arg)
+                 (abs start-arg))))))
 ;;;_   > allout-backward-current-level (arg)
 (defun allout-backward-current-level (arg)
   "Inverse of `allout-forward-current-level'."
@@ -2977,34 +3213,41 @@ this-command accordingly.
 
 Returns the qualifying command, if any, else nil."
   (interactive)
-  (let* ((key-num (cond ((numberp last-command-char) last-command-char)
+  (let* ((key-string (if (numberp last-command-char)
+                         (char-to-string last-command-char)))
+         (key-num (cond ((numberp last-command-char) last-command-char)
                         ;; for XEmacs character type:
                         ((and (fboundp 'characterp)
                               (apply 'characterp (list last-command-char)))
                          (apply 'char-to-int (list last-command-char)))
                         (t 0)))
-         mapped-binding
-         (on-bullet (eq (point) (allout-current-bullet-pos))))
+         mapped-binding)
 
     (if (zerop key-num)
         nil
 
-      (if (and (<= 33 key-num)
-               (setq mapped-binding
+      (if (and
+           ;; exclude control chars and escape:
+           (<= 33 key-num)
+           (setq mapped-binding
+                 (or (and (assoc key-string allout-keybindings-list)
+                          ;; translate literal membership on list:
+                          (cadr (assoc key-string allout-keybindings-list)))
+                     ;; translate as a keybinding:
                      (key-binding (concat allout-command-prefix
                                           (char-to-string
-                                           (if (and (<= 97 key-num) ; "a"
+                                           (if (and (<= 97 key-num)   ; "a"
                                                     (>= 122 key-num)) ; "z"
                                                (- key-num 96) key-num)))
-                                  t)))
-          ;; Qualified with the allout prefix - do hot-spot operation.
+                                  t))))
+          ;; Qualified as an allout command - do hot-spot operation.
           (setq allout-post-goto-bullet t)
         ;; accept-defaults nil, or else we'll get allout-item-icon-key-handler.
         (setq mapped-binding (key-binding (char-to-string key-num))))
 
       (while (keymapp mapped-binding)
         (setq mapped-binding
-              (lookup-key mapped-binding (read-key-sequence-vector nil t))))
+              (lookup-key mapped-binding (vector (read-char)))))
 
       (if mapped-binding
           (setq this-command mapped-binding)))))
@@ -3036,7 +3279,7 @@ Offer one suitable for current depth DEPTH as default."
       (setq choice (solicit-char-in-string
                     (format "Select bullet: %s ('%s' default): "
                             sans-escapes
-                            default-bullet)
+                            (substring-no-properties default-bullet))
                     sans-escapes
                     t)))
     (message "")
@@ -3275,7 +3518,7 @@ Nuances:
                              (allout-ascend-to-depth depth))
                             ((>= relative-depth 1) nil)
                             (t (allout-back-to-current-heading)))
-                      (setq ref-depth (allout-recent-depth))
+                      (setq ref-depth allout-recent-depth)
                       (setq ref-bullet
                             (if (> allout-recent-prefix-end 1)
                                 (allout-recent-bullet)
@@ -3363,7 +3606,7 @@ Nuances:
                 (setq dbl-space t))
             (if (save-excursion
                   (allout-next-heading)
-                  (when (> (allout-recent-depth) ref-depth)
+                  (when (> allout-recent-depth ref-depth)
                     ;; This is an offspring.
                     (forward-line -1)
                     (looking-at "^\\s-*$")))
@@ -3388,7 +3631,13 @@ Nuances:
                      (if (and dbl-space (not (> relative-depth 0)))
                          (newline 1))
                      (if (and (not (eobp))
-                              (not (bolp)))
+                              (or (not (bolp))
+                                  (and (not (bobp))
+                                       ;; bolp doesnt detect concealed
+                                       ;; trailing newlines, compensate:
+                                       (save-excursion
+                                         (forward-char -1)
+                                         (allout-hidden-p)))))
                          (forward-char 1))))
           ))
     (setq start (point))
@@ -3507,23 +3756,28 @@ Note that refill of indented paragraphs is not done."
   (interactive "p")
   (let ((initial-col (current-column))
         (on-bullet (eq (point)(allout-current-bullet-pos)))
+        from to
         (backwards (if (< arg 0)
                        (setq arg (* arg -1)))))
     (while (> arg 0)
       (save-excursion (allout-back-to-current-heading)
                       (allout-end-of-prefix)
+                      (setq from allout-recent-prefix-beginning
+                            to allout-recent-prefix-end)
                       (allout-rebullet-heading t        ;;; solicit
                                                 nil     ;;; depth
                                                 nil     ;;; number-control
                                                 nil     ;;; index
-                                                t))     ;;; do-successors
+                                                t)      ;;; do-successors
+                      (run-hook-with-args 'allout-exposure-change-hook
+                                          from to t))
       (setq arg (1- arg))
       (if (<= arg 0)
           nil
         (setq initial-col nil)          ; Override positioning back to init col
         (if (not backwards)
             (allout-next-visible-heading 1)
-          (allout-goto-prefix)
+          (allout-goto-prefix-doublechecked)
           (allout-next-visible-heading -1))))
     (message "Done.")
     (cond (on-bullet (goto-char (allout-current-bullet-pos)))
@@ -3573,7 +3827,7 @@ this function."
          (new-depth (or new-depth current-depth))
          (mb allout-recent-prefix-beginning)
          (me allout-recent-prefix-end)
-         (current-bullet (buffer-substring (- me 1) me))
+         (current-bullet (buffer-substring-no-properties (- me 1) me))
          (new-prefix (allout-make-topic-prefix current-bullet
                                                 nil
                                                 new-depth
@@ -3627,11 +3881,17 @@ this function."
     ) ; let* ((current-depth (allout-depth))...)
   ) ; defun
 ;;;_    > allout-rebullet-topic (arg)
-(defun allout-rebullet-topic (arg)
+(defun allout-rebullet-topic (arg &optional sans-offspring)
   "Rebullet the visible topic containing point and all contained subtopics.
 
 Descends into invisible as well as visible topics, however.
 
+When optional sans-offspring is non-nil, subtopics are not
+shifted.  \(Shifting a topic outwards without shifting its
+offspring is disallowed, since this would create a \"containment
+discontinuity\", where the depth difference between a topic and
+its immediate offspring is greater than one.)
+
 With repeat count, shift topic depth by that amount."
   (interactive "P")
   (let ((start-col (current-column)))
@@ -3642,17 +3902,18 @@ With repeat count, shift topic depth by that amount."
       ;; Fill the user in, in case we're shifting a big topic:
       (if (not (zerop arg)) (message "Shifting..."))
       (allout-back-to-current-heading)
-      (if (<= (+ (allout-recent-depth) arg) 0)
+      (if (<= (+ allout-recent-depth arg) 0)
           (error "Attempt to shift topic below level 1"))
-      (allout-rebullet-topic-grunt arg)
+      (allout-rebullet-topic-grunt arg nil nil nil nil sans-offspring)
       (if (not (zerop arg)) (message "Shifting... done.")))
     (move-to-column (max 0 (+ start-col arg)))))
-;;;_     > allout-rebullet-topic-grunt (&optional relative-depth ...)
+;;;_    > allout-rebullet-topic-grunt (&optional relative-depth ...)
 (defun allout-rebullet-topic-grunt (&optional relative-depth
                                                starting-depth
                                                starting-point
                                                index
-                                               do-successors)
+                                               do-successors
+                                               sans-offspring)
   "Like `allout-rebullet-topic', but on nearest containing topic
 \(visible or not).
 
@@ -3663,8 +3924,23 @@ All arguments are optional.
 First arg RELATIVE-DEPTH means to shift the depth of the entire
 topic that amount.
 
-The rest of the args are for internal recursive use by the function
-itself.  The are STARTING-DEPTH, STARTING-POINT, and INDEX."
+Several subsequent args are for internal recursive use by the function
+itself: STARTING-DEPTH, STARTING-POINT, and INDEX.
+
+Finally, if optional SANS-OFFSPRING is non-nil then the offspring
+are not shifted.  \(Shifting a topic outwards without shifting
+its offspring is disallowed, since this would create a
+\"containment discontinuity\", where the depth difference between
+a topic and its immediate offspring is greater than one..)"
+
+  ;; XXX the recursion here is peculiar, and in general the routine may
+  ;; need simplification with refactoring.
+
+  (if (and sans-offspring
+           relative-depth
+           (< relative-depth 0))
+      (error (concat "Attempt to shift topic outwards without offspring,"
+                     " would cause containment discontinuity.")))
 
   (let* ((relative-depth (or relative-depth 0))
          (new-depth (allout-depth))
@@ -3676,44 +3952,57 @@ itself.  The are STARTING-DEPTH, STARTING-POINT, and INDEX."
                     (and (or (zerop relative-depth)
                              (not on-starting-call))
                          (allout-sibling-index))))
+         (starting-index index)
          (moving-outwards (< 0 relative-depth))
-         (starting-point (or starting-point (point))))
+         (starting-point (or starting-point (point)))
+         (local-point (point)))
 
     ;; Sanity check for excessive promotion done only on starting call:
     (and on-starting-call
          moving-outwards
          (> 0 (+ starting-depth relative-depth))
-         (error "Attempt to shift topic out beyond level 1"))   ;;; ====>
+         (error "Attempt to shift topic out beyond level 1"))
 
     (cond ((= starting-depth new-depth)
-           ;; We're at depth to work on this one:
-           (allout-rebullet-heading nil         ;;; solicit
-                                     (+ starting-depth  ;;; starting-depth
-                                        relative-depth)
-                                     nil                ;;; number
-                                     index              ;;; index
-                                     ;; Every contained topic will get hit,
-                                     ;; and we have to get to outside ones
-                                     ;; deliberately:
-                                     nil)               ;;; do-successors
-           ;; ... and work on subsequent ones which are at greater depth:
-           (setq index 0)
-           (allout-next-heading)
-           (while (and (not (eobp))
-                       (< starting-depth (allout-recent-depth)))
-             (setq index (1+ index))
-             (allout-rebullet-topic-grunt relative-depth   ;;; relative-depth
-                                           (1+ starting-depth);;;starting-depth
-                                           starting-point   ;;; starting-point
-                                           index)))         ;;; index
+           ;; We're at depth to work on this one.
+
+           ;; When shifting out we work on the children before working on
+           ;; the parent to avoid interim `allout-aberrant-container-p'
+           ;; aberrancy, and vice-versa when shifting in:
+           (if (>= relative-depth 0)
+               (allout-rebullet-heading nil
+                                        (+ starting-depth relative-depth)
+                                        nil             ;;; number
+                                        index
+                                        nil)) ;;; do-successors
+           (when (not sans-offspring)
+             ;; ... and work on subsequent ones which are at greater depth:
+             (setq index 0)
+             (allout-next-heading)
+             (while (and (not (eobp))
+                         (< starting-depth (allout-depth)))
+               (setq index (1+ index))
+               (allout-rebullet-topic-grunt relative-depth
+                                            (1+ starting-depth)
+                                            starting-point
+                                            index)))
+           (when (< relative-depth 0)
+             (save-excursion
+               (goto-char local-point)
+               (allout-rebullet-heading nil               ;;; solicit
+                                        (+ starting-depth relative-depth)
+                                        nil             ;;; number
+                                        starting-index
+                                        nil)))) ;;; do-successors
 
           ((< starting-depth new-depth)
            ;; Rare case - subtopic more than one level deeper than parent.
            ;; Treat this one at an even deeper level:
-           (allout-rebullet-topic-grunt relative-depth   ;;; relative-depth
-                                         new-depth        ;;; starting-depth
-                                         starting-point   ;;; starting-point
-                                         index)))         ;;; index
+           (allout-rebullet-topic-grunt relative-depth
+                                         new-depth
+                                         starting-point
+                                         index
+                                         sans-offspring)))
 
     (if on-starting-call
         (progn
@@ -3721,8 +4010,8 @@ itself.  The are STARTING-DEPTH, STARTING-POINT, and INDEX."
           ;; if topic has changed depth
           (if (or do-successors
                   (and (not (zerop relative-depth))
-                       (or (= (allout-recent-depth) starting-depth)
-                           (= (allout-recent-depth) (+ starting-depth
+                       (or (= allout-recent-depth starting-depth)
+                           (= allout-recent-depth (+ starting-depth
                                                         relative-depth)))))
               (allout-rebullet-heading nil nil nil nil t))
           ;; Now rectify numbering of new siblings of the adjusted topic,
@@ -3747,24 +4036,24 @@ Returns final depth."
         was-eobp)
     (while (and (not (eobp))
                 (allout-depth)
-                (>= (allout-recent-depth) depth)
+                (>= allout-recent-depth depth)
                 (>= ascender depth))
                                         ; Skip over all topics at
                                         ; lesser depths, which can not
                                         ; have been disturbed:
       (while (and (not (setq was-eobp (eobp)))
-                  (> (allout-recent-depth) ascender))
+                  (> allout-recent-depth ascender))
         (allout-next-heading))
                                         ; Prime ascender for ascension:
-      (setq ascender (1- (allout-recent-depth)))
-      (if (>= (allout-recent-depth) depth)
+      (setq ascender (1- allout-recent-depth))
+      (if (>= allout-recent-depth depth)
           (allout-rebullet-heading nil  ;;; solicit
                                     nil ;;; depth
                                     nil ;;; number-control
                                     nil ;;; index
                                     t)) ;;; do-successors
       (if was-eobp (goto-char (point-max)))))
-  (allout-recent-depth))
+  allout-recent-depth)
 ;;;_    > allout-number-siblings (&optional denumber)
 (defun allout-number-siblings (&optional denumber)
   "Assign numbered topic prefix to this topic and its siblings.
@@ -3780,7 +4069,7 @@ rebulleting each topic at this level."
   (save-excursion
     (allout-back-to-current-heading)
     (allout-beginning-of-level)
-    (let ((depth (allout-recent-depth))
+    (let ((depth allout-recent-depth)
           (index (if (not denumber) 1))
           (use-bullet (equal '(16) denumber))
           (more t))
@@ -3794,55 +4083,84 @@ 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 items collapsed within it.
+
+With a negative argument, the item is shifted out using
+`allout-shift-out', instead.
+
+With an argument greater than one, shift-in the item but not its
+offspring, making the item into a sibling of its former children,
+and a child of sibling that formerly preceeded it.
+
+You are not allowed to shift the first offspring of a topic
+inwards, because that would yield a \"containment
+discontinuity\", where the depth difference between a topic and
+its immediate offspring is greater than one.  The first topic in
+the file can be adjusted to any positive depth, however."
 
-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)
-      ;; refuse to create a containment discontinuity:
-      (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 "Disallowed shift deeper than"
-                                 " containing topic's children.")))))))
-  (let ((where (point))
-        has-successor)
-    (if (and (< arg 0)
-             (allout-current-topic-collapsed-p)
-             (save-excursion (allout-next-sibling)))
-        (setq has-successor t))
-    (allout-rebullet-topic arg)
-    (when (< arg 0)
-      (save-excursion
-        (if (allout-ascend)
-            (allout-show-children)))
-      (if has-successor
-          (allout-show-children)))
-    (run-hook-with-args 'allout-structure-shifted-hook arg where)))
+  (if (< arg 0)
+      (allout-shift-out (* arg -1))
+    ;; refuse to create a containment discontinuity:
+    (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-doublechecked)
+                                      (if (< (point) start-point)
+                                          allout-recent-depth
+                                        0))))
+            (if (and (> predecessor-depth 0)
+                     (> (1+ current-depth)
+                        (1+ predecessor-depth)))
+                (error (concat "Disallowed shift deeper than"
+                               " containing topic's children."))))))
+    (let ((where (point)))
+      (allout-rebullet-topic 1 (and (> arg 1) 'sans-offspring))
+      (run-hook-with-args 'allout-structure-shifted-hook arg where))))
 ;;;_    > allout-shift-out (arg)
 (defun allout-shift-out (arg)
   "Decrease depth of current heading and any topics collapsed within it.
+This will make the item a sibling of its former container.
 
-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."
+With a negative argument, the item is shifted in using
+`allout-shift-in', instead.
+
+With an argument greater than one, shift-out the item's offspring
+but not the item itself, making the former children siblings of
+the item.
+
+With an argument greater than 1, the item's offspring are shifted
+out without shifting the item.  This will make the immediate
+subtopics into siblings of the item."
   (interactive "p")
-  (allout-shift-in (* arg -1)))
+  (if (< arg 0)
+      (allout-shift-in (* arg -1))
+    ;; Get proper exposure in this area:
+    (save-excursion (if (allout-ascend)
+                        (allout-show-children)))
+    ;; Show collapsed children if there's a successor which will become
+    ;; their sibling:
+    (if (and (allout-current-topic-collapsed-p)
+             (save-excursion (allout-next-sibling)))
+        (allout-show-children))
+    (let ((where (and (allout-depth) allout-recent-prefix-beginning)))
+      (save-excursion
+        (if (> arg 1)
+            ;; Shift the offspring but not the topic:
+            (let ((children-chart (allout-chart-subtree 1)))
+              (if (listp (car children-chart))
+                  ;; whoops:
+                  (setq children-chart (allout-flatten children-chart)))
+              (save-excursion
+                (dolist (child-point children-chart)
+                  (goto-char child-point)
+                  (allout-shift-out 1))))
+          (allout-rebullet-topic (* arg -1))))
+      (run-hook-with-args 'allout-structure-shifted-hook (* arg -1) where))))
 ;;;_   : Surgery (kill-ring) functions with special provisions for outlines:
 ;;;_    > allout-kill-line (&optional arg)
 (defun allout-kill-line (&optional arg)
@@ -3857,27 +4175,32 @@ depth, however."
       (kill-line arg)
     ;; Ah, have to watch out for adjustments:
     (let* ((beg (point))
+           end
            (beg-hidden (allout-hidden-p))
            (end-hidden (save-excursion (allout-end-of-current-line)
+                                       (setq end (point))
                                        (allout-hidden-p)))
-           (depth (allout-depth))
-           (collapsed (allout-current-topic-collapsed-p)))
+           (depth (allout-depth)))
 
-      (if collapsed
-          (put-text-property beg (1+ beg) 'allout-was-collapsed t)
-        (remove-text-properties beg (1+ beg) '(allout-was-collapsed t)))
+      (allout-annotate-hidden beg end)
 
       (if (and (not beg-hidden) (not end-hidden))
           (allout-unprotected (kill-line arg))
         (kill-line arg))
-                                        ; Provide some feedback:
-      (sit-for 0)
       (if allout-numbered-bullet
           (save-excursion               ; Renumber subsequent topics if needed:
             (if (not (looking-at allout-regexp))
                 (allout-next-heading))
             (allout-renumber-to-depth depth)))
       (run-hook-with-args 'allout-structure-deleted-hook depth (point)))))
+;;;_    > allout-copy-line-as-kill ()
+(defun allout-copy-line-as-kill ()
+  "Like allout-kill-topic, but save to kill ring instead of deleting."
+  (interactive)
+  (let ((buffer-read-only t))
+    (condition-case nil
+        (allout-kill-line)
+      (buffer-read-only nil))))
 ;;;_    > allout-kill-topic ()
 (defun allout-kill-topic ()
   "Kill topic together with subtopics.
@@ -3889,20 +4212,13 @@ Trailing whitespace is killed with a topic if that whitespace:
  - would not be added to whitespace already separating the topic from the
    previous one.
 
-Completely collapsed topics are marked as such, for re-collapse
-when yank with allout-yank into an outline as a heading."
-
-  ;; Some finagling is done to make complex topic kills appear faster
-  ;; than they actually are.  A redisplay is performed immediately
-  ;; after the region is deleted, though the renumbering process
-  ;; has yet to be performed.  This means that there may appear to be
-  ;; a lag *after* a kill has been performed.
+Topic exposure is marked with text-properties, to be used by
+allout-yank-processing for exposure recovery."
 
   (interactive)
   (let* ((inhibit-field-text-motion t)
-         (collapsed (allout-current-topic-collapsed-p))
          (beg (prog1 (allout-back-to-current-heading) (beginning-of-line)))
-         (depth (allout-recent-depth)))
+         (depth allout-recent-depth))
     (allout-end-of-current-subtree)
     (if (and (/= (current-column) 0) (not (eobp)))
         (forward-char 1))
@@ -3910,21 +4226,99 @@ when yank with allout-yank into an outline as a heading."
         (if (and (looking-at "\n")
                  (or (save-excursion
                        (or (not (allout-next-heading))
-                           (= depth (allout-recent-depth))))
+                           (= depth allout-recent-depth)))
                      (and (> (- beg (point-min)) 3)
                           (string= (buffer-substring (- beg 2) beg) "\n\n"))))
             (forward-char 1)))
 
-    (if collapsed
-        (allout-unprotected
-         (put-text-property beg (1+ beg) 'allout-was-collapsed t))
-      (allout-unprotected
-       (remove-text-properties beg (1+ beg) '(allout-was-collapsed t))))
+    (allout-annotate-hidden beg (point))
+
     (allout-unprotected (kill-region beg (point)))
-    (sit-for 0)
     (save-excursion
       (allout-renumber-to-depth depth))
     (run-hook-with-args 'allout-structure-deleted-hook depth (point))))
+;;;_    > allout-copy-topic-as-kill ()
+(defun allout-copy-topic-as-kill ()
+  "Like allout-kill-topic, but save to kill ring instead of deleting."
+  (interactive)
+  (let ((buffer-read-only t))
+    (condition-case nil
+        (allout-kill-topic)
+      (buffer-read-only (message "Topic copied...")))))
+;;;_    > allout-annotate-hidden (begin end)
+(defun allout-annotate-hidden (begin end)
+  "Qualify text with properties to indicate exposure status."
+
+  (let ((was-modified (buffer-modified-p))
+        (buffer-read-only nil))
+    (allout-unprotected
+     (remove-text-properties begin end '(allout-was-hidden t)))
+    (save-excursion
+      (goto-char begin)
+      (let (done next prev overlay)
+        (while (not done)
+          ;; at or advance to start of next hidden region:
+          (if (not (allout-hidden-p))
+              (setq next
+                    (max (1+ (point))
+                         (next-single-char-property-change (point)
+                                                           'invisible
+                                                           nil end))))
+          (if (or (not next) (eq prev next))
+              ;; still not at start of hidden area - must not be any left.
+              (setq done t)
+            (goto-char next)
+            (setq prev next)
+            (if (not (allout-hidden-p))
+                ;; still not at start of hidden area.
+                (setq done t)
+              (setq overlay (allout-get-invisibility-overlay))
+              (setq next (overlay-end overlay)
+                    prev next)
+              ;; advance to end of this hidden area:
+              (when next
+                (goto-char next)
+                (allout-unprotected
+                 (put-text-property (overlay-start overlay) next
+                                    'allout-was-hidden t))))))))
+    (set-buffer-modified-p was-modified)))
+;;;_    > allout-hide-by-annotation (begin end)
+(defun allout-hide-by-annotation (begin end)
+  "Translate text properties indicating exposure status into actual exposure."
+  (save-excursion
+    (goto-char begin)
+    (let ((was-modified (buffer-modified-p))
+          done next prev)
+      (while (not done)
+        ;; at or advance to start of next annotation:
+        (if (not (get-text-property (point) 'allout-was-hidden))
+            (setq next (next-single-char-property-change (point)
+                                                         'allout-was-hidden
+                                                         nil end)))
+        (if (or (not next) (eq prev next))
+            ;; no more or not advancing - must not be any left.
+            (setq done t)
+          (goto-char next)
+          (setq prev next)
+          (if (not (get-text-property (point) 'allout-was-hidden))
+              ;; still not at start of annotation.
+              (setq done t)
+            ;; advance to just after end of this annotation:
+            (setq next (next-single-char-property-change (point)
+                                                         'allout-was-hidden
+                                                         nil end))
+            (overlay-put (make-overlay prev next)
+                         'category 'allout-exposure-category)
+            (allout-unprotected
+             (remove-text-properties prev next '(allout-was-hidden t)))
+            (setq prev next)
+            (if next (goto-char next)))))
+      (set-buffer-modified-p was-modified))))
+;;;_    > allout-remove-exposure-annotation (begin end)
+(defun allout-remove-exposure-annotation (begin end)
+  "Remove text properties indicating exposure status."
+  (remove-text-properties begin end '(allout-was-hidden t)))
+
 ;;;_    > allout-yank-processing ()
 (defun allout-yank-processing (&optional arg)
 
@@ -3955,12 +4349,10 @@ however, are left exactly like normal, non-allout-specific yanks."
    (let* ((subj-beg (point))
           (into-bol (bolp))
           (subj-end (allout-mark-marker t))
-          (was-collapsed (get-text-property subj-beg 'allout-was-collapsed))
           ;; 'resituate' if yanking an entire topic into topic header:
           (resituate (and (allout-e-o-prefix-p)
-                          (looking-at (concat "\\(" allout-regexp "\\)"))
-                          (allout-prefix-data (match-beginning 1)
-                                              (match-end 1))))
+                          (looking-at allout-regexp)
+                          (allout-prefix-data)))
           ;; `rectify-numbering' if resituating (where several topics may
           ;; be resituating) or yanking a topic into a topic slot (bol):
           (rectify-numbering (or resituate
@@ -3968,7 +4360,7 @@ however, are left exactly like normal, non-allout-specific yanks."
      (if resituate
                                         ; The yanked stuff is a topic:
          (let* ((prefix-len (- (match-end 1) subj-beg))
-                (subj-depth (allout-recent-depth))
+                (subj-depth allout-recent-depth)
                 (prefix-bullet (allout-recent-bullet))
                 (adjust-to-depth
                  ;; Nil if adjustment unnecessary, otherwise depth to which
@@ -3982,15 +4374,13 @@ however, are left exactly like normal, non-allout-specific yanks."
                                (beginning-of-line)
                                (not (= (point) subj-beg)))
                              (looking-at allout-regexp)
-                             (allout-prefix-data (match-beginning 0)
-                                                 (match-end 0)))
-                        (allout-recent-depth))))
+                             (allout-prefix-data))
+                        allout-recent-depth)))
                 (more t))
            (setq rectify-numbering allout-numbered-bullet)
            (if adjust-to-depth
                                         ; Do the adjustment:
                (progn
-                 (message "... yanking") (sit-for 0)
                  (save-restriction
                    (narrow-to-region subj-beg subj-end)
                                         ; Trim off excessive blank
@@ -4006,7 +4396,7 @@ however, are left exactly like normal, non-allout-specific yanks."
                    (while more
                      (allout-back-to-current-heading)
                                         ; go as high as we can in each bunch:
-                     (while (allout-ascend-to-depth (1- (allout-depth))))
+                     (while (allout-ascend))
                      (save-excursion
                        (allout-rebullet-topic-grunt (- adjust-to-depth
                                                        subj-depth))
@@ -4015,7 +4405,6 @@ however, are left exactly like normal, non-allout-specific yanks."
                          (progn (widen)
                                 (forward-char -1)
                                 (narrow-to-region subj-beg (point))))))
-                 (message "")
                  ;; Preserve new bullet if it's a distinctive one, otherwise
                  ;; use old one:
                  (if (string-match (regexp-quote prefix-bullet)
@@ -4042,19 +4431,19 @@ however, are left exactly like normal, non-allout-specific yanks."
          (progn
            (save-excursion
                                         ; Give some preliminary feedback:
-             (message "... reconciling numbers") (sit-for 0)
+             (message "... reconciling numbers")
                                         ; ... and renumber, in case necessary:
              (goto-char subj-beg)
-             (if (allout-goto-prefix)
+             (if (allout-goto-prefix-doublechecked)
                  (allout-rebullet-heading nil            ;;; solicit
                                           (allout-depth) ;;; depth
                                           nil            ;;; number-control
                                           nil            ;;; index
                                           t))
              (message ""))))
-     (when (and (or into-bol resituate) was-collapsed)
-       (remove-text-properties subj-beg (1+ subj-beg) '(allout-was-collapsed))
-       (allout-hide-current-subtree))
+     (if (or into-bol resituate)
+         (allout-hide-by-annotation (point) (allout-mark-marker t))
+       (allout-remove-exposure-annotation (allout-mark-marker t) (point)))
      (if (not resituate)
          (exchange-point-and-mark))
      (run-hook-with-args 'allout-structure-added-hook subj-beg subj-end))))
@@ -4139,7 +4528,7 @@ by pops to non-distinctive yanks.  Bug..."
                   (error "%s not found and can't be created" file-name)))
             (condition-case failure
                 (find-file-other-window file-name)
-              ('error failure))
+              (error failure))
           (error "%s not found" file-name))
         )
       )
@@ -4198,7 +4587,7 @@ the exposure."
   (interactive)
   (save-excursion
     (let (beg end)
-      (allout-goto-prefix)
+      (allout-goto-prefix-doublechecked)
       (setq beg (if (allout-hidden-p) (1- (point)) (point)))
       (setq end (allout-pre-next-prefix))
       (allout-flag-region beg end nil)
@@ -4235,8 +4624,32 @@ point of non-opened subtree?)"
       (save-excursion
         (allout-beginning-of-current-line)
         (save-restriction
-          (let* ((chart (allout-chart-subtree (or level 1)))
-                 (to-reveal (allout-chart-to-reveal chart (or level 1))))
+          (let* (depth
+                 ;; translate the level spec for this routine to the ones
+                 ;; used by -chart-subtree and -chart-to-reveal:
+                 (chart-level (cond ((not level) 1)
+                                    ((eq level t) nil)
+                                    (t level)))
+                 (chart (allout-chart-subtree chart-level))
+                 (to-reveal (or (allout-chart-to-reveal chart chart-level)
+                                ;; interactive, show discontinuous children:
+                                (and chart
+                                     (interactive-p)
+                                     (save-excursion
+                                       (allout-back-to-current-heading)
+                                       (setq depth (allout-current-depth))
+                                       (and (allout-next-heading)
+                                            (> allout-recent-depth
+                                               (1+ depth))))
+                                     (message
+                                      "Discontinuous offspring; use `%s %s'%s."
+                                      (substitute-command-keys
+                                       "\\[universal-argument]")
+                                      (substitute-command-keys
+                                       "\\[allout-shift-out]")
+                                      " to elevate them.")
+                                     (allout-chart-to-reveal
+                                      chart (- allout-recent-depth depth))))))
             (goto-char start-point)
             (when (and strict (allout-hidden-p))
               ;; Concealed root would already have been taken care of,
@@ -4267,28 +4680,26 @@ Useful for coherently exposing to a random point in a hidden region."
   (save-excursion
     (let ((inhibit-field-text-motion t)
           (orig-pt (point))
-          (orig-pref (allout-goto-prefix))
+          (orig-pref (allout-goto-prefix-doublechecked))
           (last-at (point))
-          bag-it)
-      (while (or bag-it (allout-hidden-p))
+          (bag-it 0))
+      (while (or (> bag-it 1) (allout-hidden-p))
         (while (allout-hidden-p)
-          ;; XXX We would use `(move-beginning-of-line 1)', but it gets
-          ;; stuck on hidden newlines at column 80, as of GNU Emacs 22.0.50.
-          (beginning-of-line)
+          (move-beginning-of-line 1)
           (if (allout-hidden-p) (forward-char -1)))
         (if (= last-at (setq last-at (point)))
-            ;; Oops, we're not making any progress!  Show the current
-            ;; topic completely, and bag this try.
+            ;; Oops, we're not making any progress!  Show the current topic
+            ;; completely, and try one more time here, if we haven't already.
             (progn (beginning-of-line)
                    (allout-show-current-subtree)
                    (goto-char orig-pt)
-                   (setq bag-it t)
-                   (beep)
-                   (message "%s: %s"
-                            "allout-show-to-offshoot: "
-                            "Aberrant nesting encountered.")))
-        (allout-show-children)
-        (goto-char orig-pref))
+                   (setq bag-it (1+ bag-it))
+                   (if (> bag-it 1)
+                       (error "allout-show-to-offshoot: %s"
+                              "Stumped by aberrant nesting.")))
+          (if (> bag-it 0) (setq bag-it 0))
+          (allout-show-children)
+          (goto-char orig-pref)))
       (goto-char orig-pt)))
   (if (allout-hidden-p)
       (allout-show-entry)))
@@ -4368,10 +4779,10 @@ siblings, even if the target topic is already closed."
          (current-exposed (not (allout-current-topic-collapsed-p t))))
     (cond (current-exposed (allout-flag-current-subtree t))
           (just-close nil)
-          ((allout-up-current-level 1 t) (allout-hide-current-subtree))
+          ((allout-ascend) (allout-hide-current-subtree))
           (t (goto-char 0)
              (message sibs-msg)
-             (allout-goto-prefix)
+             (allout-goto-prefix-doublechecked)
              (allout-expose-topic '(0 :))
              (message (concat sibs-msg "  Done."))))
     (goto-char from)))
@@ -4494,7 +4905,10 @@ Examples:
           (cond ((eq curr-elem '*) (allout-show-current-subtree)
                  (if (> allout-recent-end-of-subtree max-pos)
                      (setq max-pos allout-recent-end-of-subtree)))
-                ((eq curr-elem '+) (allout-show-current-branches)
+                ((eq curr-elem '+)
+                 (if (not (allout-hidden-p))
+                     (save-excursion (allout-hide-current-subtree t)))
+                 (allout-show-current-branches)
                  (if (> allout-recent-end-of-subtree max-pos)
                      (setq max-pos allout-recent-end-of-subtree)))
                 ((eq curr-elem '-) (allout-show-current-entry))
@@ -4636,7 +5050,7 @@ Examples:
         level, and expose children of subsequent topics at current
         level *except* for the last, which should be opened completely."
   (list 'save-excursion
-        '(if (not (or (allout-goto-prefix)
+        '(if (not (or (allout-goto-prefix-doublechecked)
                       (allout-next-heading)))
              (error "allout-new-exposure: Can't find any outline topics"))
         (list 'allout-expose-topic (list 'quote spec))))
@@ -4758,20 +5172,20 @@ header and body.  The elements of that list are:
       (goto-char start)
       (beginning-of-line)
       ;; Goto initial topic, and register preceeding stuff, if any:
-      (if (> (allout-goto-prefix) start)
+      (if (> (allout-goto-prefix-doublechecked) start)
           ;; First topic follows beginning point - register preliminary stuff:
           (setq result (list (list 0 "" nil
                                    (buffer-substring start (1- (point)))))))
       (while (and (not done)
                   (not (eobp))          ; Loop until we've covered the region.
                   (not (> (point) end)))
-        (setq depth (allout-recent-depth)       ; Current topics depth,
+        (setq depth allout-recent-depth         ; Current topics depth,
               bullet (allout-recent-bullet)     ; ... bullet,
               prefix (allout-recent-prefix)
               beg (progn (allout-end-of-prefix t) (point))) ; and beginning.
         (setq done                      ; The boundary for the current topic:
               (not (allout-next-visible-heading 1)))
-        (setq new-depth (allout-recent-depth))
+        (setq new-depth allout-recent-depth)
         (setq gone-out out
               out (< new-depth depth))
         (beginning-of-line)
@@ -4788,7 +5202,8 @@ header and body.  The elements of that list are:
                          (allout-back-to-visible-text)))
                       strings))
           (when (< (point) next)      ; Resume from after hid text, if any.
-            (line-move 1))
+            (line-move 1)
+            (beginning-of-line))
           (setq beg (point)))
         ;; Accumulate list for this topic:
         (setq strings (nreverse strings))
@@ -5040,10 +5455,10 @@ environment.  Leaves point at the end of the line."
                                 ;;"\\\\\\|\\{\\|\\}\\|\\_\\|\\$\\|\\\"\\|\\&\\|\\^\\|\\-\\|\\*\\|#"
                                 end     ; bounded by end-of-line
                                 1)   ; no matches, move to end & return nil
-        (goto-char (match-beginning 0))
+        (goto-char (match-beginning 2))
         (insert "\\")
         (setq end (1+ end))
-        (goto-char (1+ (match-end 0)))))))
+        (goto-char (1+ (match-end 2)))))))
 ;;;_   > allout-insert-latex-header (buffer)
 (defun allout-insert-latex-header (buffer)
   "Insert initial LaTeX commands at point in BUFFER."
@@ -5089,7 +5504,7 @@ environment.  Leaves point at the end of the line."
                        (allout-latex-verb-quote (if allout-title
                                                 (condition-case nil
                                                     (eval allout-title)
-                                                  ('error "<unnamed buffer>"))
+                                                  (error "<unnamed buffer>"))
                                               "Unnamed Outline"))
                        "}\n"
                        "\\end{center}\n\n"))
@@ -5228,7 +5643,7 @@ auto-encryption specifics.
 default to symmetric encryption - you must manually \(re)encrypt key-pair
 encrypted topics if you want them to continue to use the key-pair cipher.
 
-Level-1 topics, with prefix consisting solely of an `*' asterisk, cannot be
+Level-one 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.
 
@@ -5291,12 +5706,13 @@ See `allout-toggle-current-subtree-encryption' for more details."
   (save-excursion
     (allout-end-of-prefix t)
 
-    (if (= (allout-recent-depth) 1)
+    (if (= allout-recent-depth 1)
         (error (concat "Cannot encrypt or decrypt level 1 topics -"
                        " shift it in to make it encryptable")))
 
     (let* ((allout-buffer (current-buffer))
            ;; Asses location:
+           (bullet-pos allout-recent-prefix-beginning)
            (after-bullet-pos (point))
            (was-encrypted
             (progn (if (= (point-max) after-bullet-pos)
@@ -5362,12 +5778,9 @@ See `allout-toggle-current-subtree-encryption' for more details."
                     (delete-char 1))
            ;; Add the is-encrypted bullet qualifier:
            (goto-char after-bullet-pos)
-           (insert "*"))
-         )
-       )
-      )
-    )
-  )
+           (insert "*"))))
+      (run-hook-with-args 'allout-structure-added-hook
+                          bullet-pos subtree-end))))
 ;;;_  > allout-encrypt-string (text decrypt allout-buffer key-type for-key
 ;;;                                  fetch-pass &optional retried verifying
 ;;;                                  passphrase)
@@ -5512,7 +5925,8 @@ Returns the resulting string, or nil if the transformation fails."
                      (error "decryption failed")))))
 
           (setq result-text
-                (buffer-substring 1 (- (point-max) (if decrypt 0 1))))
+                (buffer-substring-no-properties
+                 1 (- (point-max) (if decrypt 0 1))))
           )
 
         ;; validate result - non-empty
@@ -5924,17 +6338,8 @@ save.  See `allout-encrypt-unencrypted-on-saves' for more info."
   )
 
 ;;;_ #9 miscellaneous
-;;;_  > allout-mark-topic ()
-(defun allout-mark-topic ()
-  "Put the region around topic currently containing point."
-  (interactive)
-  (let ((inhibit-field-text-motion t))
-    (beginning-of-line))
-  (allout-goto-prefix)
-  (push-mark (point))
-  (allout-end-of-current-subtree)
-  (exchange-point-and-mark))
-;;;_  > outlineify-sticky ()
+;;;_  : Mode:
+;;;_   > outlineify-sticky ()
 ;; outlinify-sticky is correct spelling; provide this alias for sticklers:
 ;;;###autoload
 (defalias 'outlinify-sticky 'outlineify-sticky)
@@ -5958,7 +6363,7 @@ setup for auto-startup."
                       "`allout-mode' docstring: `^Hm'."))
       (allout-adjust-file-variable
        "allout-layout" (or allout-layout '(-1 : 0))))))
-;;;_  > allout-file-vars-section-data ()
+;;;_   > allout-file-vars-section-data ()
 (defun allout-file-vars-section-data ()
   "Return data identifying the file-vars section, or nil if none.
 
@@ -5986,7 +6391,7 @@ Returns list `(beginning-point prefix-string suffix-string)'."
       )
     )
   )
-;;;_  > allout-adjust-file-variable (varname value)
+;;;_   > 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.
 
@@ -6050,7 +6455,38 @@ enable-local-variables must be true for any of this to happen."
       )
     )
   )
-;;;_  > solicit-char-in-string (prompt string &optional do-defaulting)
+;;;_   > allout-get-configvar-values (varname)
+(defun allout-get-configvar-values (configvar-name)
+  "Return a list of values of the symbols in list bound to CONFIGVAR-NAME.
+
+The user is prompted for removal of symbols that are unbound, and they
+otherwise are ignored.
+
+CONFIGVAR-NAME should be the name of the configuration variable,
+not its value."
+
+  (let ((configvar-value (symbol-value configvar-name))
+        got)
+    (dolist (sym configvar-value)
+      (if (not (boundp sym))
+          (if (yes-or-no-p (format "%s entry `%s' is unbound - remove it? "
+                                   configvar-name sym))
+              (delq sym (symbol-value configvar-name)))
+        (push (symbol-value sym) got)))
+    (reverse got)))
+;;;_  : Topics:
+;;;_   > allout-mark-topic ()
+(defun allout-mark-topic ()
+  "Put the region around topic currently containing point."
+  (interactive)
+  (let ((inhibit-field-text-motion t))
+    (beginning-of-line))
+  (allout-goto-prefix-doublechecked)
+  (push-mark (point))
+  (allout-end-of-current-subtree)
+  (exchange-point-and-mark))
+;;;_  : UI:
+;;;_   > 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.
 
@@ -6083,7 +6519,8 @@ Optional arg DO-DEFAULTING indicates to accept empty input (CR)."
       ;; got something out of loop - return it:
       got)
   )
-;;;_  > regexp-sans-escapes (string)
+;;;_  : Strings:
+;;;_   > regexp-sans-escapes (string)
 (defun regexp-sans-escapes (regexp &optional successive-backslashes)
   "Return a copy of REGEXP with all character escapes stripped out.
 
@@ -6106,7 +6543,7 @@ Optional arg SUCCESSIVE-BACKSLASHES is used internally for recursion."
                 (regexp-sans-escapes (substring regexp 1)))
       ;; Exclude first char, but maintain count:
       (regexp-sans-escapes (substring regexp 1) successive-backslashes))))
-;;;_  > count-trailing-whitespace-region (beg end)
+;;;_   > count-trailing-whitespace-region (beg end)
 (defun count-trailing-whitespace-region (beg end)
   "Return number of trailing whitespace chars between BEG and END.
 
@@ -6117,29 +6554,25 @@ If BEG is bigger than END we return 0."
       (goto-char beg)
       (let ((count 0))
         (while (re-search-forward "[    ][      ]*$" end t)
-          (goto-char (1+ (match-beginning 0)))
+          (goto-char (1+ (match-beginning 2)))
           (setq count (1+ count)))
         count))))
-;;;_  > allout-get-configvar-values (varname)
-(defun allout-get-configvar-values (configvar-name)
-  "Return a list of values of the symbols in list bound to CONFIGVAR-NAME.
-
-The user is prompted for removal of symbols that are unbound, and they
-otherwise are ignored.
-
-CONFIGVAR-NAME should be the name of the configuration variable,
-not its value."
-
-  (let ((configvar-value (symbol-value configvar-name))
-        got)
-    (dolist (sym configvar-value)
-      (if (not (boundp sym))
-          (if (yes-or-no-p (format "%s entry `%s' is unbound - remove it? "
-                                   configvar-name sym))
-              (delq sym (symbol-value configvar-name)))
-        (push (symbol-value sym) got)))
-    (reverse got)))
-;;;_  > allout-mark-marker to accommodate divergent emacsen:
+;;;_   > allout-format-quote (string)
+(defun allout-format-quote (string)
+  "Return a copy of string with all \"%\" characters doubled."
+  (apply 'concat
+         (mapcar (lambda (char) (if (= char ?%) "%%" (char-to-string char)))
+                 string)))
+;;;_  : lists
+;;;_   > allout-flatten (list)
+(defun allout-flatten (list)
+  "Return a list of all atoms in list."
+  ;; classic.
+  (cond ((null list) nil)
+        ((atom (car list)) (cons (car list) (allout-flatten (cdr list))))
+        (t (append (allout-flatten (car list)) (allout-flatten (cdr list))))))
+;;;_  : Compatability:
+;;;_   > allout-mark-marker to accommodate divergent emacsen:
 (defun allout-mark-marker (&optional force buffer)
   "Accommodate the different signature for `mark-marker' across Emacsen.
 
@@ -6148,7 +6581,7 @@ so pass them along when appropriate."
   (if (featurep 'xemacs)
       (apply 'mark-marker force buffer)
     (mark-marker)))
-;;;_  > subst-char-in-string if necessary
+;;;_   > 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.
@@ -6160,10 +6593,10 @@ Unless optional argument INPLACE is non-nil, return a new string."
           (if (eq (aref newstr i) fromchar)
               (aset newstr i tochar)))
         newstr)))
-;;;_  > wholenump if necessary
+;;;_   > wholenump if necessary
 (if (not (fboundp 'wholenump))
     (defalias 'wholenump 'natnump))
-;;;_  > remove-overlays if necessary
+;;;_   > remove-overlays if necessary
 (if (not (fboundp 'remove-overlays))
     (defun remove-overlays (&optional beg end name val)
       "Clear BEG and END of overlays whose property NAME has value VAL.
@@ -6190,7 +6623,7 @@ BEG and END default respectively to the beginning and end of buffer."
                   (move-overlay o end (overlay-end o))
                 (delete-overlay o)))))))
   )
-;;;_  > copy-overlay if necessary - xemacs ~ 21.4
+;;;_   > copy-overlay if necessary - xemacs ~ 21.4
 (if (not (fboundp 'copy-overlay))
     (defun copy-overlay (o)
       "Return a copy of overlay O."
@@ -6202,7 +6635,7 @@ BEG and END default respectively to the beginning and end of buffer."
         (while props
           (overlay-put o1 (pop props) (pop props)))
         o1)))
-;;;_  > add-to-invisibility-spec if necessary - xemacs ~ 21.4
+;;;_   > add-to-invisibility-spec if necessary - xemacs ~ 21.4
 (if (not (fboundp 'add-to-invisibility-spec))
     (defun add-to-invisibility-spec (element)
       "Add ELEMENT to `buffer-invisibility-spec'.
@@ -6212,14 +6645,14 @@ that can be added."
           (setq buffer-invisibility-spec (list t)))
       (setq buffer-invisibility-spec
             (cons element buffer-invisibility-spec))))
-;;;_  > remove-from-invisibility-spec if necessary - xemacs ~ 21.4
+;;;_   > remove-from-invisibility-spec if necessary - xemacs ~ 21.4
 (if (not (fboundp 'remove-from-invisibility-spec))
     (defun remove-from-invisibility-spec (element)
       "Remove ELEMENT from `buffer-invisibility-spec'."
       (if (consp buffer-invisibility-spec)
           (setq buffer-invisibility-spec (delete element
                                                  buffer-invisibility-spec)))))
-;;;_  > move-beginning-of-line if necessary - older emacs, xemacs
+;;;_   > move-beginning-of-line if necessary - older emacs, xemacs
 (if (not (fboundp 'move-beginning-of-line))
     (defun move-beginning-of-line (arg)
       "Move point to beginning of current line as displayed.
@@ -6243,7 +6676,7 @@ To ignore intangibility, bind `inhibit-point-motion-hooks' to t."
         (skip-chars-backward "^\n"))
       (vertical-motion 0))
 )
-;;;_  > move-end-of-line if necessary - older emacs, xemacs
+;;;_   > move-end-of-line if necessary - older emacs, xemacs
 (if (not (fboundp 'move-end-of-line))
     (defun move-end-of-line (arg)
       "Move point to end of current line as displayed.
@@ -6283,7 +6716,7 @@ To ignore intangibility, bind `inhibit-point-motion-hooks' to t."
                   (setq arg 1)
                 (setq done t)))))))
   )
-;;;_  > line-move-invisible-p if necessary
+;;;_   > line-move-invisible-p if necessary
 (if (not (fboundp 'line-move-invisible-p))
     (defun line-move-invisible-p (pos)
       "Return non-nil if the character after POS is currently invisible."
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 3889655ff99..cbe571f8fec 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -142,7 +142,7 @@ If value is `verbose', the computed score is shown for each match."
   "Apropos pattern as entered by user.")
 
 (defvar apropos-pattern-quoted nil
-  "Apropos pattern passed through `regexp-quoute'.")
+  "Apropos pattern passed through `regexp-quote'.")
 
 (defvar apropos-words ()
   "Current list of apropos words extracted from `apropos-pattern'.")
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index c1a2047a9c6..15a7461d288 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -215,7 +215,7 @@ If this contains a %s, that will be replaced by the matching rule."
 ;;; " (file-name-nondirectory (buffer-file-name)) " ends here\n"))
   "A list specifying text to insert by default into a new file.
 Elements look like (CONDITION . ACTION) or ((CONDITION . DESCRIPTION) . ACTION).
-CONDITION maybe a regexp that must match the new file's name, or it may be
+CONDITION may be a regexp that must match the new file's name, or it may be
 a symbol that must match the major mode for this element to apply.
 Only the first matching element is effective.
 Optional DESCRIPTION is a string for filling `auto-insert-prompt'.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 9671bf26f25..718feb4dbc9 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -345,24 +345,21 @@ Keymap to display on minor modes.")
   (put 'mode-line-position 'standard-value
        (list `(quote ,standard-mode-line-position))))
 
-(defvar mode-line-buffer-identification-keymap nil "\
+(defvar mode-line-buffer-identification-keymap
+  ;; Add menu of buffer operations to the buffer identification part
+  ;; of the mode line.or header line.
+  (let ((map (make-sparse-keymap)))
+    ;; Bind down- events so that the global keymap won't ``shine
+    ;; through''.
+    (define-key map [mode-line mouse-1] 'mode-line-previous-buffer)
+    (define-key map [header-line down-mouse-1] 'ignore)
+    (define-key map [header-line mouse-1] 'mode-line-previous-buffer)
+    (define-key map [mode-line mouse-3] 'mode-line-next-buffer)
+    (define-key map [header-line down-mouse-3] 'ignore)
+    (define-key map [header-line mouse-3] 'mode-line-next-buffer)
+    map) "\
 Keymap for what is displayed by `mode-line-buffer-identification'.")
 
-;; Add menu of buffer operations to the buffer identification part
-;; of the mode line.or header line.
-;
-(let ((map (make-sparse-keymap)))
-  ;; Bind down- events so that the global keymap won't ``shine
-  ;; through''.
-  (define-key map [mode-line mouse-1] 'mode-line-previous-buffer)
-  (define-key map [header-line down-mouse-1] 'ignore)
-  (define-key map [header-line mouse-1] 'mode-line-previous-buffer)
-  (define-key map [header-line down-mouse-3] 'ignore)
-  (define-key map [mode-line mouse-3] 'mode-line-next-buffer)
-  (define-key map [header-line down-mouse-3] 'ignore)
-  (define-key map [header-line mouse-3] 'mode-line-next-buffer)
-  (setq mode-line-buffer-identification-keymap map))
-
 (defun propertized-buffer-identification (fmt)
   "Return a list suitable for `mode-line-buffer-identification'.
 FMT is a format specifier such as \"%12b\".  This function adds
@@ -615,7 +612,7 @@ language you are using."
 (let ((l (generic-character-list))
       (table (nth 1 global-map)))
   (while l
-    (set-char-table-default table (car l) 'self-insert-command)
+    (aset table (car l) 'self-insert-command)
     (setq l (cdr l))))
 
 (setq help-event-list '(help f1))
diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el
index c7f92a13847..07bc0e247f7 100644
--- a/lisp/calc/calc-lang.el
+++ b/lisp/calc/calc-lang.el
@@ -409,13 +409,54 @@
      ( \\mu        . calcFunc-moebius )))
 
 (put 'tex 'math-variable-table
-  '( ( \\pi        . var-pi )
-     ( \\infty     . var-inf )
-     ( \\infty     . var-uinf )
-     ( \\phi       . var-phi )
-     ( \\gamma     . var-gamma )
-     ( \\sum       . (math-parse-tex-sum calcFunc-sum) )
-     ( \\prod      . (math-parse-tex-sum calcFunc-prod) )))
+  '( 
+    ;; The Greek letters
+    ( \\alpha      . var-alpha )
+    ( \\beta       . var-beta  )
+    ( \\gamma      . var-gamma )
+    ( \\Gamma      . var-Gamma )
+    ( \\delta      . var-delta )
+    ( \\Delta      . var-Delta )
+    ( \\epsilon    . var-epsilon )
+    ( \\varepsilon . var-varepsilon)
+    ( \\zeta       . var-zeta )
+    ( \\eta        . var-eta  )
+    ( \\theta      . var-theta )
+    ( \\vartheta   . var-vartheta )
+    ( \\Theta      . var-Theta )
+    ( \\iota       . var-iota )
+    ( \\kappa      . var-kappa )
+    ( \\lambda     . var-lambda )
+    ( \\Lambda     . var-Lambda )
+    ( \\mu         . var-mu )
+    ( \\nu         . var-nu )
+    ( \\xi         . var-xi )
+    ( \\Xi         . var-Xi )
+    ( \\pi         . var-pi )
+    ( \\varpi      . var-varpi )
+    ( \\Pi         . var-Pi )
+    ( \\rho        . var-rho )
+    ( \\varrho     . var-varrho )
+    ( \\sigma      . var-sigma )
+    ( \\sigma      . var-varsigma )
+    ( \\Sigma      . var-Sigma )
+    ( \\tau        . var-tau )
+    ( \\upsilon    . var-upsilon )
+    ( \\Upsilon    . var-Upsilon )
+    ( \\phi        . var-phi )
+    ( \\varphi     . var-varphi )
+    ( \\Phi        . var-Phi )
+    ( \\chi        . var-chi )
+    ( \\psi        . var-psi )
+    ( \\Psi        . var-Psi )
+    ( \\omega      . var-omega )
+    ( \\Omega      . var-Omega )
+    ;; Others
+    ( \\ell        . var-ell )
+    ( \\infty      . var-inf )
+    ( \\infty      . var-uinf )
+    ( \\sum        . (math-parse-tex-sum calcFunc-sum) )
+    ( \\prod       . (math-parse-tex-sum calcFunc-prod) )))
 
 (put 'tex 'math-complex-format 'i)
 
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index bbb80bebc1d..35b7c19cf1a 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -1101,7 +1101,7 @@ If nil, selections displayed but ignored.")
 (defun calc-dispatch (&optional arg)
   "Invoke the GNU Emacs Calculator.  See `calc-dispatch-help' for details."
   (interactive "P")
-  (sit-for echo-keystrokes)
+;  (sit-for echo-keystrokes)
   (condition-case err   ; look for other keys bound to calc-dispatch
       (let ((keys (this-command-keys)))
         (unless (or (not (stringp keys))
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 29e6fe56b6e..892c76bba0c 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -394,8 +394,8 @@ displayed in a window:
                 (if (and (< appt-comp-time appt-message-warning-time)
                          (> (+ cur-comp-time appt-message-warning-time)
                             appt-max-time))
-                    (setq min-to-app (+ (- (1+ appt-max-time) cur-comp-time))
-                          appt-comp-time))
+                    (setq min-to-app (+ (- (1+ appt-max-time) cur-comp-time)
+                          appt-comp-time)))
 
                 ;; issue warning if the appointment time is
                 ;; within appt-message-warning time
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 38bcc887ec0..6fc18d05837 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -568,11 +568,20 @@ are
 
 Names can be capitalized or not, written in full (as specified by the
 variable `calendar-day-name-array'), or abbreviated (as specified by
-`calendar-day-abbrev-array') with or without a period.  To take effect,
-this variable should be set before the calendar package and its associates
-are loaded.  Otherwise, use one of the functions `european-calendar' or
-`american-calendar' to force the appropriate update."
+`calendar-day-abbrev-array') with or without a period.
+
+Setting this variable directly does not take effect (if the
+calendar package is already loaded).  Rather, use either
+\\[customize] or the functions `european-calendar' and
+`american-calendar'."
   :type 'boolean
+  ;; Without :initialize (require 'calendar) throws an error because
+  ;; american-calendar is undefined at this point.
+  :initialize 'custom-initialize-default
+  :set (lambda (symbol value)
+         (if value
+             (european-calendar)
+           (american-calendar)))
   :group 'diary)
 
 ;;;###autoload
@@ -1582,6 +1591,19 @@ See the documentation of that function for more information."
          (calendar-only-one-frame-setup arg))
         (t (calendar-basic-setup arg))))
 
+(autoload 'diary-view-entries "diary-lib"
+  "Prepare and display a buffer with diary entries.
+Searches your diary file for entries that match ARG days starting with
+the date indicated by the cursor position in the displayed three-month
+calendar."
+  t)
+
+(autoload 'list-calendar-holidays "holidays"
+  "Create a buffer containing the holidays for the current calendar window.
+The holidays are those in the list `calendar-notable-days'.  Returns t if any
+holidays are found, nil if not."
+  t)
+
 (defun calendar-basic-setup (&optional arg)
   "Display a three-month calendar in another window.
 The three months appear side by side, with the current month in the middle
@@ -1649,13 +1671,6 @@ to be replaced by asterisks to highlight it whenever it is in the window."
         (list-calendar-holidays)))
   (run-hooks 'initial-calendar-window-hook))
 
-(autoload 'diary-view-entries "diary-lib"
-  "Prepare and display a buffer with diary entries.
-Searches your diary file for entries that match ARG days starting with
-the date indicated by the cursor position in the displayed three-month
-calendar."
-  t)
-
 (autoload 'view-other-diary-entries "diary-lib"
   "Prepare and display buffer of diary entries from an alternative diary file.
 Searches for entries that match ARG days, starting with the date indicated
@@ -1930,12 +1945,6 @@ to the date indicated by point."
 to the date indicated by point."
   t)
 
-(autoload 'list-calendar-holidays "holidays"
-  "Create a buffer containing the holidays for the current calendar window.
-The holidays are those in the list `calendar-notable-days'.  Returns t if any
-holidays are found, nil if not."
-  t)
-
 (autoload 'cal-tex-cursor-month "cal-tex"
   "Make a buffer with LaTeX commands for the month cursor is on.
 Optional prefix argument specifies number of months to be produced.
diff --git a/lisp/comint.el b/lisp/comint.el
index eb5c9f28a4e..48b747065b5 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -650,7 +650,10 @@ Entry to this mode runs the hooks on `comint-mode-hook'."
   (make-local-variable 'comint-process-echoes)
   (make-local-variable 'comint-file-name-chars)
   (make-local-variable 'comint-file-name-quote-list)
-  (set (make-local-variable 'comint-accum-marker) (make-marker))
+  (make-local-variable 'comint-accum-marker)
+  (setq comint-accum-marker (make-marker))
+  (make-local-variable 'font-lock-defaults)
+  (setq font-lock-defaults '(nil))
   (add-hook 'change-major-mode-hook 'font-lock-defontify nil t)
   ;; This behavior is not useful in comint buffers, and is annoying
   (set (make-local-variable 'next-line-add-newlines) nil))
@@ -765,7 +768,8 @@ buffer.  The hook `comint-exec-hook' is run after each exec."
                     (format "COLUMNS=%d" (window-width)))
             (list "TERM=emacs"
                   (format "TERMCAP=emacs:co#%d:tc=unknown:" (window-width))))
-          (if (getenv "EMACS") nil (list "EMACS=t"))
+          (unless (getenv "EMACS")
+            (list (concat "EMACS=" invocation-directory invocation-name)))
           process-environment))
         (default-directory
           (if (file-accessible-directory-p default-directory)
diff --git a/lisp/completion.el b/lisp/completion.el
index 64bf8026e9d..53dfd7521a5 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -1885,7 +1885,7 @@ Prefix args ::
     (save-excursion
       (goto-char (point-min))
       (catch 'finish-add-completions
-        (with-syntax-table completion-c-def-syntax-table
+        (with-syntax-table completion-c-def-syntax-table
           (while t
             ;; we loop here only when scan-sexps fails
             ;; (i.e. unbalance exps.)
@@ -1895,8 +1895,7 @@ Prefix args ::
                   (cond
                    ((= (preceding-char) ?#)
                     ;; preprocessor macro, see if it's one we handle
-                    (setq string (buffer-substring (point) (+ (point) 6)))
-                    (cond ((member string '("define" "ifdef "))
+                    (cond ((looking-at "\\(define\\|ifdef\\)\\>")
                            ;; skip forward over definition symbol
                            ;; and add it to database
                            (and (forward-word 2)
@@ -1944,9 +1943,9 @@ Prefix args ::
                (throw 'finish-add-completions t))
               (error
                ;; Check for failure in scan-sexps
-               (if (or (string-equal (nth 1 e)
-                                     "Containing expression ends prematurely")
-                       (string-equal (nth 1 e) "Unbalanced parentheses"))
+               (if (member (nth 1 e)
+                           '("Containing expression ends prematurely"
+                             "Unbalanced parentheses"))
                    ;; unbalanced paren., keep going
                    ;;(ding)
                    (forward-line 1)
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 609b5572a08..ab3f7ec2b92 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -389,7 +389,7 @@
   :link '(custom-manual "(emacs)Undo")
   :group 'editing)
 
-(defgroup modeline nil
+(defgroup mode-line nil
   "Content of the modeline."
   :group 'environment)
 
@@ -1521,13 +1521,18 @@ Otherwise use brackets."
             (widget-insert description))
         (widget-insert (format ".
 %s buttons; type RET or click mouse-1 to actuate one.
-Editing a setting changes only the text in the buffer.
-Use the setting's State button to set it or save changes in it.
-Saving a change normally works by editing your Emacs init file.
-See "
+Editing a setting changes only the text in the buffer."
                                (if custom-raised-buttons
                                    "`Raised' text indicates"
                                  "Square brackets indicate")))
+        (if init-file-user
+            (widget-insert "
+Use the setting's State button to set it or save changes in it.
+Saving a change normally works by editing your Emacs init file.")
+            (widget-insert "
+\nSince you started Emacs with `-q', which inhibits use of the
+Emacs init file, you cannot save settings into the Emacs init file."))
+        (widget-insert "\nSee ")
         (widget-create 'custom-manual
                        :tag "Custom file"
                        "(emacs)Saving Customizations")
@@ -4152,6 +4157,8 @@ if only the first line of the docstring is shown."))
                                     recentf-exclude)))
          (old-buffer (find-buffer-visiting filename)))
     (with-current-buffer (or old-buffer (find-file-noselect filename))
+      (unless (eq major-mode 'emacs-lisp-mode)
+        (emacs-lisp-mode))
       (let ((inhibit-read-only t))
         (custom-save-variables)
         (custom-save-faces))
@@ -4255,19 +4262,31 @@ This function does not save the buffer."
         (let ((spec (car-safe (get symbol 'theme-value)))
               (value (get symbol 'saved-value))
               (requests (get symbol 'custom-requests))
-              (now (not (or (custom-variable-p symbol)
-                            (and (not (boundp symbol))
-                                 (not (eq (get symbol 'force-value)
-                                          'rogue))))))
+              (now (and (not (custom-variable-p symbol))
+                        (or (boundp symbol)
+                            (eq (get symbol 'force-value)
+                                'rogue))))
               (comment (get symbol 'saved-variable-comment)))
-          ;; Check `requests'.
+          ;; Check REQUESTS for validity. 
           (dolist (request requests)
             (when (and (symbolp request) (not (featurep request)))
               (message "Unknown requested feature: %s" request)
               (setq requests (delq request requests))))
+          ;; Is there anything customized about this variable?
           (when (or (and spec (eq (car spec) 'user))
                     comment
                     (and (null spec) (get symbol 'saved-value)))
+            ;; Output an element for this variable.
+            ;; It has the form (SYMBOL VALUE-FORM NOW REQUESTS COMMENT).
+            ;; SYMBOL is the variable name.
+            ;; VALUE-FORM is an expression to return the customized value.
+            ;; NOW if non-nil means always set the variable immediately
+            ;; when the customizations are reloaded.  This is used
+            ;; for rogue variables
+            ;; REQUESTS is a list of packages to load before setting the
+            ;; variable.  Each element of it will be passed to `require'.
+            ;; COMMENT is whatever comment the user has specified
+            ;; with the customize facility.
             (unless (bolp)
               (princ "\n"))
             (princ " '(")
@@ -4383,14 +4402,15 @@ This function does not save the buffer."
   "Ignoring WIDGET, create a menu entry for customization group SYMBOL."
   `( ,(custom-unlispify-menu-entry symbol t)
      :filter (lambda (&rest junk)
-               (let ((menu (custom-menu-create ',symbol)))
+               (let* ((menu (custom-menu-create ',symbol)))
                  (if (consp menu) (cdr menu) menu)))))
 
 ;;;###autoload
 (defun custom-menu-create (symbol)
   "Create menu for customization group SYMBOL.
 The menu is in a format applicable to `easy-menu-define'."
-  (let* ((item (vector (custom-unlispify-menu-entry symbol)
+  (let* ((deactivate-mark nil)
+         (item (vector (custom-unlispify-menu-entry symbol)
                        `(customize-group ',symbol)
                        t)))
     (if (and (or (not (boundp 'custom-menu-nesting))
@@ -4435,8 +4455,8 @@ The format is suitable for use with `easy-menu-define'."
   ;; Actually, this misfeature of dense keymaps was fixed on 2001-11-26.
   (let ((map (make-keymap)))
     (set-keymap-parent map widget-keymap)
-    (define-key map [remap self-insert-command] 'custom-no-edit)
-    (define-key map "\^m" 'custom-newline)
+    (define-key map [remap self-insert-command] 'Custom-no-edit)
+    (define-key map "\^m" 'Custom-newline)
     (define-key map " " 'scroll-up)
     (define-key map "\177" 'scroll-down)
     (define-key map "\C-c\C-c" 'Custom-set)
@@ -4448,12 +4468,12 @@ The format is suitable for use with `easy-menu-define'."
     map)
   "Keymap for `custom-mode'.")
 
-(defun custom-no-edit (pos &optional event)
+(defun Custom-no-edit (pos &optional event)
   "Invoke button at POS, or refuse to allow editing of Custom buffer."
   (interactive "@d")
   (error "You can't edit this part of the Custom buffer"))
 
-(defun custom-newline (pos &optional event)
+(defun Custom-newline (pos &optional event)
   "Invoke button at POS, or refuse to allow editing of Custom buffer."
   (interactive "@d")
   (let ((button (get-char-property pos 'button)))
@@ -4535,6 +4555,13 @@ if that value is non-nil."
   (setq widget-documentation-face 'custom-documentation)
   (make-local-variable 'widget-button-face)
   (setq widget-button-face custom-button)
+
+  ;; We need this because of the "More" button on docstrings.
+  ;; Otherwise clicking on "More" can push point offscreen, which
+  ;; causes the window to recenter on point, which pushes the
+  ;; newly-revealed docstring offscreen; which is annoying.  -- cyd.
+  (set (make-local-variable 'widget-button-click-moves-point) t)
+
   (set (make-local-variable 'widget-button-pressed-face) custom-button-pressed)
   (set (make-local-variable 'widget-mouse-face) custom-button-mouse)
 
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index b59cb57aaf6..15f314d75e7 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -344,11 +344,11 @@ since it could result in memory overflow and make Emacs crash."
              (scroll-step windows integer)
              (scroll-conservatively windows integer)
              (scroll-margin windows integer)
-             (hscroll-margin windows integer "21.3")
-             (hscroll-step windows number "21.3")
+             (hscroll-margin windows integer "22.1")
+             (hscroll-step windows number "22.1")
              (truncate-partial-width-windows display boolean)
              (mode-line-inverse-video modeline boolean)
-             (mode-line-in-non-selected-windows modeline boolean "21.3")
+             (mode-line-in-non-selected-windows modeline boolean "22.1")
              (line-number-display-limit display
                                         (choice integer
                                                 (const :tag "No limit" nil)))
@@ -361,17 +361,22 @@ since it could result in memory overflow and make Emacs crash."
              (unibyte-display-via-language-environment mule boolean)
              (blink-cursor-alist cursor alist "22.1")
              (overline-margin display integer "22.1")
+             (mouse-autoselect-window
+              display (choice
+                       (const :tag "Off (nil)" :value nil)
+                       (const :tag "Immediate" :value t)
+                       (number :tag "Delay by secs" :value 0.5)) "22.1")
              ;; xfaces.c
              (scalable-fonts-allowed display boolean)
              ;; xfns.c
              (x-bitmap-file-path installation
                                  (repeat (directory :format "%v")))
-             (x-use-old-gtk-file-dialog menu boolean "22.1")
+             (x-gtk-use-old-file-dialog menu boolean "22.1")
              (x-gtk-show-hidden-files menu boolean "22.1")
+             (x-gtk-file-dialog-help-text menu boolean "22.1")
              (x-gtk-whole-detached-tool-bar x boolean "22.1")
              ;; xterm.c
-             (mouse-autoselect-window display boolean "21.3")
-             (x-use-underline-position-properties display boolean "21.3")
+             (x-use-underline-position-properties display boolean "22.1")
              (x-underline-at-descent-line display boolean "22.1")
              (x-stretch-cursor display boolean "21.1")))
       this symbol group type standard version native-p
diff --git a/lisp/custom.el b/lisp/custom.el
index 2e5c0a59d9b..e69e233614a 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -210,11 +210,11 @@ The following keywords are meaningful:
         `custom-initialize-reset'.
 :set    VALUE should be a function to set the value of the symbol.
         It takes two arguments, the symbol to set and the value to
-        give it.  The default choice of function is `custom-set-default'.
+        give it.  The default choice of function is `set-default'.
 :get    VALUE should be a function to extract the value of symbol.
         The function takes one argument, a symbol, and should return
         the current value for that symbol.  The default choice of function
-        is `custom-default-value'.
+        is `default-value'.
 :require
         VALUE should be a feature symbol.  If you save a value
         for this option, then when your `.emacs' file loads the value,
@@ -874,6 +874,18 @@ COMMENT is a comment string about SYMBOL.
 EXP itself is saved unevaluated as SYMBOL property `saved-value' and
 in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
   (custom-check-theme theme)
+ 
+  ;; Process all the needed autoloads before anything else, so that the
+  ;; subsequent code has all the info it needs (e.g. which var corresponds
+  ;; to a minor mode), regardless of the ordering of the variables.
+  (dolist (entry args)
+    (let* ((symbol (indirect-variable (nth 0 entry))))
+      (unless (or (get symbol 'standard-value)
+                  (memq (get symbol 'custom-autoload) '(nil noset)))
+        ;; This symbol needs to be autoloaded, even just for a `set'.
+        (custom-load-symbol symbol))))
+ 
+  ;; Move minor modes and variables with explicit requires to the end.
   (setq args
         (sort args
               (lambda (a1 a2)
@@ -904,10 +916,6 @@ in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
             (when requests
               (put symbol 'custom-requests requests)
               (mapc 'require requests))
-            (unless (or (get symbol 'standard-value)
-                        (memq (get symbol 'custom-autoload) '(nil noset)))
-              ;; This symbol needs to be autoloaded, even just for a `set'.
-              (custom-load-symbol symbol))
             (setq set (or (get symbol 'custom-set) 'custom-set-default))
             (put symbol 'saved-value (list value))
             (put symbol 'saved-variable-comment comment)
diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index 7433c728405..b89e979ff0b 100644
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -5,10 +5,10 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2006-02-06 13:37:10 ttn>
+;; Time-stamp: <2006/09/15 17:35:06 vinicius>
 ;; Version: 2.1
 ;; Keywords: internal
-;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
+;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/desktop.el b/lisp/desktop.el
index fe5a278bae8..d2b2271d306 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -862,8 +862,10 @@ It returns t if a desktop file was loaded, nil otherwise."
       ;; Desktop file found, process it.
       (let ((desktop-first-buffer nil)
             (desktop-buffer-ok-count 0)
-            (desktop-buffer-fail-count 0))
-        (setq desktop-lazy-timer nil)
+            (desktop-buffer-fail-count 0)
+            ;; Avoid desktop saving during evaluation of desktop buffer.
+            (desktop-save nil))
+        (desktop-lazy-abort)
         ;; Evaluate desktop buffer.
         (load (desktop-full-file-name) t t t)
         ;; `desktop-create-buffer' puts buffers at end of the buffer list.
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 16bdaf152f7..01b3a5949f2 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -1259,6 +1259,7 @@ SWITCHED is non-nil if the patch is already applied."
                    (t "Hunk %s at offset %d lines"))
              msg line-offset)))
 
+(defvar diff-apply-hunk-to-backup-file nil)
 
 (defun diff-apply-hunk (&optional reverse)
   "Apply the current hunk to the source file and go to the next.
@@ -1275,6 +1276,17 @@ With a prefix argument, REVERSE the hunk."
     (cond
      ((null line-offset)
       (error "Can't find the text to patch"))
+     ((with-current-buffer buf
+        (and buffer-file-name
+             (backup-file-name-p buffer-file-name)
+             (not diff-apply-hunk-to-backup-file)
+             (not (set (make-local-variable 'diff-apply-hunk-to-backup-file)
+                       (yes-or-no-p (format "Really apply this hunk to %s? "
+                                            (file-name-nondirectory
+                                             buffer-file-name)))))))
+      (error (substitute-command-keys
+              (format "Use %s\\[diff-apply-hunk] to apply it to the other file"
+                      (if (not reverse) "\\[universal-argument] ")))))
      ((and switched
            ;; A reversed patch was detected, perhaps apply it in reverse.
            (not (save-window-excursion
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 0942c6d1dff..6082fc180dc 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -39,6 +39,11 @@
 ;; We need macros in dired.el to compile properly.
 (eval-when-compile (require 'dired))
 
+(defvar dired-create-files-failures nil
+  "Variable where `dired-create-files' records failing file names.
+Functions that operate recursively can store additional names
+into this list; they also should call `dired-log' to log the errors.")
+
 ;;; 15K
 ;;;###begin dired-cmd.el
 ;; Diffing and compressing
@@ -1145,37 +1150,59 @@ Special value `always' suppresses confirmation."
 ;;;###autoload
 (defun dired-copy-file (from to ok-flag)
   (dired-handle-overwrite to)
-  (condition-case ()
-      (dired-copy-file-recursive from to ok-flag dired-copy-preserve-time t
-                                 dired-recursive-copies)
-    (file-date-error (message "Can't set date")
-                     (sit-for 1))))
+  (dired-copy-file-recursive from to ok-flag dired-copy-preserve-time t
+                             dired-recursive-copies))
 
 (defun dired-copy-file-recursive (from to ok-flag &optional
                                        preserve-time top recursive)
-  (let ((attrs (file-attributes from)))
+  (let ((attrs (file-attributes from))
+        dirfailed)
     (if (and recursive
              (eq t (car attrs))
              (or (eq recursive 'always)
                  (yes-or-no-p (format "Recursive copies of %s? " from))))
         ;; This is a directory.
-        (let ((files (directory-files from nil dired-re-no-dot)))
+        (let ((files
+               (condition-case err
+                   (directory-files from nil dired-re-no-dot)
+                 (file-error
+                  (push (dired-make-relative from)
+                        dired-create-files-failures)
+                  (dired-log "Copying error for %s:\n%s\n" from err)
+                  (setq dirfailed t)
+                  nil))))
           (if (eq recursive 'top) (setq recursive 'always)) ; Don't ask any more.
-          (if (file-exists-p to)
-              (or top (dired-handle-overwrite to))
-            (make-directory to))
+          (unless dirfailed
+            (if (file-exists-p to)
+                (or top (dired-handle-overwrite to))
+              (condition-case err
+                  (make-directory to)
+                (file-error
+                 (push (dired-make-relative from)
+                       dired-create-files-failures)
+                 (setq files nil)
+                 (dired-log "Copying error for %s:\n%s\n" from err)))))
           (while files
             (dired-copy-file-recursive
              (expand-file-name (car files) from)
              (expand-file-name (car files) to)
              ok-flag preserve-time nil recursive)
-            (setq files (cdr files))))
+            (pop files)))
       ;; Not a directory.
       (or top (dired-handle-overwrite to))
-      (if (stringp (car attrs))
-          ;; It is a symlink
-          (make-symbolic-link (car attrs) to ok-flag)
-        (copy-file from to ok-flag dired-copy-preserve-time)))))
+      (condition-case err
+          (if (stringp (car attrs))
+              ;; It is a symlink
+              (make-symbolic-link (car attrs) to ok-flag)
+            (copy-file from to ok-flag dired-copy-preserve-time))
+        (file-date-error 
+         (push (dired-make-relative from)
+               dired-create-files-failures)
+         (dired-log "Can't set date on %s:\n%s\n" from err))
+        (file-error
+         (push (dired-make-relative from)
+               dired-create-files-failures)
+         (dired-log "Copying error for %s:\n%s\n" from err))))))
 
 ;;;###autoload
 (defun dired-rename-file (file newname ok-if-already-exists)
@@ -1297,7 +1324,8 @@ Special value `always' suppresses confirmation."
 ;; newfile's entry, or t to use the current marker character if the
 ;; oldfile was marked.
 
-  (let (failures skipped (success-count 0) (total (length fn-list)))
+  (let (dired-create-files-failures failures
+        skipped (success-count 0) (total (length fn-list)))
     (let (to overwrite-query
              overwrite-backup-query)    ; for dired-handle-overwrite
       (mapcar
@@ -1340,16 +1368,25 @@ ESC or `q' to not overwrite any of the remaining files,
                     (dired-add-file to actual-marker-char))
                 (file-error             ; FILE-CREATOR aborted
                  (progn
-                   (setq failures (cons (dired-make-relative from) failures))
+                   (push (dired-make-relative from)
+                         failures)
                    (dired-log "%s `%s' to `%s' failed:\n%s\n"
                               operation from to err))))))))
        fn-list))
     (cond
+     (dired-create-files-failures
+      (setq failures (nconc failures dired-create-files-failures))
+      (dired-log-summary
+       (format "%s failed for %d file%s in %d requests"
+                operation (length failures)
+                (dired-plural-s (length failures))
+                total)
+       failures))
      (failures
       (dired-log-summary
        (format "%s failed for %d of %d file%s"
-                operation (length failures) total
-                (dired-plural-s total))
+                operation (length failures)
+                total (dired-plural-s total))
        failures))
      (skipped
       (dired-log-summary
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 4d3734bbd5a..942d16d3478 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -958,119 +958,132 @@ dired."
 (defvar dired-guess-shell-alist-default
   (list
    (list "\\.tar$"
-         '(if dired-guess-shell-gnutar
-              (concat dired-guess-shell-gnutar " xvf")
-            "tar xvf")
-         ;; Extract files into a separate subdirectory
-         '(if dired-guess-shell-gnutar
-              (concat "mkdir " (file-name-sans-extension file)
-                      "; " dired-guess-shell-gnutar " -C "
-                      (file-name-sans-extension file) " -xvf")
-            (concat "mkdir " (file-name-sans-extension file)
-                    "; tar -C " (file-name-sans-extension file) " -xvf")))
+         '(if dired-guess-shell-gnutar
+              (concat dired-guess-shell-gnutar " xvf")
+            "tar xvf")
+         ;; Extract files into a separate subdirectory
+         '(if dired-guess-shell-gnutar
+              (concat "mkdir " (file-name-sans-extension file)
+                      "; " dired-guess-shell-gnutar " -C "
+                      (file-name-sans-extension file) " -xvf")
+            (concat "mkdir " (file-name-sans-extension file)
+                    "; tar -C " (file-name-sans-extension file) " -xvf"))
+         ;; List archive contents.
+         '(if dired-guess-shell-gnutar
+              (concat dired-guess-shell-gnutar " tvf")
+            "tar tvf"))
 
    ;; REGEXPS for compressed archives must come before the .Z rule to
    ;; be recognized:
    (list "\\.tar\\.Z$"
-         ;; Untar it.
-         '(if dired-guess-shell-gnutar
-              (concat dired-guess-shell-gnutar " zxvf")
-            (concat "zcat * | tar xvf -"))
-         ;; Optional conversion to gzip format.
-         '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
-                  " " dired-guess-shell-znew-switches))
+         ;; Untar it.
+         '(if dired-guess-shell-gnutar
+              (concat dired-guess-shell-gnutar " zxvf")
+            (concat "zcat * | tar xvf -"))
+         ;; Optional conversion to gzip format.
+         '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
+                  " " dired-guess-shell-znew-switches))
 
    ;; gzip'ed archives
    (list "\\.t\\(ar\\.\\)?gz$"
-         '(if dired-guess-shell-gnutar
-              (concat dired-guess-shell-gnutar " zxvf")
-            (concat "gunzip -qc * | tar xvf -"))
-         ;; Extract files into a separate subdirectory
-         '(if dired-guess-shell-gnutar
-              (concat "mkdir " (file-name-sans-extension file)
-                      "; " dired-guess-shell-gnutar " -C "
-                      (file-name-sans-extension file) " -zxvf")
-            (concat "mkdir " (file-name-sans-extension file)
-                    "; gunzip -qc * | tar -C "
-                    (file-name-sans-extension file) " -xvf -"))
-         ;; Optional decompression.
-         '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q" "")))
+         '(if dired-guess-shell-gnutar
+              (concat dired-guess-shell-gnutar " zxvf")
+            (concat "gunzip -qc * | tar xvf -"))
+         ;; Extract files into a separate subdirectory
+         '(if dired-guess-shell-gnutar
+              (concat "mkdir " (file-name-sans-extension file)
+                      "; " dired-guess-shell-gnutar " -C "
+                      (file-name-sans-extension file) " -zxvf")
+            (concat "mkdir " (file-name-sans-extension file)
+                    "; gunzip -qc * | tar -C "
+                    (file-name-sans-extension file) " -xvf -"))
+         ;; Optional decompression.
+         '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q" ""))
+         ;; List archive contents.
+         '(if dired-guess-shell-gnutar
+              (concat dired-guess-shell-gnutar " ztvf")
+            (concat "gunzip -qc * | tar tvf -")))
 
    ;; bzip2'ed archives
    (list "\\.t\\(ar\\.bz2\\|bz\\)$"
          "bunzip2 -c * | tar xvf -"
-         ;; Extract files into a separate subdirectory
-         '(concat "mkdir " (file-name-sans-extension file)
-                  "; bunzip2 -c * | tar -C "
-                  (file-name-sans-extension file) " -xvf -")
+         ;; Extract files into a separate subdirectory
+         '(concat "mkdir " (file-name-sans-extension file)
+                  "; bunzip2 -c * | tar -C "
+                  (file-name-sans-extension file) " -xvf -")
          ;; Optional decompression.
-         "bunzip2")
+         "bunzip2")
 
    '("\\.shar\\.Z$" "zcat * | unshar")
    '("\\.shar\\.g?z$" "gunzip -qc * | unshar")
 
    '("\\.e?ps$" "ghostview" "xloadimage" "lpr")
    (list "\\.e?ps\\.g?z$" "gunzip -qc * | ghostview -"
-         ;; Optional decompression.
-         '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
+         ;; Optional decompression.
+         '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
    (list "\\.e?ps\\.Z$" "zcat * | ghostview -"
-         ;; Optional conversion to gzip format.
-         '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
-                  " " dired-guess-shell-znew-switches))
+         ;; Optional conversion to gzip format.
+         '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
+                  " " dired-guess-shell-znew-switches))
 
    '("\\.patch$" "cat * | patch")
    (list "\\.patch\\.g?z$" "gunzip -qc * | patch"
-         ;; Optional decompression.
-         '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
+         ;; Optional decompression.
+         '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
    (list "\\.patch\\.Z$" "zcat * | patch"
-         ;; Optional conversion to gzip format.
-         '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
-                  " " dired-guess-shell-znew-switches))
+         ;; Optional conversion to gzip format.
+         '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
+                  " " dired-guess-shell-znew-switches))
 
    ;; The following four extensions are useful with dired-man ("N" key)
    (list "\\.\\(?:[0-9]\\|man\\)$" '(progn (require 'man)
-                             (if (Man-support-local-filenames)
-                                 "man -l"
-                               "cat * | tbl | nroff -man -h")))
+                                           (if (Man-support-local-filenames)
+                                               "man -l"
+                                             "cat * | tbl | nroff -man -h")))
    (list "\\.\\(?:[0-9]\\|man\\)\\.g?z$" '(progn (require 'man)
-                                   (if (Man-support-local-filenames)
-                                       "man -l"
-                                     "gunzip -qc * | tbl | nroff -man -h"))
-         ;; Optional decompression.
-         '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
+                                                 (if (Man-support-local-filenames)
+                                                     "man -l"
+                                                   "gunzip -qc * | tbl | nroff -man -h"))
+         ;; Optional decompression.
+         '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
    (list "\\.[0-9]\\.Z$" '(progn (require 'man)
-                                 (if (Man-support-local-filenames)
-                                     "man -l"
-                                   "zcat * | tbl | nroff -man -h"))
-         ;; Optional conversion to gzip format.
-         '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
-                  " " dired-guess-shell-znew-switches))
+                                 (if (Man-support-local-filenames)
+                                     "man -l"
+                                   "zcat * | tbl | nroff -man -h"))
+         ;; Optional conversion to gzip format.
+         '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
+                  " " dired-guess-shell-znew-switches))
    '("\\.pod$" "perldoc" "pod2man * | nroff -man")
 
-   '("\\.dvi$" "xdvi" "dvips")          ; preview and printing
-   '("\\.au$" "play")                   ; play Sun audiofiles
-   '("\\.mpg$" "mpeg_play")
-   '("\\.uu$" "uudecode")               ; for uudecoded files
+   '("\\.dvi$" "xdvi" "dvips")          ; preview and printing
+   '("\\.au$" "play")                   ; play Sun audiofiles
+   '("\\.mpe?g$\\|\\.avi$" "xine -p")
+   '("\\.wav$" "play")
+   '("\\.uu$" "uudecode")               ; for uudecoded files
    '("\\.hqx$" "mcvert")
-   '("\\.sh$" "sh")                     ; execute shell scripts
-   '("\\.xbm$" "bitmap")                ; view X11 bitmaps
+   '("\\.sh$" "sh")                     ; execute shell scripts
+   '("\\.xbm$" "bitmap")                ; view X11 bitmaps
    '("\\.gp$" "gnuplot")
    '("\\.p[bgpn]m$" "xloadimage")
-   '("\\.gif$" "xloadimage")                    ; view gif pictures
+   '("\\.gif$" "xloadimage")            ; view gif pictures
    '("\\.tif$" "xloadimage")
    '("\\.png$" "display")               ; xloadimage 4.1 doesn't grok PNG
    '("\\.jpe?g$" "xloadimage")
-   '("\\.fig$" "xfig")                  ; edit fig pictures
-   '("\\.out$" "xgraph")                ; for plotting purposes.
+   '("\\.fig$" "xfig")                  ; edit fig pictures
+   '("\\.out$" "xgraph")                ; for plotting purposes.
    '("\\.tex$" "latex" "tex")
    '("\\.texi\\(nfo\\)?$" "makeinfo" "texi2dvi")
-   '("\\.pdf$" "xpdf")              ; edit PDF files
+   '("\\.pdf$" "xpdf")
+   '("\\.doc$" "antiword" "strings")
+   '("\\.rpm$" "rpm -qilp" "rpm -ivh")
+   '("\\.dia$" "dia")
+   '("\\.mgp$" "mgp")
 
    ;; Some other popular archivers.
-   (list "\\.zip$" "unzip"
-         ;; Extract files into a separate subdirectory
-         '(concat "unzip" (if dired-guess-shell-gzip-quiet " -q")
-                  " -d " (file-name-sans-extension file)))
+   (list "\\.zip$" "unzip" "unzip -l"
+         ;; Extract files into a separate subdirectory
+         '(concat "unzip" (if dired-guess-shell-gzip-quiet " -q")
+                  " -d " (file-name-sans-extension file)))
    '("\\.zoo$" "zoo x//")
    '("\\.lzh$" "lharc x")
    '("\\.arc$" "arc x")
@@ -1081,10 +1094,11 @@ dired."
    (list "\\.dz$" "dictunzip")
    (list "\\.bz2$" "bunzip2")
    (list "\\.Z$" "uncompress"
-         ;; Optional conversion to gzip format.
-         '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
-                  " " dired-guess-shell-znew-switches))
-   )
+         ;; Optional conversion to gzip format.
+         '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
+                  " " dired-guess-shell-znew-switches))
+
+   '("\\.sign?$" "gpg --verify"))
 
   "Default alist used for shell command guessing.
 See `dired-guess-shell-alist-user'.")
diff --git a/lisp/dired.el b/lisp/dired.el
index 59fb21a004f..491ef261c11 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2204,40 +2204,40 @@ instead of `dired-actual-switches'."
                  (concat "\\`" (match-string 1 default-directory)))))
       (goto-char (point-min))
       (setq dired-subdir-alist nil)
-      (while (and (re-search-forward dired-subdir-regexp nil t)
-                  ;; Avoid taking a file name ending in a colon
-                  ;; as a subdir name.
-                  (not (save-excursion
-                         (goto-char (match-beginning 0))
-                         (beginning-of-line)
-                         (forward-char 2)
-                         (save-match-data (looking-at dired-re-perms)))))
-        (save-excursion
-          (goto-char (match-beginning 1))
-          (setq new-dir-name
-                (buffer-substring-no-properties (point) (match-end 1))
-                new-dir-name
-                (save-match-data
-                  (if (and R-ftp-base-dir-regex
-                           (not (string= new-dir-name default-directory))
-                           (string-match R-ftp-base-dir-regex new-dir-name))
-                      (concat default-directory
-                              (substring new-dir-name (match-end 0)))
-                    (expand-file-name new-dir-name))))
-          (delete-region (point) (match-end 1))
-          (insert new-dir-name))
-        (setq count (1+ count))
-        (dired-alist-add-1 new-dir-name
-                           ;; Place a sub directory boundary between lines.
-                           (save-excursion
-                             (goto-char (match-beginning 0))
-                             (beginning-of-line)
-                             (point-marker))))
+      (while (re-search-forward dired-subdir-regexp nil t)
+        ;; Avoid taking a file name ending in a colon
+        ;; as a subdir name.
+        (unless (save-excursion
+                  (goto-char (match-beginning 0))
+                  (beginning-of-line)
+                  (forward-char 2)
+                  (save-match-data (looking-at dired-re-perms)))
+          (save-excursion
+            (goto-char (match-beginning 1))
+            (setq new-dir-name
+                  (buffer-substring-no-properties (point) (match-end 1))
+                  new-dir-name
+                  (save-match-data
+                    (if (and R-ftp-base-dir-regex
+                             (not (string= new-dir-name default-directory))
+                             (string-match R-ftp-base-dir-regex new-dir-name))
+                        (concat default-directory
+                                (substring new-dir-name (match-end 0)))
+                      (expand-file-name new-dir-name))))
+            (delete-region (point) (match-end 1))
+            (insert new-dir-name))
+          (setq count (1+ count))
+          (dired-alist-add-1 new-dir-name
+                             ;; Place a sub directory boundary between lines.
+                             (save-excursion
+                               (goto-char (match-beginning 0))
+                               (beginning-of-line)
+                               (point-marker)))))
       (if (and (> count 1) (interactive-p))
-          (message "Buffer includes %d directories" count))
-      ;; We don't need to sort it because it is in buffer order per
-      ;; constructionem.  Return new alist:
-      dired-subdir-alist)))
+          (message "Buffer includes %d directories" count)))
+    ;; We don't need to sort it because it is in buffer order per
+    ;; constructionem.  Return new alist:
+    dired-subdir-alist))
 
 (defun dired-alist-add-1 (dir new-marker)
   ;; Add new DIR at NEW-MARKER.  Don't sort.
@@ -3043,6 +3043,10 @@ Thus, use \\[backward-page] to find the beginning of a group of errors."
                (insert "\f\n")))))))
 
 (defun dired-log-summary (string failures)
+  "State a summary of a command's failures, in echo area and log buffer.
+STRING is an overall summary of the failures.
+FAILURES is a list of file names that we failed to operate on,
+or nil if file names are not applicable."
   (if (= (length failures) 1)
       (message "%s"
                (with-current-buffer dired-log-buffer
diff --git a/lisp/dnd.el b/lisp/dnd.el
index 85881b3261f..1f3c8d71266 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -37,11 +37,11 @@
 
 ;;;###autoload
 (defcustom dnd-protocol-alist
-  '(
-    ("^file:///" . dnd-open-local-file) ; XDND format.
-    ("^file://"  . dnd-open-file)       ; URL with host
-    ("^file:"    . dnd-open-local-file) ; Old KDE, Motif, Sun
-    )
+  '(("^file:///"  . dnd-open-local-file)        ; XDND format.
+    ("^file://"   . dnd-open-file)              ; URL with host
+    ("^file:"     . dnd-open-local-file)        ; Old KDE, Motif, Sun
+    ("^\\(https?\\|ftp\\|file\\|nfs\\)://" . dnd-open-file)
+   )
 
   "The functions to call for different protocols when a drop is made.
 This variable is used by `dnd-handle-one-url' and `dnd-handle-file-name'.
@@ -59,6 +59,22 @@ if some action was made, or nil if the URL is ignored."
   :group 'dnd)
 
 
+(defcustom dnd-open-remote-file-function
+  (if (eq system-type 'windows-nt)
+      'dnd-open-local-file
+    'dnd-open-remote-url)
+  "The function to call when opening a file on a remote machine.
+The function will be called with two arguments; URI and ACTION. See
+`dnd-open-file' for details.
+If nil, then dragging remote files into Emacs will result in an error.
+Predefined functions are `dnd-open-local-file' and `dnd-open-remote-url'.
+`dnd-open-local-file' attempts to open a remote file using its UNC name and
+is the  default on MS-Windows.  `dnd-open-remote-url' uses `url-handler-mode'
+and is the default except for MS-Windows."
+  :version "22.1"
+  :type 'function
+  :group 'dnd)
+
 
 (defcustom dnd-open-file-other-window nil
   "If non-nil, always use find-file-other-window to open dropped files."
@@ -75,7 +91,7 @@ The handler is first located by looking at `dnd-protocol-alist'.
 If no match is found here, and the value of `browse-url-browser-function'
 is a pair of (REGEXP . FUNCTION), those regexps are tried for a match.
 If no match is found, just call `dnd-insert-text'.
-WINDOW is where the drop happend, ACTION is the action for the drop,
+WINDOW is where the drop happened, ACTION is the action for the drop,
 URL is what has been dropped.
 Returns ACTION."
   (require 'browse-url)
@@ -147,7 +163,11 @@ Return nil if URI is not a local file."
 The file is opened in the current window, or a new window if
 `dnd-open-file-other-window' is set.  URI is the url for the file,
 and must have the format file:file-name or file:///file-name.
-The last / in file:/// is part of the file name.  ACTION is ignored."
+The last / in file:/// is part of the file name.  If the system
+natively supports unc file names, then remote urls of the form
+file://server-name/file-name will also be handled by this function.
+An alternative for systems that do not support unc file names is
+`dnd-open-remote-url'. ACTION is ignored."
 
   (let* ((f (dnd-get-local-file-name uri t)))
     (if (and f (file-readable-p f))
@@ -158,6 +178,20 @@ The last / in file:/// is part of the file name.  ACTION is ignored."
           'private)
       (error "Can not read %s" uri))))
 
+(defun dnd-open-remote-url (uri action)
+  "Open a remote file with `find-file' and `url-handler-mode'.
+Turns `url-handler-mode' on if not on before.  The file is opened in the
+current window, or a new window if `dnd-open-file-other-window' is set.
+URI is the url for the file.  ACTION is ignored."
+  (progn
+    (require 'url-handlers)
+    (or url-handler-mode (url-handler-mode))
+    (if dnd-open-file-other-window
+        (find-file-other-window uri)
+      (find-file uri))
+    'private))
+
+
 (defun dnd-open-file (uri action)
   "Open a local or remote file.
 The file is opened in the current window, or a new window if
@@ -169,7 +203,9 @@ The last / in file://hostname/ is part of the file name."
   ;; file.  Otherwise return nil.
   (let ((local-file (dnd-get-local-file-uri uri)))
     (if local-file (dnd-open-local-file local-file action)
-      (error "Remote files not supported"))))
+      (if dnd-open-remote-file-function
+          (funcall dnd-open-remote-file-function uri action)
+        (error "Remote files not supported")))))
 
 
 (defun dnd-insert-text (window action text)
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index dff3c6bee61..015e6bfff3e 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -4281,6 +4281,11 @@ Mail anyway? (y or n) ")
       (setq lis1 (cdr lis1)))
     (cdr result)))
 
+(defun ediff-add-to-history (history-var newelt)
+  (if (fboundp 'add-to-history)
+      (add-to-history history-var newelt)
+    (set history-var (cons newelt (symbol-value history-var)))))
+
 (if (fboundp 'copy-sequence)
     (defalias 'ediff-copy-list 'copy-sequence)
   (defun ediff-copy-list (list)
diff --git a/lisp/ediff.el b/lisp/ediff.el
index 3e0be86b18b..6b37d4c1847 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -7,8 +7,8 @@
 ;; Created: February 2, 1994
 ;; Keywords: comparing, merging, patching, tools, unix
 
-(defconst ediff-version "2.81" "The current version of Ediff")
-(defconst ediff-date "February 18, 2006" "Date of last update")
+(defconst ediff-version "2.81.1" "The current version of Ediff")
+(defconst ediff-date "September 18, 2006" "Date of last update")
 
 
 ;; This file is part of GNU Emacs.
@@ -210,11 +210,12 @@
                                            ediff-last-dir-B
                                          (file-name-directory f)))
                                  (progn
-                                   (add-to-history 'file-name-history
-                                                   (ediff-abbreviate-file-name
-                                                    (expand-file-name
-                                                     (file-name-nondirectory f)
-                                                     dir-B)))
+                                   (ediff-add-to-history
+                                    'file-name-history
+                                    (ediff-abbreviate-file-name
+                                     (expand-file-name
+                                      (file-name-nondirectory f)
+                                      dir-B)))
                                    (ediff-get-default-file-name f 1)))
            )))
   (ediff-files-internal file-A
@@ -245,22 +246,24 @@
                                                     ediff-last-dir-B
                                                   (file-name-directory f)))
                                           (progn
-                                            (add-to-history 'file-name-history
-                                                            (ediff-abbreviate-file-name
-                                                             (expand-file-name
-                                                              (file-name-nondirectory f)
-                                                              dir-B)))
+                                            (ediff-add-to-history
+                                             'file-name-history
+                                             (ediff-abbreviate-file-name
+                                              (expand-file-name
+                                               (file-name-nondirectory f)
+                                               dir-B)))
                                             (ediff-get-default-file-name f 1))))
            (ediff-read-file-name "File C to compare"
                                  (setq dir-C (if ediff-use-last-dir
                                                  ediff-last-dir-C
                                                (file-name-directory ff)))
                                  (progn
-                                   (add-to-history 'file-name-history
-                                                   (ediff-abbreviate-file-name
-                                                    (expand-file-name
-                                                     (file-name-nondirectory ff)
-                                                     dir-C)))
+                                   (ediff-add-to-history
+                                    'file-name-history
+                                    (ediff-abbreviate-file-name
+                                     (expand-file-name
+                                      (file-name-nondirectory ff)
+                                      dir-C)))
                                    (ediff-get-default-file-name ff 2)))
            )))
   (ediff-files-internal file-A
@@ -1103,11 +1106,12 @@ lines.  For small regions, use `ediff-regions-wordwise'."
                                            ediff-last-dir-B
                                          (file-name-directory f)))
                                  (progn
-                                   (add-to-history 'file-name-history
-                                                   (ediff-abbreviate-file-name
-                                                    (expand-file-name
-                                                     (file-name-nondirectory f)
-                                                     dir-B)))
+                                   (ediff-add-to-history
+                                    'file-name-history
+                                    (ediff-abbreviate-file-name
+                                     (expand-file-name
+                                      (file-name-nondirectory f)
+                                      dir-B)))
                                    (ediff-get-default-file-name f 1)))
            )))
   (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))
@@ -1146,11 +1150,12 @@ lines.  For small regions, use `ediff-regions-wordwise'."
                                                     ediff-last-dir-B
                                                   (file-name-directory f)))
                                           (progn
-                                            (add-to-history 'file-name-history
-                                                            (ediff-abbreviate-file-name
-                                                             (expand-file-name
-                                                              (file-name-nondirectory f)
-                                                              dir-B)))
+                                            (ediff-add-to-history
+                                             'file-name-history
+                                             (ediff-abbreviate-file-name
+                                              (expand-file-name
+                                               (file-name-nondirectory f)
+                                               dir-B)))
                                             (ediff-get-default-file-name f 1))))
            (ediff-read-file-name "Ancestor file"
                                  (setq dir-ancestor
@@ -1158,11 +1163,12 @@ lines.  For small regions, use `ediff-regions-wordwise'."
                                            ediff-last-dir-ancestor
                                          (file-name-directory ff)))
                                  (progn
-                                   (add-to-history 'file-name-history
-                                                   (ediff-abbreviate-file-name
-                                                    (expand-file-name
-                                                     (file-name-nondirectory ff)
-                                                     dir-ancestor)))
+                                   (ediff-add-to-history
+                                    'file-name-history
+                                    (ediff-abbreviate-file-name
+                                     (expand-file-name
+                                      (file-name-nondirectory ff)
+                                      dir-ancestor)))
                                    (ediff-get-default-file-name ff 2)))
            )))
   (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index d03245bf452..5aa8bbd14cc 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -2409,7 +2409,7 @@ If such an advice was found it will be removed from the list of advices
 in that CLASS."
   (interactive (ad-read-advice-specification "Remove advice of"))
   (if (ad-is-advised function)
-      (let* ((advice-to-remove (ad-find-advice function class name)))
+      (let ((advice-to-remove (ad-find-advice function class name)))
         (if advice-to-remove
             (ad-set-advice-info-field
              function class
@@ -2747,7 +2747,7 @@ For that it has to be fbound with a non-autoload definition."
 A three-element list is returned, where the 1st element is the list of
 required arguments, the 2nd is the list of optional arguments, and the 3rd
 is the name of an optional rest parameter (or nil)."
-  (let* (required optional rest)
+  (let (required optional rest)
     (setq rest (car (cdr (memq '&rest arglist))))
     (if rest (setq arglist (reverse (cdr (memq '&rest (reverse arglist))))))
     (setq optional (cdr (memq '&optional arglist)))
@@ -2958,7 +2958,7 @@ Example: `(ad-map-arglists '(a &rest args) '(w x y z))' will return
 
 (defun ad-make-mapped-call (source-arglist target-arglist target-function)
   "Make form to call TARGET-FUNCTION with args from SOURCE-ARGLIST."
-  (let* ((mapped-form (ad-map-arglists source-arglist target-arglist)))
+  (let ((mapped-form (ad-map-arglists source-arglist target-arglist)))
     (if (eq (car mapped-form) 'funcall)
         (cons target-function (cdr (cdr mapped-form)))
       (prog1 mapped-form
diff --git a/lisp/emacs-lisp/bindat.el b/lisp/emacs-lisp/bindat.el
index 1b37f3f772f..792272ef88a 100644
--- a/lisp/emacs-lisp/bindat.el
+++ b/lisp/emacs-lisp/bindat.el
@@ -66,13 +66,13 @@
 ;;
 ;;  The corresponding Lisp bindat specification looks like this:
 ;;
-;;  (setq header-spec
+;;  (setq header-bindat-spec
 ;;    '((dest-ip   ip)
 ;;      (src-ip    ip)
 ;;      (dest-port u16)
 ;;      (src-port  u16)))
 ;;
-;;  (setq data-spec
+;;  (setq data-bindat-spec
 ;;    '((type      u8)
 ;;      (opcode    u8)
 ;;      (length    u16r)  ;; little endian order
@@ -80,12 +80,12 @@
 ;;      (data      vec (length))
 ;;      (align     4)))
 ;;
-;;  (setq packet-spec
-;;    '((header    struct header-spec)
+;;  (setq packet-bindat-spec
+;;    '((header    struct header-bindat-spec)
 ;;      (items     u8)
 ;;      (fill      3)
 ;;      (item      repeat (items)
-;;                 (struct data-spec))))
+;;                 (struct data-bindat-spec))))
 ;;
 ;;
 ;;  A binary data representation may look like
@@ -121,6 +121,9 @@
 ;; Binary Data Structure Specification Format
 ;; ------------------------------------------
 
+;; We recommend using names that end in `-bindat-spec'; such names
+;; are recognized automatically as "risky" variables.
+
 ;; The data specification is formatted as follows:
 
 ;; SPEC    ::= ( ITEM... )
@@ -342,8 +345,8 @@
 
 (defun bindat-unpack (spec bindat-raw &optional bindat-idx)
   "Return structured data according to SPEC for binary data in BINDAT-RAW.
-BINDAT-RAW is a unibyte string or vector.  Optional third arg BINDAT-IDX specifies
-the starting offset in BINDAT-RAW."
+BINDAT-RAW is a unibyte string or vector.
+Optional third arg BINDAT-IDX specifies the starting offset in BINDAT-RAW."
   (when (multibyte-string-p bindat-raw)
     (error "String is multibyte"))
   (unless bindat-idx (setq bindat-idx 0))
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 68603c905a5..666b373ca53 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -2261,7 +2261,8 @@ Code:, and others referenced in the style guide."
                     (re-search-forward "^;;; Code" nil t)
                     (re-search-forward "^(require" nil t)
                     (re-search-forward "^(" nil t))
-                (beginning-of-line)))
+                (beginning-of-line))
+               (t (re-search-forward ";;; .* --- .*\n")))
               (if (checkdoc-y-or-n-p
                    "You should have a \";;; Commentary:\", add one? ")
                   (insert "\n;;; Commentary:\n;; \n\n")
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index e8590933863..b7d63acc861 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2578,21 +2578,7 @@ surrounded by (block NAME ...).
                    (cl-const-expr-val (nth 1 keys)))))
     (cond ((eq test 'eq) (list 'memq a list))
           ((eq test 'equal) (list 'member a list))
-          ((or (null keys) (eq test 'eql))
-           (if (eq (cl-const-expr-p a) t)
-               (list (if (floatp-safe (cl-const-expr-val a)) 'member 'memq)
-                     a list)
-             (if (eq (cl-const-expr-p list) t)
-                 (let ((p (cl-const-expr-val list)) (mb nil) (mq nil))
-                   (if (not (cdr p))
-                       (and p (list 'eql a (list 'quote (car p))))
-                     (while p
-                       (if (floatp-safe (car p)) (setq mb t)
-                         (or (integerp (car p)) (symbolp (car p)) (setq mq t)))
-                       (setq p (cdr p)))
-                     (if (not mb) (list 'memq a list)
-                       (if (not mq) (list 'member a list) form))))
-               form)))
+          ((or (null keys) (eq test 'eql)) (list 'memql a list))
           (t form))))
 
 (define-compiler-macro assoc* (&whole form a list &rest keys)
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index 222407f86f2..d2d68189230 100644
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -155,7 +155,11 @@ Like (push X PLACE), except that the list is unmodified if X is `eql' to
 an element already on the list.
 \nKeywords supported:  :test :test-not :key
 \n(fn X PLACE [KEYWORD VALUE]...)"
-  (if (symbolp place) (list 'setq place (list* 'adjoin x place keys))
+  (if (symbolp place)
+      (if (null keys)
+          `(let ((x ,x))
+             (if (memql x ,place) ,place (setq ,place (cons x ,place))))
+        (list 'setq place (list* 'adjoin x place keys)))
     (list* 'callf2 'adjoin x place keys)))
 
 (defun cl-set-elt (seq n val)
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index d4ba8d30623..b22e49dac34 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -200,7 +200,8 @@ Use the command `%s' to change this variable." pretty-name mode))
 See the command `%s' for a description of this minor-mode."
                          (if body "
 Setting this variable directly does not take effect;
-use either \\[customize] or the function `%s'."))))
+either customize it (see the info node `Easy Customization')
+or call the function `%s'."))))
             `(defcustom ,mode ,init-value
                ,(format base-doc-string pretty-name mode mode)
                ,@set
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 805184e15de..98d778f1507 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -432,7 +432,7 @@ Emacs Lisp mode) that support Eldoc.")
 ;; Prime the command list.
 (eldoc-add-command-completions
  "backward-" "beginning-of-" "move-beginning-of-" "delete-other-windows"
- "delete-window"
+ "delete-window" "handle-select-window"
  "end-of-" "move-end-of-" "exchange-point-and-mark" "forward-"
  "indent-for-tab-command" "goto-" "mark-page" "mark-paragraph"
  "mouse-set-point" "move-" "pop-global-mark" "next-" "other-window"
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 50b7d8dc9ef..42c5d3183e7 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -64,7 +64,7 @@
   (concat
    "^\\s-*(\\(def\\(ine-skeleton\\|ine-generic-mode\\|ine-derived-mode\\|\
 ine\\(?:-global\\)?-minor-mode\\|ine-compilation-mode\\|un-cvs-mode\\|\
-foo\\|[^cfgv]\\(\\w\\|\\s_\\)+\\*?\\)\\|easy-mmode-define-[a-z-]+\\|easy-menu-define\\|\
+foo\\|[^icfgv]\\(\\w\\|\\s_\\)+\\*?\\)\\|easy-mmode-define-[a-z-]+\\|easy-menu-define\\|\
 menu-bar-make-toggle\\)"
    find-function-space-re
    "\\('\\|\(quote \\)?%s\\(\\s-\\|$\\|\(\\|\)\\)")
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 82eac50c874..0c66a207351 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -32,9 +32,11 @@
 ;; Layout of a timer vector:
 ;; [triggered-p high-seconds low-seconds usecs repeat-delay
 ;;  function args idle-delay]
+;; triggered-p is nil if the timer is active (waiting to be triggered),
+;;  t if it is inactive ("already triggered", in theory)
 
 (defun timer-create ()
-  "Create a timer object."
+  "Create a timer object which can be passed to `timer-activate'."
   (let ((timer (make-vector 8 nil)))
     (aset timer 0 t)
     timer))
@@ -173,6 +175,10 @@ fire repeatedly that many seconds apart."
 (defun timer-activate (timer &optional triggered-p reuse-cell)
   "Put TIMER on the list of active timers.
 
+If TRIGGERED-P is t, that means to make the timer inactive
+\(put it on the list, but mark it as already triggered).
+To remove from the list, use `cancel-timer'.
+
 REUSE-CELL, if non-nil, is a cons cell to reuse instead
 of allocating a new one."
   (if (and (timerp timer)
@@ -256,10 +262,10 @@ of allocating a new one."
   (setq timer-idle-list (delq timer timer-idle-list))
   nil)
 
-;; Remove TIMER from the list of active timers or idle timers.
-;; Only to be used in this file.  It returns the cons cell
-;; that was removed from the list.
 (defun cancel-timer-internal (timer)
+  "Remove TIMER from the list of active timers or idle timers.
+Only to be used in this file.  It returns the cons cell
+that was removed from the timer list."
   (let ((cell1 (memq timer timer-list))
         (cell2 (memq timer timer-idle-list)))
     (if cell1
@@ -270,7 +276,9 @@ of allocating a new one."
 
 ;;;###autoload
 (defun cancel-function-timers (function)
-  "Cancel all timers scheduled by `run-at-time' which would run FUNCTION."
+  "Cancel all timers which would run FUNCTION.
+This affects ordinary timers such as are scheduled by `run-at-time',
+and idle timers such as are scheduled by `run-with-idle-timer'."
   (interactive "aCancel timers of function: ")
   (let ((tail timer-list))
     (while tail
@@ -284,12 +292,19 @@ of allocating a new one."
       (setq tail (cdr tail)))))
 
 ;; Record the last few events, for debugging.
-(defvar timer-event-last-2 nil)
-(defvar timer-event-last-1 nil)
-(defvar timer-event-last nil)
+(defvar timer-event-last nil
+  "Last timer that was run.")
+(defvar timer-event-last-1 nil
+  "Next-to-last timer that was run.")
+(defvar timer-event-last-2 nil
+  "Third-to-last timer that was run.")
 
 (defvar timer-max-repeats 10
-  "*Maximum number of times to repeat a timer, if real time jumps.")
+  "*Maximum number of times to repeat a timer, if many repeats are delayed.
+Timer invocations can be delayed because Emacs is suspended or busy,
+or because the system's time changes.  If such an occurrence makes it
+appear that many invocations are overdue, this variable controls
+how many will really happen.")
 
 (defun timer-until (timer time)
   "Calculate number of seconds from when TIMER will run, until TIME.
@@ -440,6 +455,7 @@ This function returns a timer object which you can use in `cancel-timer'."
     timer))
 
 (defun with-timeout-handler (tag)
+  "This is the timer function used for the timer made by `with-timeout'."
   (throw tag 'timeout))
 
 ;;;###autoload (put 'with-timeout 'lisp-indent-function 1)
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index 1ebf1186c2d..191be58c0b5 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -265,11 +265,14 @@ display oriented stuff, use `trace-function-background' instead."
 ;;;###autoload
 (defun trace-function-background (function &optional buffer)
   "Traces FUNCTION with trace output going quietly to BUFFER.
-For every call of FUNCTION Lisp-style trace messages that display argument
-and return values will be inserted into BUFFER.  This function generates the
-trace advice for FUNCTION and activates it together with any other advice
-there might be!! Trace output will quietly go to BUFFER without changing
-the window or buffer configuration at all."
+When this tracing is enabled, every call to FUNCTION writes
+a Lisp-style trace message (showing the arguments and return value)
+into BUFFER.  This function generates advice to trace FUNCTION
+and activates it together with any other advice there might be.
+The trace output goes to BUFFER quietly, without changing
+the window or buffer configuration.
+
+BUFFER defaults to `trace-buffer'."
   (interactive
    (list
     (intern
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index b16ae17eda0..236e3e2c9ad 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1097,73 +1097,79 @@ If ARG is the atom `-', scroll upward by nearly full screen."
 ;;; Pre-command hook
 
 (defun cua--pre-command-handler-1 ()
-  (let ((movement (eq (get this-command 'CUA) 'move)))
-
-    ;; Cancel prefix key timeout if user enters another key.
-    (when cua--prefix-override-timer
-      (if (timerp cua--prefix-override-timer)
-          (cancel-timer cua--prefix-override-timer))
-      (setq cua--prefix-override-timer nil))
-
-    ;; Handle shifted cursor keys and other movement commands.
-    ;; If region is not active, region is activated if key is shifted.
-    ;; If region is active, region is cancelled if key is unshifted (and region not started with C-SPC).
-    ;; If rectangle is active, expand rectangle in specified direction and ignore the movement.
-    (if movement
-        (cond
-         ((if window-system
-              (memq 'shift (event-modifiers
-                            (aref (this-single-command-raw-keys) 0)))
-            (or
-             (memq 'shift (event-modifiers
-                           (aref (this-single-command-keys) 0)))
-             ;; See if raw escape sequence maps to a shifted event, e.g. S-up or C-S-home.
-             (and (boundp 'local-function-key-map)
-                  local-function-key-map
-                  (let ((ev (lookup-key local-function-key-map
-                                        (this-single-command-raw-keys))))
-                    (and (vector ev)
-                         (symbolp (setq ev (aref ev 0)))
-                         (string-match "S-" (symbol-name ev)))))))
-          (unless mark-active
-            (push-mark-command nil t))
-          (setq cua--last-region-shifted t)
-          (setq cua--explicit-region-start nil))
-         ((or cua--explicit-region-start cua--rectangle)
-          (unless mark-active
-            (push-mark-command nil nil)))
-         (t
-          ;; If we set mark-active to nil here, the region highlight will not be
-          ;; removed by the direct_output_ commands.
-          (setq deactivate-mark t)))
-
-      ;; Handle delete-selection property on other commands
-      (if (and mark-active (not deactivate-mark))
-          (let* ((ds (or (get this-command 'delete-selection)
-                         (get this-command 'pending-delete)))
-                 (nc (cond
-                      ((not ds) nil)
-                      ((eq ds 'yank)
-                       'cua-paste)
-                      ((eq ds 'kill)
-                       (if cua--rectangle
-                           'cua-copy-rectangle
-                         'cua-copy-region))
-                      ((eq ds 'supersede)
-                       (if cua--rectangle
-                           'cua-delete-rectangle
-                         'cua-delete-region))
-                      (t
-                       (if cua--rectangle
-                           'cua-delete-rectangle ;; replace?
-                         'cua-replace-region)))))
-            (if nc
-                (setq this-original-command this-command
-                      this-command nc)))))
-
-    ;; Detect extension of rectangles by mouse or other movement
-    (setq cua--buffer-and-point-before-command
-          (if cua--rectangle (cons (current-buffer) (point))))))
+  ;; Cancel prefix key timeout if user enters another key.
+  (when cua--prefix-override-timer
+    (if (timerp cua--prefix-override-timer)
+        (cancel-timer cua--prefix-override-timer))
+    (setq cua--prefix-override-timer nil))
+
+  (cond
+   ;; Only symbol commands can have necessary properties
+   ((not (symbolp this-command))
+    nil)
+
+   ;; Handle delete-selection property on non-movement commands
+   ((not (eq (get this-command 'CUA) 'move))
+    (when (and mark-active (not deactivate-mark))
+      (let* ((ds (or (get this-command 'delete-selection)
+                     (get this-command 'pending-delete)))
+             (nc (cond
+                  ((not ds) nil)
+                  ((eq ds 'yank)
+                   'cua-paste)
+                  ((eq ds 'kill)
+                   (if cua--rectangle
+                       'cua-copy-rectangle
+                     'cua-copy-region))
+                  ((eq ds 'supersede)
+                   (if cua--rectangle
+                       'cua-delete-rectangle
+                     'cua-delete-region))
+                  (t
+                   (if cua--rectangle
+                       'cua-delete-rectangle ;; replace?
+                     'cua-replace-region)))))
+        (if nc
+            (setq this-original-command this-command
+                  this-command nc)))))
+
+   ;; Handle shifted cursor keys and other movement commands.
+   ;; If region is not active, region is activated if key is shifted.
+   ;; If region is active, region is cancelled if key is unshifted (and region not started with C-SPC).
+   ;; If rectangle is active, expand rectangle in specified direction and ignore the movement.
+   ((if window-system
+        (memq 'shift (event-modifiers
+                      (aref (this-single-command-raw-keys) 0)))
+      (or
+       (memq 'shift (event-modifiers
+                     (aref (this-single-command-keys) 0)))
+       ;; See if raw escape sequence maps to a shifted event, e.g. S-up or C-S-home.
+       (and (boundp 'local-function-key-map)
+            local-function-key-map
+            (let ((ev (lookup-key local-function-key-map
+                                  (this-single-command-raw-keys))))
+              (and (vector ev)
+                   (symbolp (setq ev (aref ev 0)))
+                   (string-match "S-" (symbol-name ev)))))))
+    (unless mark-active
+      (push-mark-command nil t))
+    (setq cua--last-region-shifted t)
+    (setq cua--explicit-region-start nil))
+
+   ;; Set mark if user explicitly said to do so
+   ((or cua--explicit-region-start cua--rectangle)
+    (unless mark-active
+      (push-mark-command nil nil)))
+
+   ;; Else clear mark after this command.
+   (t
+    ;; If we set mark-active to nil here, the region highlight will not be
+    ;; removed by the direct_output_ commands.
+    (setq deactivate-mark t)))
+
+  ;; Detect extension of rectangles by mouse or other movement
+  (setq cua--buffer-and-point-before-command
+        (if cua--rectangle (cons (current-buffer) (point)))))
 
 (defun cua--pre-command-handler ()
   (when cua-mode
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index af757a2a55c..61d99e6c78d 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -892,12 +892,17 @@ Vi's prefix argument will be used.  Otherwise, the prefix argument passed to
               (t
                ;;(setq ch (read-char-exclusive))
                (setq ch (aref (read-key-sequence nil) 0))
+               (if viper-xemacs-p
+                   (setq ch (event-to-character ch)))
                ;; replace ^M with the newline
                (if (eq ch ?\C-m) (setq ch ?\n))
                ;; Make sure ^V and ^Q work as quotation chars
                (if (memq ch '(?\C-v ?\C-q))
-                   ;;(setq ch (read-char-exclusive))
-                   (setq ch (aref (read-key-sequence nil) 0))
+                   (progn
+                     ;;(setq ch (read-char-exclusive))
+                     (setq ch (aref (read-key-sequence nil) 0))
+                     (if viper-xemacs-p
+                         (setq ch (event-to-character ch))))
                  )
                (insert ch))
               )
@@ -1750,7 +1755,7 @@ invokes the command before that, etc."
 
 ;; Hook used in viper-undo
 (defun viper-after-change-undo-hook (beg end len)
-  (if undo-in-progress
+  (if (and (boundp 'undo-in-progress) undo-in-progress)
       (setq undo-beg-posn beg
             undo-end-posn (or end beg))
     ;; some other hooks may be changing various text properties in
@@ -3093,7 +3098,7 @@ If point is on a widget or a button, simulate clicking on that widget/button."
                (and (consp widget)
                     (get (widget-type widget) 'widget-type))))
         (widget-button-press (point))
-      (if (button-at (point))
+      (if (and (fboundp 'button-at) (fboundp 'push-button) (button-at (point)))
           (push-button)
         ;; not a widget or a button
         (viper-leave-region-active)
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 0ba7bdd041a..ea70ad609ad 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -9,7 +9,7 @@
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Keywords: emulations
 
-(defconst viper-version "3.12 of February 18, 2006"
+(defconst viper-version "3.13 of September 18, 2006"
   "The current version of Viper")
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/ezimage.el b/lisp/ezimage.el
index 84ad10ad599..ed8fb497aff 100644
--- a/lisp/ezimage.el
+++ b/lisp/ezimage.el
@@ -27,7 +27,7 @@
 ;;
 ;; A few routines for placing an image over text that will work for any
 ;; Emacs implementation without error.  When images are not supported, then
-;; they are justnot displayed.
+;; they are just not displayed.
 ;;
 ;; The idea is that gui buffers (trees, buttons, etc) will have text
 ;; representations of the GUI elements.  These routines will replace the text
diff --git a/lisp/faces.el b/lisp/faces.el
index c893e47ca79..04d4613ac4c 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2089,7 +2089,7 @@ terminal type to a different value."
 
 (defgroup mode-line-faces nil
   "Faces used in the mode line."
-  :group 'modeline
+  :group 'mode-line
   :group 'faces
   :version "22.1")
 
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 5ff63bfdec2..bd0c213ba6e 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -954,7 +954,7 @@ If t, `ffap-tex-init' will initialize this when needed.")
     (substring name 2))))
 
 (defvar ffap-rfc-path
-  (concat (ffap-host-to-filename "ds.internic.net") "/rfc/rfc%s.txt"))
+  (concat (ffap-host-to-filename "ftp.rfc-editor.org") "/in-notes/rfc%s.txt"))
 
 (defun ffap-rfc (name)
   (format ffap-rfc-path
diff --git a/lisp/filecache.el b/lisp/filecache.el
index c0e9e9e5f5d..48ca2206386 100644
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -266,6 +266,7 @@ Defaults to nil on DOS and Windows, and t on other systems."
 ;; Functions to add files to the cache
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+;;;###autoload
 (defun file-cache-add-directory (directory &optional regexp)
   "Add DIRECTORY to the file cache.
 If the optional REGEXP argument is non-nil, only files which match it will
@@ -291,6 +292,7 @@ be added to the cache."
        dir-files)
       (file-cache-add-file-list dir-files))))
 
+;;;###autoload
 (defun file-cache-add-directory-list (directory-list &optional regexp)
   "Add DIRECTORY-LIST (a list of directory names) to the file cache.
 If the optional REGEXP argument is non-nil, only files which match it
@@ -307,6 +309,8 @@ in each directory, not to the directory list itself."
   (mapcar 'file-cache-add-file file-list))
 
 ;; Workhorse function
+
+;;;###autoload
 (defun file-cache-add-file (file)
   "Add FILE to the file cache."
   (interactive "fAdd File: ")
@@ -333,6 +337,7 @@ in each directory, not to the directory list itself."
                     file-cache-alist)))
       )))
 
+;;;###autoload
 (defun file-cache-add-directory-using-find (directory)
   "Use the `find' command to add files to the file cache.
 Find is run in DIRECTORY."
@@ -355,6 +360,7 @@ Find is run in DIRECTORY."
                   "-print")
     (file-cache-add-from-file-cache-buffer)))
 
+;;;###autoload
 (defun file-cache-add-directory-using-locate (string)
   "Use the `locate' command to add files to the file cache.
 STRING is passed as an argument to the locate command."
@@ -366,6 +372,7 @@ STRING is passed as an argument to the locate command."
                 string)
   (file-cache-add-from-file-cache-buffer))
 
+;;;###autoload
 (defun file-cache-add-directory-recursively  (dir &optional regexp)
   "Adds DIR and any subdirectories to the file-cache.
 This function does not use any external programs
diff --git a/lisp/files.el b/lisp/files.el
index e099d30a01f..fbfe0e2c996 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -514,6 +514,9 @@ using \\[toggle-read-only]."
   :type 'boolean
   :group 'view)
 
+(defvar file-name-history nil
+  "History list of file names entered in the minibuffer.")
+
 (put 'ange-ftp-completion-hook-function 'safe-magic t)
 (defun ange-ftp-completion-hook-function (op &rest args)
   "Provides support for ange-ftp host name completion.
@@ -1117,13 +1120,15 @@ expand wildcards (if any) and visit multiple files."
                 (mapcar 'switch-to-buffer (cdr value))))
       (switch-to-buffer-other-frame value))))
 
-(defun find-file-existing (filename &optional wildcards)
-  "Edit the existing file FILENAME.
-Like \\[find-file] but only allow a file that exists."
-  (interactive (find-file-read-args "Find existing file: " t))
-  (unless (file-exists-p filename) (error "%s does not exist" filename))
-  (find-file filename wildcards)
-  (current-buffer))
+(defun find-file-existing (filename)
+   "Edit the existing file FILENAME.
+Like \\[find-file] but only allow a file that exists, and do not allow
+file names with wildcards."
+   (interactive (nbutlast (find-file-read-args "Find existing file: " t)))
+   (if (and (not (interactive-p)) (not (file-exists-p filename)))
+       (error "%s does not exist" filename)
+     (find-file filename)
+     (current-buffer)))
 
 (defun find-file-read-only (filename &optional wildcards)
   "Edit file FILENAME but don't allow changes.
@@ -1310,7 +1315,7 @@ removes automounter prefixes (see the variable `automount-dir-prefix')."
           (setq abbreviated-home-dir
                 (let ((abbreviated-home-dir "$foo"))
                   (concat "^" (abbreviate-file-name (expand-file-name "~"))
-                          "\\(/\\|$\\)"))))
+                          "\\(/\\|\\'\\)"))))
 
       ;; If FILENAME starts with the abbreviated homedir,
       ;; make it start with `~' instead.
@@ -1365,7 +1370,7 @@ If there is no such live buffer, return nil."
                (number (nthcdr 10 attributes))
                (list (buffer-list)) found)
           (and buffer-file-numbers-unique
-               number
+               (car-safe number)       ;Make sure the inode is not just nil.
                (while (and (not found) list)
                  (with-current-buffer (car list)
                    (if (and buffer-file-name
@@ -1904,7 +1909,7 @@ in that case, this function acts as if `enable-local-variables' were t."
      ("\\.[sS]\\'" . asm-mode)
      ("\\.asm\\'" . asm-mode)
      ("[cC]hange\\.?[lL]og?\\'" . change-log-mode)
-     ("[cC]hange[lL]og\\.[0-9]+\\'" . change-log-mode)
+     ("[cC]hange[lL]og[-.][0-9]+\\'" . change-log-mode)
      ("\\$CHANGE_LOG\\$\\.TXT" . change-log-mode)
      ("\\.scm\\.[0-9]*\\'" . scheme-mode)
      ("\\.[ck]?sh\\'\\|\\.shar\\'\\|/\\.z?profile\\'" . sh-mode)
@@ -2396,10 +2401,10 @@ asking you for confirmation."
 ;;
 ;; For variables defined in the C source code the declaration should go here:
 
-;; FIXME: Some variables should be moved according to the rules above.
 (mapc (lambda (pair)
         (put (car pair) 'safe-local-variable (cdr pair)))
-      '((fill-column                     . integerp) ;; C source code
+      '((buffer-read-only                . booleanp) ;; C source code
+        (fill-column                     . integerp) ;; C source code
         (indent-tabs-mode                . booleanp) ;; C source code
         (left-margin                     . integerp) ;; C source code
         (no-update-autoloads             . booleanp)
@@ -2697,8 +2702,8 @@ It is dangerous if either of these conditions are met:
 
  * Its name ends with \"hook(s)\", \"function(s)\", \"form(s)\", \"map\",
    \"program\", \"command(s)\", \"predicate(s)\", \"frame-alist\",
-   \"mode-alist\", \"font-lock-(syntactic-)keyword*\", or
-   \"map-alist\"."
+   \"mode-alist\", \"font-lock-(syntactic-)keyword*\",
+   \"map-alist\", or \"bindat-spec\"."
   ;; If this is an alias, check the base name.
   (condition-case nil
       (setq sym (indirect-variable sym))
@@ -2707,7 +2712,7 @@ It is dangerous if either of these conditions are met:
       (string-match "-hooks?$\\|-functions?$\\|-forms?$\\|-program$\\|\
 -commands?$\\|-predicates?$\\|font-lock-keywords$\\|font-lock-keywords\
 -[0-9]+$\\|font-lock-syntactic-keywords$\\|-frame-alist$\\|-mode-alist$\\|\
--map$\\|-map-alist$" (symbol-name sym))))
+-map$\\|-map-alist$\\|-bindat-spec$" (symbol-name sym))))
 
 (defun hack-one-local-variable-quotep (exp)
   (and (consp exp) (eq (car exp) 'quote) (consp (cdr exp))))
@@ -3729,9 +3734,15 @@ This requires the external program `diff' to be in your `exec-path'."
        (recursive-edit)
        ;; Return nil to ask about BUF again.
        nil)
-     "view this file")
-    (?d diff-buffer-with-file
-        "view changes in file"))
+     "view this buffer")
+    (?d (lambda (buf)
+          (save-window-excursion
+            (diff-buffer-with-file buf))
+          (view-buffer (get-buffer-create "*Diff*")
+                       (lambda (ignore) (exit-recursive-edit)))
+          (recursive-edit)
+          nil)
+        "view changes in this buffer"))
   "ACTION-ALIST argument used in call to `map-y-or-n-p'.")
 
 (defvar buffer-save-without-query nil
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 88e5414d525..a2895133c27 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -129,8 +129,17 @@ as the final argument."
           args (concat find-dired-find-program " . "
                        (if (string= args "")
                            ""
-                         (concat "\\( " args " \\) "))
-                       (car find-ls-option)))
+                         (concat
+                          (shell-quote-argument "(")
+                          " " args " "
+                          (shell-quote-argument ")")
+                          " "))
+                       (if (equal (car find-ls-option) "-exec ls -ld {} \\;")
+                           (concat "-exec ls -ld "
+                                   (shell-quote-argument "{}")
+                                   " "
+                                   (shell-quote-argument ";"))
+                         (car find-ls-option))))
     ;; Start the find process.
     (shell-command (concat args "&") (current-buffer))
     ;; The next statement will bomb in classic dired (no optional arg allowed)
@@ -215,7 +224,10 @@ Thus ARG can also contain additional grep options."
   (find-dired dir
               (concat "-type f -exec grep " find-grep-options " -e "
                       (shell-quote-argument regexp)
-                      " {} \\\; ")))
+                      " "
+                      (shell-quote-argument "{}")
+                      " "
+                      (shell-quote-argument ";"))))
 
 (defun find-dired-filter (proc string)
   ;; Filter for \\[find-dired] processes.
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 093780c3914..dfd3ec33089 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -718,7 +718,7 @@ see the variables `c-font-lock-extra-types', `c++-font-lock-extra-types',
            ;; If the keywords were compiled before, compile them again.
            (if was-compiled
                (setq font-lock-keywords
-                     (font-lock-compile-keywords font-lock-keywords t)))))))
+                     (font-lock-compile-keywords font-lock-keywords)))))))
 
 (defun font-lock-update-removed-keyword-alist (mode keywords how)
   "Update `font-lock-removed-keywords-alist' when adding new KEYWORDS to MODE."
@@ -825,7 +825,7 @@ happens, so the major mode can be corrected."
            ;; If the keywords were compiled before, compile them again.
            (if was-compiled
                (setq font-lock-keywords
-                     (font-lock-compile-keywords font-lock-keywords t)))))))
+                     (font-lock-compile-keywords font-lock-keywords)))))))
 
 ;;; Font Lock Support mode.
 
@@ -1168,7 +1168,12 @@ what properties to clear before refontifying a region.")
           ;; number of lines.
           ;; (setq beg (progn (goto-char beg) (line-beginning-position))
           ;;       end (progn (goto-char end) (line-beginning-position 2)))
-          )
+          (unless (eq end (point-max))
+            ;; Rounding up to a whole number of lines should include the
+            ;; line right after `end'.  Typical case: the first char of
+            ;; the line was deleted.  Or a \n was inserted in the middle
+            ;; of a line.
+            (setq end (1+ end))))
         (font-lock-fontify-region beg end)))))
 
 (defvar jit-lock-start) (defvar jit-lock-end)
@@ -1205,9 +1210,17 @@ This function does 2 things:
         (setq beg (or (previous-single-property-change
                        beg 'font-lock-multiline)
                       (point-min))))
-      (setq end (or (text-property-any end (point-max)
-                                       'font-lock-multiline nil)
-                    (point-max)))
+      (when (< end (point-max))
+        (setq end
+              (if (get-text-property end 'font-lock-multiline)
+                  (or (text-property-any end (point-max)
+                                         'font-lock-multiline nil)
+                      (point-max))
+                ;; Rounding up to a whole number of lines should include the
+                ;; line right after `end'.  Typical case: the first char of
+                ;; the line was deleted.  Or a \n was inserted in the middle
+                ;; of a line.
+                (1+ end))))
       ;; Finally, pre-enlarge the region to a whole number of lines, to try
       ;; and anticipate what font-lock-default-fontify-region will do, so as to
       ;; avoid double-redisplay.
@@ -1217,11 +1230,11 @@ This function does 2 things:
       (when (memq 'font-lock-extend-region-wholelines
                   font-lock-extend-region-functions)
         (goto-char beg)
-        (forward-line 0)
-        (setq jit-lock-start (min jit-lock-start (point)))
+        (setq jit-lock-start (min jit-lock-start (line-beginning-position)))
         (goto-char end)
-        (forward-line 1)
-        (setq jit-lock-end (max jit-lock-end (point)))))))
+        (setq jit-lock-end
+              (max jit-lock-end
+                   (if (bolp) (point) (line-beginning-position 2))))))))
 
 (defun font-lock-fontify-block (&optional arg)
   "Fontify some lines the way `font-lock-fontify-buffer' would.
@@ -1414,7 +1427,8 @@ START should be at the beginning of a line."
   ;; If `font-lock-syntactic-keywords' is not compiled, compile it.
   (unless (eq (car font-lock-syntactic-keywords) t)
     (setq font-lock-syntactic-keywords (font-lock-compile-keywords
-                                        font-lock-syntactic-keywords)))
+                                        font-lock-syntactic-keywords
+                                        t)))
   ;; Get down to business.
   (let ((case-fold-search font-lock-keywords-case-fold-search)
         (keywords (cddr font-lock-syntactic-keywords))
@@ -1570,7 +1584,7 @@ START should be at the beginning of a line.
 LOUDLY, if non-nil, allows progress-meter bar."
   (unless (eq (car font-lock-keywords) t)
     (setq font-lock-keywords
-          (font-lock-compile-keywords font-lock-keywords t)))
+          (font-lock-compile-keywords font-lock-keywords)))
   (let ((case-fold-search font-lock-keywords-case-fold-search)
         (keywords (cddr font-lock-keywords))
         (bufname (buffer-name)) (count 0)
@@ -1626,12 +1640,12 @@ LOUDLY, if non-nil, allows progress-meter bar."
 
 ;; Various functions.
 
-(defun font-lock-compile-keywords (keywords &optional regexp)
+(defun font-lock-compile-keywords (keywords &optional syntactic-keywords)
   "Compile KEYWORDS into the form (t KEYWORDS COMPILED...)
 Here each COMPILED is of the form (MATCHER HIGHLIGHT ...) as shown in the
 `font-lock-keywords' doc string.
-If REGEXP is non-nil, it means these keywords are used for
-`font-lock-keywords' rather than for `font-lock-syntactic-keywords'."
+If SYNTACTIC-KEYWORDS is non-nil, it means these keywords are used for
+`font-lock-syntactic-keywords' rather than for `font-lock-keywords'."
   (if (not font-lock-set-defaults)
       ;; This should never happen.  But some external packages sometimes
       ;; call font-lock in unexpected and incorrect ways.  It's important to
@@ -1644,10 +1658,12 @@ If REGEXP is non-nil, it means these keywords are used for
     (setq keywords
           (cons t (cons keywords
                         (mapcar 'font-lock-compile-keyword keywords))))
-    (if (and regexp
-             (eq (or syntax-begin-function
-                     font-lock-beginning-of-syntax-function)
-                 'beginning-of-defun)
+    (if (and (not syntactic-keywords)
+             (let ((beg-function
+                    (or font-lock-beginning-of-syntax-function
+                        syntax-begin-function)))
+               (or (eq beg-function 'beginning-of-defun)
+                   (get beg-function 'font-lock-syntax-paren-check)))
              (not beginning-of-defun-function))
         ;; Try to detect when a string or comment contains something that
         ;; looks like a defun and would thus confuse font-lock.
@@ -1774,7 +1790,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
       ;; Now compile the keywords.
       (unless (eq (car font-lock-keywords) t)
         (setq font-lock-keywords
-              (font-lock-compile-keywords font-lock-keywords t))))))
+              (font-lock-compile-keywords font-lock-keywords))))))
 
 ;;; Colour etc. support.
 
diff --git a/lisp/frame.el b/lisp/frame.el
index 1ad42e387a8..c9b9b1ef7de 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -771,7 +771,7 @@ the user during startup."
         (nreverse frame-initial-geometry-arguments))
   (cdr param-list))
 
-(defcustom focus-follows-mouse t
+(defcustom focus-follows-mouse (not (eq window-system 'mac))
   "*Non-nil if window system changes focus when you move the mouse.
 You should set this variable to tell Emacs how your window manager
 handles focus, since there is no way in general for Emacs to find out
@@ -1192,17 +1192,43 @@ For character terminals, each character counts as a single pixel."
      (t
       (frame-width (if (framep display) display (selected-frame)))))))
 
+(defcustom display-mm-dimensions-alist nil
+  "Alist for specifying screen dimensions in millimeters.
+The dimensions will be used for `display-mm-height' and
+`display-mm-width' if defined for the respective display.
+
+Each element of the alist has the form (display . (width . height)),
+e.g. (\":0.0\" . (287 . 215)).
+
+If `display' equals t, it specifies dimensions for all graphical
+displays not explicitely specified."
+  :version "22.1"
+  :type '(alist :key-type (choice (string :tag "Display name")
+                                  (const :tag "Default" t))
+                :value-type (cons :tag "Dimensions"
+                                  (integer :tag "Width")
+                                  (integer :tag "Height")))
+  :group 'frames)
+
 (defun display-mm-height (&optional display)
   "Return the height of DISPLAY's screen in millimeters.
+System values can be overriden by `display-mm-dimensions-alist'.
 If the information is unavailable, value is nil."
   (and (memq (framep-on-display display) '(x w32 mac))
-       (x-display-mm-height display)))
+       (or (cddr (assoc (or display (frame-parameter nil 'display))
+                        display-mm-dimensions-alist))
+           (cddr (assoc t display-mm-dimensions-alist))
+           (x-display-mm-height display))))
 
 (defun display-mm-width (&optional display)
   "Return the width of DISPLAY's screen in millimeters.
+System values can be overriden by `display-mm-dimensions-alist'.
 If the information is unavailable, value is nil."
   (and (memq (framep-on-display display) '(x w32 mac))
-       (x-display-mm-width display)))
+       (or (cadr (assoc (or display (frame-parameter nil 'display))
+                        display-mm-dimensions-alist))
+           (cadr (assoc t display-mm-dimensions-alist))
+           (x-display-mm-width display))))
 
 (defun display-backing-store (&optional display)
   "Return the backing store capability of DISPLAY's screen.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6927e3bfbac..63e7f43424d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,122 @@
+2006-10-04  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-sum.el (gnus-summary-make-menu-bar): Clarify
+        gnus-summary-limit-to-articles.
+
+2006-10-04  Romain Francoise  <romain@orebokech.com>
+
+        * gnus-util.el (gnus-alist-to-hashtable, gnus-hashtable-to-alist):
+        Moved here (and renamed) from gnus-registry.el.
+
+        * gnus-registry.el: Require gnus-util.
+        Use `gnus-alist-to-hashtable' and `gnus-hashtable-to-alist'.
+
+2006-10-04  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * pop3.el (pop3-authentication-scheme): Clarify doc.
+        (pop3-movemail): Warn about pop3-leave-mail-on-server.
+
+2006-10-04  Dave Love  <fx@gnu.org>
+
+        * pop3.el (pop3-authentication-scheme): Add custom version.
+
+2006-10-04  Jesper Harder  <harder@ifa.au.dk>
+
+        * pop3.el (pop3-leave-mail-on-server): Don't quote nil in
+        doc string.  Improve doc string.
+
+2006-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-util.el (gnus-with-local-quit): New macro.
+
+        * gnus-demon.el (gnus-demon): Replace with-local-quit with it.
+
+2006-09-28  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gmm-utils.el (gmm): Adjust custom version.
+
+        * mm-util.el (mm-charset-override-alist, mm-charset-eval-alist): Adjust
+        custom version.
+
+        * gnus-draft.el (gnus-draft-mode): Don't call `mml-mode'.
+
+2006-09-25  Chong Yidong  <cyd@stupidchicken.com>
+
+        * gnus-demon.el (gnus-demon): Use with-local-quit to avoid hangs.
+
+2006-09-19  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+        * nnslashdot.el (nnslashdot-request-article): Update end-of-article
+        regexp.  Articles containing quotation were cut prematurely.
+
+2006-09-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * message.el (message-cite-original-without-signature): Use nobody by
+        default for the value of From header.
+        (message-cite-original): Ditto.
+        (message-reply): Ditto.
+
+2006-09-09  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * pop3.el (pop3-leave-mail-on-server): Mention problem of duplicate
+        mails in the doc string.  Add some URLs in comment.
+
+2006-09-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * rfc2047.el (rfc2047-quote-special-characters-in-quoted-strings): Fix
+        backslashes handling and the way to find boundaries of quoted strings.
+
+2006-09-06  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-art.el (gnus-button-regexp, gnus-button-marker-list)
+        (gnus-button-last): Move up.  Convert comments into doc strings.
+
+2006-09-04  Chong Yidong  <cyd@stupidchicken.com>
+
+        * message.el (message-send-mail-with-sendmail): Look for sendmail in
+        several common directories.
+
+2006-09-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (article-decode-encoded-words): Make it fast.
+
+2006-09-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (article-decode-encoded-words): Don't infloop in XEmacs.
+
+        * rfc2047.el (rfc2047-strip-backslashes-in-quoted-strings): Decode `\\'
+        in quoted string into `\'.
+
+2006-09-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * rfc2047.el (rfc2047-quote-special-characters-in-quoted-strings):
+        Use standard-syntax-table.
+
+2006-09-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (gnus-decode-address-function): New variable.
+        (article-decode-encoded-words): Use it to decode headers which are
+        assumed to contain addresses.
+        (gnus-mime-delete-part): Remove useless `or'.
+
+        * gnus-sum.el (gnus-decode-encoded-address-function): New variable.
+        (gnus-summary-from-or-to-or-newsgroups): Use it to decode To header.
+        (gnus-nov-parse-line): Use it to decode From header.
+        (gnus-get-newsgroup-headers): Ditto.
+        (gnus-summary-enter-digest-group): Use it to decode `to-address'.
+
+        * mail-parse.el (mail-decode-encoded-address-region): New alias.
+        (mail-decode-encoded-address-string): New alias.
+
+        * rfc2047.el (rfc2047-quote-special-characters-in-quoted-strings):
+        New function.
+        (rfc2047-encode-message-header, rfc2047-encode-region): Use it.
+        (rfc2047-strip-backslashes-in-quoted-strings): New fnction.
+        (rfc2047-decode-region): Use it; add optional argument `address-mime'.
+        (rfc2047-decode-string): Ditto.
+        (rfc2047-decode-address-region): New function.
+        (rfc2047-decode-address-string): New function.
+
 2006-08-23  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
         [ Backported bug fix from No Gnus. ]
@@ -389,10 +508,6 @@
         * gnus-sum.el (gnus-get-newsgroup-headers-xover): Group is an
         optional parameter.
 
-2006-04-07  Reiner Steib  <Reiner.Steib@gmx.de>
-
-        * pgg-gpg.el: Revert to revision 7.15 to allow the use of gpg-agent.
-
 2006-04-06  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus-fun.el (gnus): Require it for gnus-directory.
@@ -1191,7 +1306,7 @@
         as a buffer-local variable.  This avoids creating truncated
         dribble files as a result of a hang up, eg.
 
-2005-11-04 Ken Manheimer  <ken.manheimer@gmail.com>
+2005-11-04  Ken Manheimer  <ken.manheimer@gmail.com>
 
         * pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
         (pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
@@ -2826,7 +2941,7 @@
 
         * gnus.el (gnus-group-startup-message): Search for gnus images in
         etc/images/gnus.
-        * mm-util.el (mm-find-charset-region): Likewise.
+        * mm-util.el (mm-image-load-path): Likewise.
         * smiley.el (smiley-data-directory): Search for smilies in
         etc/images/smilies.
 
@@ -3935,7 +4050,7 @@
 
         * gnus-sum.el (gnus-summary-insert-subject): Remove list identifiers.
 
-2004-09-03  Hiroshi Fujishima <pooh@nature.tsukuba.ac.jp>  (tiny change)
+2004-09-03  Hiroshi Fujishima  <pooh@nature.tsukuba.ac.jp>  (tiny change)
 
         * spam-stat.el (spam-stat-reduce-size): Set spam-stat-dirty.
         (spam-stat-save): Accept prefix argument.
@@ -4082,17 +4197,17 @@
 
         * gnus-sum.el (gnus-newsgroup-variables): Doc fix.
 
-2004-08-26  YAGI Tatsuya <ynyaaa@ybb.ne.jp>  (tiny change)
+2004-08-26  YAGI Tatsuya  <ynyaaa@ybb.ne.jp>  (tiny change)
 
         * gnus-art.el (gnus-article-next-page): Fix the way to find a real
         end-of-buffer.
 
-2004-08-26  Stefan Wiens <s.wi@gmx.net>  (tiny change)
+2004-08-26  Stefan Wiens  <s.wi@gmx.net>  (tiny change)
 
         * gnus-sum.el (gnus-read-header): Don't remove a header for the
         parent article of a sparse article in the thread hashtb.
 
-2004-08-26  David Hedbor <dhedbor@real.com>  (tiny change)
+2004-08-26  David Hedbor  <dhedbor@real.com>  (tiny change)
 
         * nnmail.el (nnmail-split-lowercase-expanded): New user option.
         (nnmail-expand-newtext): Lowercase expanded entries if
@@ -4288,7 +4403,7 @@
         * gnus-msg.el (gnus-summary-followup-with-original):
         Document yanking of region when active.
 
-2004-04-13 Kevin Greiner  <kgreiner@xpediantsolutions.com>
+2004-04-13  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-agent.el: Merged 7.3 through 7.7 updates into branch.
         Revision 7.2 changes excluded to maintain compatibility with all
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 50b978e7e75..14b4c23c38a 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -1,4 +1,4 @@
-2004-01-04 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2004-01-04  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Gnus v5.10.6 is released.
 
@@ -10,7 +10,7 @@
 
         * gnus.el (gnus-version-number): Bump.
 
-2004-01-04 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2004-01-04  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Gnus v5.10.5 is released.
 
@@ -58,7 +58,7 @@
 
         * gnus.el (gnus-version-number): Bump.
 
-2004-01-03 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2004-01-03  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Gnus v5.10.4 is released.
 
@@ -81,10 +81,9 @@
         * gnus-nocem.el (gnus-nocem-enter-article): Use the real group
         hashtb (tiny patch).
 
-2004-01-02  Kai Grossjohann  <kai@emptydomain.de>
+2004-01-02  Michael Albinus  <Michael.Albinus@alcatel.de>
 
-        * nnml.el (nnml-save-mail): Grok compressed articles.  From
-        Michael Albinus <Michael.Albinus@alcatel.de>.
+        * nnml.el (nnml-save-mail): Grok compressed articles.
 
 2004-01-02  Teodor Zlatanov  <tzz@lifelogs.com>
 
@@ -144,20 +143,16 @@
         (gnus-summary-goto-article): Allow `%40'.
         (gnus-summary-refer-article): Convert `%40' to `@'.
 
-2003-12-30  Simon Josefsson  <jas@extundo.com>
+2003-12-30  Arne J,Ax(Brgensen  <arne@arnested.dk>
 
         * smime.el (smime-crl-check): New.
-        (smime-verify-region): Use it.  From Arne J,Ax(Brgensen
-        <arne@arnested.dk> in <87llpk9v5q.fsf@seamus.arnested.dk> (tiny
-        change).
+        (smime-verify-region): Use it.
 
 2003-12-30  Reiner Steib  <Reiner.Steib@gmx.de>
 
-        * gnus-score.el (gnus-score-edit-file-at-point): Consider the
-        whole match element.  From Karl Pfl,Ad(Bsterer <sigurd@12move.de>.
-        (gnus-score-find-trace): Use it.  Added `f' and `t' commands,
-        added quick help.  With some suggestions from Karl Pfl,Ad(Bsterer
-        <sigurd@12move.de>.
+        (gnus-score-find-trace): Use gnus-score-edit-file-at-point.  Added
+        `f' and `t' commands, added quick help.  With some suggestions
+        from Karl Pfl,Ad(Bsterer <sigurd@12move.de>.
 
         * gnus-util.el (gnus-emacs-version): Added doc-string.
 
@@ -165,6 +160,11 @@
         (mml-attach-file): Use it.
         (mml-preview): Added MIME preview to gnus-buffers.
 
+2003-12-30  Karl Pfl,Ad(Bsterer  <sigurd@12move.de>
+
+        * gnus-score.el (gnus-score-edit-file-at-point): Consider the
+        whole match element.
+
 2003-12-30  Jesper Harder  <harder@ifa.au.dk>
 
         * gnus-sum.el (gnus-summary-make-menu-bar): Add ellipses.
@@ -179,7 +179,7 @@
         (gnus-secondary-method-p): Extend servers to methods before comparing.
         (gnus-secondary-method-p): Revert.
 
-2003-12-30 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-12-30  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Gnus v5.10.3 is released.
 
@@ -189,7 +189,7 @@
         Suggested by Steinar Bang <sb@dod.no>.
         (gnus-agent-auto-agentize-methods): Customize.
 
-2003-12-29  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-12-29  Kevin Greiner  <kgreiner@xpediantsolutions.com>
         * gnus.el (gnus-server-to-method): Fixed bug in 2003-12-22
         check-in.
 
@@ -210,10 +210,9 @@
         * mml1991.el (mml1991-pgg-encrypt): Decode according to CTE before
         encrypting.
 
-2003-12-28  Jesper Harder  <harder@ifa.au.dk>
+2003-12-28  Ivan Boldyrev  <boldyrev@uiggm.nsc.ru>  (tiny change).
 
         * mml1991.el (mml1991-pgg-sign): Use unibyte when re-encoding.
-        From Ivan Boldyrev <boldyrev@uiggm.nsc.ru> (tiny change).
 
 2003-12-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -243,7 +242,7 @@
         * dgnushack.el (dgnushack-compile): Increase the value for
         max-specpdl-size when compiling Gnus with Emacs 20.
 
-2003-12-22  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-12-22  Kevin Greiner  <kgreiner@xpediantsolutions.com>
         * gnus-int.el (gnus-open-server): Fixed the server status such
         that an agentized server, when opened offline, has a status of
         offline.  Also fixes bug whereby the agent's backend was called
@@ -268,7 +267,7 @@
         * gnus-agent.el (gnus-agent-read-agentview): Use
         car-less-than-car.
 
-2003-12-20  Artem Chuprina <ran@ran.pp.ru>  (tiny change)
+2003-12-20  Artem Chuprina  <ran@ran.pp.ru>  (tiny change)
 
         * message.el (message-yank-buffer): Bind message-reply-buffer to
         a buffer rather than a string.
@@ -379,7 +378,7 @@
 
         * pgg.el (pgg-run-at-time): Ditto.
 
-2003-12-11  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-12-11  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-agent.el (gnus-agent-possibly-alter-active): New Function.
         (gnus-agent-regenerate-group): When necessary, alter the group's
@@ -401,17 +400,14 @@
 
         * message.el (message-get-reply-headers): Narrow to headers.
 
-2003-12-10  Teodor Zlatanov  <tzz@lifelogs.com>
+2003-12-10  L,Bu(Brentey K,Ba(Broly  <lorentey@elte.hu>
 
-        * spam.el (spam-disable-spam-split-during-ham-respool): new
-        variable.  From lorentey@elte.hu (L,Bu(Brentey K,Ba(Broly)
-        (spam-ham-copy-or-move-routine): respect
-        spam-disable-spam-split-during-ham-respool.  From
-        lorentey@elte.hu (L,Bu(Brentey K,Ba(Broly)
-        (spam-split-disabled): new variable.  From
-        lorentey@elte.hu (L,Bu(Brentey K,Ba(Broly)
-        (spam-split): respect spam-split-disabled.  From
-        lorentey@elte.hu (L,Bu(Brentey K,Ba(Broly)
+        * spam.el (spam-disable-spam-split-during-ham-respool): New
+        variable.
+        (spam-ham-copy-or-move-routine): Respect
+        spam-disable-spam-split-during-ham-respool.
+        (spam-split-disabled): New variable.
+        (spam-split): Respect spam-split-disabled.
 
 2003-12-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -427,19 +423,21 @@
         input.
         (pgg-decode-armor-region): Don't parse packet if decoding fail.
 
-2003-12-09  Teodor Zlatanov  <tzz@lifelogs.com>
+2003-12-09  L,Bu(Brentey K,Ba(Broly  <lorentey@elte.hu>
 
         * spam.el (spam-check-bogofilter): run in the correct buffer.
-        From lorentey@elte.hu (L,Bu(Brentey K,Ba(Broly).
-        (spam-bogofilter-database-directory): correct customization
-        group.  From Xavier Maillard <zedek@gnu-rox.org>.
+
+2003-12-09  Xavier Maillard  <zedek@gnu-rox.org>
+
+        * spam.el (spam-bogofilter-database-directory): correct
+        customization group.
 
 2003-12-09  Per Abrahamsen  <abraham@dina.kvl.dk>
 
         * nnmail.el (nnmail-lazy, nnmail-split-fancy): New widgets.
         (nnmail-split-fancy): Use it.
 
-2003-12-08  Joel Ray Holveck <joelh@piquan.org>  (tiny change)
+2003-12-08  Joel Ray Holveck  <joelh@piquan.org>  (tiny change)
 
         * gnus-sum.el (gnus-summary-save-parts-1): Consider the "name"
         parameter of Content-Type.
@@ -509,32 +507,32 @@
         * gnus-util.el: Require alist and provide tm-view when compiling
         with XEmacs.
 
-2003-12-03  Steve Youngs  <sryoungs@bigpond.net.au>
+2003-12-03  Jerry James  <james@xemacs.org>  (tiny change)
 
         * gnus-xmas.el: Add autoloads for macros defined in gnus.el.
-        From Jerry James <james@xemacs.org>.
 
         * gnus-util.el: Get rmail definitions when compiling.
-        From Jerry James <james@xemacs.org>.
 
         * dns.el: Require gnus-xmas at compile time instead of trying to
         autoload `gnus-xmas-open-network-stream' because it wasn't picking
         up the macro.
-        From Jerry James <james@xemacs.org>.
 
-2003-12-01  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-12-01  Kevin Greiner  <kgreiner@xpediantsolutions.com>
+
         * gnus-agent.el (gnus-agent-consider-all-articles): Updated
         docstring.
         (gnus-predicate-implies-unread, gnus-predicate-implies-unread-1):
         Fixed implementation such that the predicate `true' no longer
         evaluates to t.
 
-2003-12-01  Teodor Zlatanov  <tzz@lifelogs.com>
+2003-12-01  Adrian Lanz  <lanz@fowi.ethz.ch>  (tiny change)
 
         * spam.el (spam-check-bogofilter): check the bogofilter headers
-        AFTER the save-excursion scope is over.  From Adrian Lanz
-        <lanz@fowi.ethz.ch>.
-        (spam-fetch-field-message-id-fast): doc fix
+        AFTER the save-excursion scope is over.
+
+2003-12-01  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * spam.el (spam-fetch-field-message-id-fast): Doc fix
 
 2003-12-01  Simon Josefsson  <jas@extundo.com>
 
@@ -549,24 +547,26 @@
         (gnus-agent-expire-group-1): Only print a message for an article
         when there actually was something done to it.
 
+        * gnus-agent.el (gnus-agent-expire-unagentized-dirs): Custom fix.
+
+2003-11-30  Kenichi Handa  <handa@m17n.org>
+
         * mm-util.el (mm-enable-multibyte): Call set-buffer-multibyte with
         'to argument.  Fixes something or other in Emacs 22, and is
-        backwards compatible.  From Kenichi Handa <handa@m17n.org>.
-
-        * gnus-agent.el (gnus-agent-expire-unagentized-dirs): Custom fix.
+        backwards compatible.
 
 2003-11-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-agent.el (gnus-agent-covered-methods): Remove nil methods.
 
-2003-11-29  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-11-29  Kevin Greiner  <kgreiner@xpediantsolutions.com>
         * gnus-start.el (gnus-activate-group): The active range of the
         group must include the articles known to the agent.
 
         * gnus.el (gnus-agent-method-p): Accept a server name as the
         method being tested.
 
-2003-11-29  Alexander Kreuzer <alex@freesources.org>  (tiny change)
+2003-11-29  Alexander Kreuzer  <alex@freesources.org>  (tiny change)
 
         * nnrss.el (nnrss-check-group): Set xml when nnrss-use-local is t.
 
@@ -669,7 +669,7 @@
 
         * dgnushack.el (mapc): Add the compiler macro for Emacs 20.
 
-2003-11-24  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-11-24  Kevin Greiner  <kgreiner@xpediantsolutions.com>
         * gnus-srvr.el (gnus-server-insert-server-line): The server names
         used in gnus-agent are different (for example, the native server
         uses the alias "native") from the names in gnus-srvr.
@@ -681,7 +681,7 @@
         new gnus-server-named-server function to get gnus-agent compatible
         names from the server buffer.
 
-2003-11-20  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-11-20  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus.el (gnus-agent-covered-methods): Documented use of
         named servers, not methods, to identity agentized groups.
@@ -762,12 +762,12 @@
         * gnus-score.el (gnus-decay-score): Return a surely smaller value
         than the argument in XEmacs.
 
-2003-11-18  Reiner Steib  <Reiner.Steib@gmx.de>
+2003-11-18  Sam Steingold  <sds@gnu.org>
 
         * message.el (message-insert-to): Don't use `gnus-message'.
         (message-header-synonyms): New variable.
         (message-carefully-insert-headers): Use it (check for synonyms).
-        Added doc-string.  From Sam Steingold <sds@gnu.org>.
+        Added doc-string.
 
 2003-11-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
@@ -848,13 +848,16 @@
 
 2003-11-10  Reiner Steib  <Reiner.Steib@gmx.de>
 
-        * message.el (message-insert-to): Do error out when the user
-        requested no Cc.  Don't insert empty To.  Can be added to
-        `message-setup-hook' now.  From Sam Steingold <sds@gnu.org>.
-        (message-mode-field-menu): Moved some entries, added
+        * message.el (message-mode-field-menu): Moved some entries, added
         `message-insert-wide-reply'.
         (message-change-subject): Fixed comment.
 
+2003-11-10  Sam Steingold  <sds@gnu.org>
+
+        * message.el (message-insert-to): Do error out when the user
+        requested no Cc.  Don't insert empty To.  Can be added to
+        `message-setup-hook' now.
+
 2003-11-10  Simon Josefsson  <jas@extundo.com>
 
         * pgg-def.el (pgg-encrypt-for-me): Change default from nil to t.
@@ -865,13 +868,12 @@
         key id too (for decryption).
         (pgg-gpg-sign-region): Likewise.
 
-2003-11-09  Simon Josefsson  <jas@extundo.com>
+2003-11-09  Satyaki Das  <satyakid@stanford.edu>
 
         * pgg-gpg.el (pgg-gpg-all-secret-keys): New variable.
         (pgg-gpg-lookup-all-secret-keys): New function.
         (pgg-gpg-select-matching-key): Likewise.
-        (pgg-gpg-decrypt-region): Use new functions.  From Satyaki Das
-        <satyakid@stanford.edu>.
+        (pgg-gpg-decrypt-region): Use new functions.
 
 2003-11-07  Teodor Zlatanov  <tzz@lifelogs.com>
 
@@ -1322,8 +1324,9 @@
         * gnus-sum.el (gnus-summary-respool-query): Don't narrow to head,
         it's done by nnmail-article-group.
 
+2003-10-12  Mark Hood  <markhood@speakeasy.net>  (tiny change)
+
         * gnus-uu.el (gnus-uu-grab-articles): Fix misplaced parens.
-        From Mark Hood <markhood@speakeasy.net> (tiny change)
 
 2003-10-10  Jesper Harder  <harder@ifa.au.dk>
 
@@ -1387,10 +1390,10 @@
 
         * spam.el (spam-install-hooks-function): Added Autoload cookie.
 
-2003-10-02  Jesper Harder  <harder@ifa.au.dk>
+2003-10-02  Michael Shields  <shields@msrl.com>
 
         * pgg-def.el (pgg-default-keyserver-address): Change to
-        subkeys.pgp.net.  From Michael Shields <shields@msrl.com>
+        subkeys.pgp.net.
 
 2003-10-01  Simon Josefsson  <jas@extundo.com>
 
@@ -1464,19 +1467,21 @@
 
         * gnus.el (gnus-group-charter-alist): Update.
 
+2003-09-10  Eric Knauel   <knauel@informatik.uni-tuebingen.de>
+
+        * spam-report.el: Use mm-url.el functions for external URL loading
+        when the built-in HTTP GET is insufficient (e.g. proxies are in
+        the way).
+
 2003-09-10  Teodor Zlatanov  <tzz@lifelogs.com>
 
-        * spam-report.el: use mm-url.el functions for external URL
-        loading when the built-in HTTP GET is insufficient (e.g. proxies
-        are in the way).  From Eric Knauel
-        <knauel@informatik.uni-tuebingen.de>.
-        (spam-report-url-ping-function): new option, defaults to the
-        built-in HTTP GET (spam-report-url-ping-plain)
-        (spam-report-url-ping): calls spam-report-url-ping-function now
-        (spam-report-url-ping-plain): new function, does what
-        spam-report-url-ping used to do
-        (spam-report-url-ping-mm-url): function that delegates to
-        mm-url.el (autoloaded)
+        * spam-report.el (spam-report-url-ping-function): New option,
+        defaults to the built-in HTTP GET (spam-report-url-ping-plain).
+        (spam-report-url-ping): Call spam-report-url-ping-function.
+        (spam-report-url-ping-plain): New function, does what
+        spam-report-url-ping used to do.
+        (spam-report-url-ping-mm-url): Function that delegates to
+        mm-url.el (autoloaded).
 
 2003-09-08  Teodor Zlatanov  <tzz@lifelogs.com>
 
@@ -1577,12 +1582,11 @@
         (mml-insert-mime-headers): Use it.  Based on (tiny) patch from
         Lars Balker Rasmussen <lars@balker.org>.
 
-2003-08-30  Simon Josefsson  <jas@extundo.com>
+2003-08-30  Gaute Strokkenes  <gs234@srcf.ucam.org>  (tiny change)
 
         * mail-source.el (mail-source-fetch-imap): Pass correct buffer to
         imap-open, reverts 2003-03-17 change.  Reverse remove before
-        calling gnus-compress-sequence.  From Gaute Strokkenes
-        <gs234@srcf.ucam.org> (tiny change).
+        calling gnus-compress-sequence.
 
 2003-08-29  Simon Josefsson  <jas@extundo.com>
 
@@ -1602,11 +1606,10 @@
         the files it may be using.  Reported by David Coe
         <davidc@debian.org>.
 
-2003-08-27  Jesper Harder  <harder@ifa.au.dk>
+2003-08-27  Vagn Johansen  <v@johansen.mail.dk>  (tiny change)
 
         * gnus-cache.el (gnus-cache-generate-active): Fix bug in
-        replacement.  From Vagn Johansen <v@johansen.mail.dk> (tiny
-        change).
+        replacement.
 
 2003-08-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -1712,10 +1715,9 @@
         * gnus.el (gnus-refer-article-method): Ditto.
         * message.el (message-courtesy-message): Ditto.
 
-2003-08-06  Jesper Harder  <harder@ifa.au.dk>
+2003-08-06  Chunyu Wang  <spr@db.cs.hit.edu.cn>  (tiny patch)
 
         * gnus-art.el (gnus-header-face-alist): Fix "Newsgroups" entry.
-        From Chunyu Wang <spr@db.cs.hit.edu.cn> (tiny patch)
 
 2003-08-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -1841,8 +1843,7 @@
         * imap.el (imap-arrival-filter): Fix test for missing process
         buffer.
 
-2003-07-09  Kai Gro,A_(Bjohann  <kai.grossjohann@gmx.net>
-        From Gaute B Strokkenes <gs234@cam.ac.uk> (tiny patch).
+2003-07-09  Gaute B Strokkenes  <gs234@cam.ac.uk>  (tiny patch).
 
         * imap.el (imap-wait-for-tag): Clarify comment.  Use timeout zero
         for second, after-process-has-died, accept-process-output.
@@ -1898,25 +1899,25 @@
         (message-canlock-generate)
         (message-generate-new-buffer-clone-locals): Docstring fixes.
 
-2003-07-07  Kai Gro,A_(Bjohann  <kai.grossjohann@gmx.net>
+2003-07-07  Gaute B Strokkenes  <gs234@cam.ac.uk>  (tiny patch)
 
         * imap.el (imap-wait-for-tag): After the process has died, look
-        for more output still pending.  From Gaute B Strokkenes
-        <gs234@cam.ac.uk> (tiny patch).
+        for more output still pending.
 
 2003-07-07  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * spam.el (spam-bogofilter-score): redisplay article normally
         after spam-bogofilter-score is called
 
+2003-07-06  Michael Piotrowski  <mxp@dynalabs.de>  (tiny change)
+
+        * gnus-sum.el (gnus-print-buffer): Apply emphasis.
+
 2003-07-06  Jesper Harder  <harder@ifa.au.dk>
 
         * message.el (message-send-mail-with-sendmail): Handle
         non-numeric return values.
 
-        * gnus-sum.el (gnus-print-buffer): Apply emphasis.
-        From Michael Piotrowski <mxp@dynalabs.de> (tiny change).
-
         * gnus-start.el (gnus-clear-system): Revert change from
         2003-06-19.
 
@@ -2013,11 +2014,13 @@
 
 2003-06-20  Jesper Harder  <harder@ifa.au.dk>
 
-        * gnus-msg.el (gnus-configure-posting-styles): Remove unused
-        variable.  From Jan Rychter <jan@rychter.com>.
-
         * spam.el (spam-spamoracle-learn): insert-string is obsolete.
 
+2003-06-20  Jan Rychter  <jan@rychter.com>
+
+        * gnus-msg.el (gnus-configure-posting-styles): Remove unused
+        variable.
+
 2003-06-19  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * spam.el (spam-enter-list): do not enter duplicate addresses into
@@ -2050,11 +2053,10 @@
         * gnus-util.el (gnus-extract-address-components): Added
         doc-string.
 
-2003-06-16  Kai Gro,A_(Bjohann  <kai.grossjohann@gmx.net>
+2003-06-16  Michael Albinus  <Michael.Albinus@alcatel.de>
 
         * nnml.el (nnml-current-group-article-to-file-alist): Don't read
-        overview when using compressed files.  From Michael Albinus
-        <Michael.Albinus@alcatel.de>.
+        overview when using compressed files.
 
 2003-06-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -2072,8 +2074,7 @@
         * gnus-sum.el (gnus-summary-force-verify-and-decrypt): Bind
         `gnus-article-emulate-mime'.
 
-2003-06-15  Kai Gro,A_(Bjohann  <kai.grossjohann@gmx.net>
-        From Tommi Vainikainen <thv+gnus@iki.fi>.
+2003-06-15  Tommi Vainikainen  <thv+gnus@iki.fi>
 
         * message.el (message-is-yours-p): New function.  Separated common
         code from message-cancel-news and message-supersede.  Added
@@ -2081,10 +2082,10 @@
         resort.
         (message-cancel-news, message-supersede): Use message-is-yours-p.
 
-2003-06-13  Kai Gro,A_(Bjohann  <kai.grossjohann@gmx.net>
+2003-06-13  Niklas Morberg  <niklas.morberg@axis.com>
 
         * nnimap.el (nnimap-split-articles): Narrow the right buffer to
-        the headers.  From Niklas Morberg <niklas.morberg@axis.com>.
+        the headers.
 
 2003-06-12  Dave Love  <fx@gnu.org>
 
@@ -2101,9 +2102,7 @@
         * spam.el (spam-check-bogofilter-headers): fix for when the score
         is requested but the message is not spam
 
-2003-06-09  Teodor Zlatanov  <tzz@lifelogs.com>
-        From Eric
-        <knauel@informatik.uni-tuebingen.de>
+2003-06-09  Eric Knauel  <knauel@informatik.uni-tuebingen.de>
 
         * spam.el (spam-use-spamoracle): new variable
         (spam-install-hooks): add spamoracle to the list of conditions
@@ -2146,8 +2145,7 @@
         * gnus-srvr.el (gnus-browse-foreign-server): Parse garbage NNTP
         groups correctly.
 
-2003-06-06  Kai Gro,A_(Bjohann  <kai.grossjohann@gmx.net>
-        From Benjamin Rutt <rutt+news@cis.ohio-state.edu>.
+2003-06-06  Benjamin Rutt  <rutt+news@cis.ohio-state.edu>.
 
         * message.el (message-fetch-field): Augment documentation to state
         the narrowed-to-headers restriction.
@@ -2173,11 +2171,9 @@
         * rfc2047.el (rfc2047-encode-region): Don't error out on invalid
         strings.
 
-2003-06-04  Jesper Harder  <harder@ifa.au.dk>
+2003-06-04  Ivan Boldyrev  <boldyrev+nospam@cgitftp.uiggm.nsc.ru>  (tiny change)
 
         * mml1991.el (mml1991-pgg-sign): Insert pgg output as unibyte.
-        From: Ivan Boldyrev <boldyrev+nospam@cgitftp.uiggm.nsc.ru> (tiny
-        change)
 
 2003-06-03  Dave Love  <fx@gnu.org>
 
@@ -2204,11 +2200,10 @@
         * message.el (message-fetch-field): Mention narrow-to-headers
         requirement.
 
-2003-06-03  Jesper Harder  <harder@ifa.au.dk>
+2003-06-03  Eric Eide  <eeide@cs.utah.edu>
 
         * gnus-xmas.el (gnus-xmas-create-image): Use
-        insert-file-contents-literally.  From: Eric Eide
-        <eeide@cs.utah.edu>
+        insert-file-contents-literally.
 
 2003-06-02  Teodor Zlatanov  <tzz@lifelogs.com>
 
@@ -2313,7 +2308,7 @@
 
         * dgnushack.el (assq-delete-all): Removed the compiler macro.
 
-2003-05-14  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-05-14  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-agent.el (gnus-agentize): Updated documentation to match
         usage.
@@ -2326,7 +2321,7 @@
 
         * gnus.el (gnus-version-number): Bump.
 
-2003-05-14 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-05-14  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Gnus v5.10.2 is released.
 
@@ -2385,7 +2380,7 @@
         in message.  Suggested by Yoichi NAKAYAMA <yoichi@geiin.org>.
         * pop3.el (pop3-movemail): Ditto.
 
-2003-05-12  Colin Marquardt <c.marquardt@alcatel.de>  (tiny change)
+2003-05-12  Colin Marquardt  <c.marquardt@alcatel.de>  (tiny change)
 
         * gnus.el (gnus-agent): Docstring fix.
 
@@ -2397,7 +2392,7 @@
         (gnus-registry-add-group): add a modification timestamp to each entry
         (gnus-registry-install-hooks): new function
 
-2003-05-12  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-05-12  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-agent.el (gnus-agent-cat-name): Eval macro while compiling.
         (gnus-agent-cat-disable-undownloaded-faces): New function.
@@ -2495,13 +2490,15 @@
         * gnus-registry.el (gnus-registry-cache-file): new file variable
         (gnus-registry-cache-read, gnus-registry-cache-save): new
         functions
-        (gnus-registry-cache-whitespace): new function.  From Dan
-        Christensen <jdc@chow.mat.jhu.edu>
         (gnus-registry-save, gnus-registry-read): use the new
         gnus-registry-cache-{read|save} functions, and change the name
         from gnus-registry-translate-{from|to}-alist
         (gnus-registry-clear): fixed so it doesn't refer to old function name
 
+2003-05-09  Dan Christensen  <jdc@chow.mat.jhu.edu>
+
+        * gnus-registry.el (gnus-registry-cache-whitespace): new function.
+
 2003-05-09  Jesper Harder  <harder@ifa.au.dk>
 
         * gnus-picon.el (gnus-picon-transform-address): Parse the encoded
@@ -2516,8 +2513,9 @@
         nnmail-split-fancy-with-parent-ignore-groups can be a single regex
         in addition to a list of regexes.
 
-        * spam.el (spam-use-regex-headers): docstring fix.  From Niklas
-        Morberg <niklas.morberg@axis.com>
+2003-05-08  Niklas Morberg  <niklas.morberg@axis.com>
+
+        * spam.el (spam-use-regex-headers): docstring fix.
 
 2003-05-08  Kai Gro,A_(Bjohann  <kai.grossjohann@gmx.net>
 
@@ -2588,7 +2586,7 @@
         * mm-bodies.el (mm-decode-coding-region-safely): Remove.
         (mm-decode-body): Don't use mm-decode-coding-region-safely.
 
-2003-05-03  Vasily Korytov <deskpot@despammed.com>  (tiny change)
+2003-05-03  Vasily Korytov  <deskpot@despammed.com>  (tiny change)
 
         * gnus-util.el (gnus-multiple-choice): Add ", ?".
 
@@ -2705,13 +2703,13 @@
 
         * gnus.el (gnus-version-number): Bump.
 
-2003-05-01  Teodor Zlatanov  <tzz@lifelogs.com>
+2003-05-01  Jon Ericson  <Jon.Ericson@jpl.nasa.gov>  (tiny change)
 
-        * spam-report.el (spam-report-gmane-regex): docstring fix.  From
-        Jon Ericson <Jon.Ericson@jpl.nasa.gov> (tiny change)
+        * spam-report.el (spam-report-gmane-regex): docstring fix.
 
         * gnus.el (gnus-install-group-spam-parameters): docstring fix.
-        From Jon Ericson <Jon.Ericson@jpl.nasa.gov> (tiny change)
+
+2003-05-01  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * gnus-registry.el (gnus-registry-fetch-extra)
         (gnus-registry-store-extra, gnus-registry-group-count): new functions
@@ -2719,11 +2717,11 @@
         (gnus-registry-add-group): changed to work with extra data element
         if present
 
-2003-05-01 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-05-01  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Gnus v5.10.1 is released.
 
-2003-05-01 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-05-01  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.24 is released.
 
@@ -2742,7 +2740,7 @@
 
         * gnus.el: Update copyright for several files.
 
-2003-05-01 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-05-01  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.23 is released.
 
@@ -2750,7 +2748,7 @@
 
         * spam-stat.el (spam-stat-test-directory): Compare against zero.
 
-2003-05-01  Trey Jackson <tjackson@ichips.intel.com>  (tiny change)
+2003-05-01  Trey Jackson  <tjackson@ichips.intel.com>  (tiny change)
 
         * spam-stat.el (spam-stat-test-directory): Skip 0 length files.
 
@@ -2767,11 +2765,11 @@
 
         * gnus.el (gnus-version-number): Bump.
 
-2003-05-01 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-05-01  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.22 is released.
 
-2003-05-01 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-05-01  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.21 is released.
 
@@ -2779,7 +2777,7 @@
 
         * gnus.el (gnus-version-number): Bump.
 
-2003-05-01 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-05-01  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.20 is released.
 
@@ -2872,7 +2870,7 @@
         * mm-util.el (mm-charset-to-coding-system): Use user specified
         charset unless coding-system-get is fboundp.
 
-2003-04-30  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-04-30  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-agent.el (gnus-agent-cat-defaccessor, gnus-agent-cat-name):
         Wrapped in eval-when-compile.
@@ -2978,7 +2976,7 @@
         (gnus-mime-display-multipart-related-as-mixed): Added doc-strings,
         allow customization.
 
-2003-04-27  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-04-27  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * dgnushack.el (dgnushack-compile-verbosely): New function.  Not
         currently called (See source for explanation).
@@ -2991,11 +2989,11 @@
 
         * gnus.el (gnus-version-number): Bump.
 
-2003-04-27 06:47:31 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-04-27 06:47:31  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.19 is released.
 
-2003-04-27  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-04-27  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-registry.el (gnus-register-spool-action): Replaced literal
         carriage-return character with its escape sequence.
@@ -3141,11 +3139,10 @@
 
         * smime.el (smime-decrypt-region): Insert From header.
 
-2003-04-21  Kai Gro,A_(Bjohann  <kai.grossjohann@gmx.net>
+2003-04-21  Gaute B Strokkenes  <gs234@cam.ac.uk>  (tiny change)
 
         * gnus-fun.el (gnus-face-from-file, gnus-convert-png-to-face):
-        Max length of header is 726, not 740.  From Gaute B Strokkenes
-        <gs234@cam.ac.uk>.
+        Max length of header is 726, not 740.
 
 2003-04-20  Jesper Harder  <harder@ifa.au.dk>
 
@@ -3270,7 +3267,7 @@
         (spam-summary-prepare-exit): check the report-gmane spam processor
         and run spam-report-gmane-register-routine if it's active
 
-        From John Wiegley <johnw@gnu.org>
+2003-04-16  John Wiegley  <johnw@gnu.org>
 
         * spam.el (spam-bogofilter-score): check bogofilter headers before
         checking bogofilter itself
@@ -3303,7 +3300,7 @@
         * nndiary.el (nndiary-compute-reminders): Don't use setf with
         nthcdr.
 
-2003-04-16  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-04-16  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-agent.el (gnus-agent-make-cat): Added optional parameter to
         specify a predicate other than false.
@@ -3321,13 +3318,11 @@
 
         * spam.el (spam-split): added save-restriction to save-excursion
 
-2003-04-15  Reiner Steib  <Reiner.Steib@gmx.de>
-        From Julien Avarre <julien@avarre.com>
+2003-04-15  Julien Avarre  <julien@avarre.com>
 
         * gnus-fun.el: Fixed autoload cookie.
 
-2003-04-15  Paul Jarc  <prj@po.cwru.edu>
-        From Remi Letot  <remi.letot@easynet.be>
+2003-04-15  Remi Letot  <remi.letot@easynet.be>
 
         * nnmaildir.el (nnmaildir-request-scan): Use gnus-remove-if
         instead of remove-if.
@@ -3381,7 +3376,7 @@
 
         * gnus.el (gnus-group-prefixed-name): Clean up.
 
-2003-04-13  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-04-13  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-agent.el (gnus-agent-group-pathname): Bind
         gnus-command-method so that gnus-agent-directory will always
@@ -3397,7 +3392,7 @@
 
         * gnus.el (gnus-version-number): Bump.
 
-2003-04-13 01:12:01 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-04-13 01:12:01  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.18 is released.
 
@@ -3452,7 +3447,7 @@
         (mm-encode-body): Don't corrupt UTF-16.
         (mm-body-encoding): Pay attention to mm-body-charset-encoding-alist.
 
-2003-04-10  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-04-10  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-agent.el (gnus-agent-get-undownloaded-list): Articles in
         the CACHE are now detected and handled the same as an article
@@ -3478,7 +3473,7 @@
         * gnus-sum.el (gnus-summary-make-menu-bar): Disable "Import file"
         and "Create article" items in non-editable groups.
 
-2003-04-09  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-04-09  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-agent.el (gnus-agent-write-active): Added option of
         replacing, rather than updating, the agent's active file.  Do NOT
@@ -3591,7 +3586,7 @@
         * gnus-sum.el: XEmacs doesn't support the 5th arg to 'load', so
         don't use it when loading gnus-sum.el if we're in XEmacs.
 
-2003-04-05  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-04-05  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-start.el (gnus-gnus-to-quick-newsrc-format): Bound
         print-escape-nonascii to fix more characters in compiled format
@@ -3602,7 +3597,7 @@
         * gnus-audio.el (gnus-audio-au-player, gnus-audio-wav-player):
         Fix customization type.
 
-2003-04-04  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-04-04  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-start.el (gnus-gnus-to-quick-newsrc-format): Bound
         print-quoted, print-readably, print-escape-multibyte, and
@@ -3662,7 +3657,7 @@
         * nntp.el (nntp-via-rlogin-command-switches): Doc fix.
         (nntp-open-via-rlogin-and-telnet): Disable the telnet linemode.
 
-2003-03-31  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-03-31  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-start.el (gnus-gnus-to-quick-newsrc-format): Bound
         print-escape-newlines to print escape sequences rather than
@@ -3685,7 +3680,7 @@
 
         * gnus.el (gnus-version-number): Bump.
 
-2003-03-31 20:08:19 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-03-31 20:08:19  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.17 is released.
 
@@ -3768,20 +3763,24 @@
         (gnus-read-newsrc-el-file): call the gnus-read-newsrc-el-hook
 
         * gnus-registry.el (gnus-registry-translate-to-alist)
-        (gnus-registry-translate-from-alist, alist-to-hashtable)
-        (hashtable-to-alist): new functions
+        (gnus-registry-translate-from-alist: new functions
         (gnus-register-spool-action): add a spool item to the registry
 
         * gnus.el (gnus-variable-list): added gnus-registry-alist to the
         list of saved variables
         (gnus-registry-alist): new variable
 
+2003-03-28  Andreas Fuchs  <asf@void.at>
+
+        * gnus-registry.el (alist-to-hashtable, hashtable-to-alist): New
+        functions.
+
 2003-03-27  Simon Josefsson  <jas@extundo.com>
 
         * gnus-art.el (article-decode-group-name): Be correct instead of
         smart.
 
-2003-03-27  Katsumi Yamaoka <yamaoka@jpl.org>
+2003-03-27  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * lpath.el: Bind url-current-object for Emacs; bind
         gnus-agent-expire-current-dirs for XEmacs; fbind open-ssl-stream
@@ -3796,7 +3795,7 @@
         * gnus-msg.el (gnus-mailing-list-groups): Fix customize type and
         doc string.
 
-2003-03-26  Kevin Ryde <user42@zip.com.au>
+2003-03-26  Kevin Ryde  <user42@zip.com.au>
 
         * gnus-sum.el (gnus-summary-find-for-reselect): Renamed from
         gnus-summary-find-uncancelled, skip temporary articles inserted by
@@ -3806,7 +3805,7 @@
 
         * smiley.el (smiley-buffer): New function.
 
-2003-03-26  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-03-26  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-agent.el (gnus-agent-fetch-selected-article): Replaced
         gnus-summary-update-line (which updated the article's face) with
@@ -3814,7 +3813,7 @@
         face by calling gnus-summary-update-line AND updates the download
         mark to show that the article was fetched).
 
-2003-03-23  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-03-23  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-agent.el (gnus-agent-expire-unagentized-dirs): Provides
         option of deleting agent directories for groups/servers that are
@@ -3879,7 +3878,7 @@
         * gnus-art.el (gnus-treat-display-xface): Don't enable if
         icontopbm isn't available.
 
-2003-03-21  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2003-03-21  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-int.el (gnus-open-server): Catch errors in backend's
         open-server method.  Returns nil rather than crashing startup.
@@ -3906,7 +3905,7 @@
         * message.el (message-split-line): New function.
         (message-mode-map): Remap split-line to message-split-line.
 
-2003-03-20  Katsumi Yamaoka <yamaoka@jpl.org>
+2003-03-20  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * message.el (message-make-overlay): Defalias it to make-overlay.
         (message-delete-overlay): Defalias it to delete-overlay.
@@ -3930,7 +3929,7 @@
         * nnrss.el (nnrss-fetch): Fetch the local stuff.
         (nnrss-check-group): Use it.
 
-2003-03-20 Mark A. Hershberger  <mah@everybody.org>
+2003-03-20  Mark A. Hershberger  <mah@everybody.org>
 
         * nnrss.el: Primitive XML Name-space support.  This means that RSS
         feeds like Kevin Burton's[1] can now be read in Gnus.
@@ -3957,7 +3956,7 @@
 
         * gnus-group.el (gnus-group-make-rss-group): New function.
 
-2003-03-20  Katsumi Yamaoka <yamaoka@jpl.org>
+2003-03-20  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * message.el (message-idna-to-ascii-rhs-1): Don't use replace-*
         for highlight overlays.
@@ -4054,7 +4053,7 @@
 
         * gnus.el (gnus-version-number): Bump.
 
-2003-03-18 00:38:22 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-03-18 00:38:22  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.16 is released.
 
@@ -4511,7 +4510,6 @@
         * spam.el: Fix typo.
 
 2003-03-01  Satyaki Das  <satyaki@theforce.stanford.edu>
-        (Trivial patch.)
 
         * pgg-gpg.el (pgg-gpg-process-region): Insert process status into
         errors-buffer. This produces a nicer error message in case of
@@ -4535,7 +4533,7 @@
 
         * message.el (message-make-fqdn): Protect against nil user-mail.
 
-2003-02-28  Vasily Korytov <deskpot@myrealbox.com>
+2003-02-28  Vasily Korytov  <deskpot@myrealbox.com>
 
         * gnus-art.el (gnus-boring-article-headers): New values:
         'to-list and 'cc-list.
@@ -4617,10 +4615,11 @@
 
         * gnus-start.el (gnus-backup-startup-file): Fixed custom type.
 
-2003-02-24  Ted Zlatanov <tzz@lifelogs.com>
+2003-02-24  Ted Zlatanov  <tzz@lifelogs.com>
+
         * spam.el: disabled spam-get-article-as-filename
 
-        From Michael Shields  <shields@msrl.com>
+2003-02-24  Michael Shields  <shields@msrl.com>
 
         * gnus-group.el (gnus-group-is-exiting-without-update-p): New.
         * gnus-sum.el (gnus-summary-exit-no-update): Use it.
@@ -4634,8 +4633,7 @@
         no spam.
         * spam.el (spam-ham-move-routine): New `copy' argument.
 
-2003-02-24  Kai Gro,A_(Bjohann  <kai.grossjohann@uni-duisburg.de>
-        From Martin Thornquist <martint@ifi.uio.no>
+2003-02-24  Martin Thornquist  <martint@ifi.uio.no>
 
         * gnus-topic.el (gnus-topic-select-group): Select last group if
         after last group.
@@ -4752,16 +4750,19 @@
         * gnus-start.el (gnus-get-unread-articles-in-group): Make sure
         the entry for the group exists before we alter it.
 
-2003-02-22  Kai Gro,A_(Bjohann  <kai.grossjohann@uni-duisburg.de>
+2003-02-22  David S Goldberg  <david.goldberg6@verizon.net>  (tiny change)
+
+        * message.el (message-mode): MML tags separate paragraphs.
 
-        * message.el (message-mode): MML tags separate paragraphs.  Small
-        change from David S Goldberg <david.goldberg6@verizon.net>.
+2003-02-22  Kai Gro,A_(Bjohann  <kai.grossjohann@uni-duisburg.de>
 
         * gnus-agent.el (gnus-agent-get-undownloaded-list): Sort
         `gnus-newsgroup-headers'.
 
+2003-02-22  Karl Pfl,Ad(Bsterer  <sigurd@12move.de>
+
         * gnus-art.el (gnus-article-refer-article): Grok more message id
-        formats.  From Karl Pfl,Ad(Bsterer <sigurd@12move.de>.
+        formats.
 
 2003-02-22  Jesper Harder  <harder@ifa.au.dk>
 
@@ -4778,8 +4779,7 @@
         (gnus-register-spool-action): added hashtable of message ID keys
         with message motion data
 
-2003-02-21  Florian Weimer  <fw@deneb.enyo.de>
-        From Reiner Steib  <Reiner.Steib@gmx.de>.
+2003-02-21  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus-art.el (gnus-button-mid-or-mail-heuristic-alist): New
         variable, used in `gnus-button-mid-or-mail-heuristic'.
@@ -4909,11 +4909,11 @@
         (spam-mark-spam-as-expired-and-move-routine): made the article
         move conditional, so it's not called even if there's nothing to move
 
-2003-02-13  Kai Gro,A_(Bjohann  <kai.grossjohann@uni-duisburg.de>
+2003-02-13  Kurt B. Kaiser  <kbk@shore.net>
 
         * message.el (message-unix-mail-delimiter): Accept any whitespace
         after the email address and before the date; do not require the
-        space character.  From Kurt B. Kaiser <kbk@shore.net>.
+        space character.
 
 2003-02-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -5021,7 +5021,7 @@
 
         * gnus.el (gnus-version-number): Bumped.
 
-2003-02-08 23:23:27 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-02-08 23:23:27  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.15 is released.
 
@@ -5036,8 +5036,9 @@
         * gnus-sum.el (gnus-summary-select-article): Remove blink removal
         code that only worked under Emacs.
 
-        * pgg-gpg.el (pgg-gpg-process-region): Don't blink.  From Satyaki
-        Das <satyaki@chicory.stanford.edu>.
+2003-02-08  Satyaki Das  <satyaki@chicory.stanford.edu>
+        
+        * pgg-gpg.el (pgg-gpg-process-region): Don't blink.
 
 2003-02-08  Jesper Harder  <harder@ifa.au.dk>
 
@@ -5367,7 +5368,7 @@
 
         * gnus.el (gnus-version-number): Bumped.
 
-2003-01-24 20:32:44 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-01-24 20:32:44  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.14 is released.
 
@@ -5491,7 +5492,7 @@
 
         * gnus.el (gnus-version-number): Bumped version number.
 
-2003-01-21 07:15:41 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-01-21 07:15:41  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.13 is released.
 
@@ -5672,7 +5673,7 @@
 
         * gnus-audio.el (gnus-audio-au-player): Use executable-find.
 
-2003-01-13  Jhair Tocancipa Triana <jhair_tocancipa@@gmx.net>
+2003-01-13  Jhair Tocancipa Triana  <jhair_tocancipa@@gmx.net>
 
         * gnus-audio.el (gnus-audio-au-player, gnus-audio-wav-player): Use
           /usr/bin/play as default player.
@@ -5754,7 +5755,7 @@
         * gnus.el (gnus-version-number): Bumped version.
         (gnus-summary-line-format): Doc fix.
 
-2003-01-12 22:02:49 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-01-12 22:02:49  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.12 is released.
 
@@ -5801,7 +5802,7 @@
 
         * gnus.el (gnus-version-number): Bumped version number.
 
-2003-01-12 13:46:20 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-01-12 13:46:20  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.11 is released.
 
@@ -6277,7 +6278,7 @@
 
         * gnus.el (gnus-version-number): Bump version number.
 
-2003-01-05 01:53:30 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-01-05 01:53:30  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.10 is released.
 
@@ -6285,7 +6286,7 @@
 
         * gnus.el (gnus-version-number): Fix version number.
 
-2003-01-05 01:40:09 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+2003-01-05 01:40:09  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.08 is released.
 
@@ -6789,11 +6790,10 @@
 
         * binhex.el (binhex-decoder-program): Fix docstring.
 
-2002-12-21  Kai Gro,A_(Bjohann  <kai.grossjohann@uni-duisburg.de>
+2002-12-21  Laurent Martelli  <laurent@bearteam.org>
 
         * mm-decode.el (mm-mailcap-command): Do not backslash-quote
         special chars if the mailcap file uses single quotes around %s.
-        From Laurent Martelli <laurent@bearteam.org>.
 
 2002-12-19  Paul Jarc  <prj@po.cwru.edu>
 
@@ -6834,7 +6834,7 @@
         * nntp.el (nntp-with-open-group-first-pass): Do not wrap in
         eval-when-compile.  Suggested by Kevin Greiner.
 
-2002-12-13  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2002-12-13  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-agent.el (gnus-agent-max-fetch-size): New, defcustom.
         (gnus-agent-fetch-headers): Initialize gnus-agent-overview-buffer
@@ -6846,13 +6846,13 @@
         Multiple chunks in the same group may perform arbitrarily large
         updates.
 
-2002-12-12  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2002-12-12  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-agent.el (gnus-agent-fetch-selected-article): Added call to
         gnus-summary-update-download-mark to update the article in the
         summary.
 
-2002-12-11  Kevin Greiner <kgreiner@xpediantsolutions.com>
+2002-12-11  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus.el (gnus-summary-high-uncached-face,
         gnus-summary-normal-uncached-face, gnus-summary-low-uncached-face)
@@ -7070,7 +7070,7 @@
         * gnus-sum.el (gnus-summary-insert-old-articles): No longer passes
         compressed range to gnus-summary-insert-articles.
 
-2002-11-26  Kevin Ryde <user42@zip.com.au>
+2002-11-26  Kevin Ryde  <user42@zip.com.au>
 
         * gnus-art.el (gnus-mime-copy-part): Look for filename
         parameter under content-disposition, not content-type.
@@ -7108,7 +7108,7 @@
         * gnus-agent.el (gnus-agent-check-overview-buffer): Make debugger
         print message on entry.
 
-        From Kevin Greiner <kgreiner@xpediantsolutions.com>.
+2002-11-25  Kevin Greiner  <kgreiner@xpediantsolutions.com>.
 
         * gnus-range.el (gnus-range-difference): New function.
         * gnus-sum.el (gnus-summary-insert-old-articles): Use it.
@@ -7119,8 +7119,7 @@
         gnus-remove-from-range instead of gnus-range-difference which
         doesn't exist.
 
-2002-11-23  Kai Gro,A_(Bjohann  <kai.grossjohann@uni-duisburg.de>
-        From Kevin Greiner <kgreiner@xpediantsolutions.com>.
+2002-11-23  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
         * gnus-agent.el (gnus-agent-downloaded-article-face): New face,
         used for showing which articles have been downloaded.
@@ -7230,7 +7229,7 @@
         * nnimap.el (nnimap-request-expire-articles): Compress sequence
         before storing \Deleted mark on expired articles.
 
-2002-11-17  Shenghuo Zhu <zsh@cs.rochester.edu>
+2002-11-17  Shenghuo Zhu  <zsh@cs.rochester.edu>
         Trivial patch from Markus Rost <rost@math.ohio-state.edu>
 
         * gnus-sum.el (gnus-summary-goto-unread): Doc fix - escape open
@@ -7320,19 +7319,18 @@
         * gnus-group.el (gnus-group-delete-group):
         gnus-cache-active-hashtb might be void.
 
-2002-11-02  Simon Josefsson  <jas@extundo.com>
+2002-11-02  Raymond Scholz  <ray-2002@zonix.de>
 
         * pgg-gpg.el (pgg-gpg-encrypt-region): Makes PGG respect the
-        setting of the default user ID.  From Raymond Scholz
-        <ray-2002@zonix.de>.
+        setting of the default user ID.
 
 2002-11-01  Jesper Harder  <harder@ifa.au.dk>
 
         * mm-bodies.el (mm-body-encoding): Don't return 8bit for 7bit
         charset.
 
-2002-10-31  Ted Zlatanov <tzz@lifelogs.com>
-        From Alex Schroeder <alex@emacswiki.org>
+2002-10-31  Alex Schroeder  <alex@emacswiki.org>
+
         * spam-stat.el (spam-stat-process-directory): add dir to message
         (spam-stat-reduce-size): No longer remove words
         with values close to 0.5, because the default value is 0.2.
@@ -7395,8 +7393,7 @@
         * mml.el (mml-mode-map): Fixed keybindings for mml-secure-*
         functions.
 
-2002-10-28  Katsumi Yamaoka  <yamaoka@jpl.org>
-        From mah@everybody.org (Mark A. Hershberger).
+2002-10-28  Mark A. Hershberger  <mah@everybody.org>
 
         * mm-url.el (mm-url-insert-file-contents): Make it return the same
         type values ("url" size) regardless of the values of
@@ -7644,7 +7641,7 @@
 
         * gnus-spec.el (gnus-pad-form): Use gnus-string-width-function.
 
-2002-10-11  Ted Zlatanov <tzz@lifelogs.com>
+2002-10-11  Ted Zlatanov  <tzz@lifelogs.com>
 
         * spam.el (spam-check-ifile): added ifile as a spam checking
         backend, and spam-use-ifle as the variable to toggle that check.
@@ -7654,7 +7651,7 @@
         * message.el (message-beginning-of-line): New variable.
         (message-beginning-of-line): Use it.
 
-2002-10-11  Ted Zlatanov <tzz@lifelogs.com>
+2002-10-11  Ted Zlatanov  <tzz@lifelogs.com>
 
         * spam.el: more compilation fixes for BBDB
 
@@ -7690,7 +7687,7 @@
         (mml2015-unabbrev-trust-alist): New.
         (mml2015-gpg-extract-signature-details): Use it.
 
-2002-10-10  Ted Zlatanov <tzz@lifelogs.com>
+2002-10-10  Ted Zlatanov  <tzz@lifelogs.com>
 
         * spam.el: compilation fixes, spam-check-bbdb function is nil if no
         BBDB installed
@@ -7818,7 +7815,7 @@
 
         * pgg.el, pgg-gpg.el, pgg-pgp5.el: Don't depend on luna.el.
 
-2002-09-29  Daiki Ueno <ueno@unixuser.org>
+2002-09-29  Daiki Ueno  <ueno@unixuser.org>
 
         * pgg.el: Remove dependency on calist.el.
 
@@ -7859,13 +7856,12 @@
 
         * message.el (message-required-mail-headers): Remove Lines:.
 
-2002-10-03  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
-        From Jesper Harder.
+2002-10-03  Jesper Harder  <harder@ifa.au.dk>
 
         * gnus-group.el (gnus-group-fetch-charter,
         gnus-group-fetch-control): Prompt for group if given a prefix
         argument.
-        * gnus-sum.el (t): Add gnus-group-fetch-charter and
+        * gnus-sum.el: Add gnus-group-fetch-charter and
         gnus-group-fetch-control to summary key map and menu.
 
 2002-10-03  Paul Jarc  <prj@po.cwru.edu>
@@ -7880,13 +7876,12 @@
         (gnus-agent-fetch-selected-article): New function for
         gnus-select-article-hook or gnus-mark-article-hook.
 
-2002-10-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-        From Peter von der Ahe <nospam2159@daimi.au.dk>.
+2002-10-02  Peter von der Ahe  <nospam2159@daimi.au.dk>
 
         * gnus-ems.el (gnus-x-splash): Set coding-system-for-read to
         raw-text.
 
-2002-09-30  Ted Zlatanov <tzz@lifelogs.com>
+2002-09-30  Ted Zlatanov  <tzz@lifelogs.com>
 
         * spam.el: merged changes from pinard@iro.umontreal.ca (Fran,Ag(Bois
         Pinard).
@@ -7927,8 +7922,7 @@
 
         * nnimap.el (nnimap-fixup-unread-after-getting-new-news): Remove.
 
-2002-09-27  Katsumi Yamaoka  <yamaoka@jpl.org>
-        From Mats Lidell <matsl@contactor.se>.
+2002-09-27  Mats Lidell  <matsl@contactor.se>
 
         * gnus-art.el (gnus-article-mode-syntax-table): Replace "-" to " ".
 
@@ -8079,20 +8073,19 @@
         * nnmaildir.el (nnmaildir--grp-add-art): fix minimum article
         number when article 1 does not exist.
 
-2002-09-25  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-09-25  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus-art.el (gnus-button-handle-apropos-variable): Fall back to
         apropos if apropos-variable does not exist.
         (gnus-button-guessed-mid-regexp)
         (gnus-button-handle-describe-prefix, gnus-button-alist): Better
-        regexes.  From Reiner Steib.
+        regexes.
         (gnus-button-handle-describe-function)
-        (gnus-button-handle-describe-variable): Doc fix.  From Reiner Steib.
+        (gnus-button-handle-describe-variable): Doc fix.
         (gnus-button-handle-describe-key, gnus-button-handle-apropos)
-        (gnus-button-handle-apropos-command): Doc fix.  From Reiner Steib.
+        (gnus-button-handle-apropos-command): Doc fix.
 
-2002-09-25  Mark A. Hershberger  <mah@everybody.org>
-        Trivial patch.
+2002-09-25  Mark A. Hershberger  <mah@everybody.org>  (tiny change)
 
         * nnrss.el (nnrss-save-server-data): Save nnrss-group-alist in
         the file.
@@ -8114,22 +8107,19 @@
         (mml2015-pgg-encrypt): New functions.
         (defvar, autoload): Prevent byte-compile warnings.
 
-2002-09-24  Katsumi Yamaoka  <yamaoka@jpl.org>
-        From TSUCHIYA Masatoshi <tsuchiya@namazu.org>.
+2002-09-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>.
 
         * gnus-art.el (article-strip-banner): Check for the existence of
         from header.
 
-2002-09-23  Kai Gro,b_(Bjohann  <grossjoh@ls6.informatik.uni-dortmund.de>
+2002-09-23  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus-art.el (gnus-button-guessed-mid-regexp): Improved regexp.
         (gnus-button-alist): Improved regexp for
         gnus-button-handle-mid-or-mail (false positives), fixed
         gnus-button-handle-man entries.
-        From Reiner Steib.
 
-2002-09-23  Paul Jarc  <prj@po.cwru.edu>
-        From Josh Huber.
+2002-09-23  Josh Huber  <huber@alum.wpi.edu>
 
         * nnmaildir.el (nnmaildir--update-nov): fix wrong-type error when
         nnmail-extra-headers is non-nil.
@@ -8158,8 +8148,7 @@
 
         * gnus-sum.el (gnus-summary-next-group): Switch to the summary buffer.
 
-2002-09-20  Kai Gro,b_(Bjohann  <grossjoh@ls6.informatik.uni-dortmund.de>
-        From Reiner Steib.
+2002-09-20  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus-art.el (gnus-button-handle-custom,
         gnus-button-handle-mid-or-mail,
@@ -8185,10 +8174,10 @@
 
         * message.el (message-completion-alist): Add Reply-To, From, etc.
 
-2002-09-18  Simon Josefsson  <jas@extundo.com>
+2002-09-18  Nevin Kapur  <nevin@jhu.edu>
 
         * nnimap.el (nnimap-request-expire-articles): Make flag setting
-        conditional.  From Nevin Kapur <nevin@jhu.edu>.
+        conditional.
 
 2002-09-17  Simon Josefsson  <jas@extundo.com>
 
@@ -8198,8 +8187,7 @@
         when articles are found.  Suggested by Nevin Kapur
         <nevin@jhu.edu>.
 
-2002-09-17  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
-        From Reiner Steib <reiner.steib@gmx.de>.
+2002-09-17  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * message.el (message-strip-subject-trailing-was)
         (message-change-subject, message-add-archive-header)
@@ -8252,8 +8240,7 @@
 
         * gnus-sum.el (gnus-summary-next-group): Semi-exit only when needed.
 
-2002-09-12  Katsumi Yamaoka  <yamaoka@jpl.org>
-        From John Paul Wallington <jpw@shootybangbang.com>.
+2002-09-12  John Paul Wallington  <jpw@shootybangbang.com>.
 
         * gnus.el (gnus-visual, gnus-meta): Fix typo.
 
@@ -8267,8 +8254,7 @@
         (nnimap-split-rule): Doc fix.
         (nnimap-request-expire-articles): Cleanup code.
 
-2002-09-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-        From TSUCHIYA Masatoshi <tsuchiya@namazu.org>.
+2002-09-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>.
 
         * gnus-art.el (gnus-article-address-banner-alist): New option.
         (article-strip-banner): Refer the above option to split banners of
@@ -8348,10 +8334,10 @@
         * gnus-util.el (gnus-frame-or-window-display-name): Exclude
         invalid display names.
 
-2002-08-30  Simon Josefsson  <jas@extundo.com>
+2002-08-30  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus-group.el (gnus-group-fetch-control): Fix typo in last
-        commit.  From Reiner Steib <4uce.02.r.steib@gmx.net>.
+        commit.
 
 2002-08-26  Jesper Harder  <harder@ifa.au.dk>
 
@@ -8362,10 +8348,9 @@
         (gnus-group-fetch-control): New function.
         Add them to the keymap and menu. Require mm-url.
 
-2002-08-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+2002-08-30  Alex Schroeder  <alex@emacswiki.org>.
 
         * gnus-mlspl.el (gnus-group-split-fancy): Doc fix.
-        From Alex Schroeder <alex@emacswiki.org>.
 
 2002-08-29  Jesper Harder  <harder@ifa.au.dk>
 
@@ -8413,10 +8398,10 @@
         * lpath.el: Fbind `frame-parameter', `make-frame-on-display',
         `device-connection' and `dfw-device'.
 
-2002-08-22  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-08-22  Jochen Hein  <jochen@jochen.org>  (tiny change)
 
         * gnus-art.el (gnus-emphasis-alist): Strikethru had a lot of false
-        positives, make it stricter.  From Jochen Hein (trivial change).
+        positives, make it stricter.
 
 2002-08-21  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -8433,8 +8418,7 @@
 
         * lpath.el: Fbind w32-focus-frame and x-focus-frame.
 
-2002-08-20  Katsumi Yamaoka  <yamaoka@jpl.org>
-        From $B>.4X(B $B5HB'(B (KOSEKI Yoshinori) <kose@meadowy.org>.
+2002-08-20  $B>.4X(B $B5HB'(B (KOSEKI Yoshinori)  <kose@meadowy.org>.
 
         * message.el (message-set-auto-save-file-name): Add support for
         the Cygwin Emacs; the system-type is `cygwin'.
@@ -8544,7 +8528,7 @@
 
         * gnus.el (gnus-version-number): Bumped version number.
 
-2002-08-04 01:48:57 Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
+2002-08-04 01:48:57  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.07 is released.
 
@@ -8556,18 +8540,17 @@
         (gnus-article-sort-by-random): New function.
         (gnus-thread-sort-by-random): New function.
 
-2002-08-02  Simon Josefsson  <jas@extundo.com>
+2002-08-02  Scott A Crosby  <scrosby@cs.rice.edu>
 
         * gnus-logic.el (gnus-advanced-integer): Swap arguments in
-        funcall.  From Scott A Crosby <scrosby@cs.rice.edu>.
+        funcall.
 
 2002-07-31  Danny Siu  <dsiu@adobe.com>
 
         * nnimap.el (nnimap-split-articles): do not call nnmail-fetch-field
         when splitting malformed messages without message-id
 
-2002-07-28  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
-        From Niklas Morberg <niklas.morberg@axis.com>.
+2002-07-28  Niklas Morberg  <niklas.morberg@axis.com>.
 
         * nnweb.el (nnweb-type, nnweb-type-definition)
         (nnweb-gmane-create-mapping, nnweb-gmane-wash-article)
@@ -8611,21 +8594,18 @@
         nnmail-expiry-target to 'delete, so that absolute deletion
         happens when absolute deletion is requested.
 
-2002-07-21  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
-        From Nevin Kapur <nevin@jhu.edu>.
+2002-07-21  Nevin Kapur  <nevin@jhu.edu>.
 
         * nnmail.el (nnmail-fancy-expiry-target): Treat nonexisting
         headers as empty headers.
 
-2002-07-21  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
-        From Jochen Hein <jochen@jochen.org>.
+2002-07-21  Jochen Hein  <jochen@jochen.org>.
 
         * gnus-art.el (gnus-emphasis-alist): Add strikethrough and
         correct typo.
         (gnus-emphasis-strikethru): New face.
 
-2002-07-20  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
-        From Jason Merrill <jason@redhat.com>.
+2002-07-20  Jason Merrill  <jason@redhat.com>.
 
         * nnfolder.el (nnfolder-retrieve-headers): Avoid searching the
         entire file for each of a sequence of missing articles.
@@ -8636,8 +8616,7 @@
         * gnus-sum.el (gnus-summary-insert-new-articles): Count down to
         avoid nreverse.
 
-2002-07-14  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
-        From Ted Zlatanov <teodor.zlatanov@divine.com>.
+2002-07-14  Ted Zlatanov  <teodor.zlatanov@divine.com>
 
         * gnus-sum.el (gnus-auto-expirable-marks): Remove `spam'.
         (gnus-summary-mode-line-format-alist): Add %h for number of
@@ -8652,25 +8631,24 @@
         (gnus-mark-article-as-read, gnus-mark-article-as-unread)
         (gnus-mark-article-as-unread, gnus-summary-catchup): Grok spam.
 
-2002-07-10  Simon Josefsson  <jas@extundo.com>
+2002-07-10  KANEMATSU Daiji  <kdaiji@bea.com>
 
         * nnimap.el (nnimap-split-to-groups): Allow group string to be a
-        function.  From KANEMATSU Daiji <kdaiji@bea.com>.
+        function.
 
 2002-07-09  Nevin Kapur  <nevin@jhu.edu>
 
         * gnus-sum.el (gnus-summary-delete-article): Respect group
         parameters while expiring.
 
-2002-07-08  Simon Josefsson  <jas@extundo.com>
+2002-07-08  Henrik Enberg  <henrik@enberg.org>
 
-        * gnus-art.el (article-make-date-line): Fix string.  From Henrik
-        Enberg.
+        * gnus-art.el (article-make-date-line): Fix string.
 
-2002-07-08  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-07-08  Niklas Morberg  <niklas.morberg@axis.com>
 
         * gnus-art.el (article-unsplit-urls): Only display MIME when this
-        function is called interactively.  From Niklas Morberg.
+        function is called interactively.
 
 2002-07-06  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -8692,10 +8670,10 @@
 
         * nnmail.el (nnmail-split-methods): fix custom type.
 
-2002-07-02  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-07-02  Niklas Morberg  <niklas.morberg@axis.com>
 
         * gnus-art.el (article-unsplit-urls): Keep URL buttonized after
-        unsplitting.  From Niklas Morberg <niklas.morberg@axis.com>.
+        unsplitting.
 
 2002-07-01  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
@@ -8707,13 +8685,12 @@
         * nntp.el (nntp-via-rlogin-command-switches): New variable.
         (nntp-open-via-rlogin-and-telnet): Re-revert; use the var above.
 
-2002-06-28  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-06-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * message.el (message-font-lock-keywords): Don't fontify
         headers in the message body, only in the header.
         (message-font-lock-make-header-matcher): New function, used by
         message-font-lock-keywords.
-        From Katsumi Yamaoka <yamaoka@jpl.org>.
 
 2002-06-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -8766,24 +8743,22 @@
         (last, coerce, subseq): Remove compiler macros for those built-in
         or unused functions.
 
-2002-06-17  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-06-17  Simon Josefsson  <jas@extundo.com>
 
         * gnus-start.el (gnus-clear-system, gnus-read-newsrc-file): Make
         sure to write byte-compiled versions of gnus-*-format-alist to
-        .newsrc.eld.  From Simon Josefsson.
+        .newsrc.eld.
 
-2002-06-16  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-06-16  Bj,Ax(Brn Mork  <bmork@dod.no>
 
         * gnus-agent.el (gnus-agent-read-servers)
         (gnus-agent-write-servers): Put server name (string like
         "nnchoke:frumple") in the file instead of a server specification
         (Lisp expression like (nnchoke "frumple" ...parameters...)).
-        From Bj,Ax(Brn Mork <bmork@dod.no>.
 
-2002-06-16  Simon Josefsson  <jas@extundo.com>
+2002-06-16  Reiner Steib  <Reiner.Steib@gmx.de>
 
-        * gnus-cache.el (gnus-cache-remove-article): n is &optional.  From
-        Reiner Steib <4uce.02.r.steib@gmx.net>.
+        * gnus-cache.el (gnus-cache-remove-article): n is &optional.
 
 2002-06-15  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -8819,8 +8794,10 @@
         * gnus-int.el (gnus-request-move-article): Agent expire article if
         successfuly moved.
 
+2002-06-11  Niklas Morberg  <niklas.morberg@axis.com>
+
         * nnweb.el (nnweb-google-create-mapping): Honors the value of
-        nnweb-max-hits.  From Niklas Morberg <niklas.morberg@axis.com>.
+        nnweb-max-hits.
 
 2002-06-10  Simon Josefsson  <jas@extundo.com>
 
@@ -8869,11 +8846,10 @@
         * nnmail.el (nnmail-mail-splitting-decodes): New variable.
         (nnmail-article-group): Use it.
 
-2002-05-30  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-05-30  Jesper Harder  <harder@ifa.au.dk>
 
         * gnus-msg.el (gnus-inews-yank-articles): Merge split header lines
-        so that code reading them won't be surprised.  From Jesper Harder
-        <harder@ifa.au.dk>.
+        so that code reading them won't be surprised.
 
 2002-05-29  Simon Josefsson  <jas@extundo.com>
 
@@ -8890,11 +8866,10 @@
 
         * gnus-group.el (gnus-group-line-format): Doc fix.
 
-2002-05-28  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-05-28  Jesper Harder  <harder@ifa.au.dk>
 
         * gnus-msg.el (gnus-inews-yank-articles): Unfold headers of
-        original article before yanking.  From Jesper Harder
-        <harder@ifa.au.dk>.
+        original article before yanking.
 
 2002-05-26  Simon Josefsson  <jas@extundo.com>
 
@@ -8920,22 +8895,23 @@
         (gnus-summary-prepare-threads): Avoid simplifying every Subject
         twice by saving the simplified subject string in simp-subject.
 
-2002-05-23  Simon Josefsson  <jas@extundo.com>
+2002-05-23  Benjamin Rutt  <rutt+news@cis.ohio-state.edu>  (tiny change)
 
-        * gnus-msg.el (gnus-confirm-mail-reply-to-news): Typo.  Trivial
-        change from Benjamin Rutt <rutt+news@cis.ohio-state.edu>.
+        * gnus-msg.el (gnus-confirm-mail-reply-to-news): Typo.
 
-        * nnweb.el (nnweb-type): Remove dejanewsold.  Trivial change from
-        Niklas Morberg <niklas.morberg@axis.com>.
+2002-05-23  Niklas Morberg  <niklas.morberg@axis.com>  (tiny change)
+
+        * nnweb.el (nnweb-type): Remove dejanewsold.
 
 2002-05-22  Simon Josefsson  <jas@extundo.com>
 
         * sieve.el (sieve-change-region): Define it before it is used.
 
+2002-05-22  Benjamin Rutt  <rutt+news@cis.ohio-state.edu>
+
         * gnus-msg.el (gnus-confirm-mail-reply-to-news)
         (gnus-summary-reply): Ask for confirmation when replying to news.
-        Defaults to not ask.  From Benjamin Rutt
-        <rutt+news@cis.ohio-state.edu>.
+        Defaults to not ask.
 
         * nnimap.el (nnimap-nov-is-evil): Improve doc.
 
@@ -8990,10 +8966,13 @@
         * nnmail.el (nnmail-cache-insert): Change group to required,
         removed code which tried to figure out the group.
 
-2002-05-13  Josh Huber  <huber@alum.wpi.edu>
+2002-05-13  Hans de Graaff  <hans@degraaff.org>
 
         * mml.el (mml-generate-mime-1): Fix mml generation for signed only
-        messages. From Hans de Graaff <hans@degraaff.org>.
+        messages.
+
+2002-05-13  Josh Huber  <huber@alum.wpi.edu>
+
         * nnml.el (nnml-request-accept-article): Pass in the group name to
         nnmail-cache-insert, since it's available.
 
@@ -9001,8 +8980,7 @@
 
         * nndoc.el (nndoc-mime-digest-type-p): Set proper file-end.
 
-2002-05-08  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
-        From Florian Weimer <fw@deneb.enyo.de>.
+2002-05-08  Florian Weimer  <fw@deneb.enyo.de>
 
         * gnus.el (subscribed): New group parameter.
         (gnus-find-subscribed-addresses): Use it.
@@ -9022,16 +9000,15 @@
         parenthesis for "<" and ">".  Suggested by Andreas Schwab
         <schwab@suse.de>.
 
-2002-05-07  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-05-07  Josh Huber  <huber@alum.wpi.edu>
 
         * nnmail.el (nnmail-cache-insert): Prefer group-art over group
-        when intuiting the group the message is written to.  From Josh
-        Huber <huber@alum.wpi.edu>.
+        when intuiting the group the message is written to.
 
-2002-05-06  Simon Josefsson  <jas@extundo.com>
+2002-05-06  Matt Armstrong  <matt@lickey.com>
 
         * gnus-topic.el (gnus-group-topic-parameters): Work when group
-        buffer doesn't show group.  From Matt Armstrong <matt@lickey.com>.
+        buffer doesn't show group.
 
 2002-05-06  Josh Huber  <huber@alum.wpi.edu>
 
@@ -9078,7 +9055,7 @@
         server.
         (nnimap-mailbox-info): defvar instead of defvoo.
 
-2002-05-01 20:09:21 Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
+2002-05-01 20:09:21  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.06 is released.
 
@@ -9188,8 +9165,7 @@
 
         * gnus-art.el (article-unsplit-urls): Allow trailing SPC.
 
-2002-04-24  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
-        From Dan Christensen <jdc+news@uwo.ca>.
+2002-04-24  Dan Christensen  <jdc+news@uwo.ca>
 
         * nndoc.el (nndoc-type-alist, nndoc-lanl-gov-announce-type-p)
         (nndoc-transform-lanl-gov-announce, nndoc-generate-lanl-gov-head):
@@ -9211,11 +9187,10 @@
         (gnus-netrc-get, gnus-netrc-machine, gnus-parse-netrc): Aliased to
         new code in netrc.el.
 
-2002-04-23  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-04-23  Matthieu Moy  <Matthieu.Moy@imag.fr>
 
         * gnus-msg.el (gnus-summary-resend-message-edit): Remove
-        message-ignored-resent-headers, too.  From Matthieu Moy
-        <Matthieu.Moy@imag.fr>.
+        message-ignored-resent-headers, too.
 
 2002-04-22  Bj,Av(Brn Torkelsson  <torkel@acc.umu.se>
 
@@ -9280,8 +9255,7 @@
         * message.el (message-gen-unsubscribed-mft): accept a prefix
         argument so CC can be included with C-u C-c C-f C-a
 
-2002-04-17  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
-        From Ted Zlatanov <teodor.zlatanov@divine.com>.
+2002-04-17  Ted Zlatanov  <teodor.zlatanov@divine.com>
 
         * spam.el (spam-whitelist, spam-blacklist, spam-enter-whitelist):
         Improve docstring.
@@ -9318,11 +9292,10 @@
         * nnml.el (nnml-save-nov, nnml-generate-nov-file):
         * pop3.el (pop3-md5): Don't hardcode point-min == 1.
 
-2002-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+2002-04-12  Daiki Ueno  <ueno@unixuser.org>
 
         * gnus-srvr.el (gnus-server-set-info): Clear
         `gnus-server-method-cache' when `gnus-server-alist' is changed.
-        From Daiki Ueno <ueno@unixuser.org>.
 
 2002-04-11  Simon Josefsson  <jas@extundo.com>
 
@@ -9476,20 +9449,18 @@
 
         * message.el (message-mode): Fix doc.
 
-2002-03-25  Simon Josefsson  <jas@extundo.com>
+2002-03-25  Matthieu Moy  <Matthieu.Moy@imag.fr>
 
-        * message.el (message-subject-re-regexp): Skip Re[42]: junk.  From
-        Matthieu Moy <Matthieu.Moy@imag.fr>.
+        * message.el (message-subject-re-regexp): Skip Re[42]: junk.
 
 2002-03-24  Jesper Harder  <harder@ifa.au.dk>
 
         * mml-sec.el (mml-unsecure-message): Add docstring.
 
-2002-03-23  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2002-03-23  Andre Srinivasan  <andre@slamdunknetworks.com>  (tiny change)
 
         * nnmail.el (nnmail-large-newsgroup): Fix doc, allow non-numeric
         value.
-        Trivial change from andre@slamdunknetworks.com
 
 2002-03-22  Josh Huber  <huber@alum.wpi.edu>
 
@@ -9517,8 +9488,9 @@
         * message.el (message-font-lock-keywords): Support multi-line MML
         tags.
 
+2002-03-21  L,Bu(Brentey K,Ba(Broly  <lorentey@elte.hu>
+
         * gnus-sum.el (gnus-print-buffer): Remove gnus-decoration.
-        Trivial change from lorentey@elte.hu (L,Bu(Brentey K,Aa(Broly)
 
 2002-03-20  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -9542,30 +9514,28 @@
         (gnus-sum-thread-tree-leaf-with-other)
         (gnus-sum-thread-tree-single-leaf): Make customizable.
 
-2002-03-16  Simon Josefsson  <jas@extundo.com>
+2002-03-16  Francis Litterio  <franl@world.std.com>
 
         * gnus-util.el (gnus-extract-address-components): Don't break on
-        names such as James "Kibo" Parry.  From Francis Litterio
-        <franl@world.std.com>.
+        names such as James "Kibo" Parry.
 
-2002-03-13  Simon Josefsson  <jas@extundo.com>
+2002-03-13  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
-        * pop3.el (pop3-open-server): Revert multibyte change.  From
-        Pavel@Janik.cz (Pavel Jan,Am(Bk).
+        * pop3.el (pop3-open-server): Revert multibyte change.
 
-        * message.el (message-send-mail-with-qmail): Make it work.  From
-        Pavel@Janik.cz (Pavel Jan,Am(Bk).
+        * message.el (message-send-mail-with-qmail): Make it work.
 
 2002-03-13  Josh Huber  <huber@alum.wpi.edu>
 
         * message.el (message-make-mft): Set case-fold-search while
         generating the MFT.  Also, a little cleanup in the MFT code.
 
-2002-03-12  Simon Josefsson  <jas@extundo.com>
+2002-03-12  Faried Nawaz  <fn@hungry.org>  (tiny change)
 
-        * message.el (message-qmail-inject-args): May be function.
-        (message-send-mail-with-qmail): Call function if m-q-i-a is
-        function.  From fn@hungry.org (Faried Nawaz).
+        * message.el (message-qmail-inject-args): May be function.  Adjust
+        doc string and custom type.
+        (message-send-mail-with-qmail): Call function if m-q-i-a is a
+        function.
 
 2002-03-12  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -9587,26 +9557,26 @@
         * nnslashdot.el (nnslashdot-request-article): Remove javascript
         too.
 
-2002-03-09  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2002-03-09  Andre Srinivasan  <andre@slamdunknetworks.com>  (tiny change)
 
         * gnus-sum.el (gnus-summary-save-parts-default-mime): Remove
         duplication.
         (gnus-summary-save-parts-type-history): Ditto.
         (gnus-summary-save-parts-last-directory): Ditto.
-        Trivial change from andre@slamdunknetworks.com
 
 2002-03-09  Paul Jarc  <prj@po.cwru.edu>
 
         * gnus-start.el (gnus-auto-subscribed-groups): Include nnmaildir.
 
+2002-03-06  Matthieu Moy  <Matthieu.Moy@imag.fr>
+
+        * gnus-msg.el (gnus-summary-resend-message-edit): New function.
+
 2002-03-06  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * nnslashdot.el (nnslashdot-request-article): Use "<!-- no ad 6
         -->" as the end of the first article.
 
-        * gnus-msg.el (gnus-summary-resend-message-edit): New function.
-        From Matthieu Moy <Matthieu.Moy@imag.fr>
-
         * message.el (message-add-action): Use add-to-list.
         (message-delete-action): New function.
 
@@ -9668,17 +9638,15 @@
         completing-read.
         (mm-view-pkcs7-decrypt): CRLF->LF.
 
-2002-03-04  Paul Jarc  <prj@po.cwru.edu>
+2002-03-04  Teodor Zlatanov  <teodor.zlatanov@divine.com>
 
         * message.el (message-hierarchical-addresses): New variable.
         (message-get-reply-headers): Use it.
-        From Ted Zlatanov <teodor.zlatanov@divine.com>
 
-2002-03-03  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2002-03-03  Geoff Greene  <ggreene@wpi.edu>  (tiny change)
 
         * message.el (message-mode): If buffer-file-name, don't set auto
         save file name.
-        Trivial change from Geoff Greene <ggreene@wpi.edu>
 
 2002-03-02  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -9725,11 +9693,12 @@
         * gnus-sum.el (gnus-articles-to-read): Use large-newsgroup-initial.
         (gnus-summary-insert-old-articles): Ditto.
 
-2002-02-26  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2002-02-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
 
         * gnus-sum.el (gnus-articles-to-read): `gnus-large-newsgroup' is
         used as the default answer of the question, "How many articles?".
-        From TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+
+2002-02-26  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * nnagent.el (nnagent-retrieve-headers): Remove articles with
         small numbers.
@@ -9738,14 +9707,15 @@
 
         * deuglify.el: Fix comments.
 
+2002-02-23  Andre Srinivasan  <andre@slamdunknetworks.com>  (tiny change)
+
+        * mml.el (mml-generate-mime-1): Add cdr.
+
 2002-02-23  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * html2text.el (html2text-clean-anchor): If there is no HREF,
         insert nothing.
 
-        * mml.el (mml-generate-mime-1): Add cdr.
-        From: andre@slamdunknetworks.com
-
         * mm-view.el (mm-text-html-renderer-alist): Add html2text.
         (mm-text-html-washer-alist): Ditto.
 
@@ -9761,11 +9731,15 @@
 
         * deuglify.el: Change copy right. Add autoload. Add coding-system.
 
-        * deuglify.el: New file. The original file name is
-        gnus-outlook-deuglify.el from Raymond Scholz <rscholz@zonix.de>.
+2002-02-22  Raymond Scholz  <rscholz@zonix.de>
+
+        * deuglify.el: New file.  The original file name is
+        gnus-outlook-deuglify.el.
+
+2002-02-22  Andre Srinivasan  <andre@slamdunknetworks.com>  (tiny change)
 
         * mm-decode.el (mm-display-external): Use
-        mm-file-name-rewrite-functions.  From <andre@slamdunknetworks.com>
+        mm-file-name-rewrite-functions.
 
 2002-02-22  Paul Jarc  <prj@po.cwru.edu>
 
@@ -9801,17 +9775,19 @@
 
         * gnus-art.el (gnus-article-edit-done): Widen the buffer.
 
+        * message.el (message-send-mail): Be talkative.
+
+2002-02-20  TSUCHIYA Masatoshi  <tsuchiya@pine.kuee.kyoto-u.ac.jp>
+
         * gnus-group.el (gnus-group-name-decode): Don't test
         multibyte-string, because it breaks XEmacs.
-        From: TSUCHIYA Masatoshi <tsuchiya@pine.kuee.kyoto-u.ac.jp>
 
-        * message.el (message-send-mail): Be talkative.
+2002-02-20  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * mm-decode.el (mm-inlined-types): Add application/x-emacs-lisp.
         (mm-automatic-display): Ditto.
 
         * mailcap.el (mailcap-mime-data): Ditto.
-        From: Reiner Steib <4uce.02.r.steib@gmx.net>
 
 2002-02-20  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -9853,10 +9829,10 @@
 
         * nnultimate.el (nnultimate-retrieve-headers): Clean up.
 
-2002-02-18  Paul Jarc  <prj@po.cwru.edu>
+2002-02-18  Mark Thomas  <mthomas@cmu.edu>
 
         * gnus-util.el (gnus-parent-id): Ignore trailing whitespace in the
-        References header field.  From Mark Thomas <mthomas@cmu.edu>.
+        References header field.
 
 2002-02-18  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -9970,8 +9946,9 @@
 
         * message-utils.el: Adopt the file.
 
+2002-02-15  Holger Schauer  <Holger.Schauer@gmx.de>
+
         * message-utils.el: New file.
-        From Holger Schauer <Holger.Schauer@gmx.de>
 
 2002-02-14  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -10079,9 +10056,6 @@
         gnus-decoration property.
         * gnus-msg.el (gnus-copy-article-buffer): Remove gnus-decoration.
 
-        * message.el (message-mode): Set local-abbrev-table.
-        From Matt Armstrong <matt@lickey.com>.
-
         * gnus-art.el (gnus-article-treat-unfold-headers): Don't remove
         too many spaces.
 
@@ -10089,8 +10063,13 @@
         (rfc2047-decode-region): Don't unfold. Let
         gnus-article-treat-unfold-headers do it.
 
+2002-02-07  Matt Armstrong  <matt@lickey.com>.
+
+        * message.el (message-mode): Set local-abbrev-table.
+
+2002-02-07  Jesper Harder  <harder@ifa.au.dk>
+
         * gnus-sum.el (gnus-dependencies-add-header): Fix typo.
-        From: Jesper Harder <harder@ifa.au.dk>
 
 2002-02-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
@@ -10117,16 +10096,18 @@
 
         * nnweb.el (nnweb-google-parse-1): Use a correct format of date.
 
-        * gnus-agent.el (gnus-agent-summary-make-menu-bar): Fix typo.
-        From Stefan Reich,Av(Br <xsteve@riic.at>.
-
         * nnagent.el (nnagent-request-expire-articles): Don't delete
         files.
 
-2002-02-05  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2002-02-06  Stefan Reich,Av(Br  <xsteve@riic.at>
+
+        * gnus-agent.el (gnus-agent-summary-make-menu-bar): Fix typo.
+
+2002-02-05  Sriram Karra  <karra@cs.utah.edu>
 
         * message.el (message-gen-unsubscribed-mft): New function.
-        From Sriram Karra <karra@cs.utah.edu>.
+
+2002-02-05  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * gnus.el (gnus-article-unpropagated-mark-lists): Backslash the
         open parenthesis.
@@ -10168,17 +10149,17 @@
         * gnus-art.el (gnus-treatment-function-alist): Move hide-citation,
         highlight-citation after emphasize.
 
-2002-02-04  Simon Josefsson  <jas@extundo.com>
+2002-02-04  David Edmondson  <dme@sun.com>
 
-        * nnfolder.el (nnfolder-open-marks):
+        * nnfolder.el (nnfolder-open-marks): Message when done.
 
-        * nnml.el (nnml-open-marks): Message when done.  From David
-        Edmondson <dme@sun.com>.
+        * nnml.el (nnml-open-marks): Ditto.
 
-2002-02-03  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2002-02-03  Steinar Bang  <sb@dod.no>
 
         * imap.el (imap-anonymous-auth): Fix typo.
-        From: Steinar Bang <sb@dod.no>
+
+2002-02-03  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * gnus-cache.el (gnus-cache-braid-nov): Use set-buffer instead of
         save-excursion.
@@ -10232,14 +10213,15 @@
 
         * gnus.el (gnus-agent): Make it customizable.
 
-        * gnus-dired.el: New file.
-        From Benjamin Rutt <brutt@bloomington.in.us>
-
         * gnus-cache.el (gnus-cache-articles-in-group): Remove from active
         if no article.
         (gnus-cache-possibly-remove-article): Ditto.
         (gnus-cache-possibly-enter-article): Use gnus-add-to-sorted-list.
 
+2002-02-02  Benjamin Rutt  <brutt@bloomington.in.us>
+
+        * gnus-dired.el: New file.
+
 2002-02-01  Simon Josefsson  <jas@extundo.com>
 
         * gnus-int.el (gnus-request-accept-article): Use gnus-get-function.
@@ -10740,7 +10722,7 @@
 
         * gnus.el (gnus-version-number): Bump version number.
 
-2002-01-20 05:33:30 Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
+2002-01-20 05:33:30  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.05 is released.
 
@@ -10974,8 +10956,9 @@
         * message.el (message-newline-and-reformat): Use `newline' instead
         of inserting \n, so that the newline is marked as hard.
 
+2002-01-13  Jesper Harder  <harder@ifa.au.dk>
+
         * gnus-spec.el (gnus-pad-form): Don't evaluate EL multiple times.
-        From Jesper Harder <harder@ifa.au.dk>.
 
 2002-01-12  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -11199,11 +11182,13 @@
         * gnus-group.el (gnus-group-read-ephemeral-group): Restore the old
         behavior of quit-config.
 
+2002-01-08  Bj,Ax(Brn Mork  <bmork@dod.no>  (tiny change)
+
         * message.el (message-make-from): Don't quote fullname.
-        From: Bj,Ax(Brn Mork <bmork@dod.no>
+
+2002-01-08  Andre Srinivasan  <andre@slamdunknetworks.com>  (tiny change)
 
         * gnus-group.el (gnus-group-suspend): Don't kill message buffers.
-        From: <andre@slamdunknetworks.com>
 
 2002-01-07  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -11486,10 +11471,10 @@
 
         * gnus-agent.el (gnus-agent-fetch-session): Run hook.
 
-2002-01-03  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-01-03  Dave Love  <fx@gnu.org>
 
         * gnus-start.el (gnus-read-init-file): Don't force coding system
-        for ~/.gnus.  From Dave Love <fx@gnu.org>.
+        for ~/.gnus.
 
 2002-01-03  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -11755,7 +11740,7 @@
         (message-fix-before-sending): Highlight invisible text and place
         point there.
 
-2002-01-01 02:32:53 Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
+2002-01-01 02:32:53  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.04 is released.
 
@@ -12094,11 +12079,10 @@
         (gnus-update-marks): Use `gnus-range-add' on a uncompressed list
         instead, it seems to result in shorter ranges.
 
-2001-12-26 11:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2001-12-26 11:00:00  Jesper Harder  <harder@ifa.au.dk>
 
         * mm-util.el (mm-iso-8859-x-to-15-region): Use
         insert-before-markers.
-        From Jesper Harder <harder@ifa.au.dk>
 
 2001-12-26  Paul Jarc  <prj@po.cwru.edu>
 
@@ -12127,12 +12111,11 @@
         (nnmaildir-version): Indicate that nnmaildir is now a standard
         part of Gnus, not separately released.
 
-2001-12-21 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2001-12-21 08:00:00  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * gnus-art.el, gnus-picon.el, gnus-sieve.el, gnus-sum.el:
         * gnus-xmas.el, imap.el, mailcap.el, mm-util.el, nnfolder.el:
         * nnheader.el, nnmail.el: Nil/NIL vs. nil.
-        From  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 2001-12-20 15:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -12145,10 +12128,9 @@
         (nnimap-close-group): Don't quote KEYLIST items.  Suggested by
         Brian P Templeton <bpt@tunes.org>.
 
-2001-12-19 17:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2001-12-19 17:00:00  Paul Jarc  <prj@po.cwru.edu>
 
         * nnmaildir.el: New file.
-        From Paul Jarc <prj@po.cwru.edu>.
 
 2001-12-19 16:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -12172,8 +12154,7 @@
 
         * gnus-win.el (gnus-get-buffer-window): Use gnus-delete-if.
 
-2001-12-18 11:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-           From Harald Meland <Harald.Meland@usit.uio.no>
+2001-12-18 11:00:00  Harald Meland  <Harald.Meland@usit.uio.no>
 
         * gnus-win.el (gnus-get-buffer-window): New function.
         (gnus-all-windows-visible-p): Use it.
@@ -12248,11 +12229,10 @@
         subscribe-level
         * gnus-topic.el (gnus-subscribe-topics): use it.
 
-2001-12-13 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2001-12-13 22:00:00  Sean Neakums  <sneakums@zork.net>  (tiny change)
 
         * gnus-msg.el (gnus-summary-mail-forward): Forward all marked
-        messages. (A small patch with indentation)
-        From Sean Neakums <sneakums@zork.net>.
+        messages.
 
         * gnus-uu.el (gnus-uu-grab-articles): Set gnus-current-article to
         nil after shooting down the gnus-original-article-buffer.
@@ -12327,12 +12307,11 @@
 
         * mml.el (mime-to-mml): Remove Content-Disposition too.
 
-2001-12-09 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2001-12-09 08:00:00  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
 
         * gnus-sum.el (gnus-summary-buffer-name): Decode group name.
         * gnus-group.el (gnus-group-name-decode): Decode unibyte
         strings only.
-        From TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 2001-12-08  Nevin Kapur  <nevin@jhu.edu>
 
@@ -12433,15 +12412,14 @@
         the beginning of lines.
         (gnus-complex-form-to-spec): Ditto.
 
-2001-12-01 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2001-12-01 08:00:00  Paul Jarc  <prj@po.cwru.edu>
 
         * message.el (message-make-mft): Fix the m-s-a-file regexp.
-        From Paul Jarc <prj@po.cwru.edu>.
 
-2001-11-30 21:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2001-11-30 21:00:00  Paul Jarc  <prj@po.cwru.edu>
 
         * message.el: New variable message-subscribed-address-file;
-        use it in message-make-mft.  From Paul Jarc <prj@po.cwru.edu>.
+        use it in message-make-mft.
 
 2001-11-30 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -12574,11 +12552,11 @@
 
         * message.el (sha1): eval-and-compile.
 
-2001-11-20  Simon Josefsson  <jas@extundo.com>
+2001-11-20  Paul Jarc  <prj@po.cwru.edu>
 
         * message.el (message-allow-no-recipients): New variable.
         (message-send): Use it, customize the prompting when posting to
-        Gcc/Fcc alone.  From prj@po.cwru.edu (Paul Jarc).
+        Gcc/Fcc alone.
 
 2001-11-20 09:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -12698,14 +12676,17 @@
 
         * mml2015.el: Mention RFC 3156.
 
-        * mml1991.el: New file.  From Sascha L,A|(Bdecke <sascha@meta-x.de>.
+2001-11-12  Sascha L,A|(Bdecke  <sascha@meta-x.de>
+
+        * mml1991.el: New file.
 
 2001-11-12 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * gnus-start.el (gnus-auto-subscribed-groups): Use ^nnml.
 
+2001-11-12  Michael Cook  <Michael.Cook@cisco.com>
+
         * gnus-sum.el (gnus-summary-move-article): Use number-to-string.
-          From <Michael.Cook@cisco.com>
 
 2001-11-11  Simon Josefsson  <jas@extundo.com>
 
@@ -12714,10 +12695,9 @@
         canlock, no need to require two different hash algs).  Suggested
         by Ferenc Wagner <wferi@bolyai1.elte.hu>.
 
-2001-11-09  Simon Josefsson  <jas@extundo.com>
+2001-11-09  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
-        * gnus.el (gnus-local-domain): Fix doc.  From Pavel Jan,Am(Bk
-        <Pavel@Janik.cz>.
+        * gnus.el (gnus-local-domain): Fix doc.
 
 2001-11-09  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
@@ -12959,7 +12939,7 @@
         mm-with-unibyte-current-buffer-mule4): Use them.
         (mm-find-mime-charset-region): Treat iso-2022-jp.
 
-        From  Dave Love  <fx@gnu.org>:
+2001-10-30  Dave Love  <fx@gnu.org>
 
         * mm-util.el (mm-mime-mule-charset-alist): Make it correct by
         construction.
@@ -13032,10 +13012,10 @@
 
         * gnus-msg.el (gnus-setup-message): Call post-command-hook.
 
-2001-10-29  Simon Josefsson  <jas@extundo.com>
+2001-10-29  Jesper Harder  <harder@myrealbox.com>
 
         * mml.el (mml-preview): Bind message-this-is-news if it is
-        news. From Jesper Harder <harder@myrealbox.com>.
+        news.
 
 2001-10-28  Simon Josefsson  <jas@extundo.com>
 
@@ -13051,8 +13031,9 @@
         * message.el (message-indent-citation): Don't add trailing
         whitespace when citing text.
 
-        * gnus.el (gnus-group-faq-directory): Fix.  From Jesper Harder
-        <harder@ifa.au.dk>.
+2001-10-27  Jesper Harder  <harder@myrealbox.com>
+
+        * gnus.el (gnus-group-faq-directory): Fix.
 
 2001-10-26 14:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -13129,22 +13110,23 @@
         * message.el (message-do-auto-fill): Avoid calling
         'rfc822-goto-eoh'.
 
-2001-10-20  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
-        From Paul Jarc <prj@po.cwru.edu>.
+2001-10-20  Paul Jarc  <prj@po.cwru.edu>
 
         * message.el (message-get-reply-headers): Restructure the logic
-        and add comments.  From Paul Jarc <prj@po.cwru.edu>.
+        and add comments.
 
 2001-10-20  Simon Josefsson  <jas@extundo.com>
 
         * message.el (message-cancel-news): Support cancel-locks.
         Suggested by Per Abrahamsson.
 
-        * nnml.el (nnml-marks-changed-p): Use `equal' when comparing
-        conses.  From David Z Maze <dmaze@MIT.EDU>.
-
         * nnfolder.el (nnfolder-marks-changed-p): Ditto.
 
+2001-10-20  David Z Maze  <dmaze@MIT.EDU>
+
+        * nnml.el (nnml-marks-changed-p): Use `equal' when comparing
+        conses.
+
 2001-10-19  Per Abrahamsen  <abraham@dina.kvl.dk>
 
         * mm-decode.el (mm-default-directory): Fix customize type.
@@ -13174,8 +13156,7 @@
         * gnus-sum.el (gnus-group-make-articles-read): Call g-r-set-mark
         when undoing.
 
-2001-10-18  Simon Josefsson  <jas@extundo.com>
-        From Frank Schmitt <usereplyto@Frank-Schmitt.net>
+2001-10-18  Frank Schmitt  <usereplyto@Frank-Schmitt.net>
 
         * gnus-sum.el (gnus-summary-limit-to-display-predicate): Fix typo.
         (gnus-summary-make-menu-bar): Ditto.
@@ -13185,11 +13166,10 @@
         * nnimap.el (nnimap-expiry-target): Make sure it is back to the
         server. Suggested by ShengHuo ZHU <zsh@cs.rochester.edu>.
 
-2001-10-17 17:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2001-10-17 17:00:00  Frank Schmitt  <usenet@Frank-Schmitt.net>
 
         * gnus-sum.el (gnus-summary-line-format-alist): user-date entry.
         * gnus-util.el (gnus-user-date): New function.
-        From Frank Schmitt <usenet@Frank-Schmitt.net>.
 
 2001-10-17  Per Abrahamsen  <abraham@dina.kvl.dk>
 
@@ -13222,8 +13202,7 @@
         * gnus-msg.el (gnus-post-method): Changed two instances of
         `active' to `current' and one `null' to `not'.
 
-2001-10-16  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
-        From Katsumi Yamaoka <yamaoka@jpl.org>.
+2001-10-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * message.el (message-setup-fill-variables): Use
         `normal-auto-fill-function' instead of `auto-fill-function'.
@@ -13279,10 +13258,9 @@
         * gnus-art.el (article-emphasize): Set `g-a-wash-types' after
         doing stuff that clears it.
 
-2001-10-12  Simon Josefsson  <jas@extundo.com>
+2001-10-12  Eric Marsden  <emarsden@laas.fr>
 
         * gnus-cache.el (gnus-summary-limit-include-cached): Rewrite.
-        From Eric Marsden <emarsden@laas.fr>.
 
 2001-10-12 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -13484,20 +13462,17 @@
         (gnus-topic-catchup-articles): New function. Suggested by Robin
         S. Socha <robin-dated-1001857693.185e29@socha.net>.
 
-2001-09-27 11:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        From Gerd M,Av(Bllmann <gerd@gnu.org>.
+2001-09-27 11:00:00  Gerd M,Av(Bllmann  <gerd@gnu.org>.
 
         * gnus-ems.el (gnus-article-display-xface): Insert xface after
         previous ones.
 
-2001-09-27 07:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        From Daiki Ueno  <ueno@unixuser.org>
+2001-09-27 07:00:00  Daiki Ueno  <ueno@unixuser.org>
 
         * gnus-sum.el (gnus-summary-show-article): The arglist of
         detect-coding-region is incompatible.
 
-2001-09-26 18:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        From Katsuhiro Hermit Endo <hermit@koka-in.org>
+2001-09-26 18:00:00  Katsuhiro Hermit Endo  <hermit@koka-in.org>
 
         * gnus-group.el (gnus-group-delete-group): Typo.
 
@@ -13580,10 +13555,9 @@
         * gnus-srvr.el (gnus-server-insert-server-line): Don't let an
         error querying a backend abort the whole process.
 
-2001-09-17 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2001-09-17 08:00:00  Gerd M,Av(Bllmann  <gerd@gnu.org>
 
         * gnus-srvr.el (gnus-server-mode): Fix bogus fontification.
-        From Gerd M,Av(Bllmann <gerd@gnu.org>.
 
 2001-09-17  Didier Verna  <didier@xemacs.org>
 
@@ -13655,7 +13629,7 @@
         * gnus-diary.el (message-mode-map): bind the above to `C-c D c'.
         * gnus-diary.el (gnus-article-edit-mode-map): ditto.
 
-2001-09-10 TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+2001-09-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
 
         * gnus-sum.el (gnus-select-newsgroup): Make
         `gnus-current-select-method' buffer-local.
@@ -13663,8 +13637,7 @@
         * gnus-art.el (gnus-request-article-this-buffer): Refer
         `gnus-current-select-method' in the current summary buffer.
 
-2001-09-10  Simon Josefsson  <jas@extundo.com>
-        From Daniel Pittman <daniel@rimspace.net>
+2001-09-10  Daniel Pittman  <daniel@rimspace.net>
 
         * gnus-spec.el (gnus-correct-pad-form): Fix.
 
@@ -13715,8 +13688,7 @@
         * gnus-agent.el (gnus-agent-fetch-group): If online, actually
         fetch group.
 
-2001-09-08  Simon Josefsson  <jas@extundo.com>
-        From Daniel Pittman <daniel@rimspace.net>
+2001-09-08  Daniel Pittman  <daniel@rimspace.net>
 
         * gnus-spec.el (gnus-correct-pad-form): New function.
         (gnus-parse-simple-format): Use it.
@@ -13728,7 +13700,7 @@
         Putnam <reader@newsguy.com>.
         (gnus-group-sort-selected-groups): Touch dribble file.
 
-2001-09-07 Raja R Harinath  <harinath@cs.umn.edu>
+2001-09-07  Raja R Harinath  <harinath@cs.umn.edu>
 
         * nnml.el (nnml-filenames-are-evil): New variable.
         (nnml-article-to-file-alist): Rename to ...
@@ -13750,10 +13722,9 @@
         * gnus-sum.el (gnus-summary-toggle-smiley): New function. Toggles
         display of graphical smilies.
 
-2001-09-07 02:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2001-09-07 02:00:00  Bill White  <billw@wolfram.com>
 
         * gnus-start.el (gnus-setup-news): A typo.
-        From Bill White <billw@wolfram.com>.
 
 2001-09-06  Simon Josefsson  <jas@extundo.com>
 
@@ -13864,8 +13835,7 @@
         * nnfolder.el (nnfolder-save-marks): Don't create directory named
         after group in ~/.
 
-2001-08-25  Simon Josefsson  <jas@extundo.com>
-        From Andreas Jaeger  <aj@suse.de>
+2001-08-25  Andreas Jaeger  <aj@suse.de>
 
         * nnfolder.el (nnfolder-open-marks): Fix typo.
         * nnml.el (nnml-open-marks): Likewise.
@@ -13919,11 +13889,12 @@
 
         * mml.el (mml-generate-mime-1): Force as multibyte string.
 
-2001-08-24 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2001-08-24 12:00:00  Martin Kretzschmar  <Martin.Kretzschmar@inf.tu-dresden.de>
 
         * gnus-sum.el (gnus-summary-insert-line)
         (gnus-summary-prepare-threads): gnus-tmp-lines should be a string.
-        From Martin Kretzschmar <Martin.Kretzschmar@inf.tu-dresden.de>
+
+2001-08-24 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * gnus-spec.el (gnus-correct-substring): Take optional END.
 
@@ -13945,8 +13916,7 @@
         * gnus-util.el (gnus-create-info-command): Return an interactive
         function.
 
-2001-08-23 19:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        From Katsumi Yamaoka <yamaoka@jpl.org>
+2001-08-23 19:00:00  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-spec.el (gnus-parse-complex-format): Use equal.
 
@@ -14100,8 +14070,7 @@
 
         * gnus.el (gnus-server-visual): Add defgroup.
 
-2001-08-19  Simon Josefsson  <jas@extundo.com>
-        From Joe Casadonte <jcasadonte@northbound-train.com>
+2001-08-19  Joe Casadonte  <jcasadonte@northbound-train.com>
 
         * gnus-srvr.el (gnus-server-opened-face, gnus-server-closed-face,
         gnus-server-denied-face): New.
@@ -14261,8 +14230,7 @@
         * gnus-delay.el (gnus-delay-article): Allow "01:23" time spec,
         which specifies a time today or tomorrow.
 
-2001-08-15  Simon Josefsson  <jas@extundo.com>
-        From Pavel@Janik.cz (Pavel Jan,Am(Bk)
+2001-08-15  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * gnus-agent.el (gnus-agent-make-mode-line-string)
         (gnus-agent-toggle-plugged): Use new API.
@@ -14308,7 +14276,6 @@
         * gnus-spec.el (gnus-format-specs): %n is 23 chars.
 
 2001-08-11 09:40:00  Karl Kleinpaste  <karl@charcoal.com>
-        Committed by Kai Gro,b_(Bjohann.
 
         * gnus-score.el (gnus-score-string): Fix `match' regexp
         for `extra' header case.
@@ -14389,23 +14356,23 @@
         * imap.el (imap-gssapi-auth-p, imap-kerberos4-auth-p): Also check
         whether `imtest' is installed.
 
-2001-08-04  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        Trivial patch from Nuutti Kotivuori  <nuutti.kotivuori@smarttrust.com>
+2001-08-04  Nuutti Kotivuori  <nuutti.kotivuori@smarttrust.com>
 
         * gnus-sum.el (gnus-summary-show-article): Call
         gnus-summary-update-secondary-secondary-mark.
         * gnus-sum.el (gnus-summary-edit-article-done): Ditto.
         * gnus-sum.el (gnus-summary-reparent-thread): Ditto.
 
+2001-08-07 16:00:00  Gerd M,Av(Bllmann  <gerd@gnu.org>
+
+        * mm-uu.el (mm-uu-dissect): Autoload.
+
 2001-08-07 16:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * gnus-sum.el (gnus-summary-make-menu-bar): Misc -> Gnus.
 
         * gnus-group.el (gnus-group-make-menu-bar): Ditto.
 
-        * mm-uu.el (mm-uu-dissect): Autoload. From Gerd M,Av(Bllmann
-        <gerd@gnu.org>.
-
         * gnus-art.el (gnus-output-to-file): Bind file-name-coding-system.
 
         * gnus-util.el (gnus-output-to-rmail): Ditto.
@@ -14527,8 +14494,7 @@
         (mm-pkcs7-enveloped-magic): Ditto.
         (mm-view-pkcs7-get-type): Don't regexp quote.
 
-2001-08-01 14:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        From Andreas Fuchs <asf@void.at>
+2001-08-01 14:00:00  Andreas Fuchs  <asf@void.at>
 
         * mml2015.el (mml2015-trust-boundaries-alist): Typo.
 
@@ -14623,13 +14589,11 @@
         (smime-dns-server): Fix customize group.
         (smime-call-openssl-region): Use `smime-extra-arguments'.
 
-2001-07-29  Simon Josefsson  <jas@extundo.com>
-        From Vladimir Volovich <vvv@vsu.ru>
+2001-07-29  Vladimir Volovich  <vvv@vsu.ru>
 
         * smime.el (smime-call-openssl-region): Ignore stderr.
 
-2001-07-29  Simon Josefsson  <jas@extundo.com>
-        From Christoph Conrad <christoph.conrad@gmx.de>
+2001-07-29  Christoph Conrad  <christoph.conrad@gmx.de>
 
         * gnus-agent.el (gnus-agent-save-group-info): Don't destroy active
         file.
@@ -14750,8 +14714,7 @@
 
         * nnimap.el (nnimap-version): Bump version number.
 
-2001-07-26 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        From Steven E. Harris <seh@speakeasy.org>
+2001-07-26 10:00:00  Steven E. Harris  <seh@speakeasy.org>
 
         * nnheader.el (nnheader-translate-file-chars): cygwin32 is running
         in M$Windows too.
@@ -14773,8 +14736,7 @@
         * gnus-sum.el (gnus-summary-prepare-threads): Shouldn't do tree
         display (%B) for threads if threading is off.
 
-2001-07-25 14:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        From Henrik Enberg <henrik@enberg.org>
+2001-07-25 14:00:00  Henrik Enberg  <henrik@enberg.org>
 
         * gnus-msg.el: Customization patch.
 
@@ -14844,8 +14806,7 @@
         * gnus-delay.el (gnus-delay-default-hour): New variable.
         (gnus-delay-article): Allow specific date in YYYY-MM-DD format.
 
-2001-07-23 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        From Karl Kleinpaste <karl@charcoal.com>
+2001-07-23 22:00:00  Karl Kleinpaste  <karl@charcoal.com>
 
         * gnus-sum.el (gnus-summary-line-format-alist): Add %B.
         (gnus-summary-prepare-threads): Ditto.
@@ -15002,11 +14963,11 @@
         * nnrss.el (nnrss-read-group-data): Nuke emacs-lisp-mode-hook.
         (nnrss-read-server-data): Ditto.
 
-2001-07-13 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2001-07-13 12:00:00  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * gnus-setup.el (gnus-use-installed-gnus): Typo.
         * Cleanup files.
-        From Pavel@Janik.cz (Pavel Jan,Am(Bk).
+
 
 2001-07-13 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -15129,8 +15090,7 @@
         * nntp.el (nntp-send-command, nntp-send-command-nodelete):
         (nntp-send-command-and-decode): Use gnus-point-at-bol.
 
-2001-07-09 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        From  Paul Jarc <prj@po.cwru.edu>
+2001-07-09 13:00:00  Paul Jarc  <prj@po.cwru.edu>
 
         * message.el (message-use-mail-followup-to): New variable.
         (message-get-reply-headers): Use it.
@@ -15218,8 +15178,7 @@
         * gnus-start.el (gnus-check-first-time-used): Use `if' instead of
         `when'.
 
-2001-07-03  Simon Josefsson  <jas@extundo.com>
-        From Nuutti Kotivuori <nuutti.kotivuori@smarttrust.com>
+2001-07-03  Nuutti Kotivuori  <nuutti.kotivuori@smarttrust.com>
 
         * flow-fill.el (fill-flowed): Use (1+ (point-at-eol)) instead.
 
@@ -15267,8 +15226,7 @@
         (rfc2047-encode-message-header): Fold lines even if
         no QP encoding is done.
 
-2001-06-23  Simon Josefsson  <jas@extundo.com>
-        From Samuel Tardieu <sam@inf.enst.fr>
+2001-06-23  Samuel Tardieu  <sam@inf.enst.fr>
 
         * smime.el (smime-keys): Support additional certificates.
         (smime-make-certfiles): New function.
@@ -15302,8 +15260,7 @@
 
         * message.el (message-goto-body): Return nil if not found. (revert!)
 
-2001-06-21 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        From Fremlin <chief@bandits.org>
+2001-06-21 10:00:00  John Fremlin  <chief@bandits.org>  (tiny change)
 
         * message.el (message-goto-body): Some messages have no header.
 
@@ -15385,7 +15342,7 @@
         * nnweb.el (nnweb-google-parse-1): Fix Google content regexp.
         (nnweb-google-wash-article): Ditto.
 
-2001-06-14 Ferenc Wagner  <wferi@bolyai1.elte.hu>
+2001-06-14  Ferenc Wagner  <wferi@bolyai1.elte.hu>
 
         * nnweb.el (nnweb-google-parse-1): Fix Google url regexp.
 
@@ -15412,17 +15369,20 @@
 
         * nnrss.el (nnrss-group-alist): Use |fr| instead of [fr].
 
-2001-06-12 11:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2001-06-12 11:00:00  Marc Lefranc  <Marc.Lefranc@univ-lille1.fr>
 
         * gnus-art.el (gnus-plain-save-name): Use file-relative-name.
-        From Marc Lefranc <Marc.Lefranc@univ-lille1.fr>.
+
+2001-06-12 11:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * nnrss.el (nnrss-node-text): Node might be nil.
 
-2001-06-11 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2001-06-11 10:00:00  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-uu.el (gnus-uu-save-article): Use mml tag instead of
-        part. From Katsumi Yamaoka <yamaoka@jpl.org>.
+        part.
+
+2001-06-11 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * nnrss.el (nnrss-group-alist): More items.
 
@@ -15436,14 +15396,11 @@
         * gnus-mlspl.el (gnus-group-split-fancy): Fix generation of split
         restrict clauses.
 
-2001-06-07 16:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-
-        From Benjamin Rutt <brutt+news@bloomington.in.us>
+2001-06-07 16:00:00  Benjamin Rutt  <brutt+news@bloomington.in.us>
 
         * message.el (message-wide-reply-confirm-recipients): New variable.
 
-2001-06-06  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        Trivial patch from Mark Thomas  <mthomas@edrc.cmu.edu>
+2001-06-06  Mark Thomas  <mthomas@edrc.cmu.edu>  (tiny change)
 
         * nnmail.el (nnmail-fix-eudora-headers): Change the In-Reply-To
         fix so it works with XEmacs.
@@ -15457,10 +15414,10 @@
 
         * nnrss.el: Fix a few bugs.
 
-2001-06-05  Simon Josefsson  <jas@extundo.com>
+2001-06-05  Alex Schroeder  <alex@gnu.org>
 
         * mm-decode.el (mm-handle-set-external-undisplayer): Don't
-        generate compiler warnings.  From Alex Schroeder <alex@gnu.org>.
+        generate compiler warnings.
 
 2001-06-04  Hrvoje Niksic  <hniksic@arsdigita.com>
 
@@ -15499,20 +15456,17 @@
         it is not possible to insert a character after a glyph which is at
         the end of a buffer.  Patch by Lloyd Zusman <ljz@asfast.com>.
 
-2001-05-28  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
-
-        From Jaap-Henk Hoepman (jhh@xs4all.nl).
+2001-05-28  Jaap-Henk Hoepman  <jhh@xs4all.nl>
 
         * mm-decode.el (mm-keep-viewer-alive-types): New variable.
         (mm-keep-viewer-alive-p, mm-handle-set-external-undisplayer,
         mm-destroy-postponed-undisplay-list): New functions.
         (mm-display-external): Use them.
 
-2001-05-27  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-05-27  Raja R. Harinath  <harinath@cs.umn.edu>
 
         * gnus-salt.el (gnus-tree-highlight-node): Bind `default-high' and
         `default-low' when evaluating `gnus-summary-highlight'.
-        From Raja R Harinath <harinath@cs.umn.edu>.
 
 2001-05-27  Simon Josefsson  <simon@josefsson.org>
 
@@ -15523,8 +15477,7 @@
         as details.
         (mml2015-mailcrypt-clear-verify): Ditto.
 
-2001-05-24  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
-        From Nevin Kapur <nevin@jhu.edu>.
+2001-05-24  Nevin Kapur  <nevin@jhu.edu>
 
         * gnus-sum.el (gnus-summary-default-high-score,
         gnus-summary-default-low-score): New variables.
@@ -15535,8 +15488,7 @@
         * message.el (message-mail): pass the 'send-actions argument to
         `message-setup'.
 
-2001-05-16  Simon Josefsson  <simon@josefsson.org>
-        From Raymond Scholz <ray-2001@zonix.de>
+2001-05-16  Raymond Scholz  <ray-2001@zonix.de>
 
         * gnus-art.el (gnus-mime-view-part-as-charset):
         (gnus-mime-internalize-part): Doc fixes.
@@ -15600,7 +15552,7 @@
         correctly.
         (nnrss-check-group): Use time.
 
-2001-05-01 19:21:19 Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
+2001-05-01 19:21:19  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.03 is released.
 
@@ -15672,12 +15624,11 @@
         (smime-decrypt-region): Ditto.
 
 2001-04-12  Jason Merrill  <jason_merrill@redhat.com>
-        Committed by Simon Josefsson  <simon@josefsson.org>
 
         * imap.el (imap-shell-open): Erase the buffer *after* copying it into
         the log.
 
-2001-04-14 01:14:42 Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
+2001-04-14 01:14:42  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
         * gnus.el: Oort Gnus v0.02 is released.
 
@@ -15705,13 +15656,11 @@
 
         * nnmail.el (nnmail-split-fancy-with-parent): Add docstring.
 
-2001-04-12 19:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        From Jason Merrill <jason_merrill@redhat.com>
+2001-04-12 19:00:00  Jason Merrill  <jason_merrill@redhat.com>
 
         * gnus-sum.el (gnus-summary-insert-new-articles): Reverse the articles.
 
 2001-04-10 08:01:15  Katsumi Yamaoka  <yamaoka@jpl.org>
-        Committed by ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * gnus-msg.el (gnus-post-news): Fill the Newsgroups header by the
         newsgroup names when the original article is a news message.
@@ -15722,7 +15671,6 @@
         supported. Suggest by Jim Meyering <jim@meyering.net>.
 
 2001-04-02  Nevin Kapur  <nevin@jhu.edu>
-        Committed by Kai Gro,b_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>.
 
         * nnmail.el (nnmail-split-it): Added check for .* at the end of
         regexp in nnmail-split-fancy.
@@ -15790,13 +15738,11 @@
         * qp.el (quoted-printable-decode-region): Just message
         malformation; don't quit.
 
-2001-03-31 21:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        From Gerd Moellmann <gerd@gnu.org>.
+2001-03-31 21:00:00  Gerd Moellmann  <gerd@gnu.org>
 
         * gnus.el (gnus-interactive): A typo.
 
 2001-03-26  Juanma Barranquero  <lektu@uol.com.br>
-        Committed by ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * gnus-util.el (gnus-delete-alist): Declare it as an alias of
         `assq-delete-all', if that function exists; otherwise use the old
@@ -15914,8 +15860,7 @@
 
         * mml2015.el (mml2015-gpg-extract-from): No error.
 
-2001-03-18 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        From Bj,Ax(Brn Mork <bmork@dod.no>.
+2001-03-18 23:00:00  Bj,Ax(Brn Mork  <bmork@dod.no>
 
         * mml2015.el (mml2015-gpg-extract-from): New function.
         (mml2015-gpg-verify): Use it.
@@ -15957,8 +15902,7 @@
         * mailcap.el (mailcap-mime-data): Add application/sieve.
         (mailcap-mime-extensions): Add .siv, .xls.
 
-2001-03-14 20:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        From Christoph Conrad <christoph.conrad@gmx.de>
+2001-03-14 20:00:00  Christoph Conrad  <christoph.conrad@gmx.de>
 
         * gnus-score.el (gnus-summary-lower-thread): Typo.
 
@@ -16003,7 +15947,6 @@
         * nnrss.el: New file.
 
 2001-03-08 02:41:36  Katsumi Yamaoka  <yamaoka@jpl.org>
-        Committed by ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * rfc2047.el (rfc2047-unfold-region): Fix arg of
         `skip-chars-forward'.
@@ -16027,9 +15970,10 @@
         directory part.
         (gnus-score-search-global-directories): Use file-directory-p.
 
+2001-03-06 13:00:00  Adrian Aichner  <adrian@xemacs.org>
+
         * gnus-score.el (gnus-score-score-files-1): Use
         gnus-kill-files-directory.
-        From Adrian Aichner <adrian@xemacs.org>.
 
 2001-03-05 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -16054,8 +15998,7 @@
 
         * gnus-sum.el (gnus-summary-limit-include-expunged): Fix.
 
-2001-03-01 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        From Katsumi Yamaoka <yamaoka@jpl.org>.
+2001-03-01 22:00:00  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * dgnushack.el (coerce, merge, subseq): defmacro.
 
@@ -16066,7 +16009,6 @@
         uncompiled versions.
 
 2001-02-26 11:27:27  Paul Jarc  <prj@po.cwru.edu>
-        Committed by ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * gnus-util.el (gnus-split-references): Handle malformed References:.
 
@@ -16074,8 +16016,7 @@
 
         * gnus-art.el (gnus-article-mime-part-status): 1 part.
 
-2001-02-25 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        From NAGY Andras <nagya@inf.elte.hu>.
+2001-02-25 10:00:00  NAGY Andras  <nagya@inf.elte.hu>
 
         * gnus.el (gnus-parameters): Typo.
 
@@ -16183,13 +16124,11 @@
         (gnus-article-sort-functions): Doc fix.  Refer to
         gnus-thread-sort-functions.
 
-2001-02-18 20:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        From Paul Jarc <prj@po.cwru.edu>.
+2001-02-18 20:00:00  Paul Jarc  <prj@po.cwru.edu>
 
         * message.el (message-get-reply-headers): More fixes.
 
 2001-02-17  Paul Jarc  <prj@po.cwru.edu>
-        Committed by ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * message.el (message-get-reply-headers): Fix bug with
         Mail-Followup-To/to-address interaction.
@@ -16234,7 +16173,6 @@
         (nnml-request-regenerate): Use it. Change to deffoo.
 
 2001-02-14  Katsumi Yamaoka  <yamaoka@jpl.org>
-        Committed by ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * gnus.el (gnus-define-group-parameter): Fix.
 
@@ -18187,7 +18125,7 @@
 
         * mml.el (mml-generate-mime-1): Ignore ascii.
 
-2000-11-16 Justin Sheehy  <justin@iago.org>
+2000-11-16  Justin Sheehy  <justin@iago.org>
 
         * gnus-sum.el (gnus-summary-make-menu-bar): Fix menu items.
 
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index f314d0e81d7..e773aa3bfac 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -35,7 +35,7 @@
 (defgroup gmm nil
   "Utility functions for Gnus, Message and MML"
   :prefix "gmm-"
-  :version "23.0" ;; No Gnus
+  :version "22.1" ;; Gnus 5.10.9
   :group 'lisp)
 
 ;; Helper functions from `gnus-utils.el': gmm-verbose, gmm-message, gmm-error
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 39292e33a1f..ecee7ff6847 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -853,6 +853,9 @@ be displayed by the first non-nil matching CONTENT face."
 (defvar gnus-decode-header-function 'mail-decode-encoded-word-region
   "Function used to decode headers.")
 
+(defvar gnus-decode-address-function 'mail-decode-encoded-address-region
+  "Function used to decode addresses.")
+
 (defvar gnus-article-dumbquotes-map
   '(("\200" "EUR")
     ("\202" ",")
@@ -2377,10 +2380,24 @@ If PROMPT (the prefix), prompt for a coding system to use."
                              (set-buffer gnus-summary-buffer)
                            (error))
                          gnus-newsgroup-ignored-charsets))
-        (inhibit-read-only t))
-    (save-restriction
-      (article-narrow-to-head)
-      (funcall gnus-decode-header-function (point-min) (point-max)))))
+        (inhibit-read-only t)
+        end start)
+    (goto-char (point-min))
+    (when (search-forward "\n\n" nil 'move)
+      (forward-line -1))
+    (setq end (point))
+    (while (not (bobp))
+      (while (progn
+               (forward-line -1)
+               (and (not (bobp))
+                    (memq (char-after) '(?\t ? )))))
+      (setq start (point))
+      (if (looking-at "\
+\\(?:Resent-\\)?\\(?:From\\|Cc\\|To\\|Bcc\\|\\(?:In-\\)?Reply-To\\|Sender\
+\\|Mail-Followup-To\\|Mail-Copies-To\\|Approved\\):")
+          (funcall gnus-decode-address-function start end)
+        (funcall gnus-decode-header-function start end))
+      (goto-char (setq end start)))))
 
 (defun article-decode-group-name ()
   "Decode group names in `Newsgroups:'."
@@ -3923,6 +3940,14 @@ commands:
   (mm-enable-multibyte)
   (gnus-run-mode-hooks 'gnus-article-mode-hook))
 
+;; Internal variables.  Are `gnus-button-regexp' and `gnus-button-last' used
+;; at all?
+(defvar gnus-button-regexp nil)
+(defvar gnus-button-marker-list nil
+  "Regexp matching any of the regexps from `gnus-button-alist'.")
+(defvar gnus-button-last nil
+  "The value of `gnus-button-alist' when `gnus-button-regexp' was build.")
+
 (defun gnus-article-setup-buffer ()
   "Initialize the article buffer."
   (let* ((name (if gnus-single-article-buffer "*Article*"
@@ -4324,9 +4349,8 @@ Deleting parts may malfunction or destroy the article; continue? ")
            (handles gnus-article-mime-handles)
            (none "(none)")
            (description
-            (or
-             (mail-decode-encoded-word-string (or (mm-handle-description data)
-                                                  none))))
+            (mail-decode-encoded-word-string (or (mm-handle-description data)
+                                                 none)))
            (filename
             (or (mail-content-type-get (mm-handle-disposition data) 'filename)
                 none))
@@ -6695,13 +6719,6 @@ HEADER is a regexp to match a header.  For a fuller explanation, see
                                :inline t
                                (integer :tag "Regexp group")))))
 
-(defvar gnus-button-regexp nil)
-(defvar gnus-button-marker-list nil)
-;; Regexp matching any of the regexps from `gnus-button-alist'.
-
-(defvar gnus-button-last nil)
-;; The value of `gnus-button-alist' when `gnus-button-regexp' was build.
-
 ;;; Commands:
 
 (defun gnus-article-push-button (event)
diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el
index 8df3a3b0e70..fb28d6440fd 100644
--- a/lisp/gnus/gnus-demon.el
+++ b/lisp/gnus/gnus-demon.el
@@ -218,7 +218,7 @@ time Emacs has been idle for IDLE `gnus-demon-timestep's."
                    (< idle gnus-demon-idle-time)) ; Idle timed out.
                   (t (< 0 gnus-demon-idle-time)))) ; Or just need to be idle.
                ;; So we call the handler.
-               (progn
+               (gnus-with-local-quit
                  (ignore-errors (funcall (car handler)))
                  ;; And reset the timer.
                  (setcar (nthcdr 1 handler)
@@ -232,14 +232,15 @@ time Emacs has been idle for IDLE `gnus-demon-timestep's."
                (gnus-demon-is-idle-p))
           ;; We want to call this handler each and every time that
           ;; Emacs is idle.
-          (ignore-errors (funcall (car handler))))
+          (gnus-with-local-quit
+            (ignore-errors (funcall (car handler)))))
          (t
           ;; We want to call this handler only if Emacs has been idle
           ;; for a specified number of timesteps.
           (and (not (memq (car handler) gnus-demon-idle-has-been-called))
                (< idle gnus-demon-idle-time)
                (gnus-demon-is-idle-p)
-               (progn
+               (gnus-with-local-quit
                  (ignore-errors (funcall (car handler)))
                  ;; Make sure the handler won't be called once more in
                  ;; this idle-cycle.
diff --git a/lisp/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el
index 125e5bebd49..013be410632 100644
--- a/lisp/gnus/gnus-draft.el
+++ b/lisp/gnus/gnus-draft.el
@@ -76,7 +76,6 @@
       (when (gnus-visual-p 'draft-menu 'menu)
         (gnus-draft-make-menu-bar))
       (gnus-add-minor-mode 'gnus-draft-mode " Draft" gnus-draft-mode-map)
-      (mml-mode)
       (gnus-run-hooks 'gnus-draft-mode-hook))))
 
 ;;; Commands
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 2e452136f3c..47944aeef41 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -60,6 +60,7 @@
 (require 'gnus)
 (require 'gnus-int)
 (require 'gnus-sum)
+(require 'gnus-util)
 (require 'nnmail)
 
 (defvar gnus-registry-dirty t
@@ -243,7 +244,8 @@ way."
         (gnus-registry-clean-empty-function))
       ;; now trim the registry appropriately
       (setq gnus-registry-alist (gnus-registry-trim
-                                 (hashtable-to-alist gnus-registry-hashtb)))
+                                 (gnus-hashtable-to-alist
+                                  gnus-registry-hashtb)))
       ;; really save
       (gnus-registry-cache-save)
       (setq gnus-registry-entry-caching caching)
@@ -262,7 +264,7 @@ way."
 
 (defun gnus-registry-read ()
   (gnus-registry-cache-read)
-  (setq gnus-registry-hashtb (alist-to-hashtable gnus-registry-alist))
+  (setq gnus-registry-hashtb (gnus-alist-to-hashtable gnus-registry-alist))
   (setq gnus-registry-dirty nil))
 
 (defun gnus-registry-trim (alist)
@@ -290,26 +292,6 @@ way."
                       (cdr (gethash (car a) timehash))
                       (cdr (gethash (car b) timehash))))))))))
 
-(defun alist-to-hashtable (alist)
-  "Build a hashtable from the values in ALIST."
-  (let ((ht (make-hash-table
-             :size 4096
-             :test 'equal)))
-    (mapc
-     (lambda (kv-pair)
-       (puthash (car kv-pair) (cdr kv-pair) ht))
-     alist)
-     ht))
-
-(defun hashtable-to-alist (hash)
-  "Build an alist from the values in HASH."
-  (let ((list nil))
-    (maphash
-     (lambda (key value)
-       (setq list (cons (cons key value) list)))
-     hash)
-    list))
-
 (defun gnus-registry-action (action data-header from &optional to method)
   (let* ((id (mail-header-id data-header))
          (subject (gnus-registry-simplify-subject
@@ -660,7 +642,7 @@ Returns the first place where the trail finds a group name."
   "Clear the Gnus registry."
   (interactive)
   (setq gnus-registry-alist nil)
-  (setq gnus-registry-hashtb (alist-to-hashtable gnus-registry-alist))
+  (setq gnus-registry-hashtb (gnus-alist-to-hashtable gnus-registry-alist))
   (setq gnus-registry-dirty t))
 
 ;;;###autoload
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index b94d093329a..8dcd0753e59 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -992,7 +992,11 @@ which it may alter in any way."
   :group 'gnus-summary)
 
 (defvar gnus-decode-encoded-word-function 'mail-decode-encoded-word-string
-  "Variable that says which function should be used to decode a string with encoded words.")
+  "Function used to decode a string with encoded words.")
+
+(defvar gnus-decode-encoded-address-function
+  'mail-decode-encoded-address-string
+  "Function used to decode addresses with encoded words.")
 
 (defcustom gnus-extra-headers '(To Newsgroups)
   "*Extra headers to parse."
@@ -1001,7 +1005,7 @@ which it may alter in any way."
   :type '(repeat symbol))
 
 (defcustom gnus-ignored-from-addresses
-  (and user-mail-address  
+  (and user-mail-address
        (not (string= user-mail-address ""))
        (regexp-quote user-mail-address))
   "*Regexp of From headers that may be suppressed in favor of To headers."
@@ -2434,7 +2438,7 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs))))
          ["Unread" gnus-summary-limit-to-unread t]
          ["Unseen" gnus-summary-limit-to-unseen t]
          ["Non-dormant" gnus-summary-limit-exclude-dormant t]
-         ["Next articles" gnus-summary-limit-to-articles t]
+         ["Next or process marked articles" gnus-summary-limit-to-articles t]
          ["Pop limit" gnus-summary-pop-limit t]
          ["Show dormant" gnus-summary-limit-include-dormant t]
          ["Hide childless dormant"
@@ -3436,7 +3440,7 @@ buffer that was in action when the last article was fetched."
               (concat "-> "
                       (inline
                         (gnus-summary-extract-address-component
-                         (funcall gnus-decode-encoded-word-function to)))))
+                         (funcall gnus-decode-encoded-address-function to)))))
              ((setq newsgroups (cdr (assq 'Newsgroups extra-headers)))
               (concat "=> " newsgroups)))))
      (inline (gnus-summary-extract-address-component gnus-tmp-from)))))
@@ -4182,7 +4186,7 @@ Returns HEADER if it was entered in the DEPENDENCIES.  Returns nil otherwise."
                    (error x))
                  (condition-case ()     ; from
                      (gnus-remove-odd-characters
-                      (funcall gnus-decode-encoded-word-function
+                      (funcall gnus-decode-encoded-address-function
                                (setq x (nnheader-nov-field))))
                    (error x))
                  (nnheader-nov-field)   ; date
@@ -5956,7 +5960,7 @@ The resulting hash table is returned, or nil if no Xrefs were found."
             (progn
               (goto-char p)
               (if (search-forward "\nfrom:" nil t)
-                  (funcall gnus-decode-encoded-word-function
+                  (funcall gnus-decode-encoded-address-function
                            (nnheader-header-value))
                 "(nobody)"))
             ;; Date.
@@ -8449,10 +8453,11 @@ to guess what the document format is."
         ;; the parent article.
         (when (setq to-address (or (gnus-fetch-field "reply-to")
                                    (gnus-fetch-field "from")))
-          (setq params (append
-                        (list (cons 'to-address
-                                    (funcall gnus-decode-encoded-word-function
-                                             to-address))))))
+          (setq params
+                (append
+                 (list (cons 'to-address
+                             (funcall gnus-decode-encoded-address-function
+                                      to-address))))))
         (setq dig (nnheader-set-temp-buffer " *gnus digest buffer*"))
         (insert-buffer-substring gnus-original-article-buffer)
         ;; Remove lines that may lead nndoc to misinterpret the
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 6f706fabce5..09d7ab9432e 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -746,6 +746,28 @@ If there's no subdirectory, delete DIRECTORY as well."
       (unless dir
         (delete-directory directory)))))
 
+;; The following two functions are used in gnus-registry.
+;; They were contributed by Andreas Fuchs <asf@void.at>.
+(defun gnus-alist-to-hashtable (alist)
+  "Build a hashtable from the values in ALIST."
+  (let ((ht (make-hash-table
+             :size 4096
+             :test 'equal)))
+    (mapc
+     (lambda (kv-pair)
+       (puthash (car kv-pair) (cdr kv-pair) ht))
+     alist)
+     ht))
+
+(defun gnus-hashtable-to-alist (hash)
+  "Build an alist from the values in HASH."
+  (let ((list nil))
+    (maphash
+     (lambda (key value)
+       (setq list (cons (cons key value) list)))
+     hash)
+    list))
+
 (defun gnus-strip-whitespace (string)
   "Return STRING stripped of all whitespace."
   (while (string-match "[\r\n\t ]+" string)
@@ -1616,6 +1638,25 @@ empty directories from OLD-PATH."
   (defalias 'gnus-set-process-query-on-exit-flag
     'process-kill-without-query))
 
+(if (fboundp 'with-local-quit)
+    (defalias 'gnus-with-local-quit 'with-local-quit)
+  (defmacro gnus-with-local-quit (&rest body)
+    "Execute BODY, allowing quits to terminate BODY but not escape further.
+When a quit terminates BODY, `gnus-with-local-quit' returns nil but
+requests another quit.  That quit will be processed as soon as quitting
+is allowed once again.  (Immediately, if `inhibit-quit' is nil.)"
+    ;;(declare (debug t) (indent 0))
+    `(condition-case nil
+         (let ((inhibit-quit nil))
+           ,@body)
+       (quit (setq quit-flag t)
+             ;; This call is to give a chance to handle quit-flag
+             ;; in case inhibit-quit is nil.
+             ;; Without this, it will not be handled until the next function
+             ;; call, and that might allow it to exit thru a condition-case
+             ;; that intends to handle the quit signal next time.
+             (eval '(ignore nil))))))
+
 (provide 'gnus-util)
 
 ;;; arch-tag: f94991af-d32b-4c97-8c26-ca12a934de49
diff --git a/lisp/gnus/mail-parse.el b/lisp/gnus/mail-parse.el
index 6a9a4755bb2..3c1aa8111c2 100644
--- a/lisp/gnus/mail-parse.el
+++ b/lisp/gnus/mail-parse.el
@@ -70,6 +70,8 @@
 (defalias 'mail-encode-encoded-word-string 'rfc2047-encode-string)
 (defalias 'mail-decode-encoded-word-region 'rfc2047-decode-region)
 (defalias 'mail-decode-encoded-word-string 'rfc2047-decode-string)
+(defalias 'mail-decode-encoded-address-region 'rfc2047-decode-address-region)
+(defalias 'mail-decode-encoded-address-string 'rfc2047-decode-address-string)
 
 (provide 'mail-parse)
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 4ee87933967..36a969fdefd 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -3280,7 +3280,7 @@ prefix, and don't delete any headers."
             (message-narrow-to-head-1)
             (vector 0
                     (or (message-fetch-field "subject") "none")
-                    (message-fetch-field "from")
+                    (or (message-fetch-field "from") "nobody")
                     (message-fetch-field "date")
                     (message-fetch-field "message-id" t)
                     (message-fetch-field "references")
@@ -3329,7 +3329,7 @@ prefix, and don't delete any headers."
               (message-narrow-to-head-1)
               (vector 0
                       (or (message-fetch-field "subject") "none")
-                      (message-fetch-field "from")
+                      (or (message-fetch-field "from") "nobody")
                       (message-fetch-field "date")
                       (message-fetch-field "message-id" t)
                       (message-fetch-field "references")
@@ -3897,9 +3897,15 @@ If you always want Gnus to send messages in one piece, set
                        'call-process-region
                        (append
                         (list (point-min) (point-max)
-                              (if (boundp 'sendmail-program)
-                                  sendmail-program
-                                "/usr/lib/sendmail")
+                              (cond ((boundp 'sendmail-program)
+                                     sendmail-program)
+                                    ((file-exists-p "/usr/sbin/sendmail")
+                                     "/usr/sbin/sendmail")
+                                    ((file-exists-p "/usr/lib/sendmail")
+                                     "/usr/lib/sendmail")
+                                    ((file-exists-p "/usr/ucblib/sendmail")
+                                     "/usr/ucblib/sendmail")
+                                    (t "fakemail"))
                               nil errbuf nil "-oi")
                         ;; Always specify who from,
                         ;; since some systems have broken sendmails.
@@ -5837,7 +5843,7 @@ want to get rid of this query permanently.")))
       (setq message-id (message-fetch-field "message-id" t)
             references (message-fetch-field "references")
             date (message-fetch-field "date")
-            from (message-fetch-field "from")
+            from (or (message-fetch-field "from") "nobody")
             subject (or (message-fetch-field "subject") "none"))
       (when gnus-list-identifiers
         (setq subject (message-strip-list-identifiers subject)))
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 26a1bf23e84..1c9f9749f85 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -253,7 +253,7 @@ superset of iso-8859-1."
                        :tag "Other options"
                        (cons (symbol :tag "From charset")
                              (symbol :tag "To charset"))))
-  :version "23.0" ;; No Gnus
+  :version "22.1" ;; Gnus 5.10.9
   :group 'mime)
 
 (defcustom mm-charset-eval-alist
@@ -270,7 +270,7 @@ If an article is encoded in an unknown CHARSET, FORM is
 evaluated.  This allows to load additional libraries providing
 charsets on demand.  If supported by your Emacs version, you
 could use `autoload-coding-system' here."
-  :version "23.0" ;; No Gnus
+  :version "22.1" ;; Gnus 5.10.9
   :type '(list (set :inline t
                     (const (windows-1250 . (mm-codepage-setup 1250 t)))
                     (const (windows-1251 . (mm-codepage-setup 1251 t)))
diff --git a/lisp/gnus/nnslashdot.el b/lisp/gnus/nnslashdot.el
index 66ce4d54472..37ecaf0f32b 100644
--- a/lisp/gnus/nnslashdot.el
+++ b/lisp/gnus/nnslashdot.el
@@ -258,7 +258,9 @@
                 (setq contents
                       (buffer-substring
                        (search-forward "<div class=\"commentBody\">")
-                       (search-forward "</div>")))))))
+                       (progn
+                         (search-forward "<div class=\"commentSub\">")
+                         (match-beginning 0))))))))
       (search-failed (nnslashdot-lose why)))
 
     (when contents
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index 7714c566dce..4b376957377 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -75,22 +75,26 @@
 
 (defcustom pop3-authentication-scheme 'pass
   "*POP3 authentication scheme.
-Defaults to 'pass, for the standard USER/PASS authentication.  Other valid
-values are 'apop."
-  :version "22.1" ;; Oort Gnus
-  :type '(choice (const :tag "USER/PASS" pass)
+Defaults to `pass', for the standard USER/PASS authentication.  The other
+valid value is 'apop'."
+  :type '(choice (const :tag "Normal user/password" pass)
                  (const :tag "APOP" apop))
+  :version "22.1" ;; Oort Gnus
   :group 'pop3)
 
 (defcustom pop3-leave-mail-on-server nil
   "*Non-nil if the mail is to be left on the POP server after fetching.
 
-If the `pop3-leave-mail-on-server' is non-`nil' the mail is to be
-left on the POP server after fetching.  Note that POP servers
-maintain no state information between sessions, so what the
-client believes is there and what is actually there may not match
-up.  If they do not, then the whole thing can fall apart and
-leave you with a corrupt mailbox."
+If `pop3-leave-mail-on-server' is non-nil the mail is to be left
+on the POP server after fetching.  Note that POP servers maintain
+no state information between sessions, so what the client
+believes is there and what is actually there may not match up.
+If they do not, then you may get duplicate mails or the whole
+thing can fall apart and leave you with a corrupt mailbox."
+  ;; We can't use the UILD support from XEmacs mail-lib or cvs.m17n.org:
+  ;; http://thread.gmane.org/v9lld8fml4.fsf@marauder.physik.uni-ulm.de
+  ;; http://thread.gmane.org/b9yy8hzy9ej.fsf@jpl.org
+  ;; Any volunteer to re-implement this?
   :version "22.1" ;; Oort Gnus
   :type 'boolean
   :group 'pop3)
@@ -166,11 +170,14 @@ Shorter values mean quicker response, but are more CPU intensive.")
           (unless pop3-leave-mail-on-server
             (pop3-dele process n))
           (setq n (+ 1 n))
-          (if pop3-debug (sit-for 1) (sit-for 0.1))
-          )
+          (if pop3-debug (sit-for 1) (sit-for 0.1))) ; why?
+      (when (and pop3-leave-mail-on-server
+                 (> n 1))
+        (message "pop3.el doesn't support UIDL.  Setting `pop3-leave-mail-on-server'
+to %s might not give the result you'd expect." pop3-leave-mail-on-server)
+        (sit-for 1))
       (pop3-quit process))
-    (kill-buffer crashbuf)
-    )
+    (kill-buffer crashbuf))
   t)
 
 (defun pop3-get-message-count ()
@@ -312,6 +319,8 @@ If NOW, use that time instead."
             ;; Date: 08 Jul 1996 23:22:24 -0400
             ;; should be
             ;; Tue Jul 9 09:04:21 1996
+
+            ;; Fixme: This should use timezone on the date field contents.
             (setq date
                   (cond ((not date)
                          "Tue Jan 1 00:00:0 1900")
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el
index aa30d9ba783..40b10c07eb4 100644
--- a/lisp/gnus/rfc2047.el
+++ b/lisp/gnus/rfc2047.el
@@ -171,6 +171,42 @@ This is either `base64' or `quoted-printable'."
       (re-search-forward ":[ \t\n]*" nil t)
       (buffer-substring-no-properties (point) (point-max)))))
 
+(defun rfc2047-quote-special-characters-in-quoted-strings (&optional
+                                                           encodable-regexp)
+  "Quote special characters with `\\'s in quoted strings.
+Quoting will not be done in a quoted string if it contains characters
+matching ENCODABLE-REGEXP."
+  (goto-char (point-min))
+  (let ((tspecials (concat "[" ietf-drums-tspecials "]"))
+        beg end)
+    (with-syntax-table (standard-syntax-table)
+      (while (search-forward "\"" nil t)
+        (setq beg (match-beginning 0))
+        (unless (eq (char-before beg) ?\\)
+          (goto-char beg)
+          (setq beg (1+ beg))
+          (condition-case nil
+              (progn
+                (forward-sexp)
+                (setq end (1- (point)))
+                (goto-char beg)
+                (if (and encodable-regexp
+                         (re-search-forward encodable-regexp end t))
+                    (goto-char (1+ end))
+                  (save-restriction
+                    (narrow-to-region beg end)
+                    (while (re-search-forward tspecials nil 'move)
+                      (if (eq (char-before) ?\\)
+                          (if (looking-at tspecials) ;; Already quoted.
+                              (forward-char)
+                            (insert "\\"))
+                        (goto-char (match-beginning 0))
+                        (insert "\\")
+                        (forward-char))))
+                  (forward-char)))
+            (error
+             (goto-char beg))))))))
+
 (defvar rfc2047-encoding-type 'address-mime
   "The type of encoding done by `rfc2047-encode-region'.
 This should be dynamically bound around calls to
@@ -187,8 +223,18 @@ Should be called narrowed to the head of the message."
       (while (not (eobp))
         (save-restriction
           (rfc2047-narrow-to-field)
+          (setq method nil
+                alist rfc2047-header-encoding-alist)
+          (while (setq elem (pop alist))
+            (when (or (and (stringp (car elem))
+                           (looking-at (car elem)))
+                      (eq (car elem) t))
+              (setq alist nil
+                    method (cdr elem))))
           (if (not (rfc2047-encodable-p))
-              (prog1
+              (prog2
+                  (when (eq method 'address-mime)
+                    (rfc2047-quote-special-characters-in-quoted-strings))
                   (if (and (eq (mm-body-7-or-8) '8bit)
                            (mm-multibyte-p)
                            (mm-coding-system-p
@@ -209,14 +255,6 @@ Should be called narrowed to the head of the message."
                      (point))
                    (point-max))))
             ;; We found something that may perhaps be encoded.
-            (setq method nil
-                  alist rfc2047-header-encoding-alist)
-            (while (setq elem (pop alist))
-              (when (or (and (stringp (car elem))
-                             (looking-at (car elem)))
-                        (eq (car elem) t))
-                (setq alist nil
-                      method (cdr elem))))
             (re-search-forward "^[^:]+: *" nil t)
             (cond
              ((eq method 'address-mime)
@@ -347,6 +385,7 @@ Dynamically bind `rfc2047-encoding-type' to change that."
                   (rfc2047-encode start (point))
                 (goto-char end))))
         ;; `address-mime' case -- take care of quoted words, comments.
+        (rfc2047-quote-special-characters-in-quoted-strings encodable-regexp)
         (with-syntax-table rfc2047-syntax-table
           (goto-char (point-min))
           (condition-case err           ; in case of unbalanced quotes
@@ -821,6 +860,29 @@ encoded-word, concatenate them, and decode it by charset.  Otherwise,
 the decoder will fully decode each encoded-word before concatenating
 them.")
 
+(defun rfc2047-strip-backslashes-in-quoted-strings ()
+  "Strip backslashes in quoted strings.  `\\\"' remains."
+  (goto-char (point-min))
+  (let (beg)
+    (with-syntax-table (standard-syntax-table)
+      (while (search-forward "\"" nil t)
+        (unless (eq (char-before) ?\\)
+          (setq beg (match-end 0))
+          (goto-char (match-beginning 0))
+          (condition-case nil
+              (progn
+                (forward-sexp)
+                (save-restriction
+                  (narrow-to-region beg (1- (point)))
+                  (goto-char beg)
+                  (while (search-forward "\\" nil 'move)
+                    (unless (memq (char-after) '(?\"))
+                      (delete-backward-char 1))
+                    (forward-char)))
+                (forward-char))
+            (error
+             (goto-char beg))))))))
+
 (defun rfc2047-charset-to-coding-system (charset)
   "Return coding-system corresponding to MIME CHARSET.
 If your Emacs implementation can't decode CHARSET, return nil."
@@ -898,8 +960,10 @@ ENCODED-WORD)."
 ;; and worthwhile (is it more correct or not?), e.g. something like
 ;; `=?iso-8859-1?q?foo?=@'.
 
-(defun rfc2047-decode-region (start end)
-  "Decode MIME-encoded words in region between START and END."
+(defun rfc2047-decode-region (start end &optional address-mime)
+  "Decode MIME-encoded words in region between START and END.
+If ADDRESS-MIME is non-nil, strip backslashes which precede characters
+other than `\"' and `\\' in quoted strings."
   (interactive "r")
   (let ((case-fold-search t)
         (eword-regexp (eval-when-compile
@@ -910,6 +974,8 @@ ENCODED-WORD)."
     (save-excursion
       (save-restriction
         (narrow-to-region start end)
+        (when address-mime
+          (rfc2047-strip-backslashes-in-quoted-strings))
         (goto-char (setq b start))
         ;; Look for the encoded-words.
         (while (setq match (re-search-forward eword-regexp nil t))
@@ -995,8 +1061,16 @@ ENCODED-WORD)."
                    (not (eq mail-parse-charset 'gnus-decoded)))
           (mm-decode-coding-region b (point-max) mail-parse-charset))))))
 
-(defun rfc2047-decode-string (string)
-  "Decode the quoted-printable-encoded STRING and return the results."
+(defun rfc2047-decode-address-region (start end)
+  "Decode MIME-encoded words in region between START and END.
+Backslashes which precede characters other than `\"' and `\\' in quoted
+strings are stripped."
+  (rfc2047-decode-region start end t))
+
+(defun rfc2047-decode-string (string &optional address-mime)
+  "Decode MIME-encoded STRING and return the result.
+If ADDRESS-MIME is non-nil, strip backslashes which precede characters
+other than `\"' and `\\' in quoted strings."
   (let ((m (mm-multibyte-p)))
     (if (string-match "=\\?" string)
         (with-temp-buffer
@@ -1010,8 +1084,16 @@ ENCODED-WORD)."
             (mm-enable-multibyte))
           (insert string)
           (inline
-            (rfc2047-decode-region (point-min) (point-max)))
+            (rfc2047-decode-region (point-min) (point-max) address-mime))
           (buffer-string))
+      (when address-mime
+        (setq string
+              (with-temp-buffer
+                (when (mm-multibyte-string-p string)
+                  (mm-enable-multibyte))
+                (insert string)
+                (rfc2047-strip-backslashes-in-quoted-strings)
+                (buffer-string))))
       ;; Fixme: As above, `m' here is inappropriate.
       (if (and m
                mail-parse-charset
@@ -1033,6 +1115,12 @@ ENCODED-WORD)."
             (mm-decode-coding-string string mail-parse-charset))
         (mm-string-as-multibyte string)))))
 
+(defun rfc2047-decode-address-string (string)
+  "Decode MIME-encoded STRING and return the result.
+Backslashes which precede characters other than `\"' and `\\' in quoted
+strings are stripped."
+  (rfc2047-decode-string string t))
+
 (defun rfc2047-pad-base64 (string)
   "Pad STRING to quartets."
   ;; Be more liberal to accept buggy base64 strings. If
diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el
index db00fff6c1c..6d33c155c64 100644
--- a/lisp/help-at-pt.el
+++ b/lisp/help-at-pt.el
@@ -246,7 +246,7 @@ properties, to enable buffer local values."
 (defun scan-buf-move-to-region (prop &optional arg hook)
   "Go to the start of the next region with non-nil PROP property.
 Then run HOOK, which should be a quoted symbol that is a normal
-hook.variable, or an expression evaluating to such a symbol.
+hook variable, or an expression evaluating to such a symbol.
 Adjacent areas with different non-nil PROP properties are
 considered different regions.
 
diff --git a/lisp/help.el b/lisp/help.el
index db76efb01a0..34b1a2fac61 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -309,7 +309,7 @@ If that doesn't give a function, return nil."
 The prefix described consists of all but the last event
 of the key sequence that ran this command."
   (interactive)
-  (let* ((key (this-command-keys)))
+  (let ((key (this-command-keys)))
     (describe-bindings
      (if (stringp key)
          (substring key 0 (1- (length key)))
@@ -535,28 +535,6 @@ If INSERT (the prefix arg) is non-nil, insert the message in the buffer."
           (princ string)))))
   nil)
 
-(defun string-key-binding (key)
-  "Value is the binding of KEY in a string.
-If KEY is an event on a string, and that string has a `local-map'
-or `keymap' property, return the binding of KEY in the string's keymap."
-  (let* ((defn nil)
-         (start (when (vectorp key)
-                  (if (memq (aref key 0)
-                            '(mode-line header-line left-margin right-margin))
-                      (event-start (aref key 1))
-                    (and (consp (aref key 0))
-                         (event-start (aref key 0))))))
-         (string-info (and (consp start) (nth 4 start))))
-    (when string-info
-      (let* ((string (car string-info))
-             (pos (cdr string-info))
-             (local-map (and (>= pos 0)
-                             (< pos (length string))
-                             (or (get-text-property pos 'local-map string)
-                                 (get-text-property pos 'keymap string)))))
-        (setq defn (and local-map (lookup-key local-map key)))))
-    defn))
-
 (defun help-key-description (key untranslated)
   (let ((string (key-description key)))
     (if (or (not untranslated)
@@ -589,11 +567,14 @@ temporarily enables it to allow getting help on disabled items and buttons."
              (menu-bar-update-yank-menu "(any string)" nil))
            (setq key (read-key-sequence "Describe key (or click or menu item): "))
            ;; If KEY is a down-event, read and discard the
-           ;; corresponding up-event.
-           (if (and (vectorp key)
-                    (eventp (elt key 0))
-                    (memq 'down (event-modifiers (elt key 0))))
-               (read-event))
+           ;; corresponding up-event.  Note that there are also
+           ;; down-events on scroll bars and mode lines: the actual
+           ;; event then is in the second element of the vector.
+           (and (vectorp key)
+                (let ((last-idx (1- (length key))))
+                  (and (eventp (aref key last-idx))
+                       (memq 'down (event-modifiers (aref key last-idx)))))
+                (read-event))
            (list
             key
             (if current-prefix-arg (prefix-numeric-value current-prefix-arg))
@@ -604,46 +585,33 @@ temporarily enables it to allow getting help on disabled items and buttons."
          (fset 'yank-menu (cons 'keymap yank-menu))))))
   (if (numberp untranslated)
       (setq untranslated (this-single-command-raw-keys)))
-  (save-excursion
-    (let ((modifiers (event-modifiers (aref key 0)))
-          (standard-output (if insert (current-buffer) t))
-          window position)
-      ;; For a mouse button event, go to the button it applies to
-      ;; to get the right key bindings.  And go to the right place
-      ;; in case the keymap depends on where you clicked.
-      (if (or (memq 'click modifiers) (memq 'down modifiers)
-              (memq 'drag modifiers))
-          (setq window (posn-window (event-start (aref key 0)))
-                position (posn-point (event-start (aref key 0)))))
-      (if (windowp window)
-          (progn
-            (set-buffer (window-buffer window))
-            (goto-char position)))
-      ;; Ok, now look up the key and name the command.
-      (let ((defn (or (string-key-binding key)
-                      (key-binding key t)))
-            key-desc)
-        ;; Handle the case where we faked an entry in "Select and Paste" menu.
-        (if (and (eq defn nil)
-                 (stringp (aref key (1- (length key))))
-                 (eq (key-binding (substring key 0 -1)) 'yank-menu))
-            (setq defn 'menu-bar-select-yank))
-        ;; Don't bother user with strings from (e.g.) the select-paste menu.
-        (if (stringp (aref key (1- (length key))))
-            (aset key (1- (length key)) "(any string)"))
-        (if (and (> (length untranslated) 0)
-                 (stringp (aref untranslated (1- (length untranslated)))))
-            (aset untranslated (1- (length untranslated))
-                  "(any string)"))
-        ;; Now describe the key, perhaps as changed.
-        (setq key-desc (help-key-description key untranslated))
-        (if (or (null defn) (integerp defn) (equal defn 'undefined))
-            (princ (format "%s is undefined" key-desc))
-          (princ (format (if (windowp window)
-                             "%s at that spot runs the command %s"
-                           "%s runs the command %s")
-                         key-desc
-                         (if (symbolp defn) defn (prin1-to-string defn)))))))))
+  (let* ((event (if (and (symbolp (aref key 0))
+                         (> (length key) 1)
+                         (consp (aref key 1)))
+                    (aref key 1)
+                  (aref key 0)))
+         (modifiers (event-modifiers event))
+         (standard-output (if insert (current-buffer) t))
+         (mouse-msg (if (or (memq 'click modifiers) (memq 'down modifiers)
+                            (memq 'drag modifiers)) " at that spot" ""))
+         (defn (key-binding key t))
+         key-desc)
+    ;; Handle the case where we faked an entry in "Select and Paste" menu.
+    (if (and (eq defn nil)
+             (stringp (aref key (1- (length key))))
+             (eq (key-binding (substring key 0 -1)) 'yank-menu))
+        (setq defn 'menu-bar-select-yank))
+    ;; Don't bother user with strings from (e.g.) the select-paste menu.
+    (if (stringp (aref key (1- (length key))))
+        (aset key (1- (length key)) "(any string)"))
+    (if (and (> (length untranslated) 0)
+             (stringp (aref untranslated (1- (length untranslated)))))
+        (aset untranslated (1- (length untranslated)) "(any string)"))
+    ;; Now describe the key, perhaps as changed.
+    (setq key-desc (help-key-description key untranslated))
+    (if (or (null defn) (integerp defn) (equal defn 'undefined))
+        (princ (format "%s%s is undefined" key-desc mouse-msg))
+      (princ (format "%s%s runs the command %S" key-desc mouse-msg defn)))))
 
 (defun describe-key (&optional key untranslated up-event)
   "Display documentation of the function invoked by KEY.
@@ -673,109 +641,119 @@ temporarily enables it to allow getting help on disabled items and buttons."
            (list
             key
             (prefix-numeric-value current-prefix-arg)
-            ;; If KEY is a down-event, read the corresponding up-event
-            ;; and use it as the third argument.
-            (if (and (vectorp key)
-                     (eventp (elt key 0))
-                     (memq 'down (event-modifiers (elt key 0))))
-                (read-event))))
+            ;; If KEY is a down-event, read and discard the
+            ;; corresponding up-event.  Note that there are also
+            ;; down-events on scroll bars and mode lines: the actual
+            ;; event then is in the second element of the vector.
+            (and (vectorp key)
+                 (let ((last-idx (1- (length key))))
+                   (and (eventp (aref key last-idx))
+                        (memq 'down (event-modifiers (aref key last-idx)))))
+                 (or (and (eventp (aref key 0))
+                          (memq 'down (event-modifiers (aref key 0)))
+                          ;; However, for the C-down-mouse-2 popup
+                          ;; menu, there is no subsequent up-event.  In
+                          ;; this case, the up-event is the next
+                          ;; element in the supplied vector.
+                          (= (length key) 1))
+                     (and (> (length key) 1)
+                          (eventp (aref key 1))
+                          (memq 'down (event-modifiers (aref key 1)))))
+                 (read-event))))
        ;; Put yank-menu back as it was, if we changed it.
        (when saved-yank-menu
          (setq yank-menu (copy-sequence saved-yank-menu))
          (fset 'yank-menu (cons 'keymap yank-menu))))))
   (if (numberp untranslated)
       (setq untranslated (this-single-command-raw-keys)))
-  (save-excursion
-    (let ((modifiers (event-modifiers (aref key 0)))
-          window position)
-      ;; For a mouse button event, go to the button it applies to
-      ;; to get the right key bindings.  And go to the right place
-      ;; in case the keymap depends on where you clicked.
-      (if (or (memq 'click modifiers) (memq 'down modifiers)
-              (memq 'drag modifiers))
-          (setq window (posn-window (event-start (aref key 0)))
-                position (posn-point (event-start (aref key 0)))))
-      (when (windowp window)
-            (set-buffer (window-buffer window))
-        (goto-char position))
-      (let ((defn (or (string-key-binding key) (key-binding key t))))
-        ;; Handle the case where we faked an entry in "Select and Paste" menu.
-        (if (and (eq defn nil)
-                 (stringp (aref key (1- (length key))))
-                 (eq (key-binding (substring key 0 -1)) 'yank-menu))
-            (setq defn 'menu-bar-select-yank))
-        (if (or (null defn) (integerp defn) (equal defn 'undefined))
-            (message "%s is undefined" (help-key-description key untranslated))
-          (help-setup-xref (list #'describe-function defn) (interactive-p))
-          ;; Don't bother user with strings from (e.g.) the select-paste menu.
-          (if (stringp (aref key (1- (length key))))
-              (aset key (1- (length key)) "(any string)"))
-          (if (and untranslated
-                   (stringp (aref untranslated (1- (length untranslated)))))
-              (aset untranslated (1- (length untranslated))
-                    "(any string)"))
-          (with-output-to-temp-buffer (help-buffer)
-            (princ (help-key-description key untranslated))
-            (if (windowp window)
-                (princ " at that spot"))
-            (princ " runs the command ")
-            (prin1 defn)
-            (princ "\n   which is ")
-            (describe-function-1 defn)
-            (when up-event
-              (let ((type (event-basic-type up-event))
-                    (hdr "\n\n-------------- up event ---------------\n\n")
-                    defn sequence
-                    mouse-1-tricky mouse-1-remapped)
-                (setq sequence (vector up-event))
-                (when (and (eq type 'mouse-1)
-                           (windowp window)
+  (let* ((event (aref key (if (and (symbolp (aref key 0))
+                                   (> (length key) 1)
+                                   (consp (aref key 1)))
+                              1
+                            0)))
+         (modifiers (event-modifiers event))
+         (mouse-msg (if (or (memq 'click modifiers) (memq 'down modifiers)
+                            (memq 'drag modifiers)) " at that spot" ""))
+         (defn (key-binding key t))
+         defn-up defn-up-tricky ev-type
+         mouse-1-remapped mouse-1-tricky)
+
+    ;; Handle the case where we faked an entry in "Select and Paste" menu.
+    (when (and (eq defn nil)
+               (stringp (aref key (1- (length key))))
+               (eq (key-binding (substring key 0 -1)) 'yank-menu))
+      (setq defn 'menu-bar-select-yank))
+    (if (or (null defn) (integerp defn) (equal defn 'undefined))
+        (message "%s%s is undefined"
+                 (help-key-description key untranslated) mouse-msg)
+      (help-setup-xref (list #'describe-function defn) (interactive-p))
+      ;; Don't bother user with strings from (e.g.) the select-paste menu.
+      (when (stringp (aref key (1- (length key))))
+        (aset key (1- (length key)) "(any string)"))
+      (when (and untranslated
+                 (stringp (aref untranslated (1- (length untranslated)))))
+        (aset untranslated (1- (length untranslated))
+              "(any string)"))
+      ;; Need to do this before erasing *Help* buffer in case event
+      ;; is a mouse click in an existing *Help* buffer.
+      (when up-event
+        (setq ev-type (event-basic-type up-event))
+        (let ((sequence (vector up-event)))
+          (when (and (eq ev-type 'mouse-1)
+                     mouse-1-click-follows-link
+                     (not (eq mouse-1-click-follows-link 'double))
+                     (setq mouse-1-remapped
+                           (mouse-on-link-p (event-start up-event))))
+            (setq mouse-1-tricky (and (integerp mouse-1-click-follows-link)
+                                      (> mouse-1-click-follows-link 0)))
+            (cond ((stringp mouse-1-remapped)
+                   (setq sequence mouse-1-remapped))
+                  ((vectorp mouse-1-remapped)
+                   (setcar up-event (elt mouse-1-remapped 0)))
+                  (t (setcar up-event 'mouse-2))))
+          (setq defn-up (key-binding sequence nil nil (event-start up-event)))
+          (when mouse-1-tricky
+            (setq sequence (vector up-event))
+            (aset sequence 0 'mouse-1)
+            (setq defn-up-tricky (key-binding sequence nil nil (event-start up-event))))))
+      (with-output-to-temp-buffer (help-buffer)
+        (princ (help-key-description key untranslated))
+        (princ (format "\
+%s runs the command %S
+  which is "
+                       mouse-msg defn))
+        (describe-function-1 defn)
+        (when up-event
+          (unless (or (null defn-up)
+                      (integerp defn-up)
+                      (equal defn-up 'undefined))
+            (princ (format "
+
+----------------- up-event %s----------------
+
+<%S>%s%s runs the command %S
+  which is "
+                           (if mouse-1-tricky "(short click) " "")
+                           ev-type mouse-msg
+                           (if mouse-1-remapped
+                               " is remapped to <mouse-2>\nwhich" "")
+                           defn-up))
+            (describe-function-1 defn-up))
+          (unless (or (null defn-up-tricky)
+                      (integerp defn-up-tricky)
+                      (eq defn-up-tricky 'undefined))
+            (princ (format "
+
+----------------- up-event (long click) ----------------
+
+Pressing <%S>%s for longer than %d milli-seconds
+runs the command %S
+  which is "
+                           ev-type mouse-msg
                            mouse-1-click-follows-link
-                           (not (eq mouse-1-click-follows-link 'double))
-                           (setq mouse-1-remapped
-                                 (with-current-buffer (window-buffer window)
-                                   (mouse-on-link-p (posn-point
-                                                     (event-start up-event))))))
-                  (setq mouse-1-tricky (and (integerp mouse-1-click-follows-link)
-                                            (> mouse-1-click-follows-link 0)))
-                  (cond ((stringp mouse-1-remapped)
-                         (setq sequence mouse-1-remapped))
-                        ((vectorp mouse-1-remapped)
-                         (setcar up-event (elt mouse-1-remapped 0)))
-                        (t (setcar up-event 'mouse-2))))
-                (setq defn (or (string-key-binding sequence)
-                               (key-binding sequence)))
-                (unless (or (null defn) (integerp defn) (equal defn 'undefined))
-                  (princ (if mouse-1-tricky
-                             "\n\n----------------- up-event (short click) ----------------\n\n"
-                           hdr))
-                  (setq hdr nil)
-                  (princ (symbol-name type))
-                  (if (windowp window)
-                      (princ " at that spot"))
-                  (if mouse-1-remapped
-                      (princ " is remapped to <mouse-2>\n  which" ))
-                  (princ " runs the command ")
-                  (prin1 defn)
-                  (princ "\n   which is ")
-                  (describe-function-1 defn))
-                (when mouse-1-tricky
-                  (setcar up-event 'mouse-1)
-                  (setq defn (or (string-key-binding (vector up-event))
-                                 (key-binding (vector up-event))))
-                  (unless (or (null defn) (integerp defn) (eq defn 'undefined))
-                    (princ (or hdr
-                               "\n\n----------------- up-event (long click) ----------------\n\n"))
-                    (princ "Pressing mouse-1")
-                    (if (windowp window)
-                        (princ " at that spot"))
-                    (princ (format " for longer than %d milli-seconds\n"
-                                   mouse-1-click-follows-link))
-                    (princ " runs the command ")
-                    (prin1 defn)
-                    (princ "\n   which is ")
-                    (describe-function-1 defn)))))
-            (print-help-return-message)))))))
+                           defn-up-tricky))
+            (describe-function-1 defn-up-tricky)))
+        (print-help-return-message)))))
 
 (defun describe-mode (&optional buffer)
   "Display documentation of current major mode and minor modes.
@@ -786,7 +764,7 @@ descriptions of the minor modes, each on a separate page.
 For this to work correctly for a minor mode, the mode's indicator
 variable \(listed in `minor-mode-alist') must also be a function
 whose documentation describes the minor mode."
-  (interactive)
+  (interactive "@")
   (unless buffer (setq buffer (current-buffer)))
   (help-setup-xref (list #'describe-mode buffer)
                    (interactive-p))
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index c2d2d293010..757a398086d 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -64,16 +64,37 @@
 
 ;;; Code:
 
+(defvar hl-line-overlay nil
+  "Overlay used by Hl-Line mode to highlight the current line.")
+(make-variable-buffer-local 'hl-line-overlay)
+
+(defvar global-hl-line-overlay nil
+  "Overlay used by Global-Hl-Line mode to highlight the current line.")
+
 (defgroup hl-line nil
   "Highlight the current line."
   :version "21.1"
   :group 'editing)
 
-(defcustom hl-line-face 'highlight
-  "Face with which to highlight the current line."
-  :type 'face
+(defface hl-line
+  '((t :inherit highlight))
+  "Default face for highlighting the current line in Hl-Line mode."
+  :version "22.1"
   :group 'hl-line)
 
+(defcustom hl-line-face 'hl-line
+  "Face with which to highlight the current line in Hl-Line mode."
+  :type 'face
+  :group 'hl-line
+  :set (lambda (symbol value)
+         (set symbol value)
+         (dolist (buffer (buffer-list))
+           (with-current-buffer buffer
+             (when hl-line-overlay
+               (overlay-put hl-line-overlay 'face hl-line-face))))
+         (when global-hl-line-overlay
+           (overlay-put global-hl-line-overlay 'face hl-line-face))))
+
 (defcustom hl-line-sticky-flag t
   "*Non-nil means highlight the current line in all windows.
 Otherwise Hl-Line mode will highlight only in the selected
@@ -92,13 +113,6 @@ It should return nil if there's no region to be highlighted.
 
 This variable is expected to be made buffer-local by modes.")
 
-(defvar hl-line-overlay nil
-  "Overlay used by Hl-Line mode to highlight the current line.")
-(make-variable-buffer-local 'hl-line-overlay)
-
-(defvar global-hl-line-overlay nil
-  "Overlay used by Global-Hl-Line mode to highlight the current line.")
-
 ;;;###autoload
 (define-minor-mode hl-line-mode
   "Buffer-local minor mode to highlight the line about point.
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 292e158c097..4ab7b9eda41 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -370,7 +370,11 @@ With numeric ARG, enable auto-update if and only if ARG is positive."
   "Evaluate FORM in each of the buffers.
 Does not display the buffer during evaluation. See
 `ibuffer-do-view-and-eval' for that."
-  (:interactive "xEval in buffers (form): "
+  (:interactive
+   (list
+    (read-from-minibuffer
+     "Eval in buffers (form): "
+     nil read-expression-map t 'read-expression-history))
    :opstring "evaluated in"
    :modifier-p :maybe)
   (eval form))
@@ -379,7 +383,11 @@ Does not display the buffer during evaluation. See
 (define-ibuffer-op view-and-eval (form)
   "Evaluate FORM while displaying each of the marked buffers.
 To evaluate a form without viewing the buffer, see `ibuffer-do-eval'."
-  (:interactive "xEval viewing buffers (form): "
+  (:interactive
+   (list
+    (read-from-minibuffer
+     "Eval viewing in buffers (form): "
+     nil read-expression-map t 'read-expression-history))
    :opstring "evaluated in"
    :complex t
    :modifier-p :maybe)
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 29767cee7f6..04672f6e29f 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -1972,12 +1972,12 @@ the value of point at the beginning of the line for that buffer."
                 (not (eq ibuffer-buf buf))))))
 
 ;; This function is a special case; it's not defined by
-;; `ibuffer-define-sorter'.
+;; `define-ibuffer-sorter'.
 (defun ibuffer-do-sort-by-recency ()
   "Sort the buffers by last view time."
   (interactive)
   (setq ibuffer-sorting-mode 'recency)
-  (ibuffer-redisplay t))
+  (ibuffer-update nil t))
 
 (defun ibuffer-update-format ()
   (when (null ibuffer-current-format)
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index f53ef7c91d1..6687c13275b 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -157,6 +157,12 @@ is minibuffer."
                                          (< (length x) (length y))))
                                ", ")
                     ">"))))))
+;;;_  = icomplete-with-completion-tables
+(defvar icomplete-with-completion-tables '(internal-complete-buffer)
+  "Specialized completion tables with which icomplete should operate.
+
+Icomplete does not operate with any specialized completion tables
+except those on this list.")
 
 ;;;_ > icomplete-mode (&optional prefix)
 ;;;###autoload
@@ -184,8 +190,9 @@ Conditions are:
   (and (window-minibuffer-p (selected-window))
        (not executing-kbd-macro)
        minibuffer-completion-table
-       ;; (or minibuffer-completing-file-name
-       (not (functionp minibuffer-completion-table)))) ;; )
+       (or (not (functionp minibuffer-completion-table))
+           (member minibuffer-completion-table
+                   icomplete-with-completion-tables))))
 
 ;;;_ > icomplete-minibuffer-setup ()
 (defun icomplete-minibuffer-setup ()
diff --git a/lisp/ido.el b/lisp/ido.el
index 2d531728b67..ff222b2958c 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2112,7 +2112,7 @@ If INITIAL is non-nil, it specifies the initial input string."
 (defun ido-edit-input ()
   "Edit absolute file name entered so far with ido; terminate by RET."
   (interactive)
-  (setq ido-text-init (if ido-matches (car ido-matches) ido-text))
+  (setq ido-text-init (if ido-matches (ido-name (car ido-matches)) ido-text))
   (setq ido-exit 'edit)
   (exit-minibuffer))
 
@@ -2224,7 +2224,6 @@ If INITIAL is non-nil, it specifies the initial input string."
   (let ((ido-current-directory (ido-expand-directory default))
         (ido-context-switch-command switch-cmd)
         ido-directory-nonreadable ido-directory-too-big
-        (minibuffer-completing-file-name t)
         filename)
 
     (if (or (not ido-mode) (ido-is-slow-ftp-host))
@@ -2268,9 +2267,10 @@ If INITIAL is non-nil, it specifies the initial input string."
 
       (unless filename
         (setq ido-saved-vc-hb vc-handled-backends)
-        (setq filename (ido-read-internal item
-                                          (or prompt "Find file: ")
-                                          'ido-file-history nil nil initial)))
+        (let ((minibuffer-completing-file-name t))
+          (setq filename (ido-read-internal item
+                                            (or prompt "Find file: ")
+                                            'ido-file-history nil nil initial))))
 
       ;; Choose the file name: either the text typed in, or the head
       ;; of the list of matches
@@ -2426,13 +2426,13 @@ If INITIAL is non-nil, it specifies the initial input string."
      ((and (= 1 (length ido-matches))
            (not (and ido-enable-tramp-completion
                      (string-equal ido-current-directory "/")
-                     (string-match "..[@:]\\'" (car ido-matches)))))
+                     (string-match "..[@:]\\'" (ido-name (car ido-matches))))))
       ;; only one choice, so select it.
       (if (not ido-confirm-unique-completion)
           (exit-minibuffer)
         (setq ido-rescan (not ido-enable-prefix))
         (delete-region (minibuffer-prompt-end) (point))
-        (insert (car ido-matches))))
+        (insert (ido-name (car ido-matches)))))
 
      (t ;; else there could be some completions
       (setq res ido-common-match-string)
@@ -2814,7 +2814,7 @@ If input stack is non-empty, delete current directory component."
   "Use first matching item as input text."
   (interactive)
   (when ido-matches
-    (setq ido-text-init (car ido-matches))
+    (setq ido-text-init (ido-name (car ido-matches)))
     (setq ido-exit 'refresh)
     (exit-minibuffer)))
 
@@ -2828,7 +2828,7 @@ If input stack is non-empty, delete current directory component."
   "Move to previous directory in file name, push first match on stack."
   (interactive)
   (if ido-matches
-      (setq ido-text (car ido-matches)))
+      (setq ido-text (ido-name (car ido-matches))))
   (setq ido-exit 'push)
   (exit-minibuffer))
 
@@ -3084,12 +3084,14 @@ for first matching file."
   (let ((oa (ido-file-extension-order a n))
         (ob (ido-file-extension-order b n)))
     (cond
-     ((= oa ob)
-      lessp)
      ((and oa ob)
-      (if lessp
-          (> oa ob)
-        (< oa ob)))
+      (cond
+       ((= oa ob)
+        lessp)
+       (lessp
+        (> oa ob))
+       (t
+        (< oa ob))))
      (oa
       (not lessp))
      (ob
@@ -3136,7 +3138,12 @@ for first matching file."
   (let ((filenames
          (split-string
           (shell-command-to-string
-           (concat "find " dir " -name \"" (if prefix "" "*") file "*\" -type " (if finddir "d" "f") " -print"))))
+           (concat "find "
+                   (shell-quote-argument dir)
+                   " -name "
+                   (shell-quote-argument
+                    (concat (if prefix "" "*") file "*"))
+                   " -type " (if finddir "d" "f") " -print"))))
         filename d f
         res)
     (while filenames
@@ -3618,7 +3625,7 @@ for first matching file."
                   ((stringp nextstr)
                    (and (>= flen (setq slen (length nextstr)))
                         (string-equal (substring name (- flen slen)) nextstr)))
-                  ((fboundp nextstr) (funcall nextstr name))
+                  ((functionp nextstr) (funcall nextstr name))
                   (t nil))
                  (setq ignorep t
                        ext-list nil
@@ -3628,7 +3635,7 @@ for first matching file."
              (setq nextstr (car re-list))
              (if (cond
                   ((stringp nextstr) (string-match nextstr name))
-                  ((fboundp nextstr) (funcall nextstr name))
+                  ((functionp nextstr) (funcall nextstr name))
                   (t nil))
                  (setq ignorep t
                        re-list nil)
@@ -3745,7 +3752,7 @@ for first matching file."
   "Kill the buffer at the head of `ido-matches'."
   (interactive)
   (let ((enable-recursive-minibuffers t)
-        (buf (car ido-matches)))
+        (buf (ido-name (car ido-matches))))
     (when buf
       (kill-buffer buf)
       ;; Check if buffer still exists.
@@ -3760,7 +3767,7 @@ for first matching file."
   "Delete the file at the head of `ido-matches'."
   (interactive)
   (let ((enable-recursive-minibuffers t)
-        (file (car ido-matches)))
+        (file (ido-name (car ido-matches))))
     (if file
         (setq file (concat ido-current-directory file)))
     (when (and file
@@ -3781,7 +3788,8 @@ for first matching file."
 (defun ido-visit-buffer (buffer method &optional record)
   "Switch to BUFFER according to METHOD.
 Record command in `command-history' if optional RECORD is non-nil."
-
+  (if (bufferp buffer)
+      (setq buffer (buffer-name buffer)))
   (let (win newframe)
     (cond
      ((eq method 'kill)
@@ -4201,7 +4209,7 @@ For details of keybindings, do `\\[describe-function] ido-find-file'."
             ((= (length contents) 2)
              "/")
             (ido-matches
-             (concat ido-current-directory (car ido-matches)))
+             (concat ido-current-directory (ido-name (car ido-matches))))
             (t
              (concat ido-current-directory (substring contents 0 -1)))))
           (setq ido-text-init (substring contents -1))
@@ -4237,12 +4245,12 @@ For details of keybindings, do `\\[describe-function] ido-find-file'."
                    ido-matches
                    (or (eq ido-enter-matching-directory 'first)
                        (null (cdr ido-matches)))
-                   (ido-final-slash (car ido-matches))
+                   (ido-final-slash (ido-name (car ido-matches)))
                    (or try-single-dir-match
                        (eq ido-enter-matching-directory t)))
           (ido-trace "single match" (car ido-matches))
           (ido-set-current-directory
-           (concat ido-current-directory (car ido-matches)))
+           (concat ido-current-directory (ido-name (car ido-matches))))
           (setq ido-exit 'refresh)
           (exit-minibuffer))
 
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 523ef3f73a8..66f719ae1eb 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -60,16 +60,19 @@ to toggle between display as an image and display as text."
   (setq major-mode 'image-mode)
   (use-local-map image-mode-map)
   (add-hook 'change-major-mode-hook 'image-toggle-display-text nil t)
-  (if (not (get-text-property (point-min) 'display))
+  (if (and (display-images-p)
+           (not (get-text-property (point-min) 'display)))
       (image-toggle-display)
     ;; Set next vars when image is already displayed but local
     ;; variables were cleared by kill-all-local-variables
     (setq cursor-type nil truncate-lines t))
   (run-mode-hooks 'image-mode-hook)
-  (message "%s" (concat (substitute-command-keys
-                    "Type \\[image-toggle-display] to view the image as ")
-                   (if (get-text-property (point-min) 'display)
-                       "text" "an image") ".")))
+  (if (display-images-p)
+      (message "%s" (concat
+                     (substitute-command-keys
+                      "Type \\[image-toggle-display] to view the image as ")
+                     (if (get-text-property (point-min) 'display)
+                         "text" "an image") "."))))
 
 ;;;###autoload
 (define-minor-mode image-minor-mode
diff --git a/lisp/imenu.el b/lisp/imenu.el
index d9c75c5fdd4..ed190c24e12 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -967,15 +967,15 @@ A trivial interface to `imenu-add-to-menubar' suitable for use in a hook."
 (defvar imenu-buffer-menubar nil)
 
 (defvar imenu-menubar-modified-tick 0
-  "The value of (buffer-modified-tick) as of last call to `imenu-update-menubar'.")
+  "The value of (buffer-chars-modified-tick) as of the last call
+to `imenu-update-menubar'.")
 (make-variable-buffer-local 'imenu-menubar-modified-tick)
 
 (defun imenu-update-menubar ()
   (when (and (current-local-map)
              (keymapp (lookup-key (current-local-map) [menu-bar index]))
-             (not (eq (buffer-modified-tick)
-                      imenu-menubar-modified-tick)))
-    (setq imenu-menubar-modified-tick (buffer-modified-tick))
+             (/= (buffer-chars-modified-tick) imenu-menubar-modified-tick))
+    (setq imenu-menubar-modified-tick (buffer-chars-modified-tick))
     (let ((index-alist (imenu--make-index-alist t)))
       ;; Don't bother updating if the index-alist has not changed
       ;; since the last time we did it.
diff --git a/lisp/info-look.el b/lisp/info-look.el
index 404eee3f2d0..2ac461aa669 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -843,12 +843,13 @@ Return nil if there is nothing appropriate in the buffer near point."
 (info-lookup-maybe-add-help
  :mode 'maxima-mode
  :ignore-case t
- :regexp "[a-zA-Z_%]+"
+ :regexp "[a-zA-Z0-9_%]+"
  :doc-spec '( ("(maxima)Function and Variable Index" nil
                "^ -+ [^:]+:[ ]+\\(\\[[^=]*=[ ]+\\)?" nil)))
 
 (info-lookup-maybe-add-help
  :mode 'inferior-maxima-mode
+ :regexp "[a-zA-Z0-9_%]+"
  :other-modes '(maxima-mode))
 
 ;; coreutils and bash builtins overlap in places, eg. printf, so there's a
diff --git a/lisp/info.el b/lisp/info.el
index dc08557e28d..05c07220892 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2792,7 +2792,8 @@ Use the \\<Info-mode-map>\\[Info-index-next] command to see the other matches.
 Give an empty topic name to go to the Index node itself."
   (interactive
    (list
-    (let ((Info-complete-menu-buffer (clone-buffer))
+    (let ((completion-ignore-case t)
+          (Info-complete-menu-buffer (clone-buffer))
           (Info-complete-nodes (Info-index-nodes))
           (Info-history-list nil))
       (if (equal Info-current-file "dir")
diff --git a/lisp/international/code-pages.el b/lisp/international/code-pages.el
index 13181268b36..994450b2a70 100644
--- a/lisp/international/code-pages.el
+++ b/lisp/international/code-pages.el
@@ -1273,6 +1273,138 @@ Return an updated `non-iso-charset-alist'."
   ?\■
   ?\ ])
 
+;;;###autoload(autoload-coding-system 'cp858 '(require 'code-pages))
+(cp-make-coding-system
+ cp858
+ [?\Ç
+  ?\ü
+  ?\é
+  ?\â
+  ?\ä
+  ?\à
+  ?\å
+  ?\ç
+  ?\ê
+  ?\ë
+  ?\è
+  ?\ï
+  ?\î
+  ?\ì
+  ?\Ä
+  ?\Å
+  ?\É
+  ?\æ
+  ?\Æ
+  ?\ô
+  ?\ö
+  ?\ò
+  ?\û
+  ?\ù
+  ?\ÿ
+  ?\Ö
+  ?\Ü
+  ?\ø
+  ?\£
+  ?\Ø
+  ?\×
+  ?\ƒ
+  ?\á
+  ?\í
+  ?\ó
+  ?\ú
+  ?\ñ
+  ?\Ñ
+  ?\ª
+  ?\º
+  ?\¿
+  ?\®
+  ?\¬
+  ?\½
+  ?\¼
+  ?\¡
+  ?\«
+  ?\»
+  ?\░
+  ?\▒
+  ?\▓
+  ?\│
+  ?\┤
+  ?\Á
+  ?\Â
+  ?\À
+  ?\©
+  ?\╣
+  ?\║
+  ?\╗
+  ?\╝
+  ?\¢
+  ?\¥
+  ?\┐
+  ?\└
+  ?\┴
+  ?\┬
+  ?\├
+  ?\─
+  ?\┼
+  ?\ã
+  ?\Ã
+  ?\╚
+  ?\╔
+  ?\╩
+  ?\╦
+  ?\╠
+  ?\═
+  ?\╬
+  ?\¤
+  ?\ð
+  ?\Ð
+  ?\Ê
+  ?\Ë
+  ?\È
+  ?\€
+  ?\Í
+  ?\Î
+  ?\Ï
+  ?\┘
+  ?\┌
+  ?\█
+  ?\▄
+  ?\¦
+  ?\Ì
+  ?\▀
+  ?\Ó
+  ?\ß
+  ?\Ô
+  ?\Ò
+  ?\õ
+  ?\Õ
+  ?\µ
+  ?\þ
+  ?\Þ
+  ?\Ú
+  ?\Û
+  ?\Ù
+  ?\ý
+  ?\Ý
+  ?\¯
+  ?\´
+  ?\­
+  ?\±
+  ?\‗
+  ?\¾
+  ?\¶
+  ?\§
+  ?\÷
+  ?\¸
+  ?\°
+  ?\¨
+  ?\·
+  ?\¹
+  ?\³
+  ?\²
+  ?\■
+  ?\ ])
+
 ;;;###autoload(autoload-coding-system 'cp860 '(require 'code-pages))
 (cp-make-coding-system
  cp860
@@ -3442,11 +3574,11 @@ Return an updated `non-iso-charset-alist'."
   ?\ƒ
   ?\§
   ?\¤
-  nil
+  ?\’
   ?\“
   ?\«
-  nil
-  nil
+  ?\‹
+  ?\›
   ?\fi
   ?\fl
   ?\®
@@ -3457,8 +3589,8 @@ Return an updated `non-iso-charset-alist'."
   ?\¦
   ?\¶
   ?\•
-  nil
-  nil
+  ?\‚
+  ?\„
   ?\”
   ?\»
   ?\…
@@ -3804,62 +3936,92 @@ Return an updated `non-iso-charset-alist'."
 (cp-make-coding-system
  ;; The base system uses arabic-iso-8bit, but that's not a MIME charset.
  iso-8859-6
- [nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
-  nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
+ [nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
+  nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
   ?\ 
-  ?\¤
-  ?\،
-  ?\­
-  ?\؛
-  ?\؟
-  ?\ء
-  ?\آ
-  ?\أ
-  ?\ؤ
-  ?\إ
-  ?\ئ
-  ?\ا
-  ?\ب
-  ?\ة
-  ?\ت
-  ?\ث
-  ?\ج
-  ?\ح
-  ?\خ
-  ?\د
-  ?\ذ
-  ?\ر
-  ?\ز
-  ?\س
-  ?\ش
-  ?\ص
-  ?\ض
-  ?\ط
-  ?\ظ
-  ?\ع
-  ?\غ
-  ?\ـ
-  ?\ف
-  ?\ق
-  ?\ك
-  ?\ل
-  ?\م
-  ?\ن
-  ?\ه
-  ?\و
-  ?\ى
-  ?\ي
-  ?\ً
-  ?\ٌ
-  ?\ٍ
-  ?\َ
-  ?\ُ
-  ?\ِ
-  ?\ّ
-  ?\ْ
-  nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
-  nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
-  nil nil nil nil nil nil nil nil nil nil nil]
+  nil
+  nil
+  nil
+  ?¤
+  nil
+  nil
+  nil
+  nil
+  nil
+  nil
+  nil
+  ?،
+  ?­
+  nil
+  nil
+  nil
+  nil
+  nil
+  nil
+  nil
+  nil
+  nil
+  nil
+  nil
+  nil
+  nil
+  ?؛
+  nil
+  nil
+  nil
+  ?؟
+  nil
+  ?ء
+  ?آ
+  ?أ
+  ?ؤ
+  ?إ
+  ?ئ
+  ?ا
+  ?ب
+  ?ة
+  ?ت
+  ?ث
+  ?ج
+  ?ح
+  ?خ
+  ?د
+  ?ذ
+  ?ر
+  ?ز
+  ?س
+  ?ش
+  ?ص
+  ?ض
+  ?ط
+  ?ظ
+  ?ع
+  ?غ
+  nil
+  nil
+  nil
+  nil
+  nil
+  ?ـ
+  ?ف
+  ?ق
+  ?ك
+  ?ل
+  ?م
+  ?ن
+  ?ه
+  ?و
+  ?ى
+  ?ي
+  ?ً
+  ?ٌ
+  ?ٍ
+  ?َ
+  ?ُ
+  ?ِ
+  ?ّ
+  ?ْ
+  nil nil nil nil nil nil nil nil nil nil nil nil nil]
  "Unicode-based Arabic ISO/IEC 8859-6 (MIME: ISO-8859-6)"
  ?6)
 (define-coding-system-alias 'arabic-iso-8bit 'iso-8859-6)
diff --git a/lisp/international/codepage.el b/lisp/international/codepage.el
index 56920b968ac..e2499002a34 100644
--- a/lisp/international/codepage.el
+++ b/lisp/international/codepage.el
@@ -220,16 +220,32 @@ character is generated by (make-char CHARSET OFFSET)."
   ;; character created by (make-char 'latin-iso8859-1 (+ N 160)).
   ;; The element nil means there's no corresponding cp850 glyph.
   [
-   255 173 189 156 207 190 221 245 249 184 166 174 170 240 169 nil
+   255 173 189 156 207 190 221 245 249 184 166 174 170 240 169 238
    248 241 253 252 239 230 244 250 247 251 167 175 172 171 243 168
    183 181 182 199 142 143 146 128 212 144 210 211 222 214 215 216
-   209 165 227 224 226 229 153 158 157 235 233 234 154 237 231 225
+   209 165 227 224 226 229 153 158 157 235 233 234 154 237 232 225
    133 160 131 198 132 134 145 135 138 130 136 137 141 161 140 139
-   208 164 149 162 147 228 148 246 155 151 163 150 129 236 232 152]
+   208 164 149 162 147 228 148 246 155 151 163 150 129 236 231 152]
   "Table for converting ISO-8859-1 characters into codepage 850 glyphs.")
 (setplist 'cp850-decode-table
           '(charset latin-iso8859-1 language "Latin-1" offset 160))
 
+;; Multilingual (Latin-9)
+(defvar cp858-decode-table
+  ;; Nth element is the code of a cp858 glyph for the multibyte
+  ;; character created by (make-char 'latin-iso8859-15 (+ N 160)).
+  ;; The element nil means there's no corresponding cp858 glyph.
+  [
+   255 173 189 156 213 190 221 245 249 184 166 174 170 240 169 238
+   248 241 253 252 239 230 244 250 247 251 167 175 172 171 243 168
+   183 181 182 199 142 143 146 128 212 144 210 211 222 214 215 216
+   209 165 227 224 226 229 153 158 157 235 233 234 154 237 232 225
+   133 160 131 198 132 134 145 135 138 130 136 137 141 161 140 139
+   208 164 149 162 147 228 148 246 155 151 163 150 129 236 231 152]
+  "Table for converting ISO-8859-15 characters into codepage 858 glyphs.")
+(setplist 'cp858-decode-table
+          '(charset latin-iso8859-15 language "Latin-9" offset 160))
+
 ;; Greek
 (defvar cp851-decode-table
   [
diff --git a/lisp/international/latexenc.el b/lisp/international/latexenc.el
index 58e8d6c88e8..4f9b4f740d5 100644
--- a/lisp/international/latexenc.el
+++ b/lisp/international/latexenc.el
@@ -63,7 +63,7 @@
     ("cp437" . cp437) ; IBM code page 437: 225 is \beta
     ("cp850" . cp850) ; IBM code page 850
     ("cp852" . cp852) ; IBM code page 852
-    ;; ("cp858" . undecided) ; IBM code page 850 but with a euro symbol
+    ("cp858" . cp858) ; IBM code page 850 but with a euro symbol
     ("cp865" . cp865) ; IBM code page 865
     ;; The DECMultinational charaterset used by the OpenVMS system
     ;; ("decmulti" . undecided)
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index aecf2128456..5e9846e0155 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -216,19 +216,21 @@ They means `unix', `dos', and `mac' respectively."
                            ((eq eol-type 'dos) 1)
                            ((eq eol-type 'mac) 2)
                            (t eol-type))))
-  (let ((orig-eol-type (coding-system-eol-type coding-system)))
-    (if (vectorp orig-eol-type)
-        (if (not eol-type)
-            coding-system
-          (aref orig-eol-type eol-type))
-      (let ((base (coding-system-base coding-system)))
-        (if (not eol-type)
-            base
-          (if (= eol-type orig-eol-type)
-              coding-system
-            (setq orig-eol-type (coding-system-eol-type base))
-            (if (vectorp orig-eol-type)
-                (aref orig-eol-type eol-type))))))))
+  ;; We call `coding-system-base' before `coding-system-eol-type',
+  ;; because the coding-system may not be initialized until then.
+  (let* ((base (coding-system-base coding-system))
+         (orig-eol-type (coding-system-eol-type coding-system)))
+    (cond ((vectorp orig-eol-type)
+           (if (not eol-type)
+               coding-system
+             (aref orig-eol-type eol-type)))
+          ((not eol-type)
+           base)
+          ((= eol-type orig-eol-type)
+           coding-system)
+          ((progn (setq orig-eol-type (coding-system-eol-type base))
+                  (vectorp orig-eol-type))
+           (aref orig-eol-type eol-type)))))
 
 (defun coding-system-change-text-conversion (coding-system coding)
   "Return a coding system which differs from CODING-SYSTEM in text conversion.
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 1cce13c76a3..9ddb666bfd0 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1871,7 +1871,13 @@ The optional second arg VISIT non-nil means that we are visiting a file."
               (let ((pos-marker (copy-marker (+ (point) inserted)))
                     ;; Prevent locking.
                     (buffer-file-name nil))
-                (set-buffer-multibyte nil)
+                (if visit
+                    ;; If we're doing this for find-file,
+                    ;; don't record undo info; this counts as
+                    ;; part of producing the buffer's initial contents.
+                    (let ((buffer-undo-list t))
+                      (set-buffer-multibyte nil))
+                  (set-buffer-multibyte nil))
                 (setq inserted (- pos-marker (point)))))
           (set-buffer-modified-p modified-p))))
   inserted)
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 3998764957e..fceebf64f22 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -1095,8 +1095,8 @@ Optional 5th arg DECODE-MAP is a Quail decode map.
 
 Optional 6th arg PROPS is a property list annotating TRANS.  See the
 function `quail-define-rules' for the detail."
-  (if (null (stringp key))
-      "Invalid Quail key `%s'" key)
+  (if (not (or (stringp key) (vectorp key)))
+      (error "Invalid Quail key `%s'" key))
   (if (not (or (numberp trans) (stringp trans) (vectorp trans)
                (consp trans)
                (symbolp trans)
diff --git a/lisp/international/utf-8.el b/lisp/international/utf-8.el
index 384d973db9f..7a57a3d099b 100644
--- a/lisp/international/utf-8.el
+++ b/lisp/international/utf-8.el
@@ -309,7 +309,10 @@ use either \\[customize] or the function
     ;; Here we bind coding-system-for-read to nil so that coding tags
     ;; in the files are respected even if the files are not yet
     ;; byte-compiled
-    (let ((coding-system-for-read nil))
+    (let ((coding-system-for-read nil)
+          ;; We must avoid clobbering this variable, in case the load
+          ;; files below use different coding systems.
+          (last-coding-system-used last-coding-system-used))
       (cond ((string= "Korean" current-language-environment)
              (load "subst-jis")
              (load "subst-big5")
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 7039dbd6812..85e0bb6763f 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1293,23 +1293,18 @@ If search string is empty, just beep."
 (defun isearch-mouse-2 (click)
   "Handle mouse-2 in Isearch mode.
 For a click in the echo area, invoke `isearch-yank-x-selection'.
-Otherwise invoke whatever mouse-2 is bound to outside of Isearch."
+Otherwise invoke whatever the calling mouse-2 command sequence
+is bound to outside of Isearch."
   (interactive "e")
   (let* ((w (posn-window (event-start click)))
          (overriding-terminal-local-map nil)
-         (key (vector (event-basic-type click)))
-         ;; FIXME: `key-binding' should accept an event as argument
-         ;; and do all the overlay/text-properties lookup etc...
-         (binding (with-current-buffer
-                      (if (window-live-p w) (window-buffer w) (current-buffer))
-                    (key-binding key))))
+         (binding (key-binding (this-command-keys-vector) t)))
     (if (and (window-minibuffer-p w)
              (not (minibuffer-window-active-p w))) ; in echo area
         (isearch-yank-x-selection)
       (when (functionp binding)
         (call-interactively binding)))))
 
-
 (defun isearch-yank-internal (jumpform)
   "Pull the text from point to the point reached by JUMPFORM.
 JUMPFORM is a lambda expression that takes no arguments and returns a
@@ -1807,8 +1802,6 @@ Isearch mode."
    ((eq   char ?|)       (isearch-fallback t nil t)))
 
   ;; Append the char to the search string, update the message and re-search.
-  (if (char-table-p translation-table-for-input)
-      (setq char (or (aref translation-table-for-input char) char)))
   (isearch-process-search-string
    (char-to-string char)
    (if (>= char ?\200)
@@ -1993,6 +1986,36 @@ Can be changed via `isearch-search-fun-function' for special needs."
      (t
       (if isearch-forward 'search-forward 'search-backward)))))
 
+(defun isearch-search-string (string bound noerror)
+  ;; Search for the first occurance of STRING or its translation.  If
+  ;; found, move point to the end of the occurance, update
+  ;; isearch-match-beg and isearch-match-end, and return point.
+  (let ((func (isearch-search-fun))
+        (len (length string))
+        pos1 pos2)
+    (setq pos1 (save-excursion (funcall func string bound noerror)))
+    (if (and (char-table-p translation-table-for-input)
+             (> (string-bytes string) len))
+        (let (translated match-data)
+          (dotimes (i len)
+            (let ((x (aref translation-table-for-input (aref string i))))
+              (when x
+                (or translated (setq translated (copy-sequence string)))
+                (aset translated i x))))
+          (when translated
+            (save-match-data
+              (save-excursion
+                (if (setq pos2 (funcall func translated bound noerror))
+                    (setq match-data (match-data t)))))
+            (when (and pos2
+                       (or (not pos1)
+                           (if isearch-forward (< pos2 pos1) (> pos2 pos1))))
+              (setq pos1 pos2)
+              (set-match-data match-data)))))
+    (if pos1
+        (goto-char pos1))
+    pos1))
+
 (defun isearch-search ()
   ;; Do the search with the current search string.
   (isearch-message nil t)
@@ -2008,9 +2031,7 @@ Can be changed via `isearch-search-fun-function' for special needs."
         (setq isearch-error nil)
         (while retry
           (setq isearch-success
-                (funcall
-                 (isearch-search-fun)
-                 isearch-string nil t))
+                (isearch-search-string isearch-string nil t))
           ;; Clear RETRY unless we matched some invisible text
           ;; and we aren't supposed to do that.
           (if (or (eq search-invisible t)
@@ -2353,7 +2374,7 @@ Attempt to do the search exactly the way the pending isearch would."
         (isearch-regexp isearch-lazy-highlight-regexp)
         (search-spaces-regexp search-whitespace-regexp))
     (condition-case nil
-        (funcall (isearch-search-fun)
+        (isearch-search-string
                  isearch-lazy-highlight-last-string
                  (if isearch-forward
                      (min (or isearch-lazy-highlight-end-limit (point-max))
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 89959ad8525..e049579d463 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -349,7 +349,7 @@ Defaults to the whole buffer.  END can be out of bounds."
          ;; Fontify chunks beginning at START.  The end of a
          ;; chunk is either `end', or the start of a region
          ;; before `end' that has already been fontified.
-         (while start
+         (while (and start (< start end))
            ;; Determine the end of this chunk.
            (setq next (or (text-property-any start end 'fontified t)
                           end))
@@ -397,19 +397,21 @@ Defaults to the whole buffer.  END can be out of bounds."
            ;; eagerly extend the refontified region with
            ;; jit-lock-after-change-extend-region-functions.
            (when (< start orig-start)
-             (lexical-let ((start start)
-                           (orig-start orig-start)
-                           (buf (current-buffer)))
-               (run-with-timer
-                0 nil (lambda ()
-                        (with-current-buffer buf
-                          (with-buffer-prepared-for-jit-lock
-                              (put-text-property start orig-start
-                                                 'fontified t)))))))
+             (run-with-timer 0 nil 'jit-lock-force-redisplay
+                             (current-buffer) start orig-start))
 
            ;; Find the start of the next chunk, if any.
            (setq start (text-property-any next end 'fontified nil))))))))
 
+(defun jit-lock-force-redisplay (buf start end)
+  "Force the display engine to re-render buffer BUF from START to END."
+  (with-current-buffer buf
+    (with-buffer-prepared-for-jit-lock
+     ;; Don't cause refontification (it's already been done), but just do
+     ;; some random buffer change, so as to force redisplay.
+     (put-text-property start end 'fontified t))))
+
+
 
 ;;; Stealth fontification.
 
diff --git a/lisp/language/european.el b/lisp/language/european.el
index fbac0527425..b070fe75607 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -37,7 +37,7 @@
 (set-language-info-alist
  "Latin-1" '((charset ascii latin-iso8859-1)
              (coding-system iso-latin-1)
-             (coding-priority iso-latin-1)
+             (coding-priority iso-latin-1 windows-1252)
              (nonascii-translation . latin-iso8859-1)
              (unibyte-syntax . "latin-1")
              (unibyte-display . iso-latin-1)
@@ -278,7 +278,7 @@ but it selects the Dutch tutorial and input method."))
  "German" '((tutorial . "TUTORIAL.de")
             (charset ascii latin-iso8859-1)
             (coding-system iso-latin-1 iso-latin-9)
-            (coding-priority iso-latin-1)
+            (coding-priority iso-latin-1 windows-1252)
             (input-method . "german-postfix")
             (nonascii-translation . latin-iso8859-1)
             (unibyte-syntax . "latin-1")
diff --git a/lisp/locate.el b/lisp/locate.el
index 5df695d59b9..9cf37e89ee1 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -114,6 +114,7 @@
 
 ;; Variables
 
+(defvar locate-current-search nil)
 (defvar locate-current-filter nil)
 
 (defgroup locate nil
@@ -289,29 +290,36 @@ the docstring of that function for its meaning."
          (run-locate-command
           (or (and current-prefix-arg (not locate-prompt-for-command))
               (and (not current-prefix-arg) locate-prompt-for-command)))
+         locate-buffer
          )
 
     ;; Find the Locate buffer
-    (save-window-excursion
-      (set-buffer (get-buffer-create locate-buffer-name))
+    (setq locate-buffer (if (eq major-mode 'locate-mode)
+                            (current-buffer)
+                          (get-buffer-create locate-buffer-name)))
+
+    (save-excursion
+      (set-buffer locate-buffer)
       (locate-mode)
+
       (let ((inhibit-read-only t)
-            (buffer-undo-list t))
-        (erase-buffer)
+            (buffer-undo-list t))
+        (erase-buffer)
+
+        (set (make-local-variable 'locate-current-search) search-string)
+        (set (make-local-variable 'locate-current-filter) filter)
 
-        (setq locate-current-filter filter)
+        (if run-locate-command
+            (shell-command search-string)
+          (apply 'call-process locate-cmd nil t nil locate-cmd-args))
 
-        (if run-locate-command
-            (shell-command search-string locate-buffer-name)
-          (apply 'call-process locate-cmd nil t nil locate-cmd-args))
+        (and filter
+             (locate-filter-output filter))
 
-        (and filter
-             (locate-filter-output filter))
+        (locate-do-setup search-string)))
 
-        (locate-do-setup search-string)
-        ))
-    (and (not (string-equal (buffer-name) locate-buffer-name))
-        (switch-to-buffer-other-window locate-buffer-name))
+    (unless (eq (current-buffer) locate-buffer)
+      (switch-to-buffer-other-window locate-buffer))
 
     (run-hooks 'dired-mode-hook)
     (dired-next-line 3)                 ;move to first matching file.
@@ -461,6 +469,7 @@ do not work in subdirectories.
         default-directory   "/"
         buffer-read-only    t
         selective-display   t)
+  (buffer-disable-undo)
   (dired-alist-add-1 default-directory (point-min-marker))
   (set (make-local-variable 'dired-directory) "/")
   (set (make-local-variable 'dired-subdir-switches) locate-ls-subdir-switches)
@@ -492,11 +501,12 @@ do not work in subdirectories.
     ;; Nothing returned from locate command?
     (and (eobp)
          (progn
-           (kill-buffer locate-buffer-name)
-           (if locate-current-filter
-               (error "Locate: no match for %s in database using filter %s"
-                      search-string locate-current-filter)
-             (error "Locate: no match for %s in database" search-string))))
+           (let ((filter locate-current-filter)) ; local
+             (kill-buffer (current-buffer))
+             (if filter
+                 (error "Locate: no match for %s in database using filter %s"
+                        search-string filter)
+               (error "Locate: no match for %s in database" search-string)))))
 
     (locate-insert-header search-string)
 
@@ -580,15 +590,14 @@ do not work in subdirectories.
   "Revert the *Locate* buffer.
 If `locate-update-when-revert' is non-nil, offer to update the
 locate database using the shell command in `locate-update-command'."
-  (let ((str (car locate-history-list)))
-    (and locate-update-when-revert
-         (yes-or-no-p "Update locate database (may take a few seconds)? ")
-         ;; `expand-file-name' is used in order to autoload Tramp if
-         ;; necessary.  It cannot be loaded when `default-directory'
-         ;; is remote.
-         (let ((default-directory (expand-file-name locate-update-path)))
-           (shell-command locate-update-command)))
-    (locate str)))
+  (and locate-update-when-revert
+       (yes-or-no-p "Update locate database (may take a few seconds)? ")
+       ;; `expand-file-name' is used in order to autoload Tramp if
+       ;; necessary.  It cannot be loaded when `default-directory'
+       ;; is remote.
+       (let ((default-directory (expand-file-name locate-update-path)))
+         (shell-command locate-update-command)))
+  (locate locate-current-search locate-current-filter))
 
 ;;; Modified three functions from `dired.el':
 ;;;   dired-find-directory,
diff --git a/lisp/longlines.el b/lisp/longlines.el
index 77e0b415344..ee469e1be09 100644
--- a/lisp/longlines.el
+++ b/lisp/longlines.el
@@ -410,7 +410,7 @@ This is called by `post-command-hook' after each command."
 
 (defun longlines-window-change-function ()
   "Re-wrap the buffer if the window width has changed.
-This is called by `window-size-change-functions'."
+This is called by `window-configuration-change-hook'."
   (when (/= fill-column (- (window-width) window-min-width))
     (setq fill-column (- (window-width) window-min-width))
     (let ((mod (buffer-modified-p)))
diff --git a/lisp/lpr.el b/lisp/lpr.el
index 14d1049f074..2c2e8c872c4 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -140,8 +140,9 @@ See definition of `print-region-1' for calling conventions."
 
 ;; Berkeley systems support -F, and GNU pr supports both -f and -F,
 ;; So it looks like -F is a better default.
-(defcustom lpr-page-header-switches '("-F")
+(defcustom lpr-page-header-switches '("-h %s" "-F")
   "*List of strings to use as options for the page-header-generating program.
+If `%s' appears in one of the strings, it is substituted by the page title.
 The variable `lpr-page-header-program' specifies the program to use."
   :type '(repeat string)
   :group 'lpr)
@@ -243,8 +244,8 @@ for further customization of the printer command."
             (let ((new-coords (print-region-new-buffer start end)))
               (apply 'call-process-region (car new-coords) (cdr new-coords)
                      lpr-page-header-program t t nil
-                     (nconc (list "-h" title)
-                            lpr-page-header-switches)))
+                     (mapcar (lambda (e) (format e title))
+                             lpr-page-header-switches)))
             (setq start (point-min)
                   end   (point-max))))
       (apply (or print-region-function 'call-process-region)
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 3bd287541cf..04928fb537b 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -1340,7 +1340,15 @@ complicated cases."
   (set-buffer prepped)
   (apply 'call-process-region
          (append (list (point-min) (point-max)
-                       (if (boundp 'sendmail-program) sendmail-program "/usr/lib/sendmail")
+                       (cond ((boundp 'sendmail-program)
+                              sendmail-program)
+                             ((file-exists-p "/usr/sbin/sendmail")
+                              "/usr/sbin/sendmail")
+                             ((file-exists-p "/usr/lib/sendmail")
+                              "/usr/lib/sendmail")
+                             ((file-exists-p "/usr/ucblib/sendmail")
+                              "/usr/ucblib/sendmail")
+                             (t "fakemail"))
                        nil errors-to nil "-oi" "-t")
                  ;; provide envelope "from" to sendmail; results will vary
                  (list "-f" user-mail-address)
diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el
index 933e1f6c8a2..bba23111612 100644
--- a/lisp/mail/rmail-spam-filter.el
+++ b/lisp/mail/rmail-spam-filter.el
@@ -134,12 +134,11 @@ spam, as one of the fields of `rsf-definitions-alist'"
   :group 'rmail-spam-filter )
 
 (defcustom rsf-min-region-to-spam-list 7
-  "*User may highlight a region in an incomming message and use
-  the menubar to add this region to the spam definitions.  This
-  variable specifies the minimum size of region that may be added
-  to spam list, to avoid accidentally adding a too short region
-  which would result in false positive identification of spam
-  messages."
+  "*Minimum size of region that you can add to the spam list.
+This is a size limit on text that you can specify as
+indicating a message is spam.  The aim is to avoid
+accidentally adding a too short region, which would result
+in false positive identification of spam."
   :type 'integer
   :group 'rmail-spam-filter )
 
@@ -212,8 +211,8 @@ specify 'this\\&that' in the appropriate spam definition field."
   :group 'rmail-spam-filter)
 
 (defvar rsf-scanning-messages-now nil
-  "Non nil when rmail-spam-filter scans messages,
-for interaction with `rsf-bbdb-auto-delete-spam-entries'")
+  "Non nil when `rmail-spam-filter' scans messages.
+This is for interaction with `rsf-bbdb-auto-delete-spam-entries'.")
 
 ;; the advantage over the automatic filter definitions is the AND conjunction
 ;; of in-one-definition-elements
@@ -596,8 +595,8 @@ Added to spam definitions as a contents field."
 (define-key rmail-mode-map "\C-cSt" 'rsf-add-subject-to-spam-list)
 
 (defun rsf-add-content-type-field ()
-  "Maintain backward compatibility with previous versions of rmail-spam-filter.
-The most recent version of rmai-spam-filter checks the contents
+  "Maintain backward compatibility for `rmail-spam-filter'.
+The most recent version of `rmail-spam-filter' checks the contents
 field of the incoming mail to see if it spam.  The format of
 `rsf-definitions-alist' has therefore changed.  This function
 checks to see if old format is used, and if it is, it converts
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 195eb60830c..68dfd9f7ca4 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -623,7 +623,7 @@ the variable `rmail-mime-feature'.")
 
 ;;;###autoload
 (defvar rmail-mime-charset-pattern
-  (concat "^content-type:[ ]*text/plain;"
+  (concat "^content-type:[ \t]*text/plain;"
           "\\(?:[ \t\n]*\\(?:format\\|delsp\\)=\"?[-a-z0-9]+\"?;\\)*"
           "[ \t\n]*charset=\"?\\([^ \t\n\";]+\\)\"?")
   "Regexp to match MIME-charset specification in a header of message.
@@ -1677,12 +1677,15 @@ It returns t if it got any new messages."
                          (if (and (featurep 'rmail-spam-filter)
                                   rmail-use-spam-filter
                                   (> rsf-number-of-spam 0))
-                             (if (= 1 new-messages)
-                                 ", and found to be a spam message"
-                               (if (> rsf-number-of-spam 1)
-                                   (format ", %d of which found to be spam messages"
-                                           rsf-number-of-spam)
-                                 ", one of which found to be a spam message"))
+                             (cond ((= 1 new-messages)
+                                    ", and appears to be spam")
+                                   ((= rsf-number-of-spam new-messages)
+                                    ", and all appear to be spam")
+                                   ((> rsf-number-of-spam 1)
+                                    (format ", and %d appear to be spam"
+                                            rsf-number-of-spam))
+                                   (t
+                                    ", and 1 appears to be spam"))
                            ""))
                 (if (and (featurep 'rmail-spam-filter)
                          rmail-use-spam-filter
@@ -1900,6 +1903,7 @@ is non-nil if the user has supplied the password interactively.
 (defun rmail-convert-to-babyl-format ()
   (let ((count 0) start
         (case-fold-search nil)
+        (buffer-undo-list t)
         (invalid-input-resync
          (function (lambda ()
                      (message "Invalid Babyl format in inbox!")
@@ -2173,6 +2177,7 @@ is non-nil if the user has supplied the password interactively.
               ;; may still be in use.  -- rms, 7 May 1993.
               ((eolp) (delete-char 1))
               (t (error "Cannot convert to babyl format")))))
+    (setq buffer-undo-list nil)
     count))
 
 ;; Delete the "From ..." line, creating various other headers with
@@ -2870,6 +2875,12 @@ iso-8859, koi8-r, etc."
                           (coding-system-change-eol-conversion
                            coding
                            (coding-system-eol-type old-coding)))
+                    ;; If old-coding is `undecided', encode-coding-region
+                    ;; will not encode the text at all.  Find a proper
+                    ;; non-trivial encoding to use.
+                    (if (memq (coding-system-base old-coding) '(nil undecided))
+                        (setq old-coding
+                              (car (find-coding-systems-region msgbeg msgend))))
                     (setq x-coding-header (point-marker))
                     (narrow-to-region msgbeg msgend)
                     (encode-coding-region (point) msgend old-coding)
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 28463208c45..288e5bd0df3 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -48,6 +48,16 @@
   :group 'sendmail
   :version "22.1")
 
+(defcustom sendmail-program
+  (cond
+    ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail")
+    ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail")
+    ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail")
+    (t "fakemail"))                     ;In ../etc, to interface to /bin/mail.
+  "Program used to send messages."
+  :group 'mail
+  :type 'file)
+
 ;;;###autoload
 (defcustom mail-from-style 'angles
   "Specifies how \"From:\" fields look.
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index ff38cd25ff8..9557844a32a 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -176,7 +176,12 @@ looks like `user@realm'."
 (defcustom smtpmail-starttls-credentials '(("" 25 "" ""))
   "Specify STARTTLS keys and certificates for servers.
 This is a list of four-element list with `servername' (a string),
-`port' (an integer), `key' (a filename) and `certificate' (a filename)."
+`port' (an integer), `key' (a filename) and `certificate' (a
+filename).
+If you do not have a certificate/key pair, leave the `key' and
+`certificate' fields as `nil'.  A key/certificate pair is only
+needed if you want to use X.509 client authenticated
+connections."
   :type '(repeat (list (string  :tag "Server")
                        (integer :tag "Port")
                        (file    :tag "Key")
@@ -536,7 +541,7 @@ This is relative to `smtpmail-queue-dir'.")
                  (decoded (base64-decode-string challenge))
                  (hash (rfc2104-hash 'md5 64 16 passwd decoded))
                  (response (concat (smtpmail-cred-user cred) " " hash))
-                 (encoded (base64-encode-string response)))
+                 (encoded (base64-encode-string response t)))
             (smtpmail-send-command process (format "%s" encoded))
             (if (or (null (car (setq ret (smtpmail-read-response process))))
                     (not (integerp (car ret)))
@@ -549,12 +554,12 @@ This is relative to `smtpmail-queue-dir'.")
                 (>= (car ret) 400))
             (throw 'done nil))
         (smtpmail-send-command
-         process (base64-encode-string (smtpmail-cred-user cred)))
+         process (base64-encode-string (smtpmail-cred-user cred) t))
         (if (or (null (car (setq ret (smtpmail-read-response process))))
                 (not (integerp (car ret)))
                 (>= (car ret) 400))
             (throw 'done nil))
-        (smtpmail-send-command process (base64-encode-string passwd))
+        (smtpmail-send-command process (base64-encode-string passwd t))
         (if (or (null (car (setq ret (smtpmail-read-response process))))
                 (not (integerp (car ret)))
                 (>= (car ret) 400))
@@ -571,7 +576,7 @@ This is relative to `smtpmail-queue-dir'.")
                                         (concat "\0"
                                                 (smtpmail-cred-user cred)
                                                 "\0"
-                                                passwd))))
+                                                passwd) t)))
         (if (or (null (car (setq ret (smtpmail-read-response process))))
                 (not (integerp (car ret)))
                 (not (equal (car ret) 235)))
diff --git a/lisp/man.el b/lisp/man.el
index 77c089b9d8d..2351853eeca 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -388,6 +388,8 @@ Otherwise, the value is whatever the function
 /\e\\[[0-9][0-9]*m/ s///g"
   "Script for berkeley-like sed to nuke backspaces and ANSI codes from manpages.")
 
+(defvar Man-topic-history nil "Topic read history.")
+
 (defvar man-mode-syntax-table
   (let ((table (copy-syntax-table (standard-syntax-table))))
     (modify-syntax-entry ?. "w" table)
@@ -686,7 +688,7 @@ all sections related to a subject, put something appropriate into the
                                 (if (string= default-entry "")
                                     ": "
                                   (format " (default %s): " default-entry)))
-                        nil nil default-entry)))
+                        nil 'Man-topic-history default-entry)))
            (if (string= input "")
                (error "No man args given")
              input))))
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index b3909559d03..642149baaf7 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -510,7 +510,7 @@ A large number or nil slows down menu responsiveness."
 
 (defun clipboard-yank ()
   "Insert the clipboard contents, or the last stretch of killed text."
-  (interactive)
+  (interactive "*")
   (let ((x-select-enable-clipboard t))
     (yank)))
 
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index a49e3b2a4a3..76875b2849b 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,18 @@
+2006-09-25  Stephen Gildea  <gildea@stop.mail-abuse.org>
+
+        * mh-junk.el (mh-spamassassin-whitelist): Add two missing
+        quotation marks, so that the last two arguments of sa-learn 
+        are separated properly (closes SF #1565460).
+        
+        * (mh-spamassassin-blacklist): In example .procmailrc, add
+        PATH element to find mhparam on Debian.
+        
+2006-09-24  Stephen Gildea  <gildea@stop.mail-abuse.org>
+
+        * mh-comp.el (mh-send-args): Initialize to "" instead of nil 
+        so that we always have a valid string for split-string even if
+        nothing is added in mh-send-letter (closes SF #1564742).
+
 2006-07-03  Bill Wohler  <wohler@newt.com>
 
         Release MH-E version 8.0.2.
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 7156b0cf318..a967a2c8d9e 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -127,7 +127,7 @@ Used by the \\[mh-edit-again] and \\[mh-extract-rejected-mail] commands.")
         (make-syntax-table text-mode-syntax-table))
   (modify-syntax-entry ?% "." mh-letter-mode-syntax-table))
 
-(defvar mh-send-args nil
+(defvar mh-send-args ""
   "Extra args to pass to \"send\" command.")
 
 (defvar mh-annotate-char nil
diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el
index 9d02db0dc11..67f267d672f 100644
--- a/lisp/mh-e/mh-junk.el
+++ b/lisp/mh-e/mh-junk.el
@@ -115,6 +115,9 @@ http://spamassassin.org/.
 To use SpamAssassin, add the following recipes to
 \".procmailrc\":
 
+    # Append to $PATH the location of mhparam in some distros.
+    PATH=$PATH:/usr/bin/mh
+
     MAILDIR=$HOME/`mhparam Path`
 
     # Fight spam with SpamAssassin.
@@ -244,7 +247,7 @@ See `mh-spamassassin-blacklist' for more information."
       (when mh-sa-learn-executable
         (message "Recategorizing this message as ham...")
         (call-process mh-sa-learn-executable msg-file mh-temp-buffer nil
-                      "--single" "--ham" "--local --no-rebuild"))
+                      "--single" "--ham" "--local" "--no-rebuild"))
       (message "Whitelisting message %d..." msg)
       (setq from
             (car (mh-funcall-if-exists
diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el
index a64dabaec81..a1209f827f1 100644
--- a/lisp/mouse-sel.el
+++ b/lisp/mouse-sel.el
@@ -702,7 +702,7 @@ Sel mode does not support using a `double' value to follow links
 using double-clicks."
   (and initial final mouse-1-click-follows-link
        (eq (car initial) 'down-mouse-1)
-       (mouse-on-link-p (posn-point (event-start initial)))
+       (mouse-on-link-p (event-start initial))
        (= (posn-point (event-start initial))
           (posn-point (event-end final)))
        (= (event-click-count initial) 1)
@@ -737,7 +737,8 @@ If `mouse-yank-at-point' is non-nil, insert at point instead."
     (mouse-set-point event))
   (when mouse-sel-get-selection-function
     (push-mark (point) 'nomsg)
-    (insert (or (funcall mouse-sel-get-selection-function selection) ""))))
+  (insert-for-yank
+   (or (funcall mouse-sel-get-selection-function selection) ""))))
 
 ;;=== Handle loss of selections ===========================================
 
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 4e11b1d4c96..0b6cccd86c6 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -556,7 +556,7 @@ resized by dragging their header-line."
          (echo-keystrokes 0)
          (start-event-frame (window-frame (car (car (cdr start-event)))))
          (start-event-window (car (car (cdr start-event))))
-         event mouse x left right edges wconfig growth
+         event mouse x left right edges growth
          (which-side
           (or (cdr (assq 'vertical-scroll-bars (frame-parameters start-event-frame)))
               'right)))
@@ -775,6 +775,24 @@ If the click is in the echo area, display the `*Messages*' buffer."
       (mouse-drag-track start-event t))))
 
 
+(defun mouse-posn-property (pos property)
+  "Look for a property at click position.
+POS may be either a buffer position or a click position like
+those returned from `event-start'.  If the click position is on
+a string, the text property PROPERTY is examined.
+If this is nil or the click is not on a string, then
+the corresponding buffer position is searched for PROPERTY.
+If PROPERTY is encountered in one of those places,
+its value is returned."
+  (if (consp pos)
+      (let ((w (posn-window pos)) (pt (posn-point pos))
+            (str (posn-string pos)))
+        (or (and str
+                 (get-text-property (cdr str) property (car str)))
+            (and pt
+                 (get-char-property pt property w))))
+    (get-char-property pos property)))
+
 (defun mouse-on-link-p (pos)
   "Return non-nil if POS is on a link in the current buffer.
 POS must be a buffer position in the current buffer or a mouse
@@ -814,24 +832,23 @@ click is the local or global binding of that event.
 
 - Otherwise, the mouse-1 event is translated into a mouse-2 event
 at the same position."
-  (let ((w (and (consp pos) (posn-window pos))))
-    (if (consp pos)
-        (setq pos (and (or mouse-1-click-in-non-selected-windows
-                           (eq (selected-window) w))
-                       (posn-point pos))))
-    (when pos
-      (with-current-buffer (window-buffer w)
-        (let ((action
-               (or (get-char-property pos 'follow-link)
-                   (save-excursion
-                     (goto-char pos)
-                     (key-binding [follow-link] nil t)))))
-          (cond
-           ((eq action 'mouse-face)
-            (and (get-char-property pos 'mouse-face) t))
-           ((functionp action)
-            (funcall action pos))
-           (t action)))))))
+  (let ((action
+         (and (or (not (consp pos))
+                  mouse-1-click-in-non-selected-windows
+                  (eq (selected-window) (posn-window pos)))
+              (or (mouse-posn-property pos 'follow-link)
+                  (key-binding [follow-link] nil t pos)))))
+    (cond
+     ((eq action 'mouse-face)
+      (and (mouse-posn-property pos 'mouse-face) t))
+     ((functionp action)
+      ;; FIXME: This seems questionable if the click is not in a buffer.
+      ;; Should we instead decide that `action' takes a `posn'?
+      (if (consp pos)
+          (with-current-buffer (window-buffer (posn-window pos))
+            (funcall action (posn-point pos)))  
+        (funcall action pos)))
+     (t action))))
 
 (defun mouse-fixup-help-message (msg)
   "Fix help message MSG for `mouse-1-click-follows-link'."
@@ -904,7 +921,7 @@ should only be used by mouse-drag-region."
                        ;; Use start-point before the intangibility
                        ;; treatment, in case we click on a link inside an
                        ;; intangible text.
-                       (mouse-on-link-p start-point)))
+                       (mouse-on-link-p start-posn)))
          (click-count (1- (event-click-count start-event)))
          (remap-double-click (and on-link
                                   (eq mouse-1-click-follows-link 'double)
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 2a63615a602..18b96a7cce1 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -490,9 +490,11 @@ to try to connect to.  Each host name may optionally be of the form HOST:PORT.
 for each matching entry. If nil, return all available attributes.
   `attrsonly', if non-nil, indicates that only attributes are retrieved,
 not their associated values.
+  `auth' is one of the symbols `simple', `krbv41' or `krbv42'.
   `base' is the base for the search as described in RFC 1779.
   `scope' is one of the three symbols `sub', `base' or `one'.
   `binddn' is the distinguished name of the user to bind as (in RFC 1779 syntax).
+  `auth' is one of the symbols `simple', `krbv41' or `krbv42'
   `passwd' is the password to use for simple authentication.
   `deref' is one of the symbols `never', `always', `search' or `find'.
   `timelimit' is the timeout limit for the connection in seconds.
@@ -512,6 +514,7 @@ an alist of attribute/value pairs."
                   ldap-default-base))
         (scope (plist-get search-plist 'scope))
         (binddn (plist-get search-plist 'binddn))
+        (auth (plist-get search-plist 'auth))
         (passwd (plist-get search-plist 'passwd))
         (deref (plist-get search-plist 'deref))
         (timelimit (plist-get search-plist 'timelimit))
@@ -541,6 +544,9 @@ an alist of attribute/value pairs."
       (if (and binddn
                (not (equal "" binddn)))
           (setq arglist (nconc arglist (list (format "-D%s" binddn)))))
+      (if (and auth
+               (equal 'simple auth))
+          (setq arglist (nconc arglist (list "-x"))))
       (if (and passwd
                (not (equal "" passwd)))
           (setq arglist (nconc arglist (list (format "-w%s" passwd)))))
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index c34ac7dcf78..a639afeecf8 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -142,9 +142,11 @@ number.	 If zero or nil, no truncating is done."
                  (integer :tag "Number of lines"))
   :group 'rcirc)
 
-(defcustom rcirc-show-maximum-output t
+(defcustom rcirc-scroll-show-maximum-output t
   "*If non-nil, scroll buffer to keep the point at the bottom of
-the window.")
+the window."
+  :type 'boolean
+  :group 'rcirc)
 
 (defcustom rcirc-authinfo nil
   "List of authentication passwords.
@@ -200,6 +202,11 @@ use either M-x customize or also call `rcirc-update-prompt'."
   :initialize 'custom-initialize-default
   :group 'rcirc)
 
+(defcustom rcirc-keywords nil
+  "List of keywords to highlight in message text."
+  :type '(repeat string)
+  :group 'rcirc)
+
 (defcustom rcirc-ignore-list ()
   "List of ignored nicks.
 Use /ignore to list them, use /ignore NICK to add or remove a nick."
@@ -212,16 +219,16 @@ When an ignored person renames, their nick is added to both lists.
 Nicks will be removed from the automatic list on follow-up renamings or
 parts.")
 
-(defcustom rcirc-bright-nick-regexp nil
-  "Regexp matching nicks to be emphasized.
+(defcustom rcirc-bright-nicks nil
+  "List of nicks to be emphasized.
 See `rcirc-bright-nick' face."
-  :type 'regexp
+  :type '(repeat string)
   :group 'rcirc)
 
-(defcustom rcirc-dim-nick-regexp nil
-  "Regexp matching nicks to be deemphasized.
+(defcustom rcirc-dim-nicks nil
+  "List of nicks to be deemphasized.
 See `rcirc-dim-nick' face."
-  :type 'regexp
+  :type '(repeat string)
   :group 'rcirc)
 
 (defcustom rcirc-print-hooks nil
@@ -246,7 +253,7 @@ Called with 5 arguments, PROCESS, SENDER, RESPONSE, TARGET and TEXT."
   :group 'rcirc)
 
 (defcustom rcirc-coding-system-alist nil
-  "Alist to decide a coding system to use for a file I/O operation.
+  "Alist to decide a coding system to use for a channel I/O operation.
 The format is ((PATTERN . VAL) ...).
 PATTERN is either a string or a cons of strings.
 If PATTERN is a string, it is used to match a target.
@@ -528,10 +535,14 @@ Function is called with PROCESS, COMMAND, SENDER, ARGS and LINE.")
                             process cmd sender args text)))
     (message "UNHANDLED: %s" text)))
 
-(defun rcirc-handler-generic (process command sender args text)
+(defvar rcirc-responses-no-activity '("305" "306")
+  "Responses that don't trigger activity in the mode-line indicator.")
+
+(defun rcirc-handler-generic (process response sender args text)
   "Generic server response handler."
-  (rcirc-print process sender command nil
-               (mapconcat 'identity (cdr args) " ") t))
+  (rcirc-print process sender response nil
+               (mapconcat 'identity (cdr args) " ")
+               (not (member response rcirc-responses-no-activity))))
 
 (defun rcirc-send-string (process string)
   "Send PROCESS a STRING plus a newline."
@@ -748,13 +759,8 @@ If NOTICEP is non-nil, send a notice instead of privmsg."
 
   ;; if the user changes the major mode or kills the buffer, there is
   ;; cleanup work to do
-  (make-local-variable 'change-major-mode-hook)
-  (add-hook 'change-major-mode-hook 'rcirc-change-major-mode-hook)
-  (make-local-variable 'kill-buffer-hook)
-  (add-hook 'kill-buffer-hook 'rcirc-kill-buffer-hook)
-
-  (make-local-variable 'window-scroll-functions)
-  (add-hook 'window-scroll-functions 'rcirc-scroll-to-bottom)
+  (add-hook 'change-major-mode-hook 'rcirc-change-major-mode-hook nil t)
+  (add-hook 'kill-buffer-hook 'rcirc-kill-buffer-hook nil t)
 
   ;; add to buffer list, and update buffer abbrevs
   (when target                          ; skip server buffer
@@ -941,7 +947,7 @@ Create the buffer if it doesn't exist."
         (if (fboundp fun)
             (funcall fun args process rcirc-target)
           (rcirc-send-string process
-                             (concat command " " args)))))))
+                             (concat command " :" args)))))))
 
 (defvar rcirc-parent-buffer nil)
 (defvar rcirc-window-configuration nil)
@@ -1073,7 +1079,8 @@ is found by looking up RESPONSE in `rcirc-response-formats'."
                    "%")
                   ((or (eq key ?n) (eq key ?N))
                    ;; %n/%N -- nick
-                   (let ((nick (concat (if (string= (with-rcirc-process-buffer process
+                   (let ((nick (concat (if (string= (with-rcirc-process-buffer 
+                                                        process
                                                       rcirc-server)
                                                     sender)
                                            ""
@@ -1084,26 +1091,26 @@ is found by looking up RESPONSE in `rcirc-response-formats'."
                                        face
                                      (cond ((string= sender (rcirc-nick process))
                                             'rcirc-my-nick)
-                                           ((and rcirc-bright-nick-regexp
-                                                 (string-match rcirc-bright-nick-regexp sender))
+                                           ((and rcirc-bright-nicks
+                                                 (string-match 
+                                                  (regexp-opt rcirc-bright-nicks)
+                                                  sender))
                                             'rcirc-bright-nick)
-                                           ((and rcirc-dim-nick-regexp
-                                                 (string-match rcirc-dim-nick-regexp sender))
+                                           ((and rcirc-dim-nicks
+                                                 (string-match
+                                                  (regexp-opt rcirc-dim-nicks)
+                                                  sender))
                                             'rcirc-dim-nick)
                                            (t
                                             'rcirc-other-nick))))))
-                  ((eq key ?T)
+                   ((eq key ?T)
                    ;; %T -- timestamp
                    (rcirc-facify
                     (format-time-string rcirc-time-format (current-time))
                     'rcirc-timestamp))
                   ((eq key ?m)
                    ;; %m -- message text
-                   ;; We add the text property `rcirc-text' to identify this
-                   ;; as the body text.
-                   (propertize
-                    (rcirc-mangle-text process (rcirc-facify text face))
-                    'rcirc-text text))
+                   (rcirc-markup-text process sender response (rcirc-facify text face)))
                   ((eq key ?t)
                    ;; %t -- target
                    (rcirc-facify (or rcirc-target "") face))
@@ -1152,20 +1159,10 @@ is found by looking up RESPONSE in `rcirc-response-formats'."
           ((or (rcirc-get-buffer process target)
                (rcirc-any-buffer process))))))
 
-(defvar rcirc-activity-type nil)
-(make-variable-buffer-local 'rcirc-activity-type)
+(defvar rcirc-activity-types nil)
+(make-variable-buffer-local 'rcirc-activity-types)
 (defvar rcirc-last-sender nil)
 (make-variable-buffer-local 'rcirc-last-sender)
-(defvar rcirc-gray-toggle nil)
-(make-variable-buffer-local 'rcirc-gray-toggle)
-
-(defun rcirc-scroll-to-bottom (window display-start)
-  "Scroll window to show maximum output if `rcirc-show-maximum-output' is
-non-nil."
-  (when rcirc-show-maximum-output
-    (with-selected-window window
-      (when (>= (window-point) rcirc-prompt-end-marker)
-        (recenter -1)))))
 
 (defun rcirc-print (process sender response target text &optional activity)
   "Print TEXT in the buffer associated with TARGET.
@@ -1245,42 +1242,45 @@ record activity."
 
           ;; 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)))))
+                          (when (and (not (eq (selected-window) w))
+                                     (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))
 
+        ;; keep window on bottom line if it was already there
+          (when rcirc-scroll-show-maximum-output
+            (walk-windows (lambda (w)
+                            (when (eq (window-buffer w) (current-buffer))
+                              (with-current-buffer (window-buffer w)
+                                (when (eq major-mode 'rcirc-mode)
+                                  (with-selected-window w
+                                    (when (<= (- (window-height)
+                                                 (count-screen-lines
+                                                  (window-point)
+                                                  (window-start))
+                                                 1)
+                                              0)
+                                      (recenter -1)))))))
+                          nil t))
+
           ;; flush undo (can we do something smarter here?)
           (buffer-disable-undo)
           (buffer-enable-undo))
 
         ;; record modeline activity
-        (when activity
-          (let ((nick-match
-                 (with-syntax-table rcirc-nick-syntax-table              
-                   (string-match (concat "\\b"
-                                         (regexp-quote (rcirc-nick process))
-                                         "\\b")
-                                 text))))
-            (when (if rcirc-ignore-buffer-activity-flag
-                      ;; - Always notice when our nick is mentioned
-                      nick-match
-                    ;; - unless our nick is mentioned, don't bother us
-                    ;; - with dim-nicks
-                    (or nick-match
-                        (not (and rcirc-dim-nick-regexp sender
-                                  (string-match rcirc-dim-nick-regexp sender)))))
-              (rcirc-record-activity
-               (current-buffer)
-               (when (or nick-match (and (not (rcirc-channel-p rcirc-target))
-                                         (not rcirc-low-priority-flag)))
-                 'nick)))))
+        (when (and activity
+                   (not rcirc-ignore-buffer-activity-flag)
+                   (not (and rcirc-dim-nicks sender
+                             (string-match (regexp-opt rcirc-dim-nicks) sender))))
+              (rcirc-record-activity (current-buffer)
+                                     (when (not (rcirc-channel-p rcirc-target))
+                                       'nick)))
 
         (sit-for 0)                     ; displayed text before hook
         (run-hook-with-args 'rcirc-print-hooks
@@ -1501,8 +1501,7 @@ activity.  Only run if the buffer is not visible and
                     (let ((t1 (with-current-buffer b1 rcirc-last-post-time))
                           (t2 (with-current-buffer b2 rcirc-last-post-time)))
                       (time-less-p t2 t1)))))
-      (if (not rcirc-activity-type)
-          (setq rcirc-activity-type type))
+      (pushnew type rcirc-activity-types)
       (rcirc-update-activity-string)))
   (run-hook-with-args 'rcirc-activity-hooks buffer))
 
@@ -1510,7 +1509,7 @@ activity.  Only run if the buffer is not visible and
   "Clear the BUFFER activity."
   (setq rcirc-activity (delete buffer rcirc-activity))
   (with-current-buffer buffer
-    (setq rcirc-activity-type nil)))
+    (setq rcirc-activity-types nil)))
 
 (defun rcirc-split-activity (activity)
   "Return a cons cell with ACTIVITY split into (lopri . hipri)."
@@ -1518,7 +1517,7 @@ activity.  Only run if the buffer is not visible and
     (dolist (buf rcirc-activity)
       (with-current-buffer buf
         (if (and rcirc-low-priority-flag
-                 (not (eq rcirc-activity-type 'nick)))
+                 (not (member 'nick rcirc-activity-types)))
             (add-to-list 'lopri buf t)
           (add-to-list 'hipri buf t))))
     (cons lopri hipri)))
@@ -1547,11 +1546,15 @@ activity.  Only run if the buffer is not visible and
 
 (defun rcirc-activity-string (buffers)
   (mapconcat (lambda (b)
-               (let ((s (rcirc-short-buffer-name b)))
+               (let ((s (substring-no-properties (rcirc-short-buffer-name b))))
                  (with-current-buffer b
-                   (if (not (eq rcirc-activity-type 'nick))
-                       s
-                     (rcirc-facify s 'rcirc-mode-line-nick)))))
+                   (dolist (type rcirc-activity-types)
+                     (rcirc-add-face 0 (length s)
+                                     (case type
+                                       (nick 'rcirc-track-nick)
+                                       (keyword 'rcirc-track-keyword))
+                                     s)))
+                 s))
              buffers ","))
 
 (defun rcirc-short-buffer-name (buffer)
@@ -1566,15 +1569,18 @@ Also, clear the overlay arrow if the current buffer is now hidden."
   (let ((current-now-hidden t))
     (walk-windows (lambda (w)
                     (let ((buf (window-buffer w)))
-                      (when (eq major-mode 'rcirc-mode)
-                        (rcirc-clear-activity buf)
+                      (with-current-buffer buf
+                        (when (eq major-mode 'rcirc-mode)
+                          (rcirc-clear-activity buf)))
                         (when (eq buf rcirc-current-buffer)
-                          (setq current-now-hidden nil))))))
+                          (setq current-now-hidden nil)))))
     ;; add overlay arrow if the buffer isn't displayed
-    (when (and rcirc-current-buffer current-now-hidden)
+    (when (and current-now-hidden
+               rcirc-current-buffer
+               (buffer-live-p rcirc-current-buffer))
       (with-current-buffer rcirc-current-buffer
-        (when (eq major-mode 'rcirc-mode)
-          (marker-position overlay-arrow-position)
+        (when (and (eq major-mode 'rcirc-mode)
+                   (marker-position overlay-arrow-position))
           (set-marker overlay-arrow-position nil)))))
 
   ;; remove any killed buffers from list
@@ -1792,17 +1798,21 @@ With a prefix arg, prompt for new topic."
   (rcirc-send-string process (format "PRIVMSG %s :\C-aACTION %s\C-a"
                                      target args)))
 
+(defun rcirc-add-or-remove (set &optional elt)
+  (if (and elt (not (string= "" elt)))
+      (if (member-ignore-case elt set)
+          (delete elt set)
+        (cons elt set))
+    set))
+
 (defun-rcirc-command ignore (nick)
   "Manage the ignore list.
 Ignore NICK, unignore NICK if already ignored, or list ignored
 nicks when no NICK is given.  When listing ignored nicks, the
 ones added to the list automatically are marked with an asterisk."
   (interactive "sToggle ignoring of nick: ")
-  (when (not (string= "" nick))
-    (if (member-ignore-case nick rcirc-ignore-list)
-        (setq rcirc-ignore-list (delete nick rcirc-ignore-list))
-      (setq rcirc-ignore-list (cons nick rcirc-ignore-list))))
-  (rcirc-print process (rcirc-nick process) "IGNORE" target 
+  (setq rcirc-ignore-list (rcirc-add-or-remove rcirc-ignore-list nick))
+  (rcirc-print process nil "IGNORE" target 
                (mapconcat
                 (lambda (nick)
                   (concat nick
@@ -1810,14 +1820,47 @@ ones added to the list automatically are marked with an asterisk."
                               "*" "")))
                 rcirc-ignore-list " ")))
 
+(defun-rcirc-command bright (nick)
+  "Manage the bright nick list."
+  (interactive "sToggle emphasis of nick: ")
+  (setq rcirc-bright-nicks (rcirc-add-or-remove rcirc-bright-nicks nick))
+  (rcirc-print process nil "BRIGHT" target 
+               (mapconcat 'identity rcirc-bright-nicks " ")))
+
+(defun-rcirc-command dim (nick)
+  "Manage the dim nick list."
+  (interactive "sToggle deemphasis of nick: ")
+  (setq rcirc-dim-nicks (rcirc-add-or-remove rcirc-dim-nicks nick))
+  (rcirc-print process nil "DIM" target 
+               (mapconcat 'identity rcirc-dim-nicks " ")))
+
+(defun-rcirc-command keyword (keyword)
+  "Manage the keyword list.
+Mark KEYWORD, unmark KEYWORD if already marked, or list marked
+keywords when no KEYWORD is given."
+  (interactive "sToggle highlighting of keyword: ")
+  (setq rcirc-keywords (rcirc-add-or-remove rcirc-keywords keyword))
+  (rcirc-print process nil "KEYWORD" target 
+               (mapconcat 'identity rcirc-keywords " ")))
+
 
-(defun rcirc-message-leader (sender face)
-  "Return a string with SENDER propertized with FACE."
-  (rcirc-facify (concat "<" sender "> ") face))
+(defun rcirc-add-face (start end name &optional object)
+  "Add face NAME to the face text property of the text from START to END."
+  (when name
+    (let ((pos start)
+          next prop)
+      (while (< pos end)
+        (setq prop (get-text-property pos 'face object)
+              next (next-single-property-change pos 'face object end))
+        (unless (member name (get-text-property pos 'face object))
+          (add-text-properties pos next (list 'face (cons name prop)) object))
+        (setq pos next)))))
 
 (defun rcirc-facify (string face)
   "Return a copy of STRING with FACE property added."
-  (propertize (or string "") 'face face 'rear-nonsticky t))
+  (let ((string (or string "")))
+    (rcirc-add-face 0 (length string) face string)
+    string))
 
 (defvar rcirc-url-regexp
   (rx-to-string
@@ -1835,8 +1878,8 @@ ones added to the list automatically are marked with an asterisk."
                   word-boundary))
          (optional 
           (and "/"
-               (1+ (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;.,{}[]"))
-               (char "-a-zA-Z0-9_=#$\@~`%&*+|\\/:;{}[]")))))
+               (1+ (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;.,{}[]()"))
+               (char "-a-zA-Z0-9_=#$\@~`%&*+|\\/:;{}[]()")))))
   "Regexp matching URLs.  Set to nil to disable URL features in rcirc.")
 
 (defun rcirc-browse-url (&optional arg)
@@ -1863,68 +1906,99 @@ ones added to the list automatically are marked with an asterisk."
     (with-current-buffer (window-buffer (posn-window position))
       (rcirc-browse-url-at-point (posn-point position)))))
 
-(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)
-
-(defun rcirc-mangle-text (process text)
+
+(defvar rcirc-markup-text-functions
+  '(rcirc-markup-body-text
+    rcirc-markup-attributes
+    rcirc-markup-my-nick
+    rcirc-markup-urls
+    rcirc-markup-keywords
+    rcirc-markup-bright-nicks)
+  "List of functions used to manipulate text before it is printed.
+
+Each function takes three arguments, PROCESS, SENDER, RESPONSE
+and CHANNEL-BUFFER.  The current buffer is temporary buffer that
+contains the text to manipulate.  Each function works on the text
+in this buffer.")
+
+(defun rcirc-markup-text (process sender response text)
   "Return TEXT with properties added based on various patterns."
-  ;; ^B
-  (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 (if (listp orig-face)
-                                (append orig-face
-                                        (list 'bold))
-                              (list orig-face 'bold))
-                      'rear-nonsticky t)
-                string)))
-           ".*?"
-           text))
-  ;; TODO: deal with ^_ and ^C colors sequences
-  (while (string-match "\\(.*\\)[
]\\(.*\\)" text)
-    (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
-                                     '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 (if (listp orig-face)
-                                                  (append orig-face
-                                                          (list 'bold))
-                                                (list orig-face 'bold))
-                                        'rear-nonsticky t
-                                        'mouse-face 'highlight
-                                        'keymap rcirc-browse-url-map)
-                                  string))
-             (push (substring-no-properties string start end) rcirc-urls))
-           rcirc-url-regexp
-           text))
-  text)
-
+  (let ((channel-buffer (current-buffer)))
+    (with-temp-buffer
+      (insert text)
+      (goto-char (point-min))
+      (dolist (fn rcirc-markup-text-functions)
+        (save-excursion
+          (funcall fn process sender response channel-buffer)))
+      (buffer-substring (point-min) (point-max)))))
+
+(defun rcirc-markup-body-text (process sender response channel-buffer)
+  ;; We add the text property `rcirc-text' to identify this as the
+  ;; body text.
+  (add-text-properties (point-min) (point-max)
+                       (list 'rcirc-text (buffer-substring-no-properties
+                                          (point-min) (point-max)))))
+
+(defun rcirc-markup-attributes (process sender response channel-buffer)
+  (while (re-search-forward "\\([\C-b\C-_\C-v]\\).*?\\(\\1\\|\C-o\\)" nil t)
+    (rcirc-add-face (match-beginning 0) (match-end 0)
+                    (case (char-after (match-beginning 1))
+                      (?\C-b 'bold)
+                      (?\C-v 'italic)
+                      (?\C-_ 'underline)))
+    ;; keep the ^O since it could terminate other attributes
+    (when (not (eq ?\C-o (char-before (match-end 2))))
+      (delete-region (match-beginning 2) (match-end 2)))
+    (delete-region (match-beginning 1) (match-end 1))
+    (goto-char (1+ (match-beginning 1))))
+  ;; remove the ^O characters now
+  (while (re-search-forward "\C-o+" nil t)
+    (delete-region (match-beginning 0) (match-end 0))))
+
+(defun rcirc-markup-my-nick (process sender response channel-buffer)
+  (with-syntax-table rcirc-nick-syntax-table
+    (while (re-search-forward (concat "\\b" 
+                                      (regexp-quote (rcirc-nick process))
+                                      "\\b")
+                              nil t)
+      (rcirc-add-face (match-beginning 0) (match-end 0) 
+                      'rcirc-nick-in-message)
+      (when (string= response "PRIVMSG")
+        (rcirc-add-face (point-min) (point-max) 'rcirc-nick-in-message-full-line)
+        (rcirc-record-activity channel-buffer 'nick)))))
+
+(defun rcirc-markup-urls (process sender response channel-buffer)
+  (while (re-search-forward rcirc-url-regexp nil t)
+    (let ((start (match-beginning 0))
+          (end (match-end 0)))
+      (rcirc-add-face start end 'rcirc-url)
+      (add-text-properties start end (list 'mouse-face 'highlight
+                                           'keymap rcirc-browse-url-map))
+      ;; record the url
+      (let ((url (buffer-substring-no-properties start end)))
+        (with-current-buffer channel-buffer
+          (push url rcirc-urls))))))
+
+(defun rcirc-markup-keywords (process sender response channel-buffer)
+  (let* ((target (with-current-buffer channel-buffer (or rcirc-target "")))
+         (keywords (delq nil (mapcar (lambda (keyword)
+                                      (when (not (string-match keyword target))
+                                        keyword))
+                                    rcirc-keywords))))
+    (when keywords
+      (while (re-search-forward (regexp-opt keywords 'words) nil t)
+        (rcirc-add-face (match-beginning 0) (match-end 0) 'rcirc-keyword)
+        (when (and (string= response "PRIVMSG")
+                   (not (string= sender (rcirc-nick process))))
+          (rcirc-record-activity channel-buffer 'keyword))))))
+
+(defun rcirc-markup-bright-nicks (process sender response channel-buffer)
+  (when (and rcirc-bright-nicks
+             (string= response "NAMES"))
+    (with-syntax-table rcirc-nick-syntax-table
+      (while (re-search-forward (regexp-opt rcirc-bright-nicks 'words) nil t)
+        (rcirc-add-face (match-beginning 0) (match-end 0)
+                        'rcirc-bright-nick)))))
 
 ;;; handlers
 ;; these are called with the server PROCESS, the SENDER, which is a
@@ -2275,12 +2349,12 @@ Passwords are stored in `rcirc-authinfo' (which see)."
     (((class color) (min-colors 16) (background dark)) (:foreground "Aquamarine"))
     (((class color) (min-colors 8)) (:foreground "magenta"))
     (t (:weight bold :underline t)))
-  "Face used for nicks matched by `rcirc-bright-nick-regexp'."
+  "Face used for nicks matched by `rcirc-bright-nicks'."
   :group 'rcirc-faces)
 
 (defface rcirc-dim-nick
   '((t :inherit default))
-  "Face used for nicks matched by `rcirc-dim-nick-regexp'."
+  "Face used for nicks in `rcirc-dim-nicks'."
   :group 'rcirc-faces)
 
 (defface rcirc-server                   ; font-lock-comment-face
@@ -2329,9 +2403,14 @@ Passwords are stored in `rcirc-authinfo' (which see)."
     (((class color) (min-colors 16) (background dark)) (:foreground "Cyan"))
     (((class color) (min-colors 8)) (:foreground "cyan" :weight bold))
     (t (:weight bold)))
-  "The face used to highlight instances of nick within messages."
+  "The face used to highlight instances of your nick within messages."
   :group 'rcirc-faces)
 
+(defface rcirc-nick-in-message-full-line
+  '((t (:bold t)))
+  "The face used emphasize the entire message when your nick is mentioned."
+  :group 'rcirc-faces)  
+
 (defface rcirc-prompt                   ; comint-highlight-prompt
   '((((min-colors 88) (background dark)) (:foreground "cyan1"))
     (((background dark)) (:foreground "cyan"))
@@ -2339,9 +2418,24 @@ Passwords are stored in `rcirc-authinfo' (which see)."
   "The face used to highlight prompts."
   :group 'rcirc-faces)
 
-(defface rcirc-mode-line-nick
+(defface rcirc-track-nick
+  '((t (:inverse-video t)))
+  "The face used in the mode-line when your nick is mentioned."
+  :group 'rcirc-faces)
+
+(defface rcirc-track-keyword
+  '((t (:bold t )))
+  "The face used in the mode-line when keywords are mentioned."
+  :group 'rcirc-faces)
+
+(defface rcirc-url
   '((t (:bold t)))
-  "The face used indicate activity directed at you."
+  "The face used to highlight urls."
+  :group 'rcirc-faces)
+
+(defface rcirc-keyword
+  '((t (:inherit highlight)))
+  "The face used to highlight keywords."
   :group 'rcirc-faces)
 
 
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index cb5a6d75331..97b08e7e704 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3888,37 +3888,50 @@ This will break if COMMAND prints a newline, followed by the value of
 (defun tramp-handle-make-auto-save-file-name ()
   "Like `make-auto-save-file-name' for tramp files.
 Returns a file name in `tramp-auto-save-directory' for autosaving this file."
-  (when tramp-auto-save-directory
-    (unless (file-exists-p tramp-auto-save-directory)
-      (make-directory tramp-auto-save-directory t)))
-  ;; jka-compr doesn't like auto-saving, so by appending "~" to the
-  ;; file name we make sure that jka-compr isn't used for the
-  ;; auto-save file.
-  (let ((buffer-file-name
-         (if tramp-auto-save-directory
-             (expand-file-name
-              (tramp-subst-strs-in-string
-               '(("_" . "|")
-                 ("/" . "_a")
-                 (":" . "_b")
-                 ("|" . "__")
-                 ("[" . "_l")
-                 ("]" . "_r"))
-               (buffer-file-name))
-              tramp-auto-save-directory)
-           (buffer-file-name))))
-    ;; Run plain `make-auto-save-file-name'.  There might be an advice when
-    ;; it is not a magic file name operation (since Emacs 22).
-    ;; We must deactivate it temporarily.
-    (if (not (ad-is-active 'make-auto-save-file-name))
-        (tramp-run-real-handler
-         'make-auto-save-file-name nil)
-      ;; else
-      (ad-deactivate 'make-auto-save-file-name)
-      (prog1
-       (tramp-run-real-handler
-        'make-auto-save-file-name nil)
-       (ad-activate 'make-auto-save-file-name)))))
+  (let ((tramp-auto-save-directory tramp-auto-save-directory))
+    ;; File name must be unique.  This is ensured with Emacs 22 (see
+    ;; UNIQUIFY element of `auto-save-file-name-transforms'); but for
+    ;; all other cases we must do it ourselves.
+    (when (boundp 'auto-save-file-name-transforms)
+      (mapcar
+       '(lambda (x)
+          (when (and (string-match (car x) buffer-file-name)
+                     (not (car (cddr x))))
+            (setq tramp-auto-save-directory
+                  (or tramp-auto-save-directory temporary-file-directory))))
+       (symbol-value 'auto-save-file-name-transforms)))
+    ;; Create directory.
+    (when tramp-auto-save-directory
+      (unless (file-exists-p tramp-auto-save-directory)
+        (make-directory tramp-auto-save-directory t)))
+    ;; jka-compr doesn't like auto-saving, so by appending "~" to the
+    ;; file name we make sure that jka-compr isn't used for the
+    ;; auto-save file.
+    (let ((buffer-file-name
+           (if tramp-auto-save-directory
+               (expand-file-name
+                (tramp-subst-strs-in-string
+                 '(("_" . "|")
+                   ("/" . "_a")
+                   (":" . "_b")
+                   ("|" . "__")
+                   ("[" . "_l")
+                   ("]" . "_r"))
+                 (buffer-file-name))
+                tramp-auto-save-directory)
+             (buffer-file-name))))
+      ;; Run plain `make-auto-save-file-name'.  There might be an advice when
+      ;; it is not a magic file name operation (since Emacs 22).
+      ;; We must deactivate it temporarily.
+      (if (not (ad-is-active 'make-auto-save-file-name))
+          (tramp-run-real-handler
+           'make-auto-save-file-name nil)
+        ;; else
+        (ad-deactivate 'make-auto-save-file-name)
+        (prog1
+            (tramp-run-real-handler
+             'make-auto-save-file-name nil)
+          (ad-activate 'make-auto-save-file-name))))))
 
 
 ;; CCC grok APPEND, LOCKNAME, CONFIRM
@@ -4333,7 +4346,12 @@ Falls back to normal file name handler if no tramp file name handler exists."
   "Add tramp file name handlers to `file-name-handler-alist'."
   (add-to-list 'file-name-handler-alist
                (cons tramp-file-name-regexp 'tramp-file-name-handler))
-  (when (or partial-completion-mode (featurep 'ido))
+  ;; `partial-completion-mode' is unknown in XEmacs.  So we should
+  ;; load it unconditionally there.  In the GNU Emacs case, method/
+  ;; user/host name completion shall be bound to `partial-completion-mode'.
+  (when (or (not (boundp 'partial-completion-mode))
+            (symbol-value 'partial-completion-mode)
+            (featurep 'ido))
     (add-to-list 'file-name-handler-alist
                  (cons tramp-completion-file-name-regexp
                        'tramp-completion-file-name-handler))
@@ -6749,8 +6767,8 @@ Return ATTR."
   ;; Set file's gid change bit.  Possible only when id-format is 'integer.
   (when (numberp (nth 3 attr))
     (setcar (nthcdr 9 attr)
-            (not (= (nth 3 attr)
-                    (tramp-get-remote-gid multi-method method user host)))))
+            (not (eql (nth 3 attr)
+                      (tramp-get-remote-gid multi-method method user host)))))
   ;; Set virtual device number.
   (setcar (nthcdr 11 attr)
           (tramp-get-device multi-method method user host))
@@ -7200,10 +7218,7 @@ Invokes `password-read' if available, `read-passwd' else."
 
 (defun tramp-time-diff (t1 t2)
   "Return the difference between the two times, in seconds.
-T1 and T2 are time values (as returned by `current-time' for example).
-
-NOTE: This function will fail if the time difference is too large to
-fit in an integer."
+T1 and T2 are time values (as returned by `current-time' for example)."
   ;; Pacify byte-compiler with `symbol-function'.
   (cond ((and (fboundp 'subtract-time)
               (fboundp 'float-time))
@@ -7214,10 +7229,9 @@ fit in an integer."
          (funcall (symbol-function 'time-to-seconds)
                   (funcall (symbol-function 'subtract-time) t1 t2)))
         ((fboundp 'itimer-time-difference)
-         (floor (funcall
-                 (symbol-function 'itimer-time-difference)
-                 (if (< (length t1) 3) (append t1 '(0)) t1)
-                 (if (< (length t2) 3) (append t2 '(0)) t2))))
+         (funcall (symbol-function 'itimer-time-difference)
+                  (if (< (length t1) 3) (append t1 '(0)) t1)
+                  (if (< (length t2) 3) (append t2 '(0)) t2)))
         (t
          ;; snarfed from Emacs 21 time-date.el; combining
          ;; time-to-seconds and subtract-time
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index c7edf9a4cdc..710022f885b 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -30,7 +30,7 @@
 ;; are auto-frobbed from configure.ac, so you should edit that file and run
 ;; "autoconf && ./configure" to change them.
 
-(defconst tramp-version "2.0.53"
+(defconst tramp-version "2.0.54"
   "This version of Tramp.")
 
 (defconst tramp-bug-report-address "tramp-devel@gnu.org"
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 0cf0160afb1..9d089a2e164 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -238,7 +238,7 @@ behavior for explicit filling, you might as well use \\[newline-and-indent]."
 (defcustom comment-empty-lines nil
   "If nil, `comment-region' does not comment out empty lines.
 If t, it always comments out empty lines.
-if `eol' it only comments out empty lines if comments are
+If `eol' it only comments out empty lines if comments are
 terminated by the end of line (i.e. `comment-end' is empty)."
   :type '(choice (const :tag "Never" nil)
           (const :tag "Always" t)
@@ -1124,12 +1124,44 @@ This has no effect in modes that do not define a comment syntax."
   :group 'comment)
 
 (defun comment-valid-prefix-p (prefix compos)
-  (or
-   ;; Accept any prefix if the current comment is not EOL-terminated.
-   (save-excursion (goto-char compos) (comment-forward) (not (bolp)))
-   ;; Accept any prefix that starts with a comment-start marker.
-   (string-match (concat "\\`[ \t]*\\(?:" comment-start-skip "\\)")
-                 prefix)))
+    "Check that the adaptive-fill-prefix is consistent with the context.
+PREFIX is the prefix (presumably guessed by `adaptive-fill-mode').
+COMPOS is the position of the beginning of the comment we're in, or nil
+if we're not inside a comment."
+  ;; This consistency checking is mostly needed to workaround the limitation
+  ;; of auto-fill-mode whose paragraph-determination doesn't pay attention
+  ;; to comment boundaries.
+  (if (null compos)
+      ;; We're not inside a comment: the prefix shouldn't match
+      ;; a comment-starter.
+      (not (and comment-start comment-start-skip
+                (string-match comment-start-skip prefix)))
+    (or
+     ;; Accept any prefix if the current comment is not EOL-terminated.
+     (save-excursion (goto-char compos) (comment-forward) (not (bolp)))
+     ;; Accept any prefix that starts with the same comment-start marker
+     ;; as the current one.
+     (when (string-match (concat "\\`[ \t]*\\(?:" comment-start-skip "\\)")
+                         prefix)
+       (let ((prefix-com (comment-string-strip (match-string 0 prefix) nil t)))
+         (string-match "\\`[ \t]*" prefix-com)
+         (let* ((prefix-space (match-string 0 prefix-com))
+                (prefix-indent (string-width prefix-space))
+                (prefix-comstart (substring prefix-com (match-end 0))))
+           (save-excursion
+             (goto-char compos)
+             ;; The comstart marker is the same.
+             (and (looking-at (regexp-quote prefix-comstart))
+                  ;; The indentation as well.
+                  (or (= prefix-indent
+                         (- (current-column) (current-left-margin)))
+                      ;; Check the indentation in two different ways, just
+                      ;; to try and avoid most of the potential funny cases.
+                      (equal prefix-space
+                             (buffer-substring (point)
+                                               (progn (move-to-left-margin)
+                                                      (point)))))))))))))
+                    
 
 ;;;###autoload
 (defun comment-indent-new-line (&optional soft)
@@ -1182,8 +1214,7 @@ unless optional argument SOFT is non-nil."
          ;; If there's an adaptive prefix, use it unless we're inside
          ;; a comment and the prefix is not a comment starter.
          ((and fill-prefix
-               (or (not compos)
-                   (comment-valid-prefix-p fill-prefix compos)))
+               (comment-valid-prefix-p fill-prefix compos))
           (indent-to-left-margin)
           (insert-and-inherit fill-prefix))
          ;; If we're not inside a comment, just try to indent.
diff --git a/lisp/novice.el b/lisp/novice.el
index 97e27da5e5e..7fff480e2c2 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -44,6 +44,8 @@ If nil, the feature is disabled, i.e., all commands work normally.")
 ;;;###autoload
 (define-obsolete-variable-alias 'disabled-command-hook 'disabled-command-function "22.1")
 
+;; It is ok here to assume that this-command is a symbol
+;; because we won't get called otherwise.
 ;;;###autoload
 (defun disabled-command-function (&rest ignore)
   (let (char)
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index 60c7988a66b..de4b494826a 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -623,9 +623,9 @@ See `fast-lock-cache-directory'."
   ;; Compile all keywords in case some are and some aren't.
   (when font-lock-syntactic-keywords
     (setq font-lock-syntactic-keywords (font-lock-compile-keywords
-                                        font-lock-syntactic-keywords)))
+                                        font-lock-syntactic-keywords t)))
   (when syntactic-keywords
-    (setq syntactic-keywords (font-lock-compile-keywords syntactic-keywords)))
+    (setq syntactic-keywords (font-lock-compile-keywords syntactic-keywords t)))
   (setq font-lock-keywords (font-lock-compile-keywords font-lock-keywords)
         keywords (font-lock-compile-keywords keywords))
   ;; Use the Font Lock cache SYNTACTIC-PROPERTIES and FACE-PROPERTIES if we're
diff --git a/lisp/paths.el b/lisp/paths.el
index 846f91793d1..022f12dd1fc 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -159,16 +159,6 @@ The `ORGANIZATION' environment variable is used instead if defined.")
   "Name of directory used by system mailer for delivering new mail.
 Its name should end with a slash.")
 
-(defcustom sendmail-program
-  (cond
-    ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail")
-    ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail")
-    ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail")
-    (t "fakemail"))                     ;In ../etc, to interface to /bin/mail.
-  "Program used to send messages."
-  :group 'mail
-  :type 'file)
-
 (defcustom remote-shell-program
   (cond
    ;; Some systems use rsh for the remote shell; others use that name for the
diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el
index e2c6396bdb2..d0c1950f1f8 100644
--- a/lisp/pcvs-defs.el
+++ b/lisp/pcvs-defs.el
@@ -98,7 +98,7 @@ repositories. It can be set interactively with \\[cvs-change-cvsroot.]
 There is no need to set this if $CVSROOT is set to a correct value.")
 
 (defcustom cvs-auto-remove-handled nil
-  "*If up-to-date files should be acknowledged automatically.
+  "If up-to-date files should be acknowledged automatically.
 If T, they will be removed from the *cvs* buffer after every command.
 If DELAYED, they will be removed from the *cvs* buffer before every command.
 If STATUS, they will only be removed after a `cvs-mode-status' command.
@@ -107,24 +107,24 @@ Else, they will never be automatically removed from the *cvs* buffer."
   :type '(choice (const nil) (const status) (const delayed) (const t)))
 
 (defcustom cvs-auto-remove-directories 'handled
-  "*If ALL, directory entries will never be shown.
+  "If ALL, directory entries will never be shown.
 If HANDLED, only non-handled directories will be shown.
 If EMPTY, only non-empty directories will be shown."
   :group 'pcl-cvs
   :type '(choice (const :tag "No" nil) (const all) (const handled) (const empty)))
 
 (defcustom cvs-auto-revert t
-  "*Non-nil if changed files should automatically be reverted."
+  "Non-nil if changed files should automatically be reverted."
   :group 'pcl-cvs
   :type '(boolean))
 
 (defcustom cvs-sort-ignore-file t
-  "*Non-nil if `cvs-mode-ignore' should sort the .cvsignore automatically."
+  "Non-nil if `cvs-mode-ignore' should sort the .cvsignore automatically."
   :group 'pcl-cvs
   :type '(boolean))
 
 (defcustom cvs-force-dir-tag t
-  "*If non-nil, tagging can only be applied to directories.
+  "If non-nil, tagging can only be applied to directories.
 Tagging should generally be applied a directory at a time, but sometimes it is
 useful to be able to tag a single file.  The normal way to do that is to use
 `cvs-mode-force-command' so as to temporarily override the restrictions,"
@@ -132,7 +132,7 @@ useful to be able to tag a single file.  The normal way to do that is to use
   :type '(boolean))
 
 (defcustom cvs-default-ignore-marks nil
-  "*Non-nil if cvs mode commands should ignore any marked files.
+  "Non-nil if cvs mode commands should ignore any marked files.
 Normally they run on the files that are marked (with `cvs-mode-mark'),
 or the file under the cursor if no files are marked.  If this variable
 is set to a non-nil value they will by default run on the file on the
@@ -151,7 +151,7 @@ current line.  See also `cvs-invert-ignore-marks'"
     (when (and cvs-force-dir-tag (not cvs-default-ignore-marks))
       (push "tag" l))
     l)
-  "*List of cvs commands that invert the default ignore-mark behavior.
+  "List of cvs commands that invert the default ignore-mark behavior.
 Commands in this set will use the opposite default from the one set
 in `cvs-default-ignore-marks'."
   :group 'pcl-cvs
@@ -160,7 +160,7 @@ in `cvs-default-ignore-marks'."
               (const "ignore")))
 
 (defcustom cvs-confirm-removals t
-  "*Ask for confirmation before removing files.
+  "Ask for confirmation before removing files.
 Non-nil means that PCL-CVS will ask confirmation before removing files
 except for files whose content can readily be recovered from the repository.
 A value of `list' means that the list of files to be deleted will be
@@ -171,7 +171,7 @@ displayed when asking for confirmation."
                  (const nil)))
 
 (defcustom cvs-add-default-message nil
-  "*Default message to use when adding files.
+  "Default message to use when adding files.
 If set to nil, `cvs-mode-add' will always prompt for a message."
   :group 'pcl-cvs
   :type '(choice (const :tag "Prompt" nil)
@@ -195,7 +195,7 @@ have no effect."
     ("tree" "*cvs-info*" cvs-status-mode)
     ("message" "*cvs-commit*" nil log-edit)
     ("log" "*cvs-info*" log-view-mode))
-  "*Buffer name and mode to be used for each command.
+  "Buffer name and mode to be used for each command.
 This is a list of elements of the form
 
         (CMD BUFNAME MODE &optional POSTPROC)
@@ -250,7 +250,7 @@ Output from cvs is placed here for asynchronous commands.")
   (if (fboundp 'ediff)
       '(cvs-ediff-diff . cvs-ediff-merge)
     '(cvs-emerge-diff . cvs-emerge-merge))
-  "*Pair of functions to be used for resp.  diff'ing and merg'ing interactively."
+  "Pair of functions to be used for resp.  diff'ing and merg'ing interactively."
   :group 'pcl-cvs
   :type '(choice (const :tag "Ediff" (cvs-ediff-diff . cvs-ediff-merge))
                  (const :tag "Emerge" (cvs-emerge-diff . cvs-emerge-merge))))
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index a9105227bfd..1f2bad13dcd 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -618,7 +618,6 @@ If non-nil, NEW means to create a new buffer no matter what."
          (str (car hf))
          (done "")
          (tin (ewoc-nth cvs-cookies 0)))
-    (if (eq (length str) 2) (setq str ""))
     ;; look for the first *real* fileinfo (to determine emptyness)
     (while
         (and tin
@@ -626,14 +625,17 @@ If non-nil, NEW means to create a new buffer no matter what."
                    '(MESSAGE DIRCHANGE)))
       (setq tin (ewoc-next cvs-cookies tin)))
     (if add
-        (setq str (concat "-- Running " cmd " ...\n" str))
+        (progn
+          ;; Remove the default empty line, if applicable.
+          (if (not (string-match "." str)) (setq str "\n"))
+          (setq str (concat "-- Running " cmd " ...\n" str)))
       (if (not (string-match
                 (concat "^-- Running " (regexp-quote cmd) " \\.\\.\\.\n") str))
           (error "Internal PCL-CVS error while removing message")
         (setq str (replace-match "" t t str))
-        (if (zerop (length str)) (setq str "\n"))
-        (setq done (concat "-- last cmd: " cmd " --"))))
-    (setq str (concat str "\n") done (concat done "\n"))
+        ;; Re-add the default empty line, if applicable.
+        (if (not (string-match "." str)) (setq str "\n\n"))
+        (setq done (concat "-- last cmd: " cmd " --\n"))))
     ;; set the new header and footer
     (ewoc-set-hf cvs-cookies
                  str (concat "\n--------------------- "
diff --git a/lisp/pgg-def.el b/lisp/pgg-def.el
index 6481a433423..790b6bd1e6b 100644
--- a/lisp/pgg-def.el
+++ b/lisp/pgg-def.el
@@ -71,6 +71,13 @@ Whether the passphrase is cached at all is controlled by
   :group 'pgg
   :type 'integer)
 
+(defcustom pgg-passphrase-coding-system
+  (if (boundp 'locale-coding-system)
+      locale-coding-system)
+  "Coding system to encode passphrase."
+  :group 'pgg
+  :type 'coding-system)
+
 (defvar pgg-messages-coding-system nil
   "Coding system used when reading from a PGP external process.")
 
diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index ab91471a619..4b8b79b068e 100644
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -74,23 +74,39 @@
          (errors-buffer pgg-errors-buffer)
          (orig-mode (default-file-modes))
          (process-connection-type nil)
-         exit-status)
+         (inhibit-redisplay t)
+         process status exit-status
+         passphrase-with-newline
+         encoded-passphrase-with-new-line)
     (with-current-buffer (get-buffer-create errors-buffer)
       (buffer-disable-undo)
       (erase-buffer))
     (unwind-protect
         (progn
           (set-default-file-modes 448)
-          (let ((coding-system-for-write 'binary)
-                (input (buffer-substring-no-properties start end))
-                (default-enable-multibyte-characters nil))
-            (with-temp-buffer
-              (when passphrase
-                (insert passphrase "\n"))
-              (insert input)
-              (setq exit-status
-                    (apply #'call-process-region (point-min) (point-max) program
-                           nil errors-buffer nil args))))
+          (let ((coding-system-for-write 'binary))
+            (setq process
+                  (apply #'start-process "*GnuPG*" errors-buffer
+                         program args)))
+          (set-process-sentinel process #'ignore)
+          (when passphrase
+            (setq passphrase-with-newline (concat passphrase "\n"))
+            (if pgg-passphrase-coding-system
+                (progn
+                  (setq encoded-passphrase-with-new-line
+                        (encode-coding-string passphrase-with-newline
+                                              pgg-passphrase-coding-system))
+                  (pgg-clear-string passphrase-with-newline))
+              (setq encoded-passphrase-with-new-line passphrase-with-newline
+                    passphrase-with-newline nil))
+            (process-send-string process encoded-passphrase-with-new-line))
+          (process-send-region process start end)
+          (process-send-eof process)
+          (while (eq 'run (process-status process))
+            (accept-process-output process 5))
+          (setq status (process-status process)
+                exit-status (process-exit-status process))
+          (delete-process process)
           (with-current-buffer (get-buffer-create output-buffer)
             (buffer-disable-undo)
             (erase-buffer)
@@ -100,9 +116,16 @@
                                                 'binary)))
                   (insert-file-contents output-file-name)))
             (set-buffer errors-buffer)
-            (if (not (equal exit-status 0))
-                (insert (format "\n%s exited abnormally: '%s'\n"
-                                program exit-status)))))
+            (if (memq status '(stop signal))
+                (error "%s exited abnormally: '%s'" program exit-status))
+            (if (= 127 exit-status)
+                (error "%s could not be found" program))))
+      (if passphrase-with-newline
+          (pgg-clear-string passphrase-with-newline))
+      (if encoded-passphrase-with-new-line
+          (pgg-clear-string encoded-passphrase-with-new-line))
+      (if (and process (eq 'run (process-status process)))
+          (interrupt-process process))
       (if (file-exists-p output-file-name)
           (delete-file output-file-name))
       (set-default-file-modes orig-mode))))
diff --git a/lisp/pgg.el b/lisp/pgg.el
index 7a30dafce8d..e8a85b58fae 100644
--- a/lisp/pgg.el
+++ b/lisp/pgg.el
@@ -148,6 +148,11 @@ regulate cache behavior."
                            #'pgg-remove-passphrase-from-cache
                            key notruncate))))
 
+(if (fboundp 'clear-string)
+    (defalias 'pgg-clear-string 'clear-string)
+  (defun pgg-clear-string (string)
+    (fillarray string ?_)))
+
 (defun pgg-remove-passphrase-from-cache (key &optional notruncate)
   "Omit passphrase associated with KEY in time-limited passphrase cache.
 
@@ -166,7 +171,7 @@ regulate cache behavior."
          (interned-timer-key (intern-soft key pgg-pending-timers))
          (old-timer (symbol-value interned-timer-key)))
     (when passphrase
-      (fillarray passphrase ?_)
+      (pgg-clear-string passphrase)
       (unintern key pgg-passphrase-cache))
     (when old-timer
       (pgg-cancel-timer old-timer)
diff --git a/lisp/play/life.el b/lisp/play/life.el
index 263c4450c9d..ddbbcd70c70 100644
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -56,7 +56,28 @@
     "            @@   " "             @@  " "              @@ "
     "               @@")
    ("@@@@@@@@@" "@   @   @" "@ @@@@@ @" "@ @   @ @" "@@@   @@@"
-    "@ @   @ @" "@ @@@@@ @" "@   @   @" "@@@@@@@@@")]
+    "@ @   @ @" "@ @@@@@ @" "@   @   @" "@@@@@@@@@")
+   ("                        @           "
+    "                      @ @           "
+    "            @@      @@            @@"
+    "           @   @    @@            @@"
+    "@@        @     @   @@              "
+    "@@        @   @ @@    @ @           "
+    "          @     @       @           "
+    "           @   @                    "
+    "            @@                      ")
+   ("      @ "
+    "    @ @@"
+    "    @ @ "
+    "    @   "
+    "  @     "
+    "@ @     ")
+   ("@@@ @"
+    "@    "
+    "   @@"
+    " @@ @"
+    "@ @ @")
+   ("@@@@@@@@ @@@@@   @@@      @@@@@@@ @@@@@")]
   "Vector of rectangles containing some Life startup patterns.")
 
 ;; Macros are used macros for manifest constants instead of variables
@@ -128,6 +149,7 @@ generations (this defaults to 1)."
           mode-name "Life"
           major-mode 'life-mode
           truncate-lines t
+          show-trailing-whitespace nil
           life-current-generation 0
           life-generation-string "0"
           mode-line-buffer-identification '("Life: generation "
@@ -269,7 +291,8 @@ generations (this defaults to 1)."
   (recenter 0)
 
   ;; Redisplay; if the user has hit a key, exit the loop.
-  (or (eq t (sit-for sleeptime))
+  (or (and (sit-for sleeptime) (< 0 sleeptime))
+      (not (input-pending-p))
       (throw 'life-exit nil)))
 
 (defun life-extinct-quit ()
diff --git a/lisp/printing.el b/lisp/printing.el
index 94be3dfbfab..18252155e49 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -5,10 +5,10 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2006-02-06 15:06:40 ttn>
+;; Time-stamp: <2006/09/15 18:53:14 vinicius>
 ;; Keywords: wp, print, PostScript
 ;; Version: 6.8.4
-;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
+;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
 (defconst pr-version "6.8.4"
   "printing.el, v 6.8.4 <2005/06/11 vinicius>
@@ -2799,7 +2799,7 @@ See `pr-ps-printer-alist'.")
 
 
 (defalias 'pr-get-symbol
-  (if (fboundp 'easy-menu-intern)
+  (if (fboundp 'easy-menu-intern)       ; hacked from easymenu.el
       'easy-menu-intern
     (lambda (s) (if (stringp s) (intern s) s))))
 
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 1b62774a72d..b70fe58b543 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -85,6 +85,12 @@ This includes those for cfservd as well as cfagent."))
     ;; File, acl &c in group:   { token ... }
     ("{[ \t]*\\([^ \t\n]+\\)" 1 font-lock-constant-face)))
 
+(defconst cfengine-font-lock-syntactic-keywords
+  ;; In the main syntax-table, backslash is marked as a punctuation, because
+  ;; of its use in DOS-style directory separators.  Here we try to recognize
+  ;; the cases where backslash is used as an escape inside strings.
+  '(("\\(\\(?:\\\\\\)+\\)\"" . "\\")))
+
 (defvar cfengine-imenu-expression
   `((nil ,(concat "^[ \t]*" (eval-when-compile
                               (regexp-opt cfengine-actions t))
@@ -218,7 +224,7 @@ to the action header."
   ;; variable substitution:
   (modify-syntax-entry ?$ "." cfengine-mode-syntax-table)
   ;; Doze path separators:
-  (modify-syntax-entry ?\\ "_" cfengine-mode-syntax-table)
+  (modify-syntax-entry ?\\ "." cfengine-mode-syntax-table)
   ;; Otherwise, syntax defaults seem OK to give reasonable word
   ;; movement.
 
@@ -237,7 +243,9 @@ to the action header."
   ;; functions in evaluated classes to string syntax, and then obey
   ;; syntax properties.
   (setq font-lock-defaults
-        '(cfengine-font-lock-keywords nil nil nil beginning-of-line))
+        '(cfengine-font-lock-keywords nil nil nil beginning-of-line
+          (font-lock-syntactic-keywords
+           . cfengine-font-lock-syntactic-keywords)))
   (setq imenu-generic-expression cfengine-imenu-expression)
   (set (make-local-variable 'beginning-of-defun-function)
        #'cfengine-beginning-of-defun)
@@ -249,5 +257,5 @@ to the action header."
 
 (provide 'cfengine)
 
-;;; arch-tag: 6b931be2-1505-4124-afa6-9675971e26d4
+;; arch-tag: 6b931be2-1505-4124-afa6-9675971e26d4
 ;;; cfengine.el ends here
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index e8c09113d39..7d9ce41229c 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -218,10 +218,6 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
      nil 1 nil 2 0
      (2 (compilation-face '(3))))
 
-    (gcc-include
-     "^\\(?:In file included\\|                \\) from \
-\\(.+\\):\\([0-9]+\\)\\(?:\\(:\\)\\|\\(,\\)\\)?" 1 2 nil (3 . 4))
-
     (gnu
      ;; I have no idea what this first line is supposed to match, but it
      ;; makes things ambiguous with output such as "foo:344:50:blabla" since
@@ -233,7 +229,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
      ;; the last line tries to rule out message where the info after the
      ;; line number starts with "SS".  --Stef
      "^\\(?:[[:alpha:]][-[:alnum:].]+: ?\\)?\
-\\([0-9]*[^0-9\n].*?\\): ?\
+\\([0-9]*[^0-9\n]\\(?:[^\n ]\\| [^-\n]\\)*?\\): ?\
 \\([0-9]+\\)\\(?:\\([.:]\\)\\([0-9]+\\)\\)?\
 \\(?:-\\([0-9]+\\)?\\(?:\\3\\([0-9]+\\)\\)?\\)?:\
 \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\
@@ -241,6 +237,12 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
 \[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)"
      1 (2 . 5) (4 . 6) (7 . 8))
 
+    ;; The `gnu' style above can incorrectly match gcc's "In file
+    ;; included from" message, so we process that first. -- cyd
+    (gcc-include
+     "^\\(?:In file included\\|                \\) from \
+\\(.+\\):\\([0-9]+\\)\\(?:\\(:\\)\\|\\(,\\)\\)?" 1 2 nil (3 . 4))
+
     (lcc
      "^\\(?:E\\|\\(W\\)\\), \\([^(\n]+\\)(\\([0-9]+\\),[ \t]*\\([0-9]+\\)"
      2 3 4 (1))
@@ -623,7 +625,7 @@ Faces `compilation-error-face', `compilation-warning-face',
                    (cons (match-string-no-properties idx) dir))
       mouse-face highlight
       keymap compilation-button-map
-      help-echo "mouse-2: visit current directory")))
+      help-echo "mouse-2: visit this directory")))
 
 ;; Data type `reverse-ordered-alist' retriever.  This function retrieves the
 ;; KEY element from the ALIST, creating it in the right position if not already
@@ -1066,7 +1068,8 @@ Returns the compilation buffer created."
                               (window-width))))
               ;; Set the EMACS variable, but
               ;; don't override users' setting of $EMACS.
-              (unless (getenv "EMACS") '("EMACS=t"))
+              (unless (getenv "EMACS")
+                (list (concat "EMACS=" invocation-directory invocation-name)))
               (copy-sequence process-environment))))
         (set (make-local-variable 'compilation-arguments)
              (list command mode name-function highlight-regexp))
@@ -1781,17 +1784,31 @@ and overlay is highlighted between MK and END-MK."
                                 (current-buffer)))
               (move-overlay compilation-highlight-overlay
                             (point) end (current-buffer)))
-            (if (numberp next-error-highlight)
-                (setq next-error-highlight-timer
-                      (run-at-time next-error-highlight nil 'delete-overlay
-                                   compilation-highlight-overlay)))
-            (if (not (or (eq next-error-highlight t)
-                         (numberp next-error-highlight)))
-                (delete-overlay compilation-highlight-overlay))))))
+            (if (or (eq next-error-highlight t)
+                    (numberp next-error-highlight))
+                ;; We want highlighting: delete overlay on next input.
+                (add-hook 'pre-command-hook
+                          'compilation-goto-locus-delete-o)
+              ;; We don't want highlighting: delete overlay now.
+              (delete-overlay compilation-highlight-overlay))
+            ;; We want highlighting for a limited time:
+            ;; set up a timer to delete it.
+            (when (numberp next-error-highlight)
+              (setq next-error-highlight-timer
+                    (run-at-time next-error-highlight nil
+                                 'compilation-goto-locus-delete-o)))))))
     (when (and (eq next-error-highlight 'fringe-arrow))
+      ;; We want a fringe arrow (instead of highlighting).
       (setq next-error-overlay-arrow-position
             (copy-marker (line-beginning-position))))))
 
+(defun compilation-goto-locus-delete-o ()
+  (delete-overlay compilation-highlight-overlay)
+  ;; Get rid of timer and hook that would try to do this again.
+  (if (timerp next-error-highlight-timer)
+      (cancel-timer next-error-highlight-timer))
+  (remove-hook 'pre-command-hook
+               'compilation-goto-locus-delete-o))
 
 (defun compilation-find-file (marker filename directory &rest formats)
   "Find a buffer for file FILENAME.
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index ad44753f352..3264e0e72f6 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -5,7 +5,7 @@
 ;;     Free Software Foundation, Inc.
 
 ;; Author: Ilya Zakharevich and Bob Olson
-;; Maintainer: Ilya Zakharevich <cperl@ilyaz.org>
+;; Maintainer: Ilya Zakharevich <ilyaz@cpan.org>
 ;; Keywords: languages, Perl
 
 ;; This file is part of GNU Emacs.
@@ -25,7 +25,7 @@
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 
-;;; Corrections made by Ilya Zakharevich cperl@ilyaz.org
+;;; Corrections made by Ilya Zakharevich ilyaz@cpan.org
 
 ;;; Commentary:
 
@@ -67,67 +67,89 @@
 ;; likewise with m, tr, y, q, qX instead of s
 
 ;;; Code:
-
+
 (defvar vc-rcs-header)
 (defvar vc-sccs-header)
 
-;; Some macros are needed for `defcustom'
 (eval-when-compile
-  (condition-case nil
-      (require 'man)
-    (error nil))
-  (defconst cperl-xemacs-p (string-match "XEmacs\\|Lucid" emacs-version))
-  (defvar cperl-can-font-lock
-    (or cperl-xemacs-p
-        (and (boundp 'emacs-major-version)
-                (or window-system
-                    (> emacs-major-version 20)))))
-  (if cperl-can-font-lock
-      (require 'font-lock))
-  (defvar msb-menu-cond)
-  (defvar gud-perldb-history)
-  (defvar font-lock-background-mode)    ; not in Emacs
-  (defvar font-lock-display-type)       ; ditto
-  (defmacro cperl-is-face (arg)         ; Takes quoted arg
-    (cond ((fboundp 'find-face)
-           `(find-face ,arg))
-          (;;(and (fboundp 'face-list)
-           ;;   (face-list))
-           (fboundp 'face-list)
-           `(member ,arg (and (fboundp 'face-list)
-                              (face-list))))
-          (t
-           `(boundp ,arg))))
-  (defmacro cperl-make-face (arg descr) ; Takes unquoted arg
-    (cond ((fboundp 'make-face)
-           `(make-face (quote ,arg)))
-          (t
-           `(defvar ,arg (quote ,arg) ,descr))))
-  (defmacro cperl-force-face (arg descr) ; Takes unquoted arg
-    `(progn
-       (or (cperl-is-face (quote ,arg))
-           (cperl-make-face ,arg ,descr))
-       (or (boundp (quote ,arg))        ; We use unquoted variants too
-           (defvar ,arg (quote ,arg) ,descr))))
-  (if cperl-xemacs-p
-      (defmacro cperl-etags-snarf-tag (file line)
-        `(progn
-           (beginning-of-line 2)
-           (list ,file ,line)))
-    (defmacro cperl-etags-snarf-tag (file line)
-      `(etags-snarf-tag)))
-  (if cperl-xemacs-p
-      (defmacro cperl-etags-goto-tag-location (elt)
-        ;;(progn
-        ;; (switch-to-buffer (get-file-buffer (elt (, elt) 0)))
-        ;; (set-buffer (get-file-buffer (elt (, elt) 0)))
-        ;; Probably will not work due to some save-excursion???
-        ;; Or save-file-position?
-        ;; (message "Did I get to line %s?" (elt (, elt) 1))
-        `(goto-line (string-to-number (elt ,elt 1))))
-    ;;)
-    (defmacro cperl-etags-goto-tag-location (elt)
-      `(etags-goto-tag-location ,elt))))
+      (condition-case nil
+          (require 'custom)
+        (error nil))
+      (condition-case nil
+          (require 'man)
+        (error nil))
+      (defconst cperl-xemacs-p (string-match "XEmacs\\|Lucid" emacs-version))
+      (defvar cperl-can-font-lock
+        (or cperl-xemacs-p
+            (and (boundp 'emacs-major-version)
+                 (or window-system
+                     (> emacs-major-version 20)))))
+      (if cperl-can-font-lock
+          (require 'font-lock))
+      (defvar msb-menu-cond)
+      (defvar gud-perldb-history)
+      (defvar font-lock-background-mode) ; not in Emacs
+      (defvar font-lock-display-type)   ; ditto
+      (defvar paren-backwards-message)  ; Not in newer XEmacs?
+      (or (fboundp 'defgroup)
+          (defmacro defgroup (name val doc &rest arr)
+            nil))
+      (or (fboundp 'custom-declare-variable)
+          (defmacro defcustom (name val doc &rest arr)
+            (` (defvar (, name) (, val) (, doc)))))
+      (or (and (fboundp 'custom-declare-variable)
+               (string< "19.31" emacs-version)) ;  Checked with 19.30: defface does not work
+          (defmacro defface (&rest arr)
+            nil))
+      ;; Avoid warning (tmp definitions)
+      (or (fboundp 'x-color-defined-p)
+          (defmacro x-color-defined-p (col)
+            (cond ((fboundp 'color-defined-p) (` (color-defined-p (, col))))
+                  ;; XEmacs >= 19.12
+                  ((fboundp 'valid-color-name-p) (` (valid-color-name-p (, col))))
+                  ;; XEmacs 19.11
+                  ((fboundp 'x-valid-color-name-p) (` (x-valid-color-name-p (, col))))
+                  (t '(error "Cannot implement color-defined-p")))))
+      (defmacro cperl-is-face (arg)     ; Takes quoted arg
+        (cond ((fboundp 'find-face)
+               (` (find-face (, arg))))
+              (;;(and (fboundp 'face-list)
+               ;;       (face-list))
+               (fboundp 'face-list)
+               (` (member (, arg) (and (fboundp 'face-list)
+                                       (face-list)))))
+              (t
+               (` (boundp (, arg))))))
+      (defmacro cperl-make-face (arg descr) ; Takes unquoted arg
+        (cond ((fboundp 'make-face)
+               (` (make-face (quote (, arg)))))
+              (t
+               (` (defvar (, arg) (quote (, arg)) (, descr))))))
+      (defmacro cperl-force-face (arg descr) ; Takes unquoted arg
+        (` (progn
+             (or (cperl-is-face (quote (, arg)))
+                 (cperl-make-face (, arg) (, descr)))
+             (or (boundp (quote (, arg))) ; We use unquoted variants too
+                 (defvar (, arg) (quote (, arg)) (, descr))))))
+      (if cperl-xemacs-p
+          (defmacro cperl-etags-snarf-tag (file line)
+            (` (progn
+                 (beginning-of-line 2)
+                 (list (, file) (, line)))))
+        (defmacro cperl-etags-snarf-tag (file line)
+          (` (etags-snarf-tag))))
+      (if cperl-xemacs-p
+          (defmacro cperl-etags-goto-tag-location (elt)
+            (`;;(progn
+             ;; (switch-to-buffer (get-file-buffer (elt (, elt) 0)))
+             ;; (set-buffer (get-file-buffer (elt (, elt) 0)))
+             ;; Probably will not work due to some save-excursion???
+             ;; Or save-file-position?
+             ;; (message "Did I get to line %s?" (elt (, elt) 1))
+             (goto-line (string-to-int (elt (, elt) 1)))))
+        ;;)
+        (defmacro cperl-etags-goto-tag-location (elt)
+          (` (etags-goto-tag-location (, elt))))))
 
 (defconst cperl-xemacs-p (string-match "XEmacs\\|Lucid" emacs-version))
 
@@ -251,6 +273,12 @@ This is in addition to cperl-continued-statement-offset."
   :type 'integer
   :group 'cperl-indentation-details)
 
+(defcustom cperl-indent-wrt-brace t
+  "*Non-nil means indent statements in if/etc block relative brace, not if/etc.
+Versions 5.2 ... 5.20 behaved as if this were `nil'."
+  :type 'boolean
+  :group 'cperl-indentation-details)
+
 (defcustom cperl-auto-newline nil
   "*Non-nil means automatically newline before and after braces,
 and after colons and semicolons, inserted in CPerl code.  The following
@@ -347,20 +375,26 @@ Affects: `cperl-font-lock', `cperl-electric-lbrace-space',
   :type 'integer
   :group 'cperl-indentation-details)
 
-(defvar cperl-vc-header-alist nil)
-(make-obsolete-variable
- 'cperl-vc-header-alist
- "use cperl-vc-rcs-header or cperl-vc-sccs-header instead.")
+(defcustom cperl-indent-comment-at-column-0 nil
+  "*Non-nil means that comment started at column 0 should be indentable."
+  :type 'boolean
+  :group 'cperl-indentation-details)
 
 (defcustom cperl-vc-sccs-header '("($sccs) = ('%W\%' =~ /(\\d+(\\.\\d+)+)/) ;")
   "*Special version of `vc-sccs-header' that is used in CPerl mode buffers."
   :type '(repeat string)
   :group 'cperl)
 
-(defcustom cperl-vc-rcs-header '("($rcs) = (' $Id\$ ' =~ /(\\d+(\\.\\d+)+)/) ;")
+(defcustom cperl-vc-rcs-header '("($rcs) = (' $Id\$ ' =~ /(\\d+(\\.\\d+)+)/);")
   "*Special version of `vc-rcs-header' that is used in CPerl mode buffers."
   :type '(repeat string)
-  :group 'cperl)
+     :group 'cperl)
+
+;; This became obsolete...
+(defvar cperl-vc-header-alist nil)
+(make-obsolete-variable
+ 'cperl-vc-header-alist
+ "use cperl-vc-rcs-header or cperl-vc-sccs-header instead.")
 
 (defcustom cperl-clobber-mode-lists
   (not
@@ -408,8 +442,15 @@ Font for POD headers."
   :type 'face
   :group 'cperl-faces)
 
-(defcustom cperl-invalid-face 'underline
-  "*Face for highlighting trailing whitespace."
+;;; Some double-evaluation happened with font-locks...  Needed with 21.2...
+(defvar cperl-singly-quote-face cperl-xemacs-p)
+
+(defcustom cperl-invalid-face           ; Does not customize with '' on XEmacs
+  (if cperl-singly-quote-face
+      'underline ''underline) ; On older Emacsen was evaluated by `font-lock'
+  (if cperl-singly-quote-face
+      "*This face is used for highlighting trailing whitespace."
+    "*Face for highlighting trailing whitespace.")
   :type 'face
   :version "21.1"
   :group 'cperl-faces)
@@ -441,7 +482,14 @@ You can always make lookup from menu or using \\[cperl-find-pods-heres]."
 
 (defcustom cperl-regexp-scan t
   "*Not-nil means make marking of regular expression more thorough.
-Effective only with `cperl-pod-here-scan'.  Not implemented yet."
+Effective only with `cperl-pod-here-scan'."
+  :type 'boolean
+  :group 'cperl-speed)
+
+(defcustom cperl-hook-after-change t
+  "*Not-nil means install hook to know which regions of buffer are changed.
+May significantly speed up delayed fontification.  Changes take effect
+after reload."
   :type 'boolean
   :group 'cperl-speed)
 
@@ -564,17 +612,25 @@ when syntaxifying a chunk of buffer."
   :type 'boolean
   :group 'cperl-speed)
 
+(defcustom cperl-syntaxify-for-menu
+  t
+  "*Non-nil means that CPerl syntaxifies up to the point before showing menu.
+This way enabling/disabling of menu items is more correct."
+  :type 'boolean
+  :group 'cperl-speed)
+
 (defcustom cperl-ps-print-face-properties
   '((font-lock-keyword-face             nil nil         bold shadow)
     (font-lock-variable-name-face       nil nil         bold)
     (font-lock-function-name-face       nil nil         bold italic box)
     (font-lock-constant-face            nil "LightGray" bold)
-    (cperl-array                        nil "LightGray" bold underline)
-    (cperl-hash                         nil "LightGray" bold italic underline)
+    (cperl-array-face                   nil "LightGray" bold underline)
+    (cperl-hash-face                            nil "LightGray" bold italic underline)
     (font-lock-comment-face             nil "LightGray" italic)
     (font-lock-string-face              nil nil         italic underline)
-    (cperl-nonoverridable               nil nil         italic underline)
+    (cperl-nonoverridable-face          nil nil         italic underline)
     (font-lock-type-face                nil nil         underline)
+    (font-lock-warning-face             nil "LightGray" bold italic box)
     (underline                          nil "LightGray" strikeout))
   "List given as an argument to `ps-extend-face-list' in `cperl-ps-print'."
   :type '(repeat (cons symbol
@@ -588,7 +644,7 @@ when syntaxifying a chunk of buffer."
 (defvar cperl-dark-foreground
   (cperl-choose-color "orchid1" "orange"))
 
-(defface cperl-nonoverridable
+(defface cperl-nonoverridable-face
   `((((class grayscale) (background light))
      (:background "Gray90" :slant italic :underline t))
     (((class grayscale) (background dark))
@@ -600,10 +656,8 @@ when syntaxifying a chunk of buffer."
     (t (:weight bold :underline t)))
   "Font Lock mode face used non-overridable keywords and modifiers of regexps."
   :group 'cperl-faces)
-;; backward-compatibility alias
-(put 'cperl-nonoverridable-face 'face-alias 'cperl-nonoverridable)
 
-(defface cperl-array
+(defface cperl-array-face
   `((((class grayscale) (background light))
      (:background "Gray90" :weight bold))
     (((class grayscale) (background dark))
@@ -615,10 +669,8 @@ when syntaxifying a chunk of buffer."
     (t (:weight bold)))
   "Font Lock mode face used to highlight array names."
   :group 'cperl-faces)
-;; backward-compatibility alias
-(put 'cperl-array-face 'face-alias 'cperl-array)
 
-(defface cperl-hash
+(defface cperl-hash-face
   `((((class grayscale) (background light))
      (:background "Gray90" :weight bold :slant italic))
     (((class grayscale) (background dark))
@@ -630,8 +682,6 @@ when syntaxifying a chunk of buffer."
     (t (:weight bold :slant italic)))
   "Font Lock mode face used to highlight hash names."
   :group 'cperl-faces)
-;; backward-compatibility alias
-(put 'cperl-hash-face 'face-alias 'cperl-hash)
 
 
 
@@ -639,9 +689,7 @@ when syntaxifying a chunk of buffer."
 
 (defvar cperl-tips 'please-ignore-this-line
   "Get maybe newer version of this package from
-  ftp://ftp.math.ohio-state.edu/pub/users/ilya/emacs
-and/or
-  ftp://ftp.math.ohio-state.edu/pub/users/ilya/perl
+  http://ilyaz.org/software/emacs
 Subdirectory `cperl-mode' may contain yet newer development releases and/or
 patches to related files.
 
@@ -666,9 +714,9 @@ want it to: put the following into your .emacs file:
   (defalias 'perl-mode 'cperl-mode)
 
 Get perl5-info from
-  $CPAN/doc/manual/info/perl-info.tar.gz
-older version was on
-  http://www.metronet.com:70/9/perlinfo/perl5/manual/perl5-info.tar.gz
+  $CPAN/doc/manual/info/perl5-old/perl5-info.tar.gz
+Also, one can generate a newer documentation running `pod2texi' converter
+  $CPAN/doc/manual/info/perl5/pod2texi-0.1.tar.gz
 
 If you use imenu-go, run imenu on perl5-info buffer (you can do it
 from Perl menu).  If many files are related, generate TAGS files from
@@ -700,11 +748,18 @@ micro-docs on what I know about CPerl problems.")
   "Description of problems in CPerl mode.
 Some faces will not be shown on some versions of Emacs unless you
 install choose-color.el, available from
-   ftp://ftp.math.ohio-state.edu/pub/users/ilya/emacs/
+  http://ilyaz.org/software/emacs
 
 `fill-paragraph' on a comment may leave the point behind the
-paragraph.  Parsing of lines with several <<EOF is not implemented
-yet.
+paragraph.  It also triggers a bug in some versions of Emacs (CPerl tries
+to detect it and bulk out).
+
+See documentation of a variable `cperl-problems-old-emaxen' for the
+problems which disappear if you upgrade Emacs to a reasonably new
+version (20.3 for Emacs, and those of 2004 for XEmacs).")
+
+(defvar cperl-problems-old-emaxen 'please-ignore-this-line
+  "Description of problems in CPerl mode specific for older Emacs versions.
 
 Emacs had a _very_ restricted syntax parsing engine until version
 20.1.  Most problems below are corrected starting from this version of
@@ -812,6 +867,13 @@ voice);
         o) Highlights trailing whitespace;
         p) Is able to manipulate Perl Regular Expressions to ease
            conversion to a more readable form.
+        q) Can ispell POD sections and HERE-DOCs.
+        r) Understands comments and character classes inside regular
+           expressions; can find matching () and [] in a regular expression.
+        s) Allows indentation of //x-style regular expressions;
+        t) Highlights different symbols in regular expressions according
+           to their function; much less problems with backslashitis;
+        u) Allows to find regular expressions which contain interpolated parts.
 
 5) The indentation engine was very smart, but most of tricks may be
 not needed anymore with the support for `syntax-table' property.  Has
@@ -829,7 +891,10 @@ the settings present before the switch.
 line-breaks/spacing between elements of the construct.
 
 10) Uses a linear-time algorith for indentation of regions (on Emaxen with
-capable syntax engines).")
+capable syntax engines).
+
+11) Syntax-highlight, indentation, sexp-recognition inside regular expressions.
+")
 
 (defvar cperl-speed 'please-ignore-this-line
   "This is an incomplete compendium of what is available in other parts
@@ -878,19 +943,19 @@ B) Speed of editing operations.
 (defvar cperl-tips-faces 'please-ignore-this-line
   "CPerl mode uses following faces for highlighting:
 
-  `cperl-array'                 Array names
-  `cperl-hash'                  Hash names
+  `cperl-array-face'                    Array names
+  `cperl-hash-face'                     Hash names
   `font-lock-comment-face'      Comments, PODs and whatever is considered
                                 syntaxically to be not code
   `font-lock-constant-face'     HERE-doc delimiters, labels, delimiters of
                                 2-arg operators s/y/tr/ or of RExen,
-  `font-lock-function-name-face' Special-cased m// and s//foo/, _ as
-                                a target of a file tests, file tests,
+  `font-lock-warning-face'      Special-cased m// and s//foo/,
+  `font-lock-function-name-face' _ as a target of a file tests, file tests,
                                 subroutine names at the moment of definition
                                 (except those conflicting with Perl operators),
                                 package names (when recognized), format names
   `font-lock-keyword-face'      Control flow switch constructs, declarators
-  `cperl-nonoverridable'        Non-overridable keywords, modifiers of RExen
+  `cperl-nonoverridable-face'   Non-overridable keywords, modifiers of RExen
   `font-lock-string-face'       Strings, qw() constructs, RExen, POD sections,
                                 literal parts and the terminator of formats
                                 and whatever is syntaxically considered
@@ -908,7 +973,25 @@ m// and s/// which do not do what one would expect them to do.
 Help with best setup of these faces for printout requested (for each of
 the faces: please specify bold, italic, underline, shadow and box.)
 
-\(Not finished.)")
+In regular expressions (except character classes):
+  `font-lock-string-face'       \"Normal\" stuff and non-0-length constructs
+  `font-lock-constant-face':    Delimiters
+  `font-lock-warning-face'      Special-cased m// and s//foo/,
+                                Mismatched closing delimiters, parens
+                                we couldn't match, misplaced quantifiers,
+                                unrecognized escape sequences
+  `cperl-nonoverridable-face'   Modifiers, as gism in m/REx/gism
+  `font-lock-type-face'         POSIX classes inside charclasses,
+                                escape sequences with arguments (\x \23 \p \N)
+                                and others match-a-char escape sequences
+  `font-lock-keyword-face'      Capturing parens, and |
+  `font-lock-function-name-face' Special symbols: $ ^ . [ ] [^ ] (?{ }) (??{ })
+  `font-lock-builtin-face'      \"Remaining\" 0-length constructs, executable
+                                parts of a REx, not-capturing parens
+  `font-lock-variable-name-face' Interpolated constructs, embedded code
+  `font-lock-comment-face'      Embedded comments
+
+")
 
 
 
@@ -985,6 +1068,25 @@ the faces: please specify bold, italic, underline, shadow and box.)
    (cperl-hairy (or hairy t))
    (t (symbol-value symbol))))
 
+
+(defun cperl-make-indent (column &optional minimum keep)
+  "Makes indent of the current line the requested amount.
+Unless KEEP, removes the old indentation.  Works around a bug in ancient
+versions of Emacs."
+  (let ((prop (get-text-property (point) 'syntax-type)))
+    (or keep
+        (delete-horizontal-space))
+    (indent-to column minimum)
+    ;; In old versions (e.g., 19.33) `indent-to' would not inherit properties
+    (and prop
+         (> (current-column) 0)
+         (save-excursion
+           (beginning-of-line)
+           (or (get-text-property (point) 'syntax-type)
+               (and (looking-at "\\=[ \t]")
+                      (put-text-property (point) (match-end 0)
+                                         'syntax-type prop)))))))
+
 ;;; Probably it is too late to set these guys already, but it can help later:
 
 ;;;(and cperl-clobber-mode-lists
@@ -1035,7 +1137,16 @@ the faces: please specify bold, italic, underline, shadow and box.)
   (cperl-define-key "\C-c\C-w" 'cperl-toggle-construct-fix)
   (cperl-define-key "\C-c\C-f" 'auto-fill-mode)
   (cperl-define-key "\C-c\C-e" 'cperl-toggle-electric)
+  (cperl-define-key "\C-c\C-b" 'cperl-find-bad-style)
+  (cperl-define-key "\C-c\C-p" 'cperl-pod-spell)
+  (cperl-define-key "\C-c\C-d" 'cperl-here-doc-spell)
+  (cperl-define-key "\C-c\C-n" 'cperl-narrow-to-here-doc)
+  (cperl-define-key "\C-c\C-v" 'cperl-next-interpolated-REx)
+  (cperl-define-key "\C-c\C-x" 'cperl-next-interpolated-REx-0)
+  (cperl-define-key "\C-c\C-y" 'cperl-next-interpolated-REx-1)
   (cperl-define-key "\C-c\C-ha" 'cperl-toggle-autohelp)
+  (cperl-define-key "\C-c\C-hp" 'cperl-perldoc)
+  (cperl-define-key "\C-c\C-hP" 'cperl-perldoc-at-point)
   (cperl-define-key "\e\C-q" 'cperl-indent-exp) ; Usually not bound
   (cperl-define-key [?\C-\M-\|] 'cperl-lineup
                     [(control meta |)])
@@ -1074,9 +1185,13 @@ the faces: please specify bold, italic, underline, shadow and box.)
            (<= emacs-minor-version 11) (<= emacs-major-version 19))
       (progn
         ;; substitute-key-definition is usefulness-deenhanced...
-        (cperl-define-key "\M-q" 'cperl-fill-paragraph)
+        ;;;;;(cperl-define-key "\M-q" 'cperl-fill-paragraph)
         (cperl-define-key "\e;" 'cperl-indent-for-comment)
         (cperl-define-key "\e\C-\\" 'cperl-indent-region))
+    (or (boundp 'fill-paragraph-function)
+        (substitute-key-definition
+         'fill-paragraph 'cperl-fill-paragraph
+         cperl-mode-map global-map))
     (substitute-key-definition
      'indent-sexp 'cperl-indent-exp
      cperl-mode-map global-map)
@@ -1094,52 +1209,101 @@ the faces: please specify bold, italic, underline, shadow and box.)
     (progn
       (require 'easymenu)
       (easy-menu-define
-        cperl-menu cperl-mode-map "Menu for CPerl mode"
-        '("Perl"
-          ["Beginning of function" beginning-of-defun t]
-          ["End of function" end-of-defun t]
-          ["Mark function" mark-defun t]
-          ["Indent expression" cperl-indent-exp t]
+       cperl-menu cperl-mode-map "Menu for CPerl mode"
+       '("Perl"
+         ["Beginning of function" beginning-of-defun t]
+         ["End of function" end-of-defun t]
+         ["Mark function" mark-defun t]
+         ["Indent expression" cperl-indent-exp t]
           ["Fill paragraph/comment" fill-paragraph t]
+         "----"
+         ["Line up a construction" cperl-lineup (cperl-use-region-p)]
+         ["Invert if/unless/while etc" cperl-invert-if-unless t]
+         ("Regexp"
+          ["Beautify" cperl-beautify-regexp
+           cperl-use-syntax-table-text-property]
+          ["Beautify one level deep" (cperl-beautify-regexp 1)
+           cperl-use-syntax-table-text-property]
+          ["Beautify a group" cperl-beautify-level
+           cperl-use-syntax-table-text-property]
+          ["Beautify a group one level deep" (cperl-beautify-level 1)
+           cperl-use-syntax-table-text-property]
+          ["Contract a group" cperl-contract-level
+           cperl-use-syntax-table-text-property]
+          ["Contract groups" cperl-contract-levels
+           cperl-use-syntax-table-text-property]
           "----"
-          ["Line up a construction" cperl-lineup (cperl-use-region-p)]
-          ["Invert if/unless/while etc" cperl-invert-if-unless t]
-          ("Regexp"
-           ["Beautify" cperl-beautify-regexp
-            cperl-use-syntax-table-text-property]
-           ["Beautify one level deep" (cperl-beautify-regexp 1)
-            cperl-use-syntax-table-text-property]
-           ["Beautify a group" cperl-beautify-level
-            cperl-use-syntax-table-text-property]
-           ["Beautify a group one level deep" (cperl-beautify-level 1)
-            cperl-use-syntax-table-text-property]
-           ["Contract a group" cperl-contract-level
-            cperl-use-syntax-table-text-property]
-           ["Contract groups" cperl-contract-levels
-            cperl-use-syntax-table-text-property])
-          ["Refresh \"hard\" constructions" cperl-find-pods-heres t]
+          ["Find next interpolated" cperl-next-interpolated-REx 
+           (next-single-property-change (point-min) 'REx-interpolated)]
+          ["Find next interpolated (no //o)"
+           cperl-next-interpolated-REx-0
+           (or (text-property-any (point-min) (point-max) 'REx-interpolated t)
+               (text-property-any (point-min) (point-max) 'REx-interpolated 1))]
+          ["Find next interpolated (neither //o nor whole-REx)"
+           cperl-next-interpolated-REx-1
+           (text-property-any (point-min) (point-max) 'REx-interpolated t)])
+         ["Insert spaces if needed to fix style" cperl-find-bad-style t]
+         ["Refresh \"hard\" constructions" cperl-find-pods-heres t]
+         "----"
+         ["Indent region" cperl-indent-region (cperl-use-region-p)]
+         ["Comment region" cperl-comment-region (cperl-use-region-p)]
+         ["Uncomment region" cperl-uncomment-region (cperl-use-region-p)]
+         "----"
+         ["Run" mode-compile (fboundp 'mode-compile)]
+         ["Kill" mode-compile-kill (and (fboundp 'mode-compile-kill)
+                                        (get-buffer "*compilation*"))]
+         ["Next error" next-error (get-buffer "*compilation*")]
+         ["Check syntax" cperl-check-syntax (fboundp 'mode-compile)]
+         "----"
+         ["Debugger" cperl-db t]
+         "----"
+         ("Tools"
+          ["Imenu" imenu (fboundp 'imenu)]
+          ["Imenu on Perl Info" cperl-imenu-on-info (featurep 'imenu)]
           "----"
-          ["Indent region" cperl-indent-region (cperl-use-region-p)]
-          ["Comment region" cperl-comment-region (cperl-use-region-p)]
-          ["Uncomment region" cperl-uncomment-region (cperl-use-region-p)]
+          ["Ispell PODs" cperl-pod-spell
+           ;; Better not to update syntaxification here:
+           ;; debugging syntaxificatio can be broken by this???
+           (or
+            (get-text-property (point-min) 'in-pod)
+            (< (progn
+                 (and cperl-syntaxify-for-menu
+                      (cperl-update-syntaxification (point-max) (point-max)))
+                 (next-single-property-change (point-min) 'in-pod nil (point-max)))
+               (point-max)))]
+          ["Ispell HERE-DOCs" cperl-here-doc-spell
+           (< (progn
+                (and cperl-syntaxify-for-menu
+                     (cperl-update-syntaxification (point-max) (point-max)))
+                (next-single-property-change (point-min) 'here-doc-group nil (point-max)))
+              (point-max))]
+          ["Narrow to this HERE-DOC" cperl-narrow-to-here-doc
+           (eq 'here-doc  (progn
+                (and cperl-syntaxify-for-menu
+                     (cperl-update-syntaxification (point) (point)))
+                (get-text-property (point) 'syntax-type)))]
+          ["Select this HERE-DOC or POD section"
+           cperl-select-this-pod-or-here-doc
+           (memq (progn
+                   (and cperl-syntaxify-for-menu
+                        (cperl-update-syntaxification (point) (point)))
+                   (get-text-property (point) 'syntax-type))
+                 '(here-doc pod))]
           "----"
-          ["Run" mode-compile (fboundp 'mode-compile)]
-          ["Kill" mode-compile-kill (and (fboundp 'mode-compile-kill)
-                                         (get-buffer "*compilation*"))]
-          ["Next error" next-error (get-buffer "*compilation*")]
-          ["Check syntax" cperl-check-syntax (fboundp 'mode-compile)]
+          ["CPerl pretty print (exprmntl)" cperl-ps-print
+           (fboundp 'ps-extend-face-list)]
           "----"
-          ["Debugger" cperl-db t]
+          ["Syntaxify region" cperl-find-pods-heres-region
+           (cperl-use-region-p)]
+          ["Profile syntaxification" cperl-time-fontification t]
+          ["Debug errors in delayed fontification" cperl-emulate-lazy-lock t]
+          ["Debug unwind for syntactic scan" cperl-toggle-set-debug-unwind t]
+          ["Debug backtrace on syntactic scan (BEWARE!!!)"
+           (cperl-toggle-set-debug-unwind nil t) t]
           "----"
-          ("Tools"
-           ["Imenu" imenu (fboundp 'imenu)]
-           ["Insert spaces if needed" cperl-find-bad-style t]
-           ["Class Hierarchy from TAGS" cperl-tags-hier-init t]
-           ;;["Update classes" (cperl-tags-hier-init t) tags-table-list]
-           ["CPerl pretty print (exprmntl)" cperl-ps-print
-            (fboundp 'ps-extend-face-list)]
-           ["Imenu on info" cperl-imenu-on-info (featurep 'imenu)]
-           ("Tags"
+          ["Class Hierarchy from TAGS" cperl-tags-hier-init t]
+          ;;["Update classes" (cperl-tags-hier-init t) tags-table-list]
+          ("Tags"
 ;;;          ["Create tags for current file" cperl-etags t]
 ;;;          ["Add tags for current file" (cperl-etags t) t]
 ;;;          ["Create tags for Perl files in directory" (cperl-etags nil t) t]
@@ -1186,10 +1350,10 @@ the faces: please specify bold, italic, underline, shadow and box.)
           ["PerlStyle" (cperl-set-style "PerlStyle") t]
           ["GNU" (cperl-set-style "GNU") t]
           ["C++" (cperl-set-style "C++") t]
-          ["FSF" (cperl-set-style "FSF") t]
+          ["K&R" (cperl-set-style "K&R") t]
           ["BSD" (cperl-set-style "BSD") t]
           ["Whitesmith" (cperl-set-style "Whitesmith") t]
-          ["Current" (cperl-set-style "Current") t]
+          ["Memorize Current" (cperl-set-style "Current") t]
           ["Memorized" (cperl-set-style-back) cperl-old-style])
          ("Micro-docs"
           ["Tips" (describe-variable 'cperl-tips) t]
@@ -1208,12 +1372,73 @@ the faces: please specify bold, italic, underline, shadow and box.)
 The expansion is entirely correct because it uses the C preprocessor."
   t)
 
+;;; These two must be unwound, otherwise take exponential time
+(defconst cperl-maybe-white-and-comment-rex "[ \t\n]*\\(#[^\n]*\n[ \t\n]*\\)*"
+"Regular expression to match optional whitespace with interpspersed comments.
+Should contain exactly one group.")
+
+;;; This one is tricky to unwind; still very inefficient...
+(defconst cperl-white-and-comment-rex "\\([ \t\n]\\|#[^\n]*\n\\)+"
+"Regular expression to match whitespace with interpspersed comments.
+Should contain exactly one group.")
+
+
+;;; Is incorporated in `cperl-imenu--function-name-regexp-perl'
+;;; `cperl-outline-regexp', `defun-prompt-regexp'.
+;;; Details of groups in this may be used in several functions; see comments
+;;; near mentioned above variable(s)...
+;;; sub($$):lvalue{}  sub:lvalue{} Both allowed...
+(defsubst cperl-after-sub-regexp (named attr) ; 9 groups without attr...
+  "Match the text after `sub' in a subroutine declaration.
+If NAMED is nil, allows anonymous subroutines.  Matches up to the first \":\"
+of attributes (if present), or end of the name or prototype (whatever is
+the last)."
+  (concat                               ; Assume n groups before this...
+   "\\("                                ; n+1=name-group
+     cperl-white-and-comment-rex        ; n+2=pre-name
+     "\\(::[a-zA-Z_0-9:']+\\|[a-zA-Z_'][a-zA-Z_0-9:']*\\)" ; n+3=name
+   "\\)"                                ; END n+1=name-group
+   (if named "" "?")
+   "\\("                                ; n+4=proto-group
+     cperl-maybe-white-and-comment-rex  ; n+5=pre-proto
+     "\\(([^()]*)\\)"                   ; n+6=prototype
+   "\\)?"                               ; END n+4=proto-group
+   "\\("                                ; n+7=attr-group
+     cperl-maybe-white-and-comment-rex  ; n+8=pre-attr
+     "\\("                              ; n+9=start-attr
+        ":"
+        (if attr (concat
+                  "\\("
+                     cperl-maybe-white-and-comment-rex ; whitespace-comments
+                     "\\(\\sw\\|_\\)+"  ; attr-name
+                     ;; attr-arg (1 level of internal parens allowed!)
+                     "\\((\\(\\\\.\\|[^\\\\()]\\|([^\\\\()]*)\\)*)\\)?"
+                     "\\("              ; optional : (XXX allows trailing???)
+                        cperl-maybe-white-and-comment-rex ; whitespace-comments
+                     ":\\)?"
+                  "\\)+")
+          "[^:]")
+     "\\)"
+   "\\)?"                               ; END n+6=proto-group
+   ))
+
+;;; Details of groups in this are used in `cperl-imenu--create-perl-index'
+;;;  and `cperl-outline-level'.
+;;;; Was: 2=sub|package; now 2=package-group, 5=package-name 8=sub-name (+3)
 (defvar cperl-imenu--function-name-regexp-perl
   (concat
-   "^\\("
-       "[ \t]*\\(sub\\|package\\)[ \t\n]+\\([a-zA-Z_0-9:']+\\)[ \t]*\\(([^()]*)[ \t]*\\)?"
-     "\\|"
-       "=head\\([12]\\)[ \t]+\\([^\n]+\\)$"
+   "^\\("                               ; 1 = all
+       "\\([ \t]*package"               ; 2 = package-group
+          "\\("                         ; 3 = package-name-group
+            cperl-white-and-comment-rex ; 4 = pre-package-name
+               "\\([a-zA-Z_0-9:']+\\)\\)?\\)" ; 5 = package-name
+       "\\|"
+          "[ \t]*sub"
+          (cperl-after-sub-regexp 'named nil) ; 8=name 11=proto 14=attr-start
+          cperl-maybe-white-and-comment-rex     ; 15=pre-block
+   "\\|"
+     "=head\\([1-4]\\)[ \t]+"           ; 16=level
+     "\\([^\n]+\\)$"                    ; 17=text
    "\\)"))
 
 (defvar cperl-outline-regexp
@@ -1225,6 +1450,12 @@ The expansion is entirely correct because it uses the C preprocessor."
 (defvar cperl-string-syntax-table nil
   "Syntax table in use in CPerl mode string-like chunks.")
 
+(defsubst cperl-1- (p)
+  (max (point-min) (1- p)))
+
+(defsubst cperl-1+ (p)
+  (min (point-max) (1+ p)))
+
 (if cperl-mode-syntax-table
     ()
   (setq cperl-mode-syntax-table (make-syntax-table))
@@ -1249,6 +1480,8 @@ The expansion is entirely correct because it uses the C preprocessor."
   (modify-syntax-entry ?| "." cperl-mode-syntax-table)
   (setq cperl-string-syntax-table (copy-syntax-table cperl-mode-syntax-table))
   (modify-syntax-entry ?$ "." cperl-string-syntax-table)
+  (modify-syntax-entry ?\{ "." cperl-string-syntax-table)
+  (modify-syntax-entry ?\} "." cperl-string-syntax-table)
   (modify-syntax-entry ?# "." cperl-string-syntax-table)) ; (?# comment )
 
 
@@ -1257,6 +1490,10 @@ The expansion is entirely correct because it uses the C preprocessor."
 ;; Fix for msb.el
 (defvar cperl-msb-fixed nil)
 (defvar cperl-use-major-mode 'cperl-mode)
+(defvar cperl-font-lock-multiline-start nil)
+(defvar cperl-font-lock-multiline nil)
+(defvar cperl-compilation-error-regexp-alist nil)
+(defvar cperl-font-locking nil)
 
 ;;;###autoload
 (defun cperl-mode ()
@@ -1402,16 +1639,24 @@ Variables controlling indentation style:
  `cperl-min-label-indent'
     Minimal indentation for line that is a label.
 
-Settings for K&R and BSD indentation styles are
-  `cperl-indent-level'                5    8
-  `cperl-continued-statement-offset'  5    8
-  `cperl-brace-offset'               -5   -8
-  `cperl-label-offset'               -5   -8
+Settings for classic indent-styles: K&R BSD=C++ GNU PerlStyle=Whitesmith
+  `cperl-indent-level'                5   4       2   4
+  `cperl-brace-offset'                0   0       0   0
+  `cperl-continued-brace-offset'     -5  -4       0   0
+  `cperl-label-offset'               -5  -4      -2  -4
+  `cperl-continued-statement-offset'  5   4       2   4
 
 CPerl knows several indentation styles, and may bulk set the
 corresponding variables.  Use \\[cperl-set-style] to do this.  Use
 \\[cperl-set-style-back] to restore the memorized preexisting values
-\(both available from menu).
+\(both available from menu).  See examples in `cperl-style-examples'.
+
+Part of the indentation style is how different parts of if/elsif/else
+statements are broken into lines; in CPerl, this is reflected on how
+templates for these constructs are created (controlled by
+`cperl-extra-newline-before-brace'), and how reflow-logic should treat \"continuation\" blocks of else/elsif/continue, controlled by the same variable,
+and by `cperl-extra-newline-before-brace-multiline',
+`cperl-merge-trailing-else', `cperl-indent-region-fix-constructs'.
 
 If `cperl-indent-level' is 0, the statement after opening brace in
 column 0 is indented on
@@ -1465,8 +1710,12 @@ or as help on variables `cperl-tips', `cperl-problems',
                 ("head2" "head2" cperl-electric-pod 0)))
         (setq abbrevs-changed prev-a-c)))
   (setq local-abbrev-table cperl-mode-abbrev-table)
-  (abbrev-mode (if (cperl-val 'cperl-electric-keywords) 1 0))
+  (if (cperl-val 'cperl-electric-keywords)
+      (abbrev-mode 1))
   (set-syntax-table cperl-mode-syntax-table)
+  ;; Until Emacs is multi-threaded, we do not actually need it local:
+  (make-local-variable 'cperl-font-lock-multiline-start)
+  (make-local-variable 'cperl-font-locking)
   (make-local-variable 'outline-regexp)
   ;; (setq outline-regexp imenu-example--function-name-regexp-perl)
   (setq outline-regexp cperl-outline-regexp)
@@ -1478,7 +1727,10 @@ or as help on variables `cperl-tips', `cperl-problems',
   (setq paragraph-separate paragraph-start)
   (make-local-variable 'paragraph-ignore-fill-prefix)
   (setq paragraph-ignore-fill-prefix t)
-  (set (make-local-variable 'fill-paragraph-function) 'cperl-fill-paragraph)
+  (if cperl-xemacs-p
+    (progn
+      (make-local-variable 'paren-backwards-message)
+      (set 'paren-backwards-message t)))
   (make-local-variable 'indent-line-function)
   (setq indent-line-function 'cperl-indent-line)
   (make-local-variable 'require-final-newline)
@@ -1492,9 +1744,22 @@ or as help on variables `cperl-tips', `cperl-problems',
   (make-local-variable 'comment-start-skip)
   (setq comment-start-skip "#+ *")
   (make-local-variable 'defun-prompt-regexp)
-  (setq defun-prompt-regexp "^[ \t]*sub[ \t\n]+\\([^ \t\n{(;]+\\)\\([ \t\n]*([^()]*)[ \t\n]*\\)?[ \t\n]*")
+;;;       "[ \t]*sub"
+;;;       (cperl-after-sub-regexp 'named nil) ; 8=name 11=proto 14=attr-start
+;;;       cperl-maybe-white-and-comment-rex     ; 15=pre-block
+  (setq defun-prompt-regexp
+        (concat "^[ \t]*\\(sub"
+                (cperl-after-sub-regexp 'named 'attr-groups)
+                "\\|"                   ; per toke.c
+                "\\(BEGIN\\|CHECK\\|INIT\\|END\\|AUTOLOAD\\|DESTROY\\)"
+                "\\)"
+                cperl-maybe-white-and-comment-rex))
   (make-local-variable 'comment-indent-function)
   (setq comment-indent-function 'cperl-comment-indent)
+  (and (boundp 'fill-paragraph-function)
+      (progn
+        (make-local-variable 'fill-paragraph-function)
+        (set 'fill-paragraph-function 'cperl-fill-paragraph)))
   (make-local-variable 'parse-sexp-ignore-comments)
   (setq parse-sexp-ignore-comments t)
   (make-local-variable 'indent-region-function)
@@ -1509,21 +1774,40 @@ or as help on variables `cperl-tips', `cperl-problems',
   (set 'vc-rcs-header cperl-vc-rcs-header)
   (make-local-variable 'vc-sccs-header)
   (set 'vc-sccs-header cperl-vc-sccs-header)
+  ;; This one is obsolete...
+  (make-local-variable 'vc-header-alist)
+  (set 'vc-header-alist (or cperl-vc-header-alist ; Avoid warning
+                            (` ((SCCS (, (car cperl-vc-sccs-header)))
+                                     (RCS (, (car cperl-vc-rcs-header)))))))
+  (cond ((boundp 'compilation-error-regexp-alist-alist);; xemacs 20.x
+         (make-local-variable 'compilation-error-regexp-alist-alist)
+         (set 'compilation-error-regexp-alist-alist
+              (cons (cons 'cperl cperl-compilation-error-regexp-alist)
+                    (symbol-value 'compilation-error-regexp-alist-alist)))
+         (if (fboundp 'compilation-build-compilation-error-regexp-alist)
+             (let ((f 'compilation-build-compilation-error-regexp-alist))
+               (funcall f))
+           (push 'cperl compilation-error-regexp-alist)))
+        ((boundp 'compilation-error-regexp-alist);; xmeacs 19.x
+         (make-local-variable 'compilation-error-regexp-alist)
+         (set 'compilation-error-regexp-alist
+               (cons cperl-compilation-error-regexp-alist
+                     (symbol-value 'compilation-error-regexp-alist)))))
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults
         (cond
          ((string< emacs-version "19.30")
-          '(cperl-font-lock-keywords-2))
+          '(cperl-font-lock-keywords-2 nil nil ((?_ . "w"))))
          ((string< emacs-version "19.33") ; Which one to use?
           '((cperl-font-lock-keywords
              cperl-font-lock-keywords-1
-             cperl-font-lock-keywords-2)))
+             cperl-font-lock-keywords-2) nil nil ((?_ . "w"))))
          (t
           '((cperl-load-font-lock-keywords
              cperl-load-font-lock-keywords-1
-             cperl-load-font-lock-keywords-2)
-            nil nil ((?_ . "w"))))))
+             cperl-load-font-lock-keywords-2) nil nil ((?_ . "w"))))))
   (make-local-variable 'cperl-syntax-state)
+  (setq cperl-syntax-state nil)         ; reset syntaxification cache
   (if cperl-use-syntax-table-text-property
       (progn
         (make-local-variable 'parse-sexp-lookup-properties)
@@ -1533,10 +1817,12 @@ or as help on variables `cperl-tips', `cperl-problems',
         (or (boundp 'font-lock-unfontify-region-function)
             (set 'font-lock-unfontify-region-function
                  'font-lock-default-unfontify-region))
-        (make-local-variable 'font-lock-unfontify-region-function)
-        (set 'font-lock-unfontify-region-function ; not present with old Emacs
-              'cperl-font-lock-unfontify-region-function)
+        (unless cperl-xemacs-p          ; Our: just a plug for wrong font-lock
+          (make-local-variable 'font-lock-unfontify-region-function)
+          (set 'font-lock-unfontify-region-function ; not present with old Emacs
+               'cperl-font-lock-unfontify-region-function))
         (make-local-variable 'cperl-syntax-done-to)
+        (setq cperl-syntax-done-to nil) ; reset syntaxification cache
         (make-local-variable 'font-lock-syntactic-keywords)
         (setq font-lock-syntactic-keywords
               (if cperl-syntaxify-by-font-lock
@@ -1546,10 +1832,20 @@ or as help on variables `cperl-tips', `cperl-problems',
                 ;;  to make font-lock think that font-lock-syntactic-keywords
                 ;;  are defined.
                 '(t)))))
+  (if (boundp 'font-lock-multiline)     ; Newer font-lock; use its facilities
+      (progn
+        (setq cperl-font-lock-multiline t) ; Not localized...
+        (set 'font-lock-multiline t)) ; not present with old Emacs; auto-local
+    (make-local-variable 'font-lock-fontify-region-function)
+    (set 'font-lock-fontify-region-function ; not present with old Emacs
+         'cperl-font-lock-fontify-region-function))
+  (make-local-variable 'font-lock-fontify-region-function)
+  (set 'font-lock-fontify-region-function ; not present with old Emacs
+       'cperl-font-lock-fontify-region-function)
   (make-local-variable 'cperl-old-style)
   (if (boundp 'normal-auto-fill-function) ; 19.33 and later
       (set (make-local-variable 'normal-auto-fill-function)
-           'cperl-do-auto-fill)       ; RMS has it as #'cperl-do-auto-fill ???
+           'cperl-do-auto-fill)
     (or (fboundp 'cperl-old-auto-fill-mode)
         (progn
           (fset 'cperl-old-auto-fill-mode (symbol-function 'auto-fill-mode))
@@ -1562,12 +1858,18 @@ or as help on variables `cperl-tips', `cperl-problems',
       (if (cperl-val 'cperl-font-lock)
           (progn (or cperl-faces-init (cperl-init-faces))
                  (font-lock-mode 1))))
+  (set (make-local-variable 'facemenu-add-face-function)
+       'cperl-facemenu-add-face-function) ; XXXX What this guy is for???
   (and (boundp 'msb-menu-cond)
        (not cperl-msb-fixed)
        (cperl-msb-fix))
   (if (featurep 'easymenu)
       (easy-menu-add cperl-menu))       ; A NOP in Emacs.
   (run-mode-hooks 'cperl-mode-hook)
+  (if cperl-hook-after-change
+      (progn
+        (make-local-hook 'after-change-functions)
+        (add-hook 'after-change-functions 'cperl-after-change-function nil t)))
   ;; After hooks since fontification will break this
   (if cperl-pod-here-scan
       (or cperl-syntaxify-by-font-lock
@@ -1616,31 +1918,37 @@ or as help on variables `cperl-tips', `cperl-problems',
 (defvar cperl-st-ket '(5 . ?\<))
 
 
-(defun cperl-comment-indent ()
+(defun cperl-comment-indent ()          ; called at point at supposed comment
   (let ((p (point)) (c (current-column)) was phony)
-    (if (looking-at "^#") 0             ; Existing comment at bol stays there.
+    (if (and (not cperl-indent-comment-at-column-0)
+             (looking-at "^#"))
+        0       ; Existing comment at bol stays there.
       ;; Wrong comment found
       (save-excursion
         (setq was (cperl-to-comment-or-eol)
               phony (eq (get-text-property (point) 'syntax-table)
                         cperl-st-cfence))
         (if phony
-            (progn
+            (progn                      ; Too naive???
               (re-search-forward "#\\|$") ; Hmm, what about embedded #?
               (if (eq (preceding-char) ?\#)
                   (forward-char -1))
               (setq was nil)))
-        (if (= (point) p)
+        (if (= (point) p)               ; Our caller found a correct place
             (progn
               (skip-chars-backward " \t")
-              (max (1+ (current-column)) ; Else indent at comment column
-                   comment-column))
+              (setq was (current-column))
+              (if (eq was 0)
+                  comment-column
+                (max (1+ was) ; Else indent at comment column
+                     comment-column)))
+          ;; No, the caller found a random place; we need to edit ourselves
           (if was nil
             (insert comment-start)
             (backward-char (length comment-start)))
           (setq cperl-wrong-comment t)
-          (indent-to comment-column 1)  ; Indent minimum 1
-          c)))))                        ; except leave at least one space.
+          (cperl-make-indent comment-column 1) ; Indent min 1
+          c)))))
 
 ;;;(defun cperl-comment-indent-fallback ()
 ;;;  "Is called if the standard comment-search procedure fails.
@@ -1666,7 +1974,7 @@ or as help on variables `cperl-tips', `cperl-problems',
   (interactive)
   (let (cperl-wrong-comment)
     (indent-for-comment)
-    (if cperl-wrong-comment
+    (if cperl-wrong-comment             ; set by `cperl-comment-indent'
         (progn (cperl-to-comment-or-eol)
                (forward-char (length comment-start))))))
 
@@ -1966,15 +2274,10 @@ to nil."
             (or
              (get-text-property (point) 'in-pod)
              (cperl-after-expr-p nil "{;:")
-             (and (re-search-backward
-                   ;; "\\(\\`\n?\\|\n\n\\)=\\sw+"
-                   "\\(\\`\n?\\|^\n\\)=\\sw+"
-                   (point-min) t)
-                  (not (or
-                        (looking-at "=cut")
-                        (and cperl-use-syntax-table-text-property
-                             (not (eq (get-text-property (point) 'syntax-type)
-                                      'pod)))))))))
+             (and (re-search-backward "\\(\\`\n?\\|^\n\\)=\\sw+" (point-min) t)
+                  (not (looking-at "\n*=cut"))
+                  (or (not cperl-use-syntax-table-text-property)
+                      (eq (get-text-property (point) 'syntax-type) 'pod))))))
          (progn
            (save-excursion
              (setq notlast (re-search-forward "^\n=" nil t)))
@@ -2252,7 +2555,7 @@ key.  Will untabify if `cperl-electric-backspace-untabify' is non-nil."
 
 (put 'cperl-electric-backspace 'delete-selection 'supersede)
 
-(defun cperl-inside-parens-p ()
+(defun cperl-inside-parens-p ()         ;; NOT USED????
   (condition-case ()
       (save-excursion
         (save-restriction
@@ -2332,8 +2635,9 @@ Return the amount the indentation changed by."
             (zerop shift-amt))
         (if (> (- (point-max) pos) (point))
             (goto-char (- (point-max) pos)))
-      (delete-region beg (point))
-      (indent-to indent)
+      ;;;(delete-region beg (point))
+      ;;;(indent-to indent)
+      (cperl-make-indent indent)
       ;; If initial point was within line's indentation,
       ;; position after the indentation.  Else stay at same point in text.
       (if (> (- (point-max) pos) (point))
@@ -2380,63 +2684,55 @@ Return the amount the indentation changed by."
       (or state (setq state (parse-partial-sexp start start-point -1 nil start-state)))
       (list start state depth prestart))))
 
-(defun cperl-block-p ()            ; Do not C-M-q !  One string contains ";" !
-  ;; Positions is before ?\{.  Checks whether it starts a block.
-  ;; No save-excursion!
-  (cperl-backward-to-noncomment (point-min))
-  (or (memq (preceding-char) (append ";){}$@&%\C-@" nil)) ; Or label!  \C-@ at bobp
-                                        ; Label may be mixed up with `$blah :'
-      (save-excursion (cperl-after-label))
-      (and (memq (char-syntax (preceding-char)) '(?w ?_))
-           (progn
-             (backward-sexp)
-             ;; Need take into account `bless', `return', `tr',...
-             (or (and (looking-at "[a-zA-Z0-9_:]+[ \t\n\f]*[{#]") ; Method call syntax
-                      (not (looking-at "\\(bless\\|return\\|q[wqrx]?\\|tr\\|[smy]\\)\\>")))
-                 (progn
-                   (skip-chars-backward " \t\n\f")
-                   (and (memq (char-syntax (preceding-char)) '(?w ?_))
-                        (progn
-                          (backward-sexp)
-                          (looking-at
-                           "sub[ \t]+[a-zA-Z0-9_:]+[ \t\n\f]*\\(([^()]*)[ \t\n\f]*\\)?[#{]")))))))))
-
 (defvar cperl-look-for-prop '((pod in-pod) (here-doc-delim here-doc-group)))
 
-(defun cperl-calculate-indent (&optional parse-data) ; was parse-start
-  "Return appropriate indentation for current line as Perl code.
-In usual case returns an integer: the column to indent to.
-Returns nil if line starts inside a string, t if in a comment.
-
-Will not correct the indentation for labels, but will correct it for braces
-and closing parentheses and brackets."
+(defun cperl-beginning-of-property (p prop &optional lim)
+  "Given that P has a property PROP, find where the property starts.
+Will not look before LIM."
+  ;;; XXXX What to do at point-max???
+  (or (previous-single-property-change (cperl-1+ p) prop lim)
+      (point-min))
+;;;  (cond ((eq p (point-min))
+;;;      p)
+;;;     ((and lim (<= p lim))
+;;;      p)
+;;;     ((not (get-text-property (1- p) prop))
+;;;      p)
+;;;     (t (or (previous-single-property-change p look-prop lim)
+;;;            (point-min))))
+  )
+
+(defun cperl-sniff-for-indent (&optional parse-data) ; was parse-start
+  ;; Old workhorse for calculation of indentation; the major problem
+  ;; is that it mixes the sniffer logic to understand what the current line
+  ;; MEANS with the logic to actually calculate where to indent it.
+  ;; The latter part should be eventually moved to `cperl-calculate-indent';
+  ;; actually, this is mostly done now...
   (cperl-update-syntaxification (point) (point))
-  (save-excursion
-    (if (or
-         (and (memq (get-text-property (point) 'syntax-type)
-                    '(pod here-doc here-doc-delim format))
-              (not (get-text-property (point) 'indentable)))
-         ;; before start of POD - whitespace found since do not have 'pod!
-         (and (looking-at "[ \t]*\n=")
-              (error "Spaces before POD section!"))
-         (and (not cperl-indent-left-aligned-comments)
-              (looking-at "^#")))
-        nil
-      (beginning-of-line)
-      (let ((indent-point (point))
-            (char-after (save-excursion
-                          (skip-chars-forward " \t")
-                          (following-char)))
-            (in-pod (get-text-property (point) 'in-pod))
-            (pre-indent-point (point))
-            p prop look-prop is-block delim)
-        (cond
-         (in-pod
-          ;; In the verbatim part, probably code example.  What to do???
-          )
-         (t
-          (save-excursion
-            ;; Not in POD
+  (let ((res (get-text-property (point) 'syntax-type)))
+    (save-excursion
+      (cond
+       ((and (memq res '(pod here-doc here-doc-delim format))
+             (not (get-text-property (point) 'indentable)))
+        (vector res))
+       ;; before start of POD - whitespace found since do not have 'pod!
+       ((looking-at "[ \t]*\n=")
+        (error "Spaces before POD section!"))
+       ((and (not cperl-indent-left-aligned-comments)
+             (looking-at "^#"))
+        [comment-special:at-beginning-of-line])
+       ((get-text-property (point) 'in-pod)
+        [in-pod])
+       (t
+        (beginning-of-line)
+        (let* ((indent-point (point))
+               (char-after-pos (save-excursion
+                                 (skip-chars-forward " \t")
+                                 (point)))
+               (char-after (char-after char-after-pos))
+               (pre-indent-point (point))
+               p prop look-prop is-block delim)
+          (save-excursion               ; Know we are not in POD, find appropriate pos before
             (cperl-backward-to-noncomment nil)
             (setq p (max (point-min) (1- (point)))
                   prop (get-text-property p 'syntax-type)
@@ -2444,437 +2740,597 @@ and closing parentheses and brackets."
                                 'syntax-type))
             (if (memq prop '(pod here-doc format here-doc-delim))
                 (progn
-                  (goto-char (or (previous-single-property-change p look-prop)
-                                 (point-min)))
+                  (goto-char (cperl-beginning-of-property p look-prop))
                   (beginning-of-line)
-                  (setq pre-indent-point (point)))))))
-        (goto-char pre-indent-point)
-        (let* ((case-fold-search nil)
-               (s-s (cperl-get-state (car parse-data) (nth 1 parse-data)))
-               (start (or (nth 2 parse-data)
-                          (nth 0 s-s)))
-               (state (nth 1 s-s))
-               (containing-sexp (car (cdr state)))
-               old-indent)
-          (if (and
-               ;;containing-sexp                ;; We are buggy at toplevel :-(
-               parse-data)
-              (progn
-                (setcar parse-data pre-indent-point)
-                (setcar (cdr parse-data) state)
-                (or (nth 2 parse-data)
-                    (setcar (cddr parse-data) start))
-                ;; Before this point: end of statement
-                (setq old-indent (nth 3 parse-data))))
-          (cond ((get-text-property (point) 'indentable)
-                 ;; indent to just after the surrounding open,
-                 ;; skip blanks if we do not close the expression.
-                 (goto-char (1+ (previous-single-property-change (point) 'indentable)))
-                 (or (memq char-after (append ")]}" nil))
-                     (looking-at "[ \t]*\\(#\\|$\\)")
-                     (skip-chars-forward " \t"))
-                 (current-column))
-                ((or (nth 3 state) (nth 4 state))
-                 ;; return nil or t if should not change this line
-                 (nth 4 state))
-                ;; XXXX Do we need to special-case this?
-                ((null containing-sexp)
-                 ;; Line is at top level.  May be data or function definition,
-                 ;; or may be function argument declaration.
-                 ;; Indent like the previous top level line
-                 ;; unless that ends in a closeparen without semicolon,
-                 ;; in which case this line is the first argument decl.
-                 (skip-chars-forward " \t")
-                 (+ (save-excursion
-                      (goto-char start)
-                      (- (current-indentation)
-                         (if (nth 2 s-s) cperl-indent-level 0)))
-                    (if (= char-after ?{) cperl-continued-brace-offset 0)
-                    (progn
-                      (cperl-backward-to-noncomment (or old-indent (point-min)))
-                      ;; Look at previous line that's at column 0
-                      ;; to determine whether we are in top-level decls
-                      ;; or function's arg decls.  Set basic-indent accordingly.
-                      ;; Now add a little if this is a continuation line.
-                      (if (or (bobp)
-                              (eq (point) old-indent) ; old-indent was at comment
-                              (eq (preceding-char) ?\;)
-                              ;;  Had ?\) too
-                              (and (eq (preceding-char) ?\})
-                                   (cperl-after-block-and-statement-beg
-                                    (point-min))) ; Was start - too close
-                              (memq char-after (append ")]}" nil))
-                              (and (eq (preceding-char) ?\:) ; label
-                                   (progn
-                                     (forward-sexp -1)
-                                     (skip-chars-backward " \t")
-                                     (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*[ \t]*:")))
-                              (get-text-property (point) 'first-format-line))
-                          (progn
-                            (if (and parse-data
-                                     (not (eq char-after ?\C-j)))
-                                (setcdr (cddr parse-data)
-                                        (list pre-indent-point)))
-                            0)
-                        cperl-continued-statement-offset))))
-                ((not
-                  (or (setq is-block
-                            (and (setq delim (= (char-after containing-sexp) ?{))
-                                 (save-excursion ; Is it a hash?
-                                   (goto-char containing-sexp)
-                                   (cperl-block-p))))
-                      cperl-indent-parens-as-block))
-                 ;; group is an expression, not a block:
-                 ;; indent to just after the surrounding open parens,
-                 ;; skip blanks if we do not close the expression.
-                 (goto-char (1+ containing-sexp))
-                 (or (memq char-after
-                           (append (if delim "}" ")]}") nil))
-                     (looking-at "[ \t]*\\(#\\|$\\)")
-                     (skip-chars-forward " \t"))
-                 (+ (current-column)
-                    (if (and delim
-                             (eq char-after ?\}))
-                        ;; Correct indentation of trailing ?\}
-                        (+ cperl-indent-level cperl-close-paren-offset)
-                      0)))
-;;;           ((and (/= (char-after containing-sexp) ?{)
-;;;                 (not cperl-indent-parens-as-block))
-;;;            ;; line is expression, not statement:
-;;;            ;; indent to just after the surrounding open,
-;;;            ;; skip blanks if we do not close the expression.
-;;;            (goto-char (1+ containing-sexp))
-;;;            (or (memq char-after (append ")]}" nil))
-;;;                (looking-at "[ \t]*\\(#\\|$\\)")
-;;;                (skip-chars-forward " \t"))
-;;;            (current-column))
-;;;           ((progn
-;;;              ;; Containing-expr starts with \{.  Check whether it is a hash.
-;;;              (goto-char containing-sexp)
-;;;              (and (not (cperl-block-p))
-;;;                   (not cperl-indent-parens-as-block)))
-;;;            (goto-char (1+ containing-sexp))
-;;;            (or (eq char-after ?\})
-;;;                (looking-at "[ \t]*\\(#\\|$\\)")
-;;;                (skip-chars-forward " \t"))
-;;;            (+ (current-column)      ; Correct indentation of trailing ?\}
-;;;               (if (eq char-after ?\}) (+ cperl-indent-level
-;;;                                          cperl-close-paren-offset)
-;;;                 0)))
-                (t
-                 ;; Statement level.  Is it a continuation or a new statement?
-                 ;; Find previous non-comment character.
-                 (goto-char pre-indent-point)
-                 (cperl-backward-to-noncomment containing-sexp)
-                 ;; Back up over label lines, since they don't
-                 ;; affect whether our line is a continuation.
-                 ;; (Had \, too)
-                 (while ;;(or (eq (preceding-char) ?\,)
-                     (and (eq (preceding-char) ?:)
-                          (or ;;(eq (char-after (- (point) 2)) ?\') ; ????
-                           (memq (char-syntax (char-after (- (point) 2)))
-                                 '(?w ?_))))
-                   ;;)
-                   (if (eq (preceding-char) ?\,)
-                       ;; Will go to beginning of line, essentially.
-                       ;; Will ignore embedded sexpr XXXX.
-                       (cperl-backward-to-start-of-continued-exp containing-sexp))
-                   (beginning-of-line)
-                   (cperl-backward-to-noncomment containing-sexp))
-                 ;; Now we get the answer.
-                 (if (not (or (eq (1- (point)) containing-sexp)
-                              (memq (preceding-char)
-                                    (append (if is-block " ;{" " ,;{") '(nil)))
-                              (and (eq (preceding-char) ?\})
-                                   (cperl-after-block-and-statement-beg
-                                    containing-sexp))
-                              (get-text-property (point) 'first-format-line)))
-                     ;; This line is continuation of preceding line's statement;
-                     ;; indent  `cperl-continued-statement-offset'  more than the
-                     ;; previous line of the statement.
-                     ;;
-                     ;; There might be a label on this line, just
-                     ;; consider it bad style and ignore it.
-                     (progn
-                       (cperl-backward-to-start-of-continued-exp containing-sexp)
-                       (+ (if (memq char-after (append "}])" nil))
-                              0         ; Closing parenth
-                            cperl-continued-statement-offset)
-                          (if (or is-block
-                                  (not delim)
-                                  (not (eq char-after ?\})))
-                              0
-                            ;; Now it is a hash reference
-                            (+ cperl-indent-level cperl-close-paren-offset))
-                          (if (looking-at "\\w+[ \t]*:")
-                              (if (> (current-indentation) cperl-min-label-indent)
-                                  (- (current-indentation) cperl-label-offset)
-                                ;; Do not move `parse-data', this should
-                                ;; be quick anyway (this comment comes
-                                ;; from different location):
-                                (cperl-calculate-indent))
-                            (current-column))
-                          (if (eq char-after ?\{)
-                              cperl-continued-brace-offset 0)))
-                   ;; This line starts a new statement.
-                   ;; Position following last unclosed open.
-                   (goto-char containing-sexp)
-                   ;; Is line first statement after an open-brace?
-                   (or
-                    ;; If no, find that first statement and indent like
-                    ;; it.  If the first statement begins with label, do
-                    ;; not believe when the indentation of the label is too
-                    ;; small.
-                    (save-excursion
-                      (forward-char 1)
-                      (setq old-indent (current-indentation))
-                      (let ((colon-line-end 0))
-                        (while
-                            (progn (skip-chars-forward " \t\n")
-                                   (looking-at "#\\|[a-zA-Z0-9_$]*:[^:]\\|=[a-zA-Z]"))
-                          ;; Skip over comments and labels following openbrace.
-                          (cond ((= (following-char) ?\#)
-                                 (forward-line 1))
-                                ((= (following-char) ?\=)
-                                 (goto-char
-                                  (or (next-single-property-change (point) 'in-pod)
-                                      (point-max)))) ; do not loop if no syntaxification
-                                ;; label:
-                                (t
-                                 (save-excursion (end-of-line)
-                                                 (setq colon-line-end (point)))
-                                 (search-forward ":"))))
-                        ;; The first following code counts
-                        ;; if it is before the line we want to indent.
-                        (and (< (point) indent-point)
-                             (if (> colon-line-end (point)) ; After label
-                                 (if (> (current-indentation)
-                                        cperl-min-label-indent)
-                                     (- (current-indentation) cperl-label-offset)
-                                   ;; Do not believe: `max' is involved
-                                   (+ old-indent cperl-indent-level))
-                               (current-column)))))
-                    ;; If no previous statement,
-                    ;; indent it relative to line brace is on.
-                    ;; For open brace in column zero, don't let statement
-                    ;; start there too.  If cperl-indent-level is zero,
-                    ;; use cperl-brace-offset + cperl-continued-statement-offset instead.
-                    ;; For open-braces not the first thing in a line,
-                    ;; add in cperl-brace-imaginary-offset.
-
-                    ;; If first thing on a line:  ?????
-                    (+ (if (and (bolp) (zerop cperl-indent-level))
-                           (+ cperl-brace-offset cperl-continued-statement-offset)
-                         cperl-indent-level)
-                       (if (or is-block
-                               (not delim)
-                               (not (eq char-after ?\})))
-                           0
-                         ;; Now it is a hash reference
-                         (+ cperl-indent-level cperl-close-paren-offset))
-                       ;; Move back over whitespace before the openbrace.
-                       ;; If openbrace is not first nonwhite thing on the line,
-                       ;; add the cperl-brace-imaginary-offset.
-                       (progn (skip-chars-backward " \t")
-                              (if (bolp) 0 cperl-brace-imaginary-offset))
-                       ;; If the openbrace is preceded by a parenthesized exp,
-                       ;; move to the beginning of that;
-                       ;; possibly a different line
-                       (progn
-                         (if (eq (preceding-char) ?\))
-                             (forward-sexp -1))
-                         ;; In the case it starts a subroutine, indent with
-                         ;; respect to `sub', not with respect to the
-                         ;; first thing on the line, say in the case of
-                         ;; anonymous sub in a hash.
-                         ;;
-                         (skip-chars-backward " \t")
-                         (if (and (eq (preceding-char) ?b)
+                  (setq pre-indent-point (point)))))
+          (goto-char pre-indent-point)  ; Orig line skipping preceeding pod/etc
+          (let* ((case-fold-search nil)
+                 (s-s (cperl-get-state (car parse-data) (nth 1 parse-data)))
+                 (start (or (nth 2 parse-data) ; last complete sexp terminated
+                            (nth 0 s-s))) ; Good place to start parsing
+                 (state (nth 1 s-s))
+                 (containing-sexp (car (cdr state)))
+                 old-indent)
+            (if (and
+                 ;;containing-sexp              ;; We are buggy at toplevel :-(
+                 parse-data)
+                (progn
+                  (setcar parse-data pre-indent-point)
+                  (setcar (cdr parse-data) state)
+                  (or (nth 2 parse-data)
+                      (setcar (cddr parse-data) start))
+                  ;; Before this point: end of statement
+                  (setq old-indent (nth 3 parse-data))))
+            (cond ((get-text-property (point) 'indentable)
+                   ;; indent to "after" the surrounding open
+                   ;; (same offset as `cperl-beautify-regexp-piece'),
+                   ;; skip blanks if we do not close the expression.
+                   (setq delim          ; We do not close the expression
+                         (get-text-property
+                          (cperl-1+ char-after-pos) 'indentable)
+                         p (1+ (cperl-beginning-of-property
+                                (point) 'indentable))
+                         is-block       ; misused for: preceeding line in REx
+                         (save-excursion ; Find preceeding line
+                           (cperl-backward-to-noncomment p)
+                           (beginning-of-line)
+                           (if (<= (point) p)
+                               (progn   ; get indent from the first line
+                                 (goto-char p)
+                                 (skip-chars-forward " \t")
+                                 (if (memq (char-after (point))
+                                           (append "#\n" nil))
+                                     nil ; Can't use intentation of this line...
+                                   (point)))
+                             (skip-chars-forward " \t")
+                             (point)))
+                         prop (parse-partial-sexp p char-after-pos))
+                   (cond ((not delim)   ; End the REx, ignore is-block
+                          (vector 'indentable 'terminator p is-block))
+                         (is-block      ; Indent w.r.t. preceeding line
+                          (vector 'indentable 'cont-line char-after-pos
+                                  is-block char-after p))
+                         (t             ; No preceeding line...
+                          (vector 'indentable 'first-line p))))
+                  ((get-text-property char-after-pos 'REx-part2)
+                   (vector 'REx-part2 (point)))
+                  ((nth 3 state)
+                   [comment])
+                  ((nth 4 state)
+                   [string])
+                  ;; XXXX Do we need to special-case this?
+                  ((null containing-sexp)
+                   ;; Line is at top level.  May be data or function definition,
+                   ;; or may be function argument declaration.
+                   ;; Indent like the previous top level line
+                   ;; unless that ends in a closeparen without semicolon,
+                   ;; in which case this line is the first argument decl.
+                   (skip-chars-forward " \t")
+                   (cperl-backward-to-noncomment (or old-indent (point-min)))
+                   (setq state
+                         (or (bobp)
+                             (eq (point) old-indent) ; old-indent was at comment
+                             (eq (preceding-char) ?\;)
+                             ;;  Had ?\) too
+                             (and (eq (preceding-char) ?\})
+                                  (cperl-after-block-and-statement-beg
+                                   (point-min))) ; Was start - too close
+                             (memq char-after (append ")]}" nil))
+                             (and (eq (preceding-char) ?\:) ; label
                                   (progn
                                     (forward-sexp -1)
-                                    (looking-at "sub\\>"))
-                                  (setq old-indent
-                                        (nth 1
-                                             (parse-partial-sexp
-                                              (save-excursion (beginning-of-line) (point))
-                                              (point)))))
-                             (progn (goto-char (1+ old-indent))
-                                    (skip-chars-forward " \t")
-                                    (current-column))
-                           ;; Get initial indentation of the line we are on.
-                           ;; If line starts with label, calculate label indentation
-                           (if (save-excursion
-                                 (beginning-of-line)
-                                 (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*:[^:]"))
-                               (if (> (current-indentation) cperl-min-label-indent)
-                                   (- (current-indentation) cperl-label-offset)
-                                 ;; Do not move `parse-data', this should
-                                 ;; be quick anyway:
-                                 (cperl-calculate-indent))
-                             (current-indentation))))))))))))))
-
-;; (defvar cperl-indent-alist
-;;   '((string nil)
-;;     (comment nil)
-;;     (toplevel 0)
-;;     (toplevel-after-parenth 2)
-;;     (toplevel-continued 2)
-;;     (expression 1))
-;;   "Alist of indentation rules for CPerl mode.
-;; The values mean:
-;;   nil: do not indent;
-;;   number: add this amount of indentation.
-
-;; Not finished, not used.")
-
-;; (defun cperl-where-am-i (&optional parse-start start-state)
-;;   ;; Unfinished
-;;   "Return a list of lists ((TYPE POS)...) of good points before the point.
-;; ;; POS may be nil if it is hard to find, say, when TYPE is `string' or `comment'.
-
-;; ;; Not finished, not used."
-;;   (save-excursion
-;;     (let* ((start-point (point))
-;;         (s-s (cperl-get-state))
-;;         (start (nth 0 s-s))
-;;         (state (nth 1 s-s))
-;;         (prestart (nth 3 s-s))
-;;         (containing-sexp (car (cdr state)))
-;;         (case-fold-search nil)
-;;         (res (list (list 'parse-start start) (list 'parse-prestart prestart))))
-;;       (cond ((nth 3 state)           ; In string
-;;           (setq res (cons (list 'string nil (nth 3 state)) res))) ; What started string
-;;          ((nth 4 state)              ; In comment
-;;           (setq res (cons '(comment) res)))
-;;          ((null containing-sexp)
-;;           ;; Line is at top level.
-;;           ;; Indent like the previous top level line
-;;           ;; unless that ends in a closeparen without semicolon,
-;;           ;; in which case this line is the first argument decl.
-;;           (cperl-backward-to-noncomment (or parse-start (point-min)))
-;;           ;;(skip-chars-backward " \t\f\n")
-;;           (cond
-;;            ((or (bobp)
-;;                 (memq (preceding-char) (append ";}" nil)))
-;;             (setq res (cons (list 'toplevel start) res)))
-;;            ((eq (preceding-char) ?\) )
-;;             (setq res (cons (list 'toplevel-after-parenth start) res)))
-;;            (t
-;;             (setq res (cons (list 'toplevel-continued start) res)))))
-;;          ((/= (char-after containing-sexp) ?{)
-;;           ;; line is expression, not statement:
-;;           ;; indent to just after the surrounding open.
-;;           ;; skip blanks if we do not close the expression.
-;;           (setq res (cons (list 'expression-blanks
-;;                                 (progn
-;;                                   (goto-char (1+ containing-sexp))
-;;                                   (or (looking-at "[ \t]*\\(#\\|$\\)")
-;;                                       (skip-chars-forward " \t"))
-;;                                   (point)))
-;;                           (cons (list 'expression containing-sexp) res))))
-;;          ((progn
-;;             ;; Containing-expr starts with \{.  Check whether it is a hash.
-;;             (goto-char containing-sexp)
-;;             (not (cperl-block-p)))
-;;           (setq res (cons (list 'expression-blanks
-;;                                 (progn
-;;                                   (goto-char (1+ containing-sexp))
-;;                                   (or (looking-at "[ \t]*\\(#\\|$\\)")
-;;                                       (skip-chars-forward " \t"))
-;;                                   (point)))
-;;                           (cons (list 'expression containing-sexp) res))))
-;;          (t
-;;           ;; Statement level.
-;;           (setq res (cons (list 'in-block containing-sexp) res))
-;;           ;; Is it a continuation or a new statement?
-;;           ;; Find previous non-comment character.
-;;           (cperl-backward-to-noncomment containing-sexp)
-;;           ;; Back up over label lines, since they don't
-;;           ;; affect whether our line is a continuation.
-;;           ;; Back up comma-delimited lines too ?????
-;;           (while (or (eq (preceding-char) ?\,)
-;;                      (save-excursion (cperl-after-label)))
-;;             (if (eq (preceding-char) ?\,)
-;;                 ;; Will go to beginning of line, essentially
-;;                 ;; Will ignore embedded sexpr XXXX.
-;;                 (cperl-backward-to-start-of-continued-exp containing-sexp))
-;;             (beginning-of-line)
-;;             (cperl-backward-to-noncomment containing-sexp))
-;;           ;; Now we get the answer.
-;;           (if (not (memq (preceding-char) (append ";}{" '(nil)))) ; Was ?\,
-;;               ;; This line is continuation of preceding line's statement.
-;;               (list (list 'statement-continued containing-sexp))
-;;             ;; This line starts a new statement.
-;;             ;; Position following last unclosed open.
-;;             (goto-char containing-sexp)
-;;             ;; Is line first statement after an open-brace?
-;;             (or
-;;              ;; If no, find that first statement and indent like
-;;              ;; it.  If the first statement begins with label, do
-;;              ;; not believe when the indentation of the label is too
-;;              ;; small.
-;;              (save-excursion
-;;                (forward-char 1)
-;;                (let ((colon-line-end 0))
-;;                  (while (progn (skip-chars-forward " \t\n" start-point)
-;;                                (and (< (point) start-point)
-;;                                     (looking-at
-;;                                      "#\\|[a-zA-Z_][a-zA-Z0-9_]*:[^:]")))
-;;                    ;; Skip over comments and labels following openbrace.
-;;                    (cond ((= (following-char) ?\#)
-;;                           ;;(forward-line 1)
-;;                           (end-of-line))
-;;                          ;; label:
-;;                          (t
-;;                           (save-excursion (end-of-line)
-;;                                           (setq colon-line-end (point)))
-;;                           (search-forward ":"))))
-;;                  ;; Now at the point, after label, or at start
-;;                  ;; of first statement in the block.
-;;                  (and (< (point) start-point)
-;;                       (if (> colon-line-end (point))
-;;                           ;; Before statement after label
-;;                           (if (> (current-indentation)
-;;                                  cperl-min-label-indent)
-;;                               (list (list 'label-in-block (point)))
-;;                             ;; Do not believe: `max' is involved
-;;                             (list
-;;                              (list 'label-in-block-min-indent (point))))
-;;                         ;; Before statement
-;;                         (list 'statement-in-block (point))))))
-;;              ;; If no previous statement,
-;;              ;; indent it relative to line brace is on.
-;;              ;; For open brace in column zero, don't let statement
-;;              ;; start there too.  If cperl-indent-level is zero,
-;;              ;; use cperl-brace-offset + cperl-continued-statement-offset instead.
-;;              ;; For open-braces not the first thing in a line,
-;;              ;; add in cperl-brace-imaginary-offset.
-
-;;              ;; If first thing on a line:  ?????
-;;              (+ (if (and (bolp) (zerop cperl-indent-level))
-;;                     (+ cperl-brace-offset cperl-continued-statement-offset)
-;;                   cperl-indent-level)
-;;                 ;; Move back over whitespace before the openbrace.
-;;                 ;; If openbrace is not first nonwhite thing on the line,
-;;                 ;; add the cperl-brace-imaginary-offset.
-;;                 (progn (skip-chars-backward " \t")
-;;                        (if (bolp) 0 cperl-brace-imaginary-offset))
-;;                 ;; If the openbrace is preceded by a parenthesized exp,
-;;                 ;; move to the beginning of that;
-;;                 ;; possibly a different line
-;;                 (progn
-;;                   (if (eq (preceding-char) ?\))
-;;                       (forward-sexp -1))
-;;                   ;; Get initial indentation of the line we are on.
-;;                   ;; If line starts with label, calculate label indentation
-;;                   (if (save-excursion
-;;                         (beginning-of-line)
-;;                         (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*:[^:]"))
-;;                       (if (> (current-indentation) cperl-min-label-indent)
-;;                           (- (current-indentation) cperl-label-offset)
-;;                         (cperl-calculate-indent))
-;;                     (current-indentation))))))))
-;;       res)))
+                                    (skip-chars-backward " \t")
+                                    (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*[ \t]*:")))
+                             (get-text-property (point) 'first-format-line)))
+                   
+                   ;; Look at previous line that's at column 0
+                   ;; to determine whether we are in top-level decls
+                   ;; or function's arg decls.  Set basic-indent accordingly.
+                   ;; Now add a little if this is a continuation line.
+                   (and state
+                        parse-data
+                        (not (eq char-after ?\C-j))
+                        (setcdr (cddr parse-data)
+                                (list pre-indent-point)))
+                   (vector 'toplevel start char-after state (nth 2 s-s)))
+                  ((not
+                    (or (setq is-block
+                              (and (setq delim (= (char-after containing-sexp) ?{))
+                                   (save-excursion ; Is it a hash?
+                                     (goto-char containing-sexp)
+                                     (cperl-block-p))))
+                        cperl-indent-parens-as-block))
+                   ;; group is an expression, not a block:
+                   ;; indent to just after the surrounding open parens,
+                   ;; skip blanks if we do not close the expression.
+                   (goto-char (1+ containing-sexp))
+                   (or (memq char-after
+                             (append (if delim "}" ")]}") nil))
+                       (looking-at "[ \t]*\\(#\\|$\\)")
+                       (skip-chars-forward " \t"))
+                   (setq old-indent (point)) ; delim=is-brace
+                   (vector 'in-parens char-after (point) delim containing-sexp))
+                  (t
+                   ;; Statement level.  Is it a continuation or a new statement?
+                   ;; Find previous non-comment character.
+                   (goto-char pre-indent-point) ; Skip one level of POD/etc
+                   (cperl-backward-to-noncomment containing-sexp)
+                   ;; Back up over label lines, since they don't
+                   ;; affect whether our line is a continuation.
+                   ;; (Had \, too)
+                   (while;;(or (eq (preceding-char) ?\,)
+                       (and (eq (preceding-char) ?:)
+                            (or;;(eq (char-after (- (point) 2)) ?\') ; ????
+                             (memq (char-syntax (char-after (- (point) 2)))
+                                   '(?w ?_))))
+                     ;;)
+                     ;; This is always FALSE?
+                     (if (eq (preceding-char) ?\,)
+                         ;; Will go to beginning of line, essentially.
+                         ;; Will ignore embedded sexpr XXXX.
+                         (cperl-backward-to-start-of-continued-exp containing-sexp))
+                     (beginning-of-line)
+                     (cperl-backward-to-noncomment containing-sexp))
+                   ;; Now we get non-label preceeding the indent point
+                   (if (not (or (eq (1- (point)) containing-sexp)
+                                (memq (preceding-char)
+                                      (append (if is-block " ;{" " ,;{") '(nil)))
+                                (and (eq (preceding-char) ?\})
+                                     (cperl-after-block-and-statement-beg
+                                      containing-sexp))
+                                (get-text-property (point) 'first-format-line)))
+                       ;; This line is continuation of preceding line's statement;
+                       ;; indent  `cperl-continued-statement-offset'  more than the
+                       ;; previous line of the statement.
+                       ;;
+                       ;; There might be a label on this line, just
+                       ;; consider it bad style and ignore it.
+                       (progn
+                         (cperl-backward-to-start-of-continued-exp containing-sexp)
+                         (vector 'continuation (point) char-after is-block delim))
+                     ;; This line starts a new statement.
+                     ;; Position following last unclosed open brace
+                     (goto-char containing-sexp)
+                     ;; Is line first statement after an open-brace?
+                     (or
+                      ;; If no, find that first statement and indent like
+                      ;; it.  If the first statement begins with label, do
+                      ;; not believe when the indentation of the label is too
+                      ;; small.
+                      (save-excursion
+                        (forward-char 1)
+                        (let ((colon-line-end 0))
+                          (while
+                              (progn (skip-chars-forward " \t\n")
+                                     (looking-at "#\\|[a-zA-Z0-9_$]*:[^:]\\|=[a-zA-Z]"))
+                            ;; Skip over comments and labels following openbrace.
+                            (cond ((= (following-char) ?\#)
+                                   (forward-line 1))
+                                  ((= (following-char) ?\=)
+                                   (goto-char
+                                    (or (next-single-property-change (point) 'in-pod)
+                                        (point-max)))) ; do not loop if no syntaxification
+                                  ;; label:
+                                  (t
+                                   (save-excursion (end-of-line)
+                                                   (setq colon-line-end (point)))
+                                   (search-forward ":"))))
+                          ;; We are at beginning of code (NOT label or comment)
+                          ;; First, the following code counts
+                          ;; if it is before the line we want to indent.
+                          (and (< (point) indent-point)
+                               (vector 'have-prev-sibling (point) colon-line-end
+                                       containing-sexp))))
+                      (progn
+                        ;; If no previous statement,
+                        ;; indent it relative to line brace is on.
+
+                        ;; For open-braces not the first thing in a line,
+                        ;; add in cperl-brace-imaginary-offset.
+
+                        ;; If first thing on a line:  ?????
+                        ;; Move back over whitespace before the openbrace.
+                        (setq           ; brace first thing on a line
+                         old-indent (progn (skip-chars-backward " \t") (bolp)))
+                        ;; Should we indent w.r.t. earlier than start?
+                        ;; Move to start of control group, possibly on a different line
+                        (or cperl-indent-wrt-brace
+                            (cperl-backward-to-noncomment (point-min)))
+                        ;; If the openbrace is preceded by a parenthesized exp,
+                        ;; move to the beginning of that;
+                        (if (eq (preceding-char) ?\))
+                            (progn
+                              (forward-sexp -1)
+                              (cperl-backward-to-noncomment (point-min))))
+                        ;; In the case it starts a subroutine, indent with
+                        ;; respect to `sub', not with respect to the
+                        ;; first thing on the line, say in the case of
+                        ;; anonymous sub in a hash.
+                        (if (and;; Is it a sub in group starting on this line?
+                             (cond ((get-text-property (point) 'attrib-group)
+                                    (goto-char (cperl-beginning-of-property
+                                                (point) 'attrib-group)))
+                                   ((eq (preceding-char) ?b)
+                                    (forward-sexp -1)
+                                    (looking-at "sub\\>")))
+                             (setq p (nth 1 ; start of innermost containing list
+                                          (parse-partial-sexp
+                                           (save-excursion (beginning-of-line)
+                                                           (point))
+                                           (point)))))
+                            (progn
+                              (goto-char (1+ p)) ; enclosing block on the same line
+                              (skip-chars-forward " \t")
+                              (vector 'code-start-in-block containing-sexp char-after
+                                      (and delim (not is-block)) ; is a HASH
+                                      old-indent ; brace first thing on a line
+                                      t (point) ; have something before...
+                                      )
+                              ;;(current-column)
+                              )
+                          ;; Get initial indentation of the line we are on.
+                          ;; If line starts with label, calculate label indentation
+                          (vector 'code-start-in-block containing-sexp char-after
+                                  (and delim (not is-block)) ; is a HASH
+                                  old-indent ; brace first thing on a line
+                                  nil (point) ; nothing interesting before
+                                  ))))))))))))))
+
+(defvar cperl-indent-rules-alist
+  '((pod nil)                           ; via `syntax-type' property
+    (here-doc nil)                      ; via `syntax-type' property
+    (here-doc-delim nil)                ; via `syntax-type' property
+    (format nil)                        ; via `syntax-type' property
+    (in-pod nil)                        ; via `in-pod' property
+    (comment-special:at-beginning-of-line nil)
+    (string t)
+    (comment nil))
+  "Alist of indentation rules for CPerl mode.
+The values mean:
+  nil: do not indent;
+  number: add this amount of indentation.
+
+Not finished.")
+
+(defun cperl-calculate-indent (&optional parse-data) ; was parse-start
+  "Return appropriate indentation for current line as Perl code.
+In usual case returns an integer: the column to indent to.
+Returns nil if line starts inside a string, t if in a comment.
+
+Will not correct the indentation for labels, but will correct it for braces
+and closing parentheses and brackets."
+  ;; This code is still a broken architecture: in some cases we need to
+  ;; compensate for some modifications which `cperl-indent-line' will add later
+  (save-excursion
+    (let ((i (cperl-sniff-for-indent parse-data)) what p)
+      (cond
+       ;;((or (null i) (eq i t) (numberp i))
+       ;;  i)
+       ((vectorp i)
+        (setq what (assoc (elt i 0) cperl-indent-rules-alist))
+        (cond
+         (what (cadr what))             ; Load from table
+         ;;
+         ;; Indenters for regular expressions with //x and qw()
+         ;;
+         ((eq 'REx-part2 (elt i 0)) ;; [self start] start of /REP in s//REP/x
+          (goto-char (elt i 1))
+          (condition-case nil   ; Use indentation of the 1st part
+              (forward-sexp -1))
+          (current-column))
+         ((eq 'indentable (elt i 0))    ; Indenter for REGEXP qw() etc
+          (cond                ;;; [indentable terminator start-pos is-block]
+           ((eq 'terminator (elt i 1)) ; Lone terminator of "indentable string"
+            (goto-char (elt i 2))       ; After opening parens
+            (1- (current-column)))
+           ((eq 'first-line (elt i 1)); [indentable first-line start-pos]
+            (goto-char (elt i 2))
+            (+ (or cperl-regexp-indent-step cperl-indent-level)
+               -1
+               (current-column)))
+           ((eq 'cont-line (elt i 1)); [indentable cont-line pos prev-pos first-char start-pos]
+            ;; Indent as the level after closing parens
+            (goto-char (elt i 2))       ; indent line
+            (skip-chars-forward " \t)") ; Skip closing parens
+            (setq p (point))
+            (goto-char (elt i 3))       ; previous line
+            (skip-chars-forward " \t)") ; Skip closing parens
+            ;; Number of parens in between:
+            (setq p (nth 0 (parse-partial-sexp (point) p))
+                  what (elt i 4))       ; First char on current line
+            (goto-char (elt i 3))       ; previous line
+            (+ (* p (or cperl-regexp-indent-step cperl-indent-level))
+               (cond ((eq what ?\) )
+                      (- cperl-close-paren-offset)) ; compensate
+                     ((eq what ?\| )
+                      (- (or cperl-regexp-indent-step cperl-indent-level)))
+                     (t 0))
+               (if (eq (following-char) ?\| )
+                   (or cperl-regexp-indent-step cperl-indent-level)
+                 0)
+               (current-column)))
+           (t
+            (error "Unrecognized value of indent: %s" i))))
+         ;;
+         ;; Indenter for stuff at toplevel
+         ;;
+         ((eq 'toplevel (elt i 0)) ;; [toplevel start char-after state immed-after-block]
+          (+ (save-excursion            ; To beg-of-defun, or end of last sexp
+               (goto-char (elt i 1))    ; start = Good place to start parsing
+               (- (current-indentation) ; 
+                  (if (elt i 4) cperl-indent-level 0))) ; immed-after-block
+             (if (eq (elt i 2) ?{) cperl-continued-brace-offset 0) ; char-after
+             ;; Look at previous line that's at column 0
+             ;; to determine whether we are in top-level decls
+             ;; or function's arg decls.  Set basic-indent accordingly.
+             ;; Now add a little if this is a continuation line.
+             (if (elt i 3)              ; state (XXX What is the semantic???)
+                 0
+               cperl-continued-statement-offset)))
+         ;;
+         ;; Indenter for stuff in "parentheses" (or brackets, braces-as-hash)
+         ;;
+         ((eq 'in-parens (elt i 0))
+          ;; in-parens char-after old-indent-point is-brace containing-sexp
+
+          ;; group is an expression, not a block:
+          ;; indent to just after the surrounding open parens,
+          ;; skip blanks if we do not close the expression.
+          (+ (progn
+               (goto-char (elt i 2))            ; old-indent-point
+               (current-column))
+             (if (and (elt i 3)         ; is-brace
+                      (eq (elt i 1) ?\})) ; char-after
+                 ;; Correct indentation of trailing ?\}
+                 (+ cperl-indent-level cperl-close-paren-offset)
+               0)))
+         ;;
+         ;; Indenter for continuation lines
+         ;;
+         ((eq 'continuation (elt i 0))
+          ;; [continuation statement-start char-after is-block is-brace]
+          (goto-char (elt i 1))         ; statement-start
+          (+ (if (memq (elt i 2) (append "}])" nil)) ; char-after
+                 0                      ; Closing parenth
+               cperl-continued-statement-offset)
+             (if (or (elt i 3)          ; is-block
+                     (not (elt i 4))            ; is-brace
+                     (not (eq (elt i 2) ?\}))) ; char-after
+                 0
+               ;; Now it is a hash reference
+               (+ cperl-indent-level cperl-close-paren-offset))
+             ;; Labels do not take :: ...
+             (if (looking-at "\\(\\w\\|_\\)+[ \t]*:")
+                 (if (> (current-indentation) cperl-min-label-indent)
+                     (- (current-indentation) cperl-label-offset)
+                   ;; Do not move `parse-data', this should
+                   ;; be quick anyway (this comment comes
+                   ;; from different location):
+                   (cperl-calculate-indent))
+               (current-column))
+             (if (eq (elt i 2) ?\{)     ; char-after
+                 cperl-continued-brace-offset 0)))
+         ;;
+         ;; Indenter for lines in a block which are not leading lines
+         ;;
+         ((eq 'have-prev-sibling (elt i 0))
+          ;; [have-prev-sibling sibling-beg colon-line-end block-start]
+          (goto-char (elt i 1))
+          (if (> (elt i 2) (point)) ; colon-line-end; After-label, same line
+              (if (> (current-indentation)
+                     cperl-min-label-indent)
+                  (- (current-indentation) cperl-label-offset)
+                ;; Do not believe: `max' was involved in calculation of indent
+                (+ cperl-indent-level
+                   (save-excursion
+                     (goto-char (elt i 3)) ; block-start
+                     (current-indentation))))
+            (current-column)))
+         ;;
+         ;; Indenter for the first line in a block
+         ;;
+         ((eq 'code-start-in-block (elt i 0))
+          ;;[code-start-in-block before-brace char-after
+          ;; is-a-HASH-ref brace-is-first-thing-on-a-line
+          ;; group-starts-before-start-of-sub start-of-control-group]
+          (goto-char (elt i 1))
+          ;; For open brace in column zero, don't let statement
+          ;; start there too.  If cperl-indent-level=0,
+          ;; use cperl-brace-offset + cperl-continued-statement-offset instead.
+          (+ (if (and (bolp) (zerop cperl-indent-level))
+                 (+ cperl-brace-offset cperl-continued-statement-offset)
+               cperl-indent-level)
+             (if (and (elt i 3) ; is-a-HASH-ref
+                      (eq (elt i 2) ?\})) ; char-after: End of a hash reference
+                 (+ cperl-indent-level cperl-close-paren-offset)
+               0)
+             ;; Unless openbrace is the first nonwhite thing on the line,
+             ;; add the cperl-brace-imaginary-offset.
+             (if (elt i 4) 0            ; brace-is-first-thing-on-a-line
+               cperl-brace-imaginary-offset)
+             (progn
+               (goto-char (elt i 6))    ; start-of-control-group
+               (if (elt i 5)            ; group-starts-before-start-of-sub
+                   (current-column)
+                 ;; Get initial indentation of the line we are on.
+                 ;; If line starts with label, calculate label indentation
+                 (if (save-excursion
+                       (beginning-of-line)
+                       (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*:[^:]"))
+                     (if (> (current-indentation) cperl-min-label-indent)
+                         (- (current-indentation) cperl-label-offset)
+                       ;; Do not move `parse-data', this should
+                       ;; be quick anyway:
+                       (cperl-calculate-indent))
+                   (current-indentation))))))
+         (t
+          (error "Unrecognized value of indent: %s" i))))
+       (t
+        (error "Got strange value of indent: %s" i))))))
+
+(defvar cperl-indent-alist
+  '((string nil)
+    (comment nil)
+    (toplevel 0)
+    (toplevel-after-parenth 2)
+    (toplevel-continued 2)
+    (expression 1))
+  "Alist of indentation rules for CPerl mode.
+The values mean:
+  nil: do not indent;
+  number: add this amount of indentation.
+
+Not finished, not used.")
+
+(defun cperl-where-am-i (&optional parse-start start-state)
+  ;; Unfinished
+  "Return a list of lists ((TYPE POS)...) of good points before the point.
+POS may be nil if it is hard to find, say, when TYPE is `string' or `comment'.
+
+Not finished, not used."
+  (save-excursion
+    (let* ((start-point (point)) unused
+           (s-s (cperl-get-state))
+           (start (nth 0 s-s))
+           (state (nth 1 s-s))
+           (prestart (nth 3 s-s))
+           (containing-sexp (car (cdr state)))
+           (case-fold-search nil)
+           (res (list (list 'parse-start start) (list 'parse-prestart prestart))))
+      (cond ((nth 3 state)              ; In string
+             (setq res (cons (list 'string nil (nth 3 state)) res))) ; What started string
+            ((nth 4 state)              ; In comment
+             (setq res (cons '(comment) res)))
+            ((null containing-sexp)
+             ;; Line is at top level.
+             ;; Indent like the previous top level line
+             ;; unless that ends in a closeparen without semicolon,
+             ;; in which case this line is the first argument decl.
+             (cperl-backward-to-noncomment (or parse-start (point-min)))
+             ;;(skip-chars-backward " \t\f\n")
+             (cond
+              ((or (bobp)
+                   (memq (preceding-char) (append ";}" nil)))
+               (setq res (cons (list 'toplevel start) res)))
+              ((eq (preceding-char) ?\) )
+               (setq res (cons (list 'toplevel-after-parenth start) res)))
+              (t
+               (setq res (cons (list 'toplevel-continued start) res)))))
+            ((/= (char-after containing-sexp) ?{)
+             ;; line is expression, not statement:
+             ;; indent to just after the surrounding open.
+             ;; skip blanks if we do not close the expression.
+             (setq res (cons (list 'expression-blanks
+                                   (progn
+                                     (goto-char (1+ containing-sexp))
+                                     (or (looking-at "[ \t]*\\(#\\|$\\)")
+                                         (skip-chars-forward " \t"))
+                                     (point)))
+                             (cons (list 'expression containing-sexp) res))))
+            ((progn
+               ;; Containing-expr starts with \{.  Check whether it is a hash.
+               (goto-char containing-sexp)
+               (not (cperl-block-p)))
+             (setq res (cons (list 'expression-blanks
+                                   (progn
+                                     (goto-char (1+ containing-sexp))
+                                     (or (looking-at "[ \t]*\\(#\\|$\\)")
+                                         (skip-chars-forward " \t"))
+                                     (point)))
+                             (cons (list 'expression containing-sexp) res))))
+            (t
+             ;; Statement level.
+             (setq res (cons (list 'in-block containing-sexp) res))
+             ;; Is it a continuation or a new statement?
+             ;; Find previous non-comment character.
+             (cperl-backward-to-noncomment containing-sexp)
+             ;; Back up over label lines, since they don't
+             ;; affect whether our line is a continuation.
+             ;; Back up comma-delimited lines too ?????
+             (while (or (eq (preceding-char) ?\,)
+                        (save-excursion (cperl-after-label)))
+               (if (eq (preceding-char) ?\,)
+                   ;; Will go to beginning of line, essentially
+                   ;; Will ignore embedded sexpr XXXX.
+                   (cperl-backward-to-start-of-continued-exp containing-sexp))
+               (beginning-of-line)
+               (cperl-backward-to-noncomment containing-sexp))
+             ;; Now we get the answer.
+             (if (not (memq (preceding-char) (append ";}{" '(nil)))) ; Was ?\,
+                 ;; This line is continuation of preceding line's statement.
+                 (list (list 'statement-continued containing-sexp))
+               ;; This line starts a new statement.
+               ;; Position following last unclosed open.
+               (goto-char containing-sexp)
+               ;; Is line first statement after an open-brace?
+               (or
+                ;; If no, find that first statement and indent like
+                ;; it.  If the first statement begins with label, do
+                ;; not believe when the indentation of the label is too
+                ;; small.
+                (save-excursion
+                  (forward-char 1)
+                  (let ((colon-line-end 0))
+                    (while (progn (skip-chars-forward " \t\n" start-point)
+                                  (and (< (point) start-point)
+                                       (looking-at
+                                        "#\\|[a-zA-Z_][a-zA-Z0-9_]*:[^:]")))
+                      ;; Skip over comments and labels following openbrace.
+                      (cond ((= (following-char) ?\#)
+                             ;;(forward-line 1)
+                             (end-of-line))
+                            ;; label:
+                            (t
+                             (save-excursion (end-of-line)
+                                             (setq colon-line-end (point)))
+                             (search-forward ":"))))
+                    ;; Now at the point, after label, or at start
+                    ;; of first statement in the block.
+                    (and (< (point) start-point)
+                         (if (> colon-line-end (point))
+                             ;; Before statement after label
+                             (if (> (current-indentation)
+                                    cperl-min-label-indent)
+                                 (list (list 'label-in-block (point)))
+                               ;; Do not believe: `max' is involved
+                               (list
+                                (list 'label-in-block-min-indent (point))))
+                           ;; Before statement
+                           (list 'statement-in-block (point))))))
+                ;; If no previous statement,
+                ;; indent it relative to line brace is on.
+                ;; For open brace in column zero, don't let statement
+                ;; start there too.  If cperl-indent-level is zero,
+                ;; use cperl-brace-offset + cperl-continued-statement-offset instead.
+                ;; For open-braces not the first thing in a line,
+                ;; add in cperl-brace-imaginary-offset.
+
+                ;; If first thing on a line:  ?????
+                (setq unused            ; This is not finished...
+                (+ (if (and (bolp) (zerop cperl-indent-level))
+                       (+ cperl-brace-offset cperl-continued-statement-offset)
+                     cperl-indent-level)
+                   ;; Move back over whitespace before the openbrace.
+                   ;; If openbrace is not first nonwhite thing on the line,
+                   ;; add the cperl-brace-imaginary-offset.
+                   (progn (skip-chars-backward " \t")
+                          (if (bolp) 0 cperl-brace-imaginary-offset))
+                   ;; If the openbrace is preceded by a parenthesized exp,
+                   ;; move to the beginning of that;
+                   ;; possibly a different line
+                   (progn
+                     (if (eq (preceding-char) ?\))
+                         (forward-sexp -1))
+                     ;; Get initial indentation of the line we are on.
+                     ;; If line starts with label, calculate label indentation
+                     (if (save-excursion
+                           (beginning-of-line)
+                           (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*:[^:]"))
+                         (if (> (current-indentation) cperl-min-label-indent)
+                             (- (current-indentation) cperl-label-offset)
+                           (cperl-calculate-indent))
+                       (current-indentation)))))))))
+      res)))
 
 (defun cperl-calculate-indent-within-comment ()
   "Return the indentation amount for line, assuming that
@@ -2894,14 +3350,22 @@ the current line is to be regarded as part of a block comment."
 
 (defun cperl-to-comment-or-eol ()
   "Go to position before comment on the current line, or to end of line.
-Returns true if comment is found."
-  (let (state stop-in cpoint (lim (progn (end-of-line) (point))))
+Returns true if comment is found.  In POD will not move the point."
+  ;; If the line is inside other syntax groups (qq-style strings, HERE-docs)
+  ;; then looks for literal # or end-of-line.
+  (let (state stop-in cpoint (lim (progn (end-of-line) (point))) pr e)
+    (or cperl-font-locking
+        (cperl-update-syntaxification lim lim))
     (beginning-of-line)
-    (if (or
-         (eq (get-text-property (point) 'syntax-type) 'pod)
-         (re-search-forward "\\=[ \t]*\\(#\\|$\\)" lim t))
+    (if (setq pr (get-text-property (point) 'syntax-type))
+        (setq e (next-single-property-change (point) 'syntax-type nil (point-max))))
+    (if (or (eq pr 'pod)
+            (if (or (not e) (> e lim))  ; deep inside a group
+                (re-search-forward "\\=[ \t]*\\(#\\|$\\)" lim t)))
         (if (eq (preceding-char) ?\#) (progn (backward-char 1) t))
-      ;; Else
+      ;; Else - need to do it the hard way
+      (and (and e (<= e lim))
+           (goto-char e))
       (while (not stop-in)
         (setq state (parse-partial-sexp (point) lim nil nil nil t))
                                         ; stop at comment
@@ -2933,17 +3397,11 @@ Returns true if comment is found."
           (setq stop-in t)))            ; Finish
       (nth 4 state))))
 
-(defsubst cperl-1- (p)
-  (max (point-min) (1- p)))
-
-(defsubst cperl-1+ (p)
-  (min (point-max) (1+ p)))
-
 (defsubst cperl-modify-syntax-type (at how)
   (if (< at (point-max))
       (progn
         (put-text-property at (1+ at) 'syntax-table how)
-        (put-text-property at (1+ at) 'rear-nonsticky t))))
+        (put-text-property at (1+ at) 'rear-nonsticky '(syntax-table)))))
 
 (defun cperl-protect-defun-start (s e)
   ;; C code looks for "^\\s(" to skip comment backward in "hard" situations
@@ -2978,35 +3436,53 @@ Returns true if comment is found."
                          ( ?\{ . ?\} )
                          ( ?\< . ?\> )))
 
-(defun cperl-forward-re (lim end is-2arg set-st st-l err-l argument
+(defun cperl-cached-syntax-table (st)
+  "Get a syntax table cached in ST, or create and cache into ST a syntax table.
+All the entries of the syntax table are \".\", except for a backslash, which
+is quoting."
+  (if (car-safe st)
+      (car st)
+    (setcar st (make-syntax-table))
+    (setq st (car st))
+    (let ((i 0))
+      (while (< i 256)
+        (modify-syntax-entry i "." st)
+        (setq i (1+ i))))
+    (modify-syntax-entry ?\\ "\\" st)
+    st))
+
+(defun cperl-forward-re (lim end is-2arg st-l err-l argument
                              &optional ostart oend)
-  ;; Works *before* syntax recognition is done
-  ;; May modify syntax-type text property if the situation is too hard
-  (let (b starter ender st i i2 go-forward reset-st)
+"Find the end of a regular expression or a stringish construct (q[] etc).
+The point should be before the starting delimiter.
+
+Goes to LIM if none is found.  If IS-2ARG is non-nil, assumes that it
+is s/// or tr/// like expression.  If END is nil, generates an error
+message if needed.  If SET-ST is non-nil, will use (or generate) a
+cached syntax table in ST-L.  If ERR-L is non-nil, will store the
+error message in its CAR (unless it already contains some error
+message).  ARGUMENT should be the name of the construct (used in error
+messages).  OSTART, OEND may be set in recursive calls when processing
+the second argument of 2ARG construct.
+
+Works *before* syntax recognition is done.  In IS-2ARG situation may
+modify syntax-type text property if the situation is too hard."
+  (let (b starter ender st i i2 go-forward reset-st set-st)
     (skip-chars-forward " \t")
     ;; ender means matching-char matcher.
     (setq b (point)
           starter (if (eobp) 0 (char-after b))
           ender (cdr (assoc starter cperl-starters)))
     ;; What if starter == ?\\  ????
-    (if set-st
-        (if (car st-l)
-            (setq st (car st-l))
-          (setcar st-l (make-syntax-table))
-          (setq i 0 st (car st-l))
-          (while (< i 256)
-            (modify-syntax-entry i "." st)
-            (setq i (1+ i)))
-          (modify-syntax-entry ?\\ "\\" st)))
+    (setq st (cperl-cached-syntax-table st-l))
     (setq set-st t)
     ;; Whether we have an intermediate point
     (setq i nil)
     ;; Prepare the syntax table:
-    (and set-st
-         (if (not ender)                ; m/blah/, s/x//, s/x/y/
-             (modify-syntax-entry starter "$" st)
-           (modify-syntax-entry starter (concat "(" (list ender)) st)
-           (modify-syntax-entry ender  (concat ")" (list starter)) st)))
+    (if (not ender)             ; m/blah/, s/x//, s/x/y/
+        (modify-syntax-entry starter "$" st)
+      (modify-syntax-entry starter (concat "(" (list ender)) st)
+      (modify-syntax-entry ender  (concat ")" (list starter)) st))
     (condition-case bb
         (progn
           ;; We use `$' syntax class to find matching stuff, but $$
@@ -3053,7 +3529,7 @@ Returns true if comment is found."
                 (modify-syntax-entry starter (if (eq starter ?\\) "\\" ".") st)
                 (if ender (modify-syntax-entry ender "." st))
                 (setq set-st nil)
-                (setq ender (cperl-forward-re lim end nil t st-l err-l
+                (setq ender (cperl-forward-re lim end nil st-l err-l
                                               argument starter ender)
                  ender (nth 2 ender)))))
       (error (goto-char lim)
@@ -3078,6 +3554,33 @@ Returns true if comment is found."
     ;; go-forward: has 2 args, and the second part is empty
     (list i i2 ender starter go-forward)))
 
+(defun cperl-forward-group-in-re (&optional st-l)
+  "Find the end of a group in a REx.
+Return the error message (if any).  Does not work if delimiter is `)'.
+Works before syntax recognition is done."
+  ;; Works *before* syntax recognition is done
+  (or st-l (setq st-l (list nil)))      ; Avoid overwriting '()
+  (let (st b reset-st)
+    (condition-case b
+        (progn
+          (setq st (cperl-cached-syntax-table st-l))
+          (modify-syntax-entry ?\( "()" st)
+          (modify-syntax-entry ?\) ")(" st)
+          (setq reset-st (syntax-table))
+          (set-syntax-table st)
+          (forward-sexp 1))
+      (error (message
+              "cperl-forward-group-in-re: error %s" b)))
+    ;; now restore the initial state
+    (if st
+        (progn
+          (modify-syntax-entry ?\( "." st)
+          (modify-syntax-entry ?\) "." st)))
+    (if reset-st
+        (set-syntax-table reset-st))
+    b))
+
+
 (defvar font-lock-string-face)
 ;;(defvar font-lock-reference-face)
 (defvar font-lock-constant-face)
@@ -3103,13 +3606,24 @@ Returns true if comment is found."
 ;;      d) 'Q'uoted string:
 ;;              part between markers inclusive is marked `syntax-type' ==> `string'
 ;;              part between `q' and the first marker is marked `syntax-type' ==> `prestring'
+;;              second part of s///e is marked `syntax-type' ==> `multiline'
+;;      e) Attributes of subroutines: `attrib-group' ==> t
+;;              (or 0 if declaration); up to `{' or ';': `syntax-type' => `sub-decl'.
+;;      f) Multiline my/our declaration lists etc: `syntax-type' => `multiline'
+
+;;; In addition, some parts of RExes may be marked as `REx-interpolated'
+;;; (value: 0 in //o, 1 if "interpolated variable" is whole-REx, t otherwise).
 
 (defun cperl-unwind-to-safe (before &optional end)
   ;; if BEFORE, go to the previous start-of-line on each step of unwinding
   (let ((pos (point)) opos)
-    (setq opos pos)
-    (while (and pos (get-text-property pos 'syntax-type))
-      (setq pos (previous-single-property-change pos 'syntax-type))
+    (while (and pos (progn
+                      (beginning-of-line)
+                      (get-text-property (setq pos (point)) 'syntax-type)))
+      (setq opos pos
+            pos (cperl-beginning-of-property pos 'syntax-type))
+      (if (eq pos (point-min))
+          (setq pos nil))
       (if pos
           (if before
               (progn
@@ -3126,32 +3640,117 @@ Returns true if comment is found."
     (setq pos (point))
     (if end
         ;; Do the same for end, going small steps
-        (progn
+        (save-excursion
           (while (and end (get-text-property end 'syntax-type))
             (setq pos end
-                  end (next-single-property-change end 'syntax-type)))
+                  end (next-single-property-change end 'syntax-type nil (point-max)))
+            (if end (progn (goto-char end)
+                           (or (bolp) (forward-line 1))
+                           (setq end (point)))))
           (or end pos)))))
 
+;;; These are needed for byte-compile (at least with v19)
 (defvar cperl-nonoverridable-face)
+(defvar font-lock-variable-name-face)
 (defvar font-lock-function-name-face)
+(defvar font-lock-keyword-face)
+(defvar font-lock-builtin-face)
+(defvar font-lock-type-face)
 (defvar font-lock-comment-face)
+(defvar font-lock-warning-face)
 
-(defun cperl-find-pods-heres (&optional min max non-inter end ignore-max)
+(defun cperl-find-sub-attrs (&optional st-l b-fname e-fname pos)
+  "Syntaxically mark (and fontify) attributes of a subroutine.
+Should be called with the point before leading colon of an attribute."
+  ;; Works *before* syntax recognition is done
+  (or st-l (setq st-l (list nil)))      ; Avoid overwriting '()
+  (let (st b p reset-st after-first (start (point)) start1 end1)
+    (condition-case b
+        (while (looking-at
+                (concat
+                 "\\("                  ; 1=optional? colon
+                   ":" cperl-maybe-white-and-comment-rex ; 2=whitespace/comment?
+                 "\\)"
+                 (if after-first "?" "")
+                 ;; No space between name and paren allowed...
+                 "\\(\\sw+\\)"          ; 3=name
+                 "\\((\\)?"))           ; 4=optional paren
+          (and (match-beginning 1)
+               (cperl-postpone-fontification
+                (match-beginning 0) (cperl-1+ (match-beginning 0))
+                'face font-lock-constant-face))
+          (setq start1 (match-beginning 3) end1 (match-end 3))
+          (cperl-postpone-fontification start1 end1
+                                        'face font-lock-constant-face)
+          (goto-char end1)              ; end or before `('
+          (if (match-end 4)             ; Have attribute arguments...
+              (progn
+                (if st nil
+                  (setq st (cperl-cached-syntax-table st-l))
+                  (modify-syntax-entry ?\( "()" st)
+                  (modify-syntax-entry ?\) ")(" st))
+                (setq reset-st (syntax-table) p (point))
+                (set-syntax-table st)
+                (forward-sexp 1)
+                (set-syntax-table reset-st)
+                (setq reset-st nil)
+                (cperl-commentify p (point) t))) ; mark as string
+          (forward-comment (buffer-size))
+          (setq after-first t))
+      (error (message
+              "L%d: attribute `%s': %s"
+              (count-lines (point-min) (point))
+              (and start1 end1 (buffer-substring start1 end1)) b)
+             (setq start nil)))
+    (and start
+         (progn
+           (put-text-property start (point)
+                              'attrib-group (if (looking-at "{") t 0))
+           (and pos
+                (< 1 (count-lines (+ 3 pos) (point))) ; end of `sub'
+                ;; Apparently, we do not need `multiline': faces added now
+                (put-text-property (+ 3 pos) (cperl-1+ (point))
+                                   'syntax-type 'sub-decl))
+           (and b-fname                 ; Fontify here: the following condition
+                (cperl-postpone-fontification ; is too hard to determine by
+                 b-fname e-fname 'face ; a REx, so do it here
+                (if (looking-at "{")
+                    font-lock-function-name-face
+                  font-lock-variable-name-face)))))
+    ;; now restore the initial state
+    (if st
+        (progn
+          (modify-syntax-entry ?\( "." st)
+          (modify-syntax-entry ?\) "." st)))
+    (if reset-st
+        (set-syntax-table reset-st))))
+
+(defsubst cperl-look-at-leading-count (is-x-REx e)
+  (if (re-search-forward (concat "\\=" (if is-x-REx "[ \t\n]*" "") "[{?+*]")
+                         (1- e) t)      ; return nil on failure, no moving
+      (if (eq ?\{ (preceding-char)) nil
+        (cperl-postpone-fontification
+         (1- (point)) (point)
+         'face font-lock-warning-face))))
+
+;;; Debugging this may require (setq max-specpdl-size 2000)...
+(defun cperl-find-pods-heres (&optional min max non-inter end ignore-max end-of-here-doc)
   "Scans the buffer for hard-to-parse Perl constructions.
 If `cperl-pod-here-fontify' is not-nil after evaluation, will fontify
 the sections using `cperl-pod-head-face', `cperl-pod-face',
 `cperl-here-face'."
   (interactive)
-  (or min (setq min (point-min)
+ (or min (setq min (point-min)
                 cperl-syntax-state nil
                 cperl-syntax-done-to min))
   (or max (setq max (point-max)))
   (let* ((cperl-pod-here-fontify (eval cperl-pod-here-fontify)) go tmpend
          face head-face here-face b e bb tag qtag b1 e1 argument i c tail tb
-         is-REx is-x-REx REx-comment-start REx-comment-end was-comment i2
+         is-REx is-x-REx REx-subgr-start REx-subgr-end was-subgr i2 hairy-RE
          (case-fold-search nil) (inhibit-read-only t) (buffer-undo-list t)
-         (modified (buffer-modified-p))
+         (modified (buffer-modified-p)) overshoot is-o-REx
          (after-change-functions nil)
+         (cperl-font-locking t)
          (use-syntax-state (and cperl-syntax-state
                                 (>= min (car cperl-syntax-state))))
          (state-point (if use-syntax-state
@@ -3162,33 +3761,62 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
          ;; (st-l '(nil)) (err-l '(nil)) ; Would overwrite - propagates from a function call to a function call!
          (st-l (list nil)) (err-l (list nil))
          ;; Somehow font-lock may be not loaded yet...
+         ;; (e.g., when building TAGS via command-line call)
          (font-lock-string-face (if (boundp 'font-lock-string-face)
                                     font-lock-string-face
                                   'font-lock-string-face))
-         (font-lock-constant-face (if (boundp 'font-lock-constant-face)
+         (my-cperl-delimiters-face (if (boundp 'font-lock-constant-face)
                                       font-lock-constant-face
                                     'font-lock-constant-face))
-         (font-lock-function-name-face
+         (my-cperl-REx-spec-char-face   ; [] ^.$ and wrapper-of ({})
           (if (boundp 'font-lock-function-name-face)
               font-lock-function-name-face
             'font-lock-function-name-face))
+         (font-lock-variable-name-face  ; interpolated vars and ({})-code
+          (if (boundp 'font-lock-variable-name-face)
+              font-lock-variable-name-face
+            'font-lock-variable-name-face))
+         (font-lock-function-name-face  ; used in `cperl-find-sub-attrs'
+          (if (boundp 'font-lock-function-name-face)
+              font-lock-function-name-face
+            'font-lock-function-name-face))
+         (font-lock-constant-face       ; used in `cperl-find-sub-attrs'
+          (if (boundp 'font-lock-constant-face)
+              font-lock-constant-face
+            'font-lock-constant-face))
+         (my-cperl-REx-0length-face ; 0-length, (?:)etc, non-literal \
+          (if (boundp 'font-lock-builtin-face)
+              font-lock-builtin-face
+            'font-lock-builtin-face))
          (font-lock-comment-face
           (if (boundp 'font-lock-comment-face)
               font-lock-comment-face
             'font-lock-comment-face))
-         (cperl-nonoverridable-face
+         (font-lock-warning-face
+          (if (boundp 'font-lock-warning-face)
+              font-lock-warning-face
+            'font-lock-warning-face))
+         (my-cperl-REx-ctl-face         ; (|)
+          (if (boundp 'font-lock-keyword-face)
+              font-lock-keyword-face
+            'font-lock-keyword-face))
+         (my-cperl-REx-modifiers-face   ; //gims
           (if (boundp 'cperl-nonoverridable-face)
               cperl-nonoverridable-face
-            'cperl-nonoverridable))
+            'cperl-nonoverridable-face))
+         (my-cperl-REx-length1-face     ; length=1 escaped chars, POSIX classes
+          (if (boundp 'font-lock-type-face)
+              font-lock-type-face
+            'font-lock-type-face))
          (stop-point (if ignore-max
                          (point-max)
                        max))
          (search
           (concat
-           "\\(\\`\n?\\|^\n\\)="
+           "\\(\\`\n?\\|^\n\\)="        ; POD
            "\\|"
            ;; One extra () before this:
-           "<<"
+           "<<"                         ; HERE-DOC
            "\\("                        ; 1 + 1
            ;; First variant "BLAH" or just ``.
            "[ \t]*"                     ; Yes, whitespace is allowed!
@@ -3204,36 +3832,44 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
            "\\)"
            "\\|"
            ;; 1+6 extra () before this:
-           "^[ \t]*\\(format\\)[ \t]*\\([a-zA-Z0-9_]+\\)?[ \t]*=[ \t]*$"
+           "^[ \t]*\\(format\\)[ \t]*\\([a-zA-Z0-9_]+\\)?[ \t]*=[ \t]*$" ;FRMAT
            (if cperl-use-syntax-table-text-property
                (concat
                 "\\|"
                 ;; 1+6+2=9 extra () before this:
-                "\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>"
+                "\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>" ; QUOTED CONSTRUCT
                 "\\|"
                 ;; 1+6+2+1=10 extra () before this:
                 "\\([?/<]\\)"   ; /blah/ or ?blah? or <file*glob>
                 "\\|"
-                ;; 1+6+2+1+1=11 extra () before this:
-                "\\<sub\\>[ \t]*\\([a-zA-Z_:'0-9]+[ \t]*\\)?\\(([^()]*)\\)"
+                ;; 1+6+2+1+1=11 extra () before this
+                "\\<sub\\>"             ;  sub with proto/attr
+                "\\("
+                   cperl-white-and-comment-rex
+                   "\\(::[a-zA-Z_:'0-9]*\\|[a-zA-Z_'][a-zA-Z_:'0-9]*\\)\\)?" ; name
+                "\\("
+                   cperl-maybe-white-and-comment-rex
+                   "\\(([^()]*)\\|:[^:]\\)\\)" ; prototype or attribute start
                 "\\|"
-                ;; 1+6+2+1+1+2=13 extra () before this:
-                "\\$\\(['{]\\)"
+                ;; 1+6+2+1+1+6=17 extra () before this:
+                "\\$\\(['{]\\)"         ; $' or ${foo}
                 "\\|"
-                ;; 1+6+2+1+1+2+1=14 extra () before this:
+                ;; 1+6+2+1+1+6+1=18 extra () before this (old pack'var syntax;
+                ;; we do not support intervening comments...):
                 "\\(\\<sub[ \t\n\f]+\\|[&*$@%]\\)[a-zA-Z0-9_]*'"
-                ;; 1+6+2+1+1+2+1+1=15 extra () before this:
+                ;; 1+6+2+1+1+6+1+1=19 extra () before this:
                 "\\|"
-                "__\\(END\\|DATA\\)__"
-                ;; 1+6+2+1+1+2+1+1+1=16 extra () before this:
+                "__\\(END\\|DATA\\)__"  ; __END__ or __DATA__
+                ;; 1+6+2+1+1+6+1+1+1=20 extra () before this:
                 "\\|"
-                "\\\\\\(['`\"($]\\)")
+                "\\\\\\(['`\"($]\\)")   ; BACKWACKED something-hairy
              ""))))
     (unwind-protect
         (progn
           (save-excursion
             (or non-inter
                 (message "Scanning for \"hard\" Perl constructions..."))
+            ;;(message "find: %s --> %s" min max)
             (and cperl-pod-here-fontify
                  ;; We had evals here, do not know why...
                  (setq face cperl-pod-face
@@ -3241,16 +3877,22 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                        here-face cperl-here-face))
             (remove-text-properties min max
                                     '(syntax-type t in-pod t syntax-table t
+                                                  attrib-group t
+                                                  REx-interpolated t
                                                   cperl-postpone t
                                                   syntax-subtype t
                                                   rear-nonsticky t
+                                                  front-sticky t
                                                   here-doc-group t
                                                   first-format-line t
+                                                  REx-part2 t
                                                   indentable t))
             ;; Need to remove face as well...
             (goto-char min)
             (and (eq system-type 'emx)
-                 (looking-at "extproc[ \t]") ; Analogue of #!
+                 (eq (point) 1)
+                 (let ((case-fold-search t))
+                   (looking-at "extproc[ \t]")) ; Analogue of #!
                  (cperl-commentify min
                                    (save-excursion (end-of-line) (point))
                                    nil))
@@ -3258,11 +3900,38 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                     (< (point) max)
                     (re-search-forward search max t))
               (setq tmpend nil)         ; Valid for most cases
+              (setq b (match-beginning 0)
+                    state (save-excursion (parse-partial-sexp
+                                           state-point b nil nil state))
+                    state-point b)
               (cond
+               ;; 1+6+2+1+1+6=17 extra () before this:
+               ;;    "\\$\\(['{]\\)"
+               ((match-beginning 18) ; $' or ${foo}
+                (if (eq (preceding-char) ?\') ; $'
+                    (progn
+                      (setq b (1- (point))
+                            state (parse-partial-sexp
+                                   state-point (1- b) nil nil state)
+                            state-point (1- b))
+                      (if (nth 3 state) ; in string
+                          (cperl-modify-syntax-type (1- b) cperl-st-punct))
+                      (goto-char (1+ b)))
+                  ;; else: ${
+                  (setq bb (match-beginning 0))
+                  (cperl-modify-syntax-type bb cperl-st-punct)))
+               ;; No processing in strings/comments beyond this point:
+               ((or (nth 3 state) (nth 4 state))
+                t)                      ; Do nothing in comment/string
                ((match-beginning 1)     ; POD section
                 ;;  "\\(\\`\n?\\|^\n\\)="
-                (if (looking-at "cut\\>")
-                    (if ignore-max
+                (setq b (match-beginning 0)
+                      state (parse-partial-sexp
+                             state-point b nil nil state)
+                      state-point b)
+                (if (or (nth 3 state) (nth 4 state)
+                        (looking-at "cut\\>"))
+                    (if (or (nth 3 state) (nth 4 state) ignore-max)
                         nil             ; Doing a chunk only
                       (message "=cut is not preceded by a POD section")
                       (or (car err-l) (setcar err-l (point))))
@@ -3288,11 +3957,15 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                        (progn
                          (remove-text-properties
                           max e '(syntax-type t in-pod t syntax-table t
+                                              attrib-group t
+                                              REx-interpolated t
                                               cperl-postpone t
                                               syntax-subtype t
                                               here-doc-group t
                                               rear-nonsticky t
+                                              front-sticky t
                                               first-format-line t
+                                              REx-part2 t
                                               indentable t))
                          (setq tmpend tb)))
                   (put-text-property b e 'in-pod t)
@@ -3335,7 +4008,8 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                   (or (eq e (point-max))
                       (forward-char -1)))) ; Prepare for immediate POD start.
                ;; Here document
-               ;; We do only one here-per-line
+               ;; We can do many here-per-line;
+               ;; but multiline quote on the same line as <<HERE confuses us...
                ;; ;; One extra () before this:
                ;;"<<"
                ;;  "\\("                        ; 1 + 1
@@ -3352,21 +4026,42 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                ;;    "\\(\\)"           ; To preserve count of pars :-( 6 + 1
                ;;  "\\)"
                ((match-beginning 2)     ; 1 + 1
-                ;; Abort in comment:
-                (setq b (point))
-                (setq state (parse-partial-sexp state-point b nil nil state)
-                      state-point b
+                (setq b (point)
                       tb (match-beginning 0)
-                      i (or (nth 3 state) (nth 4 state)))
-                (if i
-                    (setq c t)
-                  (setq c (and
-                           (match-beginning 5)
-                           (not (match-beginning 6)) ; Empty
-                           (looking-at
-                            "[ \t]*[=0-9$@%&(]"))))
+                      c (and            ; not HERE-DOC
+                         (match-beginning 5)
+                         (save-match-data
+                           (or (looking-at "[ \t]*(") ; << function_call()
+                               (save-excursion ; 1 << func_name, or $foo << 10
+                                 (condition-case nil
+                                     (progn
+                                       (goto-char tb)
+               ;;; XXX What to do: foo <<bar ???
+               ;;; XXX Need to support print {a} <<B ???
+                                       (forward-sexp -1)
+                                       (save-match-data 
+                                        ; $foo << b; $f .= <<B;
+                                        ; ($f+1) << b; a($f) . <<B;
+                                        ; foo 1, <<B; $x{a} <<b;
+                                         (cond
+                                          ((looking-at "[0-9$({]")
+                                           (forward-sexp 1)
+                                           (and
+                                            (looking-at "[ \t]*<<")
+                                            (condition-case nil
+                                                ;; print $foo <<EOF
+                                                (progn
+                                                  (forward-sexp -2)
+                                                  (not
+                                                   (looking-at "\\(printf?\\|system\\|exec\\|sort\\)\\>")))
+                                                (error t)))))))
+                                   (error nil))) ; func(<<EOF)
+                               (and (not (match-beginning 6)) ; Empty
+                                    (looking-at
+                                     "[ \t]*[=0-9$@%&(]"))))))
                 (if c                   ; Not here-doc
                     nil                 ; Skip it.
+                  (setq c (match-end 2)) ; 1 + 1
                   (if (match-beginning 5) ;4 + 1
                       (setq b1 (match-beginning 5) ; 4 + 1
                             e1 (match-end 5)) ; 4 + 1
@@ -3376,15 +4071,20 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                         qtag (regexp-quote tag))
                   (cond (cperl-pod-here-fontify
                          ;; Highlight the starting delimiter
-                         (cperl-postpone-fontification b1 e1 'face font-lock-constant-face)
+                         (cperl-postpone-fontification 
+                          b1 e1 'face my-cperl-delimiters-face)
                          (cperl-put-do-not-fontify b1 e1 t)))
                   (forward-line)
+                  (setq i (point))
+                  (if end-of-here-doc
+                      (goto-char end-of-here-doc))
                   (setq b (point))
                   ;; We do not search to max, since we may be called from
                   ;; some hook of fontification, and max is random
                   (or (and (re-search-forward (concat "^" qtag "$")
                                               stop-point 'toend)
-                           (eq (following-char) ?\n))
+                           ;;;(eq (following-char) ?\n) ; XXXX WHY???
+                           )
                     (progn              ; Pretend we matched at the end
                       (goto-char (point-max))
                       (re-search-forward "\\'")
@@ -3393,8 +4093,9 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                   (if cperl-pod-here-fontify
                       (progn
                         ;; Highlight the ending delimiter
-                        (cperl-postpone-fontification (match-beginning 0) (match-end 0)
-                                                      'face font-lock-constant-face)
+                        (cperl-postpone-fontification
+                         (match-beginning 0) (match-end 0)
+                         'face my-cperl-delimiters-face)
                         (cperl-put-do-not-fontify b (match-end 0) t)
                         ;; Highlight the HERE-DOC
                         (cperl-postpone-fontification b (match-beginning 0)
@@ -3404,10 +4105,21 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                      'syntax-type 'here-doc)
                   (put-text-property (match-beginning 0) e1
                                      'syntax-type 'here-doc-delim)
-                  (put-text-property b e1
-                                     'here-doc-group t)
+                  (put-text-property b e1 'here-doc-group t)
+                  ;; This makes insertion at the start of HERE-DOC update
+                  ;; the whole construct:
+                  (put-text-property b (cperl-1+ b) 'front-sticky '(syntax-type))
                   (cperl-commentify b e1 nil)
                   (cperl-put-do-not-fontify b (match-end 0) t)
+                  ;; Cache the syntax info...
+                  (setq cperl-syntax-state (cons state-point state))
+                  ;; ... and process the rest of the line...
+                  (setq overshoot
+                        (elt            ; non-inter ignore-max
+                         (cperl-find-pods-heres c i t end t e1) 1))
+                  (if (and overshoot (> overshoot (point)))
+                      (goto-char overshoot)
+                    (setq overshoot e1))
                   (if (> e1 max)
                       (setq tmpend tb))))
                ;; format
@@ -3462,7 +4174,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                 (if (> (point) max)
                     (setq tmpend tb))
                 (put-text-property b (point) 'syntax-type 'format))
-               ;; Regexp:
+               ;; qq-like String or Regexp:
                ((or (match-beginning 10) (match-beginning 11))
                 ;; 1+6+2=9 extra () before this:
                 ;; "\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>"
@@ -3471,10 +4183,10 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                 (setq b1 (if (match-beginning 10) 10 11)
                       argument (buffer-substring
                                 (match-beginning b1) (match-end b1))
-                      b (point)
+                      b (point)         ; end of qq etc
                       i b
                       c (char-after (match-beginning b1))
-                      bb (char-after (1- (match-beginning b1))) ; tmp holder
+                      bb (char-after (1- (match-beginning b1))) ; tmp holder
                       ;; bb == "Not a stringy"
                       bb (if (eq b1 10) ; user variables/whatever
                              (and (memq bb (append "$@%*#_:-&>" nil)) ; $#y)
@@ -3488,7 +4200,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                               (- (match-beginning b1) 2))
                                              ?\-))
                                         ((eq bb ?\&)
-                                         (not (eq (char-after   ; &&m/blah/
+                                         (not (eq (char-after ; &&m/blah/
                                                    (- (match-beginning b1) 2))
                                                   ?\&)))
                                         (t t)))
@@ -3506,41 +4218,40 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                         (setq argument ""
                               b1 nil
                               bb        ; Not a regexp?
-                              (progn
-                                (not
-                                 ;; What is below: regexp-p?
-                                 (and
-                                  (or (memq (preceding-char)
-                                            (append (if (memq c '(?\? ?\<))
-                                                        ;; $a++ ? 1 : 2
-                                                        "~{(=|&*!,;:"
-                                                      "~{(=|&+-*!,;:") nil))
-                                      (and (eq (preceding-char) ?\})
-                                           (cperl-after-block-p (point-min)))
-                                      (and (eq (char-syntax (preceding-char)) ?w)
-                                           (progn
-                                             (forward-sexp -1)
+                              (not
+                               ;; What is below: regexp-p?
+                               (and
+                                (or (memq (preceding-char)
+                                          (append (if (memq c '(?\? ?\<))
+                                                      ;; $a++ ? 1 : 2
+                                                      "~{(=|&*!,;:["
+                                                    "~{(=|&+-*!,;:[") nil))
+                                    (and (eq (preceding-char) ?\})
+                                         (cperl-after-block-p (point-min)))
+                                    (and (eq (char-syntax (preceding-char)) ?w)
+                                         (progn
+                                           (forward-sexp -1)
 ;; After these keywords `/' starts a RE.  One should add all the
 ;; functions/builtins which expect an argument, but ...
-                                             (if (eq (preceding-char) ?-)
-                                                 ;; -d ?foo? is a RE
-                                                 (looking-at "[a-zA-Z]\\>")
-                                               (and
-                                                (not (memq (preceding-char)
-                                                           '(?$ ?@ ?& ?%)))
-                                                (looking-at
-                                                 "\\(while\\|if\\|unless\\|until\\|and\\|or\\|not\\|xor\\|split\\|grep\\|map\\|print\\)\\>")))))
-                                      (and (eq (preceding-char) ?.)
-                                           (eq (char-after (- (point) 2)) ?.))
-                                      (bobp))
-                                  ;;  m|blah| ? foo : bar;
-                                  (not
-                                   (and (eq c ?\?)
-                                        cperl-use-syntax-table-text-property
-                                        (not (bobp))
-                                        (progn
-                                          (forward-char -1)
-                                          (looking-at "\\s|")))))))
+                                           (if (eq (preceding-char) ?-)
+                                               ;; -d ?foo? is a RE
+                                               (looking-at "[a-zA-Z]\\>")
+                                             (and
+                                              (not (memq (preceding-char)
+                                                         '(?$ ?@ ?& ?%)))
+                                              (looking-at
+                                               "\\(while\\|if\\|unless\\|until\\|and\\|or\\|not\\|xor\\|split\\|grep\\|map\\|print\\)\\>")))))
+                                    (and (eq (preceding-char) ?.)
+                                         (eq (char-after (- (point) 2)) ?.))
+                                    (bobp))
+                                ;;  m|blah| ? foo : bar;
+                                (not
+                                 (and (eq c ?\?)
+                                      cperl-use-syntax-table-text-property
+                                      (not (bobp))
+                                      (progn
+                                        (forward-char -1)
+                                        (looking-at "\\s|"))))))
                               b (1- b))
                       ;; s y tr m
                       ;; Check for $a -> y
@@ -3550,13 +4261,9 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                (eq (char-after (- go 2)) ?-))
                           ;; Not a regexp
                           (setq bb t))))
-                (or bb (setq state (parse-partial-sexp
-                                    state-point b nil nil state)
-                             state-point b))
-                (setq bb (or bb (nth 3 state) (nth 4 state)))
-                (goto-char b)
                 (or bb
                     (progn
+                      (goto-char b)
                       (if (looking-at "[ \t\n\f]+\\(#[^\n]*\n[ \t\n\f]*\\)+")
                           (goto-char (match-end 0))
                         (skip-chars-forward " \t\n\f"))
@@ -3593,6 +4300,8 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                     (skip-chars-backward " \t\n\f")
                                     (memq (preceding-char)
                                           (append "$@%&*" nil))))
+                             (setq bb t))
+                            ((eobp)
                              (setq bb t)))))
                 (if bb
                     (goto-char i)
@@ -3605,15 +4314,16 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                   ;; qtag means two-arg matcher, may be reset to
                   ;;   2 or 3 later if some special quoting is needed.
                   ;; e1 means matching-char matcher.
-                  (setq b (point)
+                  (setq b (point)       ; before the first delimiter
                         ;; has 2 args
                         i2 (string-match "^\\([sy]\\|tr\\)$" argument)
                         ;; We do not search to max, since we may be called from
                         ;; some hook of fontification, and max is random
                         i (cperl-forward-re stop-point end
                                             i2
-                                            t st-l err-l argument)
-                        ;; Note that if `go', then it is considered as 1-arg
+                                            st-l err-l argument)
+                        ;; If `go', then it is considered as 1-arg, `b1' is nil
+                        ;; as in s/foo//x; the point is before final "slash"
                         b1 (nth 1 i)    ; start of the second part
                         tag (nth 2 i)   ; ender-char, true if second part
                                         ; is with matching chars []
@@ -3625,13 +4335,18 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                  (1- e1))
                         e (if i i e1)   ; end of the first part
                         qtag nil        ; need to preserve backslashitis
-                        is-x-REx nil)   ; REx has //x modifier
+                        is-x-REx nil is-o-REx nil); REx has //x //o modifiers
+                  ;; If s{} (), then b/b1 are at "{", "(", e1/i after ")", "}"
                   ;; Commenting \\ is dangerous, what about ( ?
                   (and i tail
                        (eq (char-after i) ?\\)
                        (setq qtag t))
-                  (if (looking-at "\\sw*x") ; qr//x
-                      (setq is-x-REx t))
+                  (and (if go (looking-at ".\\sw*x")
+                         (looking-at "\\sw*x")) ; qr//x
+                       (setq is-x-REx t))
+                  (and (if go (looking-at ".\\sw*o")
+                         (looking-at "\\sw*o")) ; //o
+                       (setq is-o-REx t))
                   (if (null i)
                       ;; Considered as 1arg form
                       (progn
@@ -3648,9 +4363,11 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                     (cperl-commentify b i t)
                     (if (looking-at "\\sw*e") ; s///e
                         (progn
+                          ;; Cache the syntax info...
+                          (setq cperl-syntax-state (cons state-point state))
                           (and
                            ;; silent:
-                           (cperl-find-pods-heres b1 (1- (point)) t end)
+                           (car (cperl-find-pods-heres b1 (1- (point)) t end))
                            ;; Error
                            (goto-char (1+ max)))
                           (if (and tag (eq (preceding-char) ?\>))
@@ -3658,6 +4375,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                 (cperl-modify-syntax-type (1- (point)) cperl-st-ket)
                                 (cperl-modify-syntax-type i cperl-st-bra)))
                           (put-text-property b i 'syntax-type 'string)
+                          (put-text-property i (point) 'syntax-type 'multiline)
                           (if is-x-REx
                               (put-text-property b i 'indentable t)))
                       (cperl-commentify b1 (point) t)
@@ -3673,7 +4391,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                         (forward-word 1) ; skip modifiers s///s
                         (if tail (cperl-commentify tail (point) t))
                         (cperl-postpone-fontification
-                         e1 (point) 'face 'cperl-nonoverridable)))
+                         e1 (point) 'face my-cperl-REx-modifiers-face)))
                   ;; Check whether it is m// which means "previous match"
                   ;; and highlight differently
                   (setq is-REx
@@ -3691,7 +4409,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                    (not (looking-at "split\\>")))
                                (error t))))
                       (cperl-postpone-fontification
-                       b e 'face font-lock-function-name-face)
+                       b e 'face font-lock-warning-face)
                     (if (or i2          ; Has 2 args
                             (and cperl-fontify-m-as-s
                                  (or
@@ -3700,135 +4418,417 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                        (not (eq ?\< (char-after b)))))))
                         (progn
                           (cperl-postpone-fontification
-                           b (cperl-1+ b) 'face font-lock-constant-face)
+                           b (cperl-1+ b) 'face my-cperl-delimiters-face)
                           (cperl-postpone-fontification
-                           (1- e) e 'face font-lock-constant-face)))
+                           (1- e) e 'face my-cperl-delimiters-face)))
                     (if (and is-REx cperl-regexp-scan)
-                        ;; Process RExen better
+                        ;; Process RExen: embedded comments, charclasses and ]
+;;;/\3333\xFg\x{FFF}a\ppp\PPP\qqq\C\99f(?{  foo  })(??{  foo  })/;
+;;;/a\.b[^a[:ff:]b]x$ab->$[|$,$ab->[cd]->[ef]|$ab[xy].|^${a,b}{c,d}/;
+;;;/(?<=foo)(?<!bar)(x)(?:$ab|\$\/)$|\\\b\x888\776\[\:$/xxx;
+;;;m?(\?\?{b,a})? + m/(??{aa})(?(?=xx)aa|bb)(?#aac)/;
+;;;m$(^ab[c]\$)$ + m+(^ab[c]\$\+)+ + m](^ab[c\]$|.+)] + m)(^ab[c]$|.+\));
+;;;m^a[\^b]c^ + m.a[^b]\.c.;
                         (save-excursion
                           (goto-char (1+ b))
+                          ;; First 
+                          (cperl-look-at-leading-count is-x-REx e)
+                          (setq hairy-RE
+                                (concat
+                                 (if is-x-REx
+                                     (if (eq (char-after b) ?\#)
+                                         "\\((\\?\\\\#\\)\\|\\(\\\\#\\)"
+                                       "\\((\\?#\\)\\|\\(#\\)")
+                                   ;; keep the same count: add a fake group
+                                   (if (eq (char-after b) ?\#)
+                                       "\\((\\?\\\\#\\)\\(\\)"
+                                     "\\((\\?#\\)\\(\\)"))
+                                 "\\|"
+                                    "\\(\\[\\)" ; 3=[
+                                 "\\|"
+                                    "\\(]\\)" ; 4=]
+                                 "\\|"
+                                 ;; XXXX Will not be able to use it in s)))
+                                 (if (eq (char-after b) ?\) )
+                                     "\\())))\\)" ; Will never match
+                                   (if (eq (char-after b) ?? )
+                                       ;;"\\((\\\\\\?\\(\\\\\\?\\)?{\\)"
+                                       "\\((\\\\\\?\\\\\\?{\\|()\\\\\\?{\\)"
+                                     "\\((\\?\\??{\\)")) ; 5= (??{ (?{
+                                 "\\|"  ; 6= 0-length, 7: name, 8,9:code, 10:group
+                                    "\\(" ;; XXXX 1-char variables, exc. |()\s
+                                       "[$@]"
+                                       "\\("
+                                          "[_a-zA-Z:][_a-zA-Z0-9:]*"
+                                       "\\|"
+                                          "{[^{}]*}" ; only one-level allowed
+                                       "\\|"
+                                          "[^{(|) \t\r\n\f]"
+                                       "\\)"
+                                       "\\(" ;;8,9:code part of array/hash elt
+                                          "\\(" "->" "\\)?"
+                                          "\\[[^][]*\\]"
+                                          "\\|"
+                                          "{[^{}]*}"
+                                       "\\)*"
+                                    ;; XXXX: what if u is delim?
+                                    "\\|"
+                                       "[)^|$.*?+]"
+                                    "\\|"
+                                       "{[0-9]+}"
+                                    "\\|"
+                                       "{[0-9]+,[0-9]*}"
+                                    "\\|"
+                                       "\\\\[luLUEQbBAzZG]"
+                                    "\\|"
+                                       "(" ; Group opener
+                                       "\\(" ; 10 group opener follower
+                                          "\\?\\((\\?\\)" ; 11: in (?(?=C)A|B)
+                                       "\\|"
+                                          "\\?[:=!>?{]" ; "?" something
+                                       "\\|"
+                                          "\\?[-imsx]+[:)]" ; (?i) (?-s:.)
+                                       "\\|"
+                                          "\\?([0-9]+)" ; (?(1)foo|bar)
+                                       "\\|"
+                                          "\\?<[=!]"
+                                       ;;;"\\|"
+                                       ;;;   "\\?"
+                                       "\\)?"
+                                    "\\)"
+                                 "\\|"
+                                    "\\\\\\(.\\)" ; 12=\SYMBOL
+                                 ))
                           (while
-                              (and (< (point) e)
-                                   (re-search-forward
-                                    (if is-x-REx
-                                        (if (eq (char-after b) ?\#)
-                                            "\\((\\?\\\\#\\)\\|\\(\\\\#\\)"
-                                          "\\((\\?#\\)\\|\\(#\\)")
-                                      (if (eq (char-after b) ?\#)
-                                          "\\((\\?\\\\#\\)"
-                                        "\\((\\?#\\)"))
-                                    (1- e) 'to-end))
+                              (and (< (point) (1- e))
+                                   (re-search-forward hairy-RE (1- e) 'to-end))
                             (goto-char (match-beginning 0))
-                            (setq REx-comment-start (point)
-                                  was-comment t)
-                            (if (save-excursion
-                                  (and
-                                   ;; XXX not working if outside delimiter is #
-                                   (eq (preceding-char) ?\\)
-                                   (= (% (skip-chars-backward "$\\\\") 2) -1)))
-                                ;; Not a comment, avoid loop:
-                                (progn (setq was-comment nil)
-                                       (forward-char 1))
-                              (if (match-beginning 2)
+                            (setq REx-subgr-start (point)
+                                  was-subgr (following-char))
+                            (cond
+                             ((match-beginning 6) ; 0-length builtins, groups
+                              (goto-char (match-end 0))
+                              (if (match-beginning 11)
+                                  (goto-char (match-beginning 11)))
+                              (if (>= (point) e)
+                                  (goto-char (1- e)))
+                              (cperl-postpone-fontification
+                               (match-beginning 0) (point)
+                               'face
+                               (cond
+                                ((eq was-subgr ?\) )
+                                 (condition-case nil
+                                     (save-excursion
+                                       (forward-sexp -1)
+                                       (if (> (point) b)
+                                           (if (if (eq (char-after b) ?? )
+                                                   (looking-at "(\\\\\\?")
+                                                 (eq (char-after (1+ (point))) ?\?))
+                                               my-cperl-REx-0length-face
+                                             my-cperl-REx-ctl-face)
+                                         font-lock-warning-face))
+                                   (error font-lock-warning-face)))
+                                ((eq was-subgr ?\| )
+                                 my-cperl-REx-ctl-face)
+                                ((eq was-subgr ?\$ )
+                                 (if (> (point) (1+ REx-subgr-start))
+                                     (progn
+                                       (put-text-property
+                                        (match-beginning 0) (point)
+                                        'REx-interpolated
+                                        (if is-o-REx 0
+                                            (if (and (eq (match-beginning 0)
+                                                         (1+ b))
+                                                     (eq (point)
+                                                         (1- e))) 1 t)))
+                                       font-lock-variable-name-face)
+                                   my-cperl-REx-spec-char-face))
+                                ((memq was-subgr (append "^." nil) )
+                                 my-cperl-REx-spec-char-face)
+                                ((eq was-subgr ?\( )
+                                 (if (not (match-beginning 10))
+                                     my-cperl-REx-ctl-face
+                                   my-cperl-REx-0length-face))
+                                (t my-cperl-REx-0length-face)))
+                              (if (and (memq was-subgr (append "(|" nil))
+                                       (not (string-match "(\\?[-imsx]+)"
+                                                          (match-string 0))))
+                                  (cperl-look-at-leading-count is-x-REx e))
+                              (setq was-subgr nil)) ; We do stuff here
+                             ((match-beginning 12) ; \SYMBOL
+                              (forward-char 2)
+                              (if (>= (point) e)
+                                  (goto-char (1- e))
+                                ;; How many chars to not highlight:
+                                ;; 0-len special-alnums in other branch =>
+                                ;; Generic:  \non-alnum (1), \alnum (1+face)
+                                ;; Is-delim: \non-alnum (1/spec-2) alnum-1 (=what hai)
+                                (setq REx-subgr-start (point)
+                                      qtag (preceding-char))
+                                (cperl-postpone-fontification
+                                 (- (point) 2) (- (point) 1) 'face
+                                 (if (memq qtag
+                                           (append "ghijkmoqvFHIJKMORTVY" nil))
+                                     font-lock-warning-face
+                                   my-cperl-REx-0length-face))
+                                (if (and (eq (char-after b) qtag)
+                                         (memq qtag (append ".])^$|*?+" nil)))
+                                    (progn
+                                      (if (and cperl-use-syntax-table-text-property
+                                               (eq qtag ?\) ))
+                                          (put-text-property
+                                           REx-subgr-start (1- (point))
+                                           'syntax-table cperl-st-punct))
+                                      (cperl-postpone-fontification
+                                       (1- (point)) (point) 'face
+                                        ; \] can't appear below
+                                       (if (memq qtag (append ".]^$" nil))
+                                           'my-cperl-REx-spec-char-face
+                                         (if (memq qtag (append "*?+" nil))
+                                             'my-cperl-REx-0length-face
+                                           'my-cperl-REx-ctl-face))))) ; )|
+                                ;; Test for arguments:
+                                (cond
+                                 ;; This is not pretty: the 5.8.7 logic:
+                                 ;; \0numx  -> octal (up to total 3 dig)
+                                 ;; \DIGIT  -> backref unless \0
+                                 ;; \DIGITs -> backref if legal
+                                 ;;          otherwise up to 3 -> octal
+                                 ;; Do not try to distinguish, we guess
+                                 ((or (and (memq qtag (append "01234567" nil))
+                                           (re-search-forward
+                                            "\\=[01234567]?[01234567]?"
+                                            (1- e) 'to-end))
+                                      (and (memq qtag (append "89" nil))
+                                           (re-search-forward 
+                                            "\\=[0123456789]*" (1- e) 'to-end))
+                                      (and (eq qtag ?x)
+                                           (re-search-forward
+                                            "\\=[0-9a-fA-F][0-9a-fA-F]?\\|\\={[0-9a-fA-F]+}"
+                                            (1- e) 'to-end))
+                                      (and (memq qtag (append "pPN" nil))
+                                           (re-search-forward "\\={[^{}]+}\\|."
+                                            (1- e) 'to-end))
+                                      (eq (char-syntax qtag) ?w))
+                                  (cperl-postpone-fontification
+                                   (1- REx-subgr-start) (point)
+                                   'face my-cperl-REx-length1-face))))
+                              (setq was-subgr nil)) ; We do stuff here
+                             ((match-beginning 3) ; [charclass]
+                              (forward-char 1)
+                              (if (eq (char-after b) ?^ )
+                                  (and (eq (following-char) ?\\ )
+                                       (eq (char-after (cperl-1+ (point)))
+                                           ?^ )
+                                       (forward-char 2))
+                                (and (eq (following-char) ?^ )
+                                     (forward-char 1)))
+                              (setq argument b ; continue?
+                                    tag nil ; list of POSIX classes
+                                    qtag (point))
+                              (if (eq (char-after b) ?\] )
+                                  (and (eq (following-char) ?\\ )
+                                       (eq (char-after (cperl-1+ (point)))
+                                           ?\] )
+                                       (setq qtag (1+ qtag))
+                                       (forward-char 2))
+                                (and (eq (following-char) ?\] )
+                                     (forward-char 1)))
+                              ;; Apparently, I can't put \] into a charclass
+                              ;; in m]]: m][\\\]\]] produces [\\]]
+;;; POSIX?  [:word:] [:^word:] only inside []
+;;;                                    "\\=\\(\\\\.\\|[^][\\\\]\\|\\[:\\^?\sw+:]\\|\\[[^:]\\)*]")
+                              (while 
+                                  (and argument
+                                       (re-search-forward
+                                        (if (eq (char-after b) ?\] )
+                                            "\\=\\(\\\\[^]]\\|[^]\\\\]\\)*\\\\]"
+                                          "\\=\\(\\\\.\\|[^]\\\\]\\)*]")
+                                        (1- e) 'toend))
+                                ;; Is this ] an end of POSIX class?
+                                (if (save-excursion
+                                      (and
+                                       (search-backward "[" argument t)
+                                       (< REx-subgr-start (point))
+                                       (not
+                                        (and ; Should work with delim = \
+                                         (eq (preceding-char) ?\\ )
+                                         (= (% (skip-chars-backward
+                                                "\\\\") 2) 0)))
+                                       (looking-at
+                                        (cond
+                                         ((eq (char-after b) ?\] )
+                                          "\\\\*\\[:\\^?\\sw+:\\\\\\]")
+                                         ((eq (char-after b) ?\: )
+                                          "\\\\*\\[\\\\:\\^?\\sw+\\\\:]")
+                                         ((eq (char-after b) ?^ )
+                                          "\\\\*\\[:\\(\\\\\\^\\)?\\sw+:\]")
+                                         ((eq (char-syntax (char-after b))
+                                              ?w)
+                                          (concat
+                                           "\\\\*\\[:\\(\\\\\\^\\)?\\(\\\\"
+                                           (char-to-string (char-after b))
+                                           "\\|\\sw\\)+:\]"))
+                                         (t "\\\\*\\[:\\^?\\sw*:]")))
+                                       (setq argument (point))))
+                                    (setq tag (cons (cons argument (point))
+                                                    tag)
+                                          argument (point)) ; continue
+                                  (setq argument nil)))
+                              (and argument
+                                   (message "Couldn't find end of charclass in a REx, pos=%s"
+                                            REx-subgr-start))
+                              (if (and cperl-use-syntax-table-text-property
+                                       (> (- (point) 2) REx-subgr-start))
+                                  (put-text-property
+                                   (1+ REx-subgr-start) (1- (point))
+                                   'syntax-table cperl-st-punct))
+                              (cperl-postpone-fontification
+                               REx-subgr-start qtag
+                               'face my-cperl-REx-spec-char-face)
+                              (cperl-postpone-fontification
+                               (1- (point)) (point) 'face
+                               my-cperl-REx-spec-char-face)
+                              (if (eq (char-after b) ?\] )
+                                  (cperl-postpone-fontification
+                                   (- (point) 2) (1- (point))
+                                   'face my-cperl-REx-0length-face))
+                              (while tag
+                                (cperl-postpone-fontification
+                                 (car (car tag)) (cdr (car tag))
+                                 'face my-cperl-REx-length1-face)
+                                (setq tag (cdr tag)))
+                              (setq was-subgr nil)) ; did facing already
+                             ;; Now rare stuff:
+                             ((and (match-beginning 2) ; #-comment
+                                   (/= (match-beginning 2) (match-end 2)))
+                              (beginning-of-line 2)
+                              (if (> (point) e)
+                                  (goto-char (1- e))))
+                             ((match-beginning 4) ; character "]"
+                              (setq was-subgr nil) ; We do stuff here
+                              (goto-char (match-end 0))
+                              (if cperl-use-syntax-table-text-property
+                                  (put-text-property
+                                   (1- (point)) (point)
+                                   'syntax-table cperl-st-punct))
+                              (cperl-postpone-fontification
+                               (1- (point)) (point)
+                               'face font-lock-warning-face))
+                             ((match-beginning 5) ; before (?{}) (??{})
+                              (setq tag (match-end 0))
+                              (if (or (setq qtag
+                                            (cperl-forward-group-in-re st-l))
+                                      (and (>= (point) e)
+                                           (setq qtag "no matching `)' found"))
+                                      (and (not (eq (char-after (- (point) 2))
+                                                    ?\} ))
+                                           (setq qtag "Can't find })")))
                                   (progn
-                                    (beginning-of-line 2)
-                                    (if (> (point) e)
-                                        (goto-char (1- e))))
-                                ;; Works also if the outside delimiters are ().
-                                (or (search-forward ")" (1- e) 'toend)
-                                    (message
-                                     "Couldn't find end of (?#...)-comment in a REx, pos=%s"
-                                     REx-comment-start))))
+                                    (goto-char (1- e))
+                                    (message qtag))
+                                (cperl-postpone-fontification
+                                 (1- tag) (1- (point))
+                                 'face font-lock-variable-name-face)
+                                (cperl-postpone-fontification
+                                 REx-subgr-start (1- tag)
+                                 'face my-cperl-REx-spec-char-face)
+                                (cperl-postpone-fontification
+                                 (1- (point)) (point)
+                                 'face my-cperl-REx-spec-char-face)
+                                (if cperl-use-syntax-table-text-property
+                                    (progn
+                                      (put-text-property
+                                       (- (point) 2) (1- (point))
+                                       'syntax-table cperl-st-cfence)
+                                      (put-text-property
+                                       (+ REx-subgr-start 2)
+                                       (+ REx-subgr-start 3)
+                                       'syntax-table cperl-st-cfence))))
+                              (setq was-subgr nil))
+                             (t         ; (?#)-comment
+                              ;; Inside "(" and "\" arn't special in any way
+                              ;; Works also if the outside delimiters are ().
+                              (or;;(if (eq (char-after b) ?\) )
+                               ;;(re-search-forward
+                               ;; "[^\\\\]\\(\\\\\\\\\\)*\\\\)"
+                               ;; (1- e) 'toend)
+                               (search-forward ")" (1- e) 'toend)
+                               ;;)
+                               (message
+                                "Couldn't find end of (?#...)-comment in a REx, pos=%s"
+                                REx-subgr-start))))
                             (if (>= (point) e)
                                 (goto-char (1- e)))
-                            (if was-comment
-                                (progn
-                                  (setq REx-comment-end (point))
-                                  (cperl-commentify
-                                   REx-comment-start REx-comment-end nil)
-                                  (cperl-postpone-fontification
-                                   REx-comment-start REx-comment-end
-                                   'face font-lock-comment-face))))))
+                            (cond
+                             (was-subgr
+                              (setq REx-subgr-end (point))
+                              (cperl-commentify
+                               REx-subgr-start REx-subgr-end nil)
+                              (cperl-postpone-fontification
+                               REx-subgr-start REx-subgr-end
+                               'face font-lock-comment-face))))))
                     (if (and is-REx is-x-REx)
                         (put-text-property (1+ b) (1- e)
                                            'syntax-subtype 'x-REx)))
                   (if i2
                       (progn
                         (cperl-postpone-fontification
-                         (1- e1) e1 'face font-lock-constant-face)
+                         (1- e1) e1 'face my-cperl-delimiters-face)
                         (if (assoc (char-after b) cperl-starters)
-                            (cperl-postpone-fontification
-                             b1 (1+ b1) 'face font-lock-constant-face))))
+                            (progn
+                              (cperl-postpone-fontification
+                               b1 (1+ b1) 'face my-cperl-delimiters-face)
+                              (put-text-property b1 (1+ b1)
+                                           'REx-part2 t)))))
                   (if (> (point) max)
                       (setq tmpend tb))))
-               ((match-beginning 13)    ; sub with prototypes
-                (setq b (match-beginning 0))
+               ((match-beginning 17)    ; sub with prototype or attribute
+                ;; 1+6+2+1+1=11 extra () before this (sub with proto/attr):
+                ;;"\\<sub\\>\\("                        ;12
+                ;;   cperl-white-and-comment-rex        ;13
+                ;;   "\\([a-zA-Z_:'0-9]+\\)\\)?" ; name ;14
+                ;;"\\(" cperl-maybe-white-and-comment-rex       ;15,16
+                ;;   "\\(([^()]*)\\|:[^:]\\)\\)" ; 17:proto or attribute start
+                (setq b1 (match-beginning 14) e1 (match-end 14))
                 (if (memq (char-after (1- b))
                           '(?\$ ?\@ ?\% ?\& ?\*))
                     nil
-                  (setq state (parse-partial-sexp
-                               state-point b nil nil state)
-                        state-point b)
-                  (if (or (nth 3 state) (nth 4 state))
-                      nil
-                    ;; Mark as string
-                    (cperl-commentify (match-beginning 13) (match-end 13) t))
-                  (goto-char (match-end 0))))
-               ;; 1+6+2+1+1+2=13 extra () before this:
-               ;;    "\\$\\(['{]\\)"
-               ((and (match-beginning 14)
-                     (eq (preceding-char) ?\')) ; $'
-                (setq b (1- (point))
-                      state (parse-partial-sexp
-                             state-point (1- b) nil nil state)
-                      state-point (1- b))
-                (if (nth 3 state)       ; in string
-                    (cperl-modify-syntax-type (1- b) cperl-st-punct))
-                (goto-char (1+ b)))
-               ;; 1+6+2+1+1+2=13 extra () before this:
-               ;;    "\\$\\(['{]\\)"
-               ((match-beginning 14)    ; ${
-                (setq bb (match-beginning 0))
-                (cperl-modify-syntax-type bb cperl-st-punct))
-               ;; 1+6+2+1+1+2+1=14 extra () before this:
+                  (goto-char b)
+                  (if (eq (char-after (match-beginning 17)) ?\( )
+                      (progn
+                        (cperl-commentify ; Prototypes; mark as string
+                         (match-beginning 17) (match-end 17) t)
+                        (goto-char (match-end 0))
+                        ;; Now look for attributes after prototype:
+                        (forward-comment (buffer-size))
+                        (and (looking-at ":[^:]")
+                             (cperl-find-sub-attrs st-l b1 e1 b)))
+                    ;; treat attributes without prototype
+                    (goto-char (match-beginning 17))
+                    (cperl-find-sub-attrs st-l b1 e1 b))))
+               ;; 1+6+2+1+1+6+1=18 extra () before this:
                ;;    "\\(\\<sub[ \t\n\f]+\\|[&*$@%]\\)[a-zA-Z0-9_]*'")
-               ((match-beginning 15)    ; old $abc'efg syntax
-                (setq bb (match-end 0)
-                      b (match-beginning 0)
-                      state (parse-partial-sexp
-                             state-point b nil nil state)
-                      state-point b)
-                (if (nth 3 state)       ; in string
-                    nil
-                  (put-text-property (1- bb) bb 'syntax-table cperl-st-word))
+               ((match-beginning 19)    ; old $abc'efg syntax
+                (setq bb (match-end 0))
+                ;;;(if (nth 3 state) nil        ; in string
+                (put-text-property (1- bb) bb 'syntax-table cperl-st-word)
                 (goto-char bb))
-               ;; 1+6+2+1+1+2+1+1=15 extra () before this:
+               ;; 1+6+2+1+1+6+1+1=19 extra () before this:
                ;; "__\\(END\\|DATA\\)__"
-               ((match-beginning 16)    ; __END__, __DATA__
-                (setq bb (match-end 0)
-                      b (match-beginning 0)
-                      state (parse-partial-sexp
-                             state-point b nil nil state)
-                      state-point b)
-                (if (or (nth 3 state) (nth 4 state))
-                    nil
-                  ;; (put-text-property b (1+ bb) 'syntax-type 'pod) ; Cheat
-                  (cperl-commentify b bb nil)
-                  (setq end t))
-                (goto-char bb))
-               ((match-beginning 17)    ; "\\\\\\(['`\"($]\\)"
-                ;; Trailing backslash ==> non-quoting outside string/comment
-                (setq bb (match-end 0)
-                      b (match-beginning 0))
+               ((match-beginning 20)    ; __END__, __DATA__
+                (setq bb (match-end 0))
+                ;; (put-text-property b (1+ bb) 'syntax-type 'pod) ; Cheat
+                (cperl-commentify b bb nil)
+                (setq end t))
+               ;; "\\\\\\(['`\"($]\\)"
+               ((match-beginning 21)
+                ;; Trailing backslash; make non-quoting outside string/comment
+                (setq bb (match-end 0))
                 (goto-char b)
                 (skip-chars-backward "\\\\")
                 ;;;(setq i2 (= (% (skip-chars-backward "\\\\") 2) -1))
-                (setq state (parse-partial-sexp
-                             state-point b nil nil state)
-                      state-point b)
-                (if (or (nth 3 state) (nth 4 state) )
-                    nil
-                  (cperl-modify-syntax-type b cperl-st-punct))
+                (cperl-modify-syntax-type b cperl-st-punct)
                 (goto-char bb))
                (t (error "Error in regexp of the sniffer")))
               (if (> (point) stop-point)
@@ -3839,7 +4839,10 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                       (or (car err-l) (setcar err-l b)))
                     (goto-char stop-point))))
             (setq cperl-syntax-state (cons state-point state)
-                  cperl-syntax-done-to (or tmpend (max (point) max))))
+                  ;; Do not mark syntax as done past tmpend???
+                  cperl-syntax-done-to (or tmpend (max (point) max)))
+            ;;(message "state-at=%s, done-to=%s" state-point cperl-syntax-done-to)
+            )
           (if (car err-l) (goto-char (car err-l))
             (or non-inter
                 (message "Scanning for \"hard\" Perl constructions... done"))))
@@ -3851,48 +4854,91 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
       ;; cperl-mode-syntax-table.
       ;; (set-syntax-table cperl-mode-syntax-table)
       )
-    (car err-l)))
+    (list (car err-l) overshoot)))
+
+(defun cperl-find-pods-heres-region (min max)
+  (interactive "r")
+  (cperl-find-pods-heres min max))
 
 (defun cperl-backward-to-noncomment (lim)
   ;; Stops at lim or after non-whitespace that is not in comment
+  ;; XXXX Wrongly understands end-of-multiline strings with # as comment
   (let (stop p pr)
-    (while (and (not stop) (> (point) (or lim 1)))
+    (while (and (not stop) (> (point) (or lim (point-min))))
       (skip-chars-backward " \t\n\f" lim)
       (setq p (point))
       (beginning-of-line)
       (if (memq (setq pr (get-text-property (point) 'syntax-type))
                 '(pod here-doc here-doc-delim))
           (cperl-unwind-to-safe nil)
-      (or (looking-at "^[ \t]*\\(#\\|$\\)")
-          (progn (cperl-to-comment-or-eol) (bolp))
-          (progn
-            (skip-chars-backward " \t")
-            (if (< p (point)) (goto-char p))
-            (setq stop t)))))))
+        (or (and (looking-at "^[ \t]*\\(#\\|$\\)")
+                 (not (memq pr '(string prestring))))
+            (progn (cperl-to-comment-or-eol) (bolp))
+            (progn
+              (skip-chars-backward " \t")
+              (if (< p (point)) (goto-char p))
+              (setq stop t)))))))
 
+;; Used only in `cperl-calculate-indent'...
+(defun cperl-block-p ()            ; Do not C-M-q !  One string contains ";" !
+  ;; Positions is before ?\{.  Checks whether it starts a block.
+  ;; No save-excursion!  This is more a distinguisher of a block/hash ref...
+  (cperl-backward-to-noncomment (point-min))
+  (or (memq (preceding-char) (append ";){}$@&%\C-@" nil)) ; Or label!  \C-@ at bobp
+                                        ; Label may be mixed up with `$blah :'
+      (save-excursion (cperl-after-label))
+      (get-text-property (cperl-1- (point)) 'attrib-group)
+      (and (memq (char-syntax (preceding-char)) '(?w ?_))
+           (progn
+             (backward-sexp)
+             ;; sub {BLK}, print {BLK} $data, but NOT `bless', `return', `tr'
+             (or (and (looking-at "[a-zA-Z0-9_:]+[ \t\n\f]*[{#]") ; Method call syntax
+                      (not (looking-at "\\(bless\\|return\\|q[wqrx]?\\|tr\\|[smy]\\)\\>")))
+                 ;; sub bless::foo {}
+                 (progn
+                   (cperl-backward-to-noncomment (point-min))
+                   (and (eq (preceding-char) ?b)
+                        (progn
+                          (forward-sexp -1)
+                          (looking-at "sub[ \t\n\f#]")))))))))
+
+;;; What is the difference of (cperl-after-block-p lim t) and (cperl-block-p)?
+;;; No save-excursion; condition-case ...  In (cperl-block-p) the block
+;;; may be a part of an in-statement construct, such as
+;;;   ${something()}, print {FH} $data.
+;;; Moreover, one takes positive approach (looks for else,grep etc)
+;;; another negative (looks for bless,tr etc)
 (defun cperl-after-block-p (lim &optional pre-block)
-  "Return true if the preceeding } ends a block or a following { starts one.
-Would not look before LIM.  If PRE-BLOCK is nil checks preceeding }.
-otherwise following {."
-  ;; We suppose that the preceding char is }.
+  "Return true if the preceeding } (if PRE-BLOCK, following {) delimits a block.
+Would not look before LIM.  Assumes that LIM is a good place to begin a
+statement.  The kind of block we treat here is one after which a new
+statement would start; thus the block in ${func()} does not count."
   (save-excursion
     (condition-case nil
         (progn
           (or pre-block (forward-sexp -1))
           (cperl-backward-to-noncomment lim)
           (or (eq (point) lim)
-              (eq (preceding-char) ?\) ) ; if () {}    sub f () {}
-              (if (eq (char-syntax (preceding-char)) ?w) ; else {}
+              ;; if () {}   // sub f () {}   // sub f :a(') {}
+              (eq (preceding-char) ?\) )
+              ;; label: {}
+              (save-excursion (cperl-after-label))
+              ;; sub :attr {}
+              (get-text-property (cperl-1- (point)) 'attrib-group)
+              (if (memq (char-syntax (preceding-char)) '(?w ?_)) ; else {}
                   (save-excursion
                     (forward-sexp -1)
-                    (or (looking-at "\\(else\\|continue\\|grep\\|map\\|BEGIN\\|END\\|CHECK\\|INIT\\)\\>")
+                    ;; else {}     but not    else::func {}
+                    (or (and (looking-at "\\(else\\|continue\\|grep\\|map\\|BEGIN\\|END\\|CHECK\\|INIT\\)\\>")
+                             (not (looking-at "\\(\\sw\\|_\\)+::")))
                         ;; sub f {}
                         (progn
                           (cperl-backward-to-noncomment lim)
-                          (and (eq (char-syntax (preceding-char)) ?w)
+                          (and (eq (preceding-char) ?b)
                                (progn
                                  (forward-sexp -1)
-                                 (looking-at "sub\\>"))))))
+                                 (looking-at "sub[ \t\n\f#]"))))))
+                ;; What preceeds is not word...  XXXX Last statement in sub???
                 (cperl-after-expr-p lim))))
       (error nil))))
 
@@ -3914,12 +4960,12 @@ CHARS is a string that contains good characters to have before us (however,
         (if (get-text-property (point) 'here-doc-group)
             (progn
               (goto-char
-               (previous-single-property-change (point) 'here-doc-group))
+               (cperl-beginning-of-property (point) 'here-doc-group))
               (beginning-of-line 0)))
         (if (get-text-property (point) 'in-pod)
             (progn
               (goto-char
-               (previous-single-property-change (point) 'in-pod))
+               (cperl-beginning-of-property (point) 'in-pod))
               (beginning-of-line 0)))
         (if (looking-at "^[ \t]*\\(#\\|$\\)") nil ; Only comment, skip
           ;; Else: last iteration, or a label
@@ -3931,7 +4977,7 @@ CHARS is a string that contains good characters to have before us (however,
                    (progn
                      (forward-char -1)
                      (skip-chars-backward " \t\n\f" lim)
-                     (eq (char-syntax (preceding-char)) ?w)))
+                     (memq (char-syntax (preceding-char)) '(?w ?_))))
               (forward-sexp -1)         ; Possibly label.  Skip it
             (goto-char p)
             (setq stop t))))
@@ -3947,6 +4993,44 @@ CHARS is a string that contains good characters to have before us (however,
                        (eq (get-text-property (point) 'syntax-type)
                            'format)))))))))
 
+(defun cperl-backward-to-start-of-expr (&optional lim)
+  (condition-case nil
+      (progn
+        (while (and (or (not lim)
+                        (> (point) lim))
+                    (not (cperl-after-expr-p lim)))
+          (forward-sexp -1)
+          ;; May be after $, @, $# etc of a variable
+          (skip-chars-backward "$@%#")))
+    (error nil)))
+
+(defun cperl-at-end-of-expr (&optional lim)
+  ;; Since the SEXP approach below is very fragile, do some overengineering
+  (or (looking-at (concat cperl-maybe-white-and-comment-rex "[;}]"))
+      (condition-case nil
+          (save-excursion
+            ;; If nothing interesting after, does as (forward-sexp -1);
+            ;; otherwise fails, or ends at a start of following sexp.
+            ;; XXXX PROBLEMS: if what follows (after ";") @FOO, or ${bar}
+            ;; may be stuck after @ or $; just put some stupid workaround now:
+            (let ((p (point)))
+              (forward-sexp 1)
+              (forward-sexp -1)
+              (while (memq (preceding-char) (append "%&@$*" nil))
+                (forward-char -1))
+              (or (< (point) p)
+                  (cperl-after-expr-p lim))))
+        (error t))))
+
+(defun cperl-forward-to-end-of-expr (&optional lim)
+  (let ((p (point))))
+  (condition-case nil
+      (progn
+        (while (and (< (point) (or lim (point-max)))
+                    (not (cperl-at-end-of-expr)))
+          (forward-sexp 1)))
+    (error nil)))
+
 (defun cperl-backward-to-start-of-continued-exp (lim)
   (if (memq (preceding-char) (append ")]}\"'`" nil))
       (forward-sexp -1))
@@ -3987,18 +5071,51 @@ conditional/loop constructs."
         (beginning-of-line)
         (while (null done)
           (setq top (point))
-          (while (= (nth 0 (parse-partial-sexp (point) tmp-end
-                                               -1)) -1)
+          ;; Plan A: if line has an unfinished paren-group, go to end-of-group
+          (while (= -1 (nth 0 (parse-partial-sexp (point) tmp-end -1)))
             (setq top (point)))         ; Get the outermost parenths in line
           (goto-char top)
           (while (< (point) tmp-end)
             (parse-partial-sexp (point) tmp-end nil t) ; To start-sexp or eol
             (or (eolp) (forward-sexp 1)))
-          (if (> (point) tmp-end)
-              (save-excursion
-                (end-of-line)
-                (setq tmp-end (point)))
-            (setq done t)))
+          (if (> (point) tmp-end)       ; Yes, there an unfinished block
+              nil
+            (if (eq ?\) (preceding-char))
+                (progn ;; Plan B: find by REGEXP block followup this line
+                  (setq top (point))
+                  (condition-case nil
+                      (progn
+                        (forward-sexp -2)
+                        (if (eq (following-char) ?$ ) ; for my $var (list)
+                            (progn
+                              (forward-sexp -1)
+                              (if (looking-at "\\(my\\|local\\|our\\)\\>")
+                                  (forward-sexp -1))))
+                        (if (looking-at
+                             (concat "\\(\\elsif\\|if\\|unless\\|while\\|until"
+                                     "\\|for\\(each\\)?\\>\\(\\("
+                                     cperl-maybe-white-and-comment-rex
+                                     "\\(my\\|local\\|our\\)\\)?"
+                                     cperl-maybe-white-and-comment-rex
+                                     "\\$[_a-zA-Z0-9]+\\)?\\)\\>"))
+                            (progn
+                              (goto-char top)
+                              (forward-sexp 1)
+                              (setq top (point)))))
+                    (error (setq done t)))
+                  (goto-char top))
+              (if (looking-at           ; Try Plan C: continuation block
+                   (concat cperl-maybe-white-and-comment-rex
+                           "\\<\\(else\\|elsif\|continue\\)\\>"))
+                  (progn
+                    (goto-char (match-end 0))
+                    (save-excursion
+                      (end-of-line)
+                      (setq tmp-end (point))))
+                (setq done t))))
+          (save-excursion
+            (end-of-line)
+            (setq tmp-end (point))))
         (goto-char tmp-end)
         (setq tmp-end (point-marker)))
       (if cperl-indent-region-fix-constructs
@@ -4027,16 +5144,26 @@ Returns some position at the last line."
         ;; Looking at:
         ;; }
         ;; else
-        (if (and cperl-merge-trailing-else
-                 (looking-at
-                  "[ \t]*}[ \t]*\n[ \t\n]*\\(els\\(e\\|if\\)\\|continue\\)\\>"))
-            (progn
-              (search-forward "}")
-              (setq p (point))
-              (skip-chars-forward " \t\n")
-              (delete-region p (point))
+        (if cperl-merge-trailing-else
+            (if (looking-at
+                 "[ \t]*}[ \t]*\n[ \t\n]*\\(els\\(e\\|if\\)\\|continue\\)\\>")
+                (progn
+                  (search-forward "}")
+                  (setq p (point))
+                  (skip-chars-forward " \t\n")
+                  (delete-region p (point))
               (insert (make-string cperl-indent-region-fix-constructs ?\s))
-              (beginning-of-line)))
+                  (beginning-of-line)))
+          (if (looking-at "[ \t]*}[ \t]*\\(els\\(e\\|if\\)\\|continue\\)\\>")
+              (save-excursion
+                  (search-forward "}")
+                  (delete-horizontal-space)
+                  (insert "\n")
+                  (setq ret (point))
+                  (if (cperl-indent-line parse-data)
+                      (progn
+                        (cperl-fix-line-spacing end parse-data)
+                        (setq ret (point)))))))
         ;; Looking at:
         ;; }     else
         (if (looking-at "[ \t]*}\\(\t*\\|[ \t][ \t]+\\)\\<\\(els\\(e\\|if\\)\\|continue\\)\\>")
@@ -4073,19 +5200,19 @@ Returns some position at the last line."
               (insert
                (make-string cperl-indent-region-fix-constructs ?\s))
               (beginning-of-line)))
-        ;; Looking at:
-        ;; } foreach my $var ()    {
+        ;; Looking at (with or without "}" at start, ending after "({"):
+        ;; } foreach my $var ()         OR   {
         (if (looking-at
              "[ \t]*\\(}[ \t]*\\)?\\<\\(\\els\\(e\\|if\\)\\|continue\\|if\\|unless\\|while\\|for\\(each\\)?\\(\\([ \t]+\\(my\\|local\\|our\\)\\)?[ \t]*\\$[_a-zA-Z0-9]+\\)?\\|until\\)\\>\\([ \t]*(\\|[ \t\n]*{\\)\\|[ \t]*{")
             (progn
-              (setq ml (match-beginning 8))
+              (setq ml (match-beginning 8)) ; "(" or "{" after control word
               (re-search-forward "[({]")
               (forward-char -1)
               (setq p (point))
               (if (eq (following-char) ?\( )
                   (progn
                     (forward-sexp 1)
-                    (setq pp (point)))
+                    (setq pp (point)))  ; past parenth-group
                 ;; after `else' or nothing
                 (if ml                  ; after `else'
                     (skip-chars-backward " \t\n")
@@ -4095,13 +5222,13 @@ Returns some position at the last line."
               ;; Multiline expr should be special
               (setq ml (and pp (save-excursion (goto-char p)
                                                (search-forward "\n" pp t))))
-              (if (and (or (not pp) (< pp end))
+              (if (and (or (not pp) (< pp end)) ; Do not go too far...
                        (looking-at "[ \t\n]*{"))
                   (progn
                     (cond
                      ((bolp)            ; Were before `{', no if/else/etc
                       nil)
-                     ((looking-at "\\(\t*\\| [ \t]+\\){")
+                     ((looking-at "\\(\t*\\| [ \t]+\\){") ; Not exactly 1 SPACE
                       (delete-horizontal-space)
                       (if (if ml
                               cperl-extra-newline-before-brace-multiline
@@ -4124,7 +5251,17 @@ Returns some position at the last line."
                       (skip-chars-forward " \t\n")
                       (delete-region pp (point))
                       (insert
-                       (make-string cperl-indent-region-fix-constructs ?\s))))
+                       (make-string cperl-indent-region-fix-constructs ?\ )))
+                     ((and (looking-at "[\t ]*{")
+                           (if ml cperl-extra-newline-before-brace-multiline
+                             cperl-extra-newline-before-brace))
+                      (delete-horizontal-space)
+                      (insert "\n")
+                      (setq ret (point))
+                      (if (cperl-indent-line parse-data)
+                          (progn
+                            (cperl-fix-line-spacing end parse-data)
+                            (setq ret (point))))))
                     ;; Now we are before `{'
                     (if (looking-at "[ \t\n]*{[ \t]*[^ \t\n#]")
                         (progn
@@ -4276,7 +5413,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
   ;; (interactive "P") ; Only works when called from fill-paragraph.  -stef
   (let (;; Non-nil if the current line contains a comment.
         has-comment
-
+        fill-paragraph-function         ; do not recurse
         ;; If has-comment, the appropriate fill-prefix for the comment.
         comment-fill-prefix
         ;; Line that contains code and comment (or nil)
@@ -4308,7 +5445,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
               dc (- c (current-column)) len (- start (point))
               start (point-marker))
         (delete-char len)
-        (insert (make-string dc ?-)))))
+        (insert (make-string dc ?-))))) ; Placeholder (to avoid splitting???)
     (if (not has-comment)
         (fill-paragraph justify)       ; Do the usual thing outside of comment
       ;; Narrow to include only the comment, and then fill the region.
@@ -4330,11 +5467,16 @@ indentation and initial hashes.  Behaves usually outside of comment."
            (point)))
         ;; Remove existing hashes
         (save-excursion
-          (goto-char (point-min))
-          (while (progn (forward-line 1) (< (point) (point-max)))
-            (skip-chars-forward " \t")
-            (and (looking-at "#+")
-                 (delete-char (- (match-end 0) (match-beginning 0))))))
+        (goto-char (point-min))
+        (while (progn (forward-line 1) (< (point) (point-max)))
+          (skip-chars-forward " \t")
+          (if (looking-at "#+")
+              (progn
+                (if (and (eq (point) (match-beginning 0))
+                         (not (eq (point) (match-end 0)))) nil
+                    (error
+ "Bug in Emacs: `looking-at' in `narrow-to-region': match-data is garbage"))
+                (delete-char (- (match-end 0) (match-beginning 0)))))))
 
         ;; Lines with only hashes on them can be paragraph boundaries.
         (let ((paragraph-start (concat paragraph-start "\\|^[ \t#]*$"))
@@ -4350,7 +5492,8 @@ indentation and initial hashes.  Behaves usually outside of comment."
               (setq comment-column c)
               (indent-for-comment)
               ;; Repeat once more, flagging as iteration
-              (cperl-fill-paragraph justify t)))))))
+              (cperl-fill-paragraph justify t))))))
+  t)
 
 (defun cperl-do-auto-fill ()
   ;; Break out if the line is short enough
@@ -4401,8 +5544,8 @@ indentation and initial hashes.  Behaves usually outside of comment."
   (let ((index-alist '()) (index-pack-alist '()) (index-pod-alist '())
         (index-unsorted-alist '()) (i-s-f (default-value 'imenu-sort-function))
         (index-meth-alist '()) meth
-        packages ends-ranges p marker
-        (prev-pos 0) char fchar index index1 name (end-range 0) package)
+        packages ends-ranges p marker is-proto
+        (prev-pos 0) is-pack index index1 name (end-range 0) package)
     (goto-char (point-min))
     (cperl-update-syntaxification (point-max) (point-max))
     ;; Search for the function
@@ -4410,72 +5553,81 @@ indentation and initial hashes.  Behaves usually outside of comment."
       (while (re-search-forward
               (or regexp cperl-imenu--function-name-regexp-perl)
               nil t)
+        ;; 2=package-group, 5=package-name 8=sub-name
         (cond
          ((and                          ; Skip some noise if building tags
-           (match-beginning 2)          ; package or sub
-           (eq (char-after (match-beginning 2)) ?p) ; package
+           (match-beginning 5)          ; package name
+           ;;(eq (char-after (match-beginning 2)) ?p) ; package
            (not (save-match-data
                   (looking-at "[ \t\n]*;")))) ; Plain text word 'package'
           nil)
          ((and
-           (match-beginning 2)          ; package or sub
+           (or (match-beginning 2)
+               (match-beginning 8))             ; package or sub
            ;; Skip if quoted (will not skip multi-line ''-strings :-():
            (null (get-text-property (match-beginning 1) 'syntax-table))
            (null (get-text-property (match-beginning 1) 'syntax-type))
            (null (get-text-property (match-beginning 1) 'in-pod)))
-          (save-excursion
-            (goto-char (match-beginning 2))
-            (setq fchar (following-char)))
+          (setq is-pack (match-beginning 2))
           ;; (if (looking-at "([^()]*)[ \t\n\f]*")
           ;;    (goto-char (match-end 0)))      ; Messes what follows
-          (setq char (following-char)   ; ?\; for "sub foo () ;"
-                meth nil
+          (setq meth nil
                 p (point))
           (while (and ends-ranges (>= p (car ends-ranges)))
             ;; delete obsolete entries
             (setq ends-ranges (cdr ends-ranges) packages (cdr packages)))
           (setq package (or (car packages) "")
                 end-range (or (car ends-ranges) 0))
-          (if (eq fchar ?p)
-              (setq name (buffer-substring (match-beginning 3) (match-end 3))
-                    name (progn
-                           (set-text-properties 0 (length name) nil name)
-                           name)
-                    package (concat name "::")
-                    name (concat "package " name)
-                    end-range
-                    (save-excursion
-                      (parse-partial-sexp (point) (point-max) -1) (point))
-                    ends-ranges (cons end-range ends-ranges)
-                    packages (cons package packages)))
-          ;;   )
+          (if is-pack                   ; doing "package"
+              (progn
+                (if (match-beginning 5) ; named package
+                    (setq name (buffer-substring (match-beginning 5)
+                                                 (match-end 5))
+                          name (progn
+                                 (set-text-properties 0 (length name) nil name)
+                                 name)
+                          package (concat name "::")
+                          name (concat "package " name))
+                  ;; Support nameless packages
+                  (setq name "package;" package ""))
+                (setq end-range
+                      (save-excursion
+                        (parse-partial-sexp (point) (point-max) -1) (point))
+                      ends-ranges (cons end-range ends-ranges)
+                      packages (cons package packages)))
+            (setq is-proto
+                  (or (eq (following-char) ?\;)
+                      (eq 0 (get-text-property (point) 'attrib-group)))))
           ;; Skip this function name if it is a prototype declaration.
-          (if (and (eq fchar ?s) (eq char ?\;)) nil
-            (setq name (buffer-substring (match-beginning 3) (match-end 3))
-                  marker (make-marker))
-            (set-text-properties 0 (length name) nil name)
-            (set-marker marker (match-end 3))
-            (if (eq fchar ?p)
-                (setq name (concat "package " name))
-              (cond ((string-match "[:']" name)
-                     (setq meth t))
-                    ((> p end-range) nil)
-                    (t
-                     (setq name (concat package name) meth t))))
+          (if (and is-proto (not is-pack)) nil
+            (or is-pack
+                (setq name
+                      (buffer-substring (match-beginning 8) (match-end 8)))
+                (set-text-properties 0 (length name) nil name))
+            (setq marker (make-marker))
+            (set-marker marker (match-end (if is-pack 2 8)))
+            (cond (is-pack nil)
+                  ((string-match "[:']" name)
+                   (setq meth t))
+                  ((> p end-range) nil)
+                  (t
+                   (setq name (concat package name) meth t)))
             (setq index (cons name marker))
-            (if (eq fchar ?p)
+            (if is-pack
                 (push index index-pack-alist)
               (push index index-alist))
             (if meth (push index index-meth-alist))
             (push index index-unsorted-alist)))
-         ((match-beginning 5)           ; POD section
-          ;; (beginning-of-line)
-          (setq index (imenu-example--name-and-position)
-                name (buffer-substring (match-beginning 6) (match-end 6)))
+         ((match-beginning 16)          ; POD section
+          (setq name (buffer-substring (match-beginning 17) (match-end 17))
+                marker (make-marker))
+          (set-marker marker (match-beginning 17))
           (set-text-properties 0 (length name) nil name)
-          (if (eq (char-after (match-beginning 5)) ?2)
-              (setq name (concat "   " name)))
-          (setcar index name)
+          (setq name (concat (make-string
+                              (* 3 (- (char-after (match-beginning 16)) ?1))
+                              ?\ )
+                             name)
+                index (cons name marker))
           (setq index1 (cons (concat "=" name) (cdr index)))
           (push index index-pod-alist)
           (push index1 index-unsorted-alist)))))
@@ -4539,29 +5691,20 @@ indentation and initial hashes.  Behaves usually outside of comment."
 (defun cperl-outline-level ()
   (looking-at outline-regexp)
   (cond ((not (match-beginning 1)) 0)   ; beginning-of-file
-        ((match-beginning 2)
-         (if (eq (char-after (match-beginning 2)) ?p)
-             0                          ; package
-           1))                          ; sub
-        ((match-beginning 5)
-         (if (eq (char-after (match-beginning 5)) ?1)
-             1                          ; head1
-           2))                          ; head2
-        (t 3)))                         ; should not happen
+;;;; 2=package-group, 5=package-name 8=sub-name 16=head-level
+        ((match-beginning 2) 0)         ; package
+        ((match-beginning 8) 1)         ; sub
+        ((match-beginning 16)
+         (- (char-after (match-beginning 16)) ?0)) ; headN ==> N
+        (t 5)))                         ; should not happen
 
 
 (defvar cperl-compilation-error-regexp-alist
-  ;; This look like a paranoiac regexp: could anybody find a better one? (which WORK).
+  ;; This look like a paranoiac regexp: could anybody find a better one? (which WORKS).
   '(("^[^\n]* \\(file\\|at\\) \\([^ \t\n]+\\) [^\n]*line \\([0-9]+\\)[\\., \n]"
      2 3))
   "Alist that specifies how to match errors in perl output.")
 
-(if (fboundp 'eval-after-load)
-    (eval-after-load
-        "mode-compile"
-      '(setq perl-compilation-error-regexp-alist
-             cperl-compilation-error-regexp-alist)))
-
 
 (defun cperl-windowed-init ()
   "Initialization under windowed version."
@@ -4602,9 +5745,12 @@ indentation and initial hashes.  Behaves usually outside of comment."
   ;; Allow `cperl-find-pods-heres' to run.
   (or (boundp 'font-lock-constant-face)
       (cperl-force-face font-lock-constant-face
-                        "Face for constant and label names")
-      ;;(setq font-lock-constant-face 'font-lock-constant-face)
-      ))
+                        "Face for constant and label names"))
+  (or (boundp 'font-lock-warning-face)
+      (cperl-force-face font-lock-warning-face
+                        "Face for things which should stand out"))
+  ;;(setq font-lock-constant-face 'font-lock-constant-face)
+  )
 
 (defun cperl-init-faces ()
   (condition-case errs
@@ -4627,7 +5773,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
                'identity
                '("if" "until" "while" "elsif" "else" "unless" "for"
                  "foreach" "continue" "exit" "die" "last" "goto" "next"
-                 "redo" "return" "local" "exec" "sub" "do" "dump" "use"
+                 "redo" "return" "local" "exec" "sub" "do" "dump" "use" "our"
                  "require" "package" "eval" "my" "BEGIN" "END" "CHECK" "INIT")
                "\\|")                   ; Flow control
               "\\)\\>") 2)              ; was "\\)[ \n\t;():,\|&]"
@@ -4711,7 +5857,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
               ;; "chop" "defined" "delete" "do" "each" "else" "elsif"
               ;; "eval" "exists" "for" "foreach" "format" "goto"
               ;; "grep" "if" "keys" "last" "local" "map" "my" "next"
-              ;; "no" "package" "pop" "pos" "print" "printf" "push"
+              ;; "no" "our" "package" "pop" "pos" "print" "printf" "push"
               ;; "q" "qq" "qw" "qx" "redo" "return" "scalar" "shift"
               ;; "sort" "splice" "split" "study" "sub" "tie" "tr"
               ;; "undef" "unless" "unshift" "untie" "until" "use"
@@ -4726,15 +5872,38 @@ indentation and initial hashes.  Behaves usually outside of comment."
               "u\\(se\\|n\\(shift\\|ti\\(l\\|e\\)\\|def\\|less\\)\\)\\|"
               "while\\|y\\|__\\(END\\|DATA\\)__" ;__DATA__ added manually
               "\\|[sm]"                 ; Added manually
-              "\\)\\>") 2 'cperl-nonoverridable)
+              "\\)\\>") 2 'cperl-nonoverridable-face)
             ;;          (mapconcat 'identity
             ;;                     '("#endif" "#else" "#ifdef" "#ifndef" "#if"
             ;;                       "#include" "#define" "#undef")
             ;;                     "\\|")
             '("-[rwxoRWXOezsfdlpSbctugkTBMAC]\\>\\([ \t]+_\\>\\)?" 0
               font-lock-function-name-face keep) ; Not very good, triggers at "[a-z]"
-            '("\\<sub[ \t]+\\([^ \t{;()]+\\)[ \t]*\\(([^()]*)[ \t]*\\)?[#{\n]" 1
-              font-lock-function-name-face)
+            ;; This highlights declarations and definitions differenty.
+            ;; We do not try to highlight in the case of attributes:
+            ;; it is already done by `cperl-find-pods-heres'
+            (list (concat "\\<sub"
+                          cperl-white-and-comment-rex ; whitespace/comments
+                          "\\([^ \n\t{;()]+\\)" ; 2=name (assume non-anonymous)
+                          "\\("
+                            cperl-maybe-white-and-comment-rex ;whitespace/comments?
+                            "([^()]*)\\)?" ; prototype
+                          cperl-maybe-white-and-comment-rex ; whitespace/comments?
+                          "[{;]")
+                  2 (if cperl-font-lock-multiline
+                        '(if (eq (char-after (cperl-1- (match-end 0))) ?\{ )
+                             'font-lock-function-name-face
+                           'font-lock-variable-name-face)
+                      ;; need to manually set 'multiline' for older font-locks
+                      '(progn
+                         (if (< 1 (count-lines (match-beginning 0)
+                                               (match-end 0)))
+                             (put-text-property
+                              (+ 3 (match-beginning 0)) (match-end 0)
+                              'syntax-type 'multiline))
+                         (if (eq (char-after (cperl-1- (match-end 0))) ?\{ )
+                             'font-lock-function-name-face
+                           'font-lock-variable-name-face))))
             '("\\<\\(package\\|require\\|use\\|import\\|no\\|bootstrap\\)[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t;]" ; require A if B;
               2 font-lock-function-name-face)
             '("^[ \t]*format[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t]*=[ \t]*$"
@@ -4770,12 +5939,56 @@ indentation and initial hashes.  Behaves usually outside of comment."
                                    (2 '(restart 2 nil) nil t)))
                         nil t)))        ; local variables, multiple
                   (font-lock-anchored
-                   '("^[ \t{}]*\\(my\\|local\\|our\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)"
-                     (3 font-lock-variable-name-face)
-                     ("\\=[ \t]*,[ \t]*\\([$@%*][a-zA-Z0-9_:]+\\)"
-                      nil nil
-                      (1 font-lock-variable-name-face))))
-                  (t '("^[ \t{}]*\\(my\\|local\\our\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)"
+                   ;; 1=my_etc, 2=white? 3=(+white? 4=white? 5=var
+                   (` ((, (concat "\\<\\(my\\|local\\|our\\)"
+                                  cperl-maybe-white-and-comment-rex
+                                  "\\(("
+                                     cperl-maybe-white-and-comment-rex
+                                  "\\)?\\([$@%*]\\([a-zA-Z0-9_:]+\\|[^a-zA-Z0-9_]\\)\\)"))
+                       (5 (, (if cperl-font-lock-multiline
+                                 'font-lock-variable-name-face
+                               '(progn  (setq cperl-font-lock-multiline-start
+                                              (match-beginning 0))
+                                        'font-lock-variable-name-face))))
+                       ((, (concat "\\="
+                                   cperl-maybe-white-and-comment-rex
+                                   ","
+                                   cperl-maybe-white-and-comment-rex
+                                   "\\([$@%*]\\([a-zA-Z0-9_:]+\\|[^a-zA-Z0-9_]\\)\\)"))
+                        ;; Bug in font-lock: limit is used not only to limit 
+                        ;; searches, but to set the "extend window for
+                        ;; facification" property.  Thus we need to minimize.
+                        (, (if cperl-font-lock-multiline
+                             '(if (match-beginning 3)
+                                  (save-excursion
+                                    (goto-char (match-beginning 3))
+                                    (condition-case nil
+                                        (forward-sexp 1)
+                                      (error
+                                       (condition-case nil
+                                           (forward-char 200)
+                                         (error nil)))) ; typeahead
+                                    (1- (point))) ; report limit
+                                (forward-char -2)) ; disable continued expr
+                             '(if (match-beginning 3)
+                                  (point-max) ; No limit for continuation
+                                (forward-char -2)))) ; disable continued expr
+                        (, (if cperl-font-lock-multiline
+                               nil
+                             '(progn    ; Do at end
+                                ;; "my" may be already fontified (POD),
+                                ;; so cperl-font-lock-multiline-start is nil
+                                (if (or (not cperl-font-lock-multiline-start)
+                                        (> 2 (count-lines
+                                              cperl-font-lock-multiline-start
+                                              (point))))
+                                    nil
+                                  (put-text-property
+                                   (1+ cperl-font-lock-multiline-start) (point)
+                                   'syntax-type 'multiline))
+                                (setq cperl-font-lock-multiline-start nil))))
+                        (3 font-lock-variable-name-face)))))
+                  (t '("^[ \t{}]*\\(my\\|local\\|our\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)"
                        3 font-lock-variable-name-face)))
             '("\\<for\\(each\\)?\\([ \t]+\\(my\\|local\\|our\\)\\)?[ \t]*\\(\\$[a-zA-Z_][a-zA-Z_0-9]*\\)[ \t]*("
               4 font-lock-variable-name-face)
@@ -4785,21 +5998,32 @@ indentation and initial hashes.  Behaves usually outside of comment."
           (setq
            t-font-lock-keywords-1
            (and (fboundp 'turn-on-font-lock) ; Check for newer font-lock
-                (not cperl-xemacs-p)    ; not yet as of XEmacs 19.12
+                ;; not yet as of XEmacs 19.12, works with 21.1.11
+                (or
+                 (not cperl-xemacs-p)
+                 (string< "21.1.9" emacs-version)
+                 (and (string< "21.1.10" emacs-version)
+                      (string< emacs-version "21.1.2")))
                 '(
                   ("\\(\\([@%]\\|\$#\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)" 1
                    (if (eq (char-after (match-beginning 2)) ?%)
-                       'cperl-hash
-                     'cperl-array)
+                       'cperl-hash-face
+                     'cperl-array-face)
                    t)                   ; arrays and hashes
                   ("\\(\\([$@]+\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)[ \t]*\\([[{]\\)"
                    1
                    (if (= (- (match-end 2) (match-beginning 2)) 1)
                        (if (eq (char-after (match-beginning 3)) ?{)
-                           'cperl-hash
-                         'cperl-array) ; arrays and hashes
+                           'cperl-hash-face
+                         'cperl-array-face) ; arrays and hashes
                      font-lock-variable-name-face) ; Just to put something
                    t)
+                  ("\\(@\\|\\$#\\)\\(\\$+\\([a-zA-Z_:][a-zA-Z0-9_:]*\\|[^ \t\n]\\)\\)"
+                   (1 cperl-array-face)
+                   (2 font-lock-variable-name-face))
+                  ("\\(%\\)\\(\\$+\\([a-zA-Z_:][a-zA-Z0-9_:]*\\|[^ \t\n]\\)\\)"
+                   (1 cperl-hash-face)
+                   (2 font-lock-variable-name-face))
                   ;;("\\([smy]\\|tr\\)\\([^a-z_A-Z0-9]\\)\\(\\([^\n\\]*||\\)\\)\\2")
                        ;;; Too much noise from \s* @s[ and friends
                   ;;("\\(\\<\\([msy]\\|tr\\)[ \t]*\\([^ \t\na-zA-Z0-9_]\\)\\|\\(/\\)\\)"
@@ -4811,7 +6035,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
           (if cperl-highlight-variables-indiscriminately
               (setq t-font-lock-keywords-1
                     (append t-font-lock-keywords-1
-                            (list '("[$*]{?\\(\\sw+\\)" 1
+                            (list '("\\([$*]{?\\sw+\\)" 1
                                     font-lock-variable-name-face)))))
           (setq cperl-font-lock-keywords-1
                 (if cperl-syntaxify-by-font-lock
@@ -4864,27 +6088,35 @@ indentation and initial hashes.  Behaves usually outside of comment."
                       [nil              nil             t               t       t]
                       nil
                       [nil              nil             t               t       t])
+                (list 'font-lock-warning-face
+                      ["Pink"           "Red"           "Gray50"        "LightGray"]
+                      ["gray20"         "gray90"
+                                                        "gray80"        "gray20"]
+                      [nil              nil             t               t       t]
+                      nil
+                      [nil              nil             t               t       t]
+                      )
                 (list 'font-lock-constant-face
                       ["CadetBlue"      "Aquamarine"    "Gray50"        "LightGray"]
                       nil
                       [nil              nil             t               t       t]
                       nil
                       [nil              nil             t               t       t])
-                (list 'cperl-nonoverridable
+                (list 'cperl-nonoverridable-face
                       ["chartreuse3"    ("orchid1" "orange")
                        nil              "Gray80"]
                       [nil              nil             "gray90"]
                       [nil              nil             nil             t       t]
                       [nil              nil             t               t]
                       [nil              nil             t               t       t])
-                (list 'cperl-array
+                (list 'cperl-array-face
                       ["blue"           "yellow"        nil             "Gray80"]
                       ["lightyellow2"   ("navy" "os2blue" "darkgreen")
                        "gray90"]
                       t
                       nil
                       nil)
-                (list 'cperl-hash
+                (list 'cperl-hash-face
                       ["red"            "red"           nil             "Gray80"]
                       ["lightyellow2"   ("navy" "os2blue" "darkgreen")
                        "gray90"]
@@ -4907,15 +6139,17 @@ indentation and initial hashes.  Behaves usually outside of comment."
                             "Face for variable names")
           (cperl-force-face font-lock-type-face
                             "Face for data types")
-          (cperl-force-face cperl-nonoverridable
+          (cperl-force-face cperl-nonoverridable-face
                             "Face for data types from another group")
+          (cperl-force-face font-lock-warning-face
+                            "Face for things which should stand out")
           (cperl-force-face font-lock-comment-face
                             "Face for comments")
           (cperl-force-face font-lock-function-name-face
                             "Face for function names")
-          (cperl-force-face cperl-hash
+          (cperl-force-face cperl-hash-face
                             "Face for hashes")
-          (cperl-force-face cperl-array
+          (cperl-force-face cperl-array-face
                             "Face for arrays")
           ;;(defvar font-lock-constant-face 'font-lock-constant-face)
           ;;(defvar font-lock-variable-name-face 'font-lock-variable-name-face)
@@ -4925,7 +6159,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
           ;;    "Face to use for data types."))
           ;;(or (boundp 'cperl-nonoverridable-face)
           ;;    (defconst cperl-nonoverridable-face
-          ;;    'cperl-nonoverridable
+          ;;    'cperl-nonoverridable-face
           ;;    "Face to use for data types from another group."))
           ;;(if (not cperl-xemacs-p) nil
           ;;  (or (boundp 'font-lock-comment-face)
@@ -4941,24 +6175,24 @@ indentation and initial hashes.  Behaves usually outside of comment."
           ;;      'font-lock-function-name-face
           ;;      "Face to use for function names.")))
           (if (and
-               (not (cperl-is-face 'cperl-array))
+               (not (cperl-is-face 'cperl-array-face))
                (cperl-is-face 'font-lock-emphasized-face))
-              (copy-face 'font-lock-emphasized-face 'cperl-array))
+              (copy-face 'font-lock-emphasized-face 'cperl-array-face))
           (if (and
-               (not (cperl-is-face 'cperl-hash))
+               (not (cperl-is-face 'cperl-hash-face))
                (cperl-is-face 'font-lock-other-emphasized-face))
-              (copy-face 'font-lock-other-emphasized-face 'cperl-hash))
+              (copy-face 'font-lock-other-emphasized-face 'cperl-hash-face))
           (if (and
-               (not (cperl-is-face 'cperl-nonoverridable))
+               (not (cperl-is-face 'cperl-nonoverridable-face))
                (cperl-is-face 'font-lock-other-type-face))
-              (copy-face 'font-lock-other-type-face 'cperl-nonoverridable))
+              (copy-face 'font-lock-other-type-face 'cperl-nonoverridable-face))
           ;;(or (boundp 'cperl-hash-face)
           ;;    (defconst cperl-hash-face
-          ;;    'cperl-hash
+          ;;    'cperl-hash-face
           ;;    "Face to use for hashes."))
           ;;(or (boundp 'cperl-array-face)
           ;;    (defconst cperl-array-face
-          ;;    'cperl-array
+          ;;    'cperl-array-face
           ;;    "Face to use for arrays."))
           ;; Here we try to guess background
           (let ((background
@@ -4997,17 +6231,17 @@ indentation and initial hashes.  Behaves usually outside of comment."
                                        "pink")))
                (t
                 (set-face-background 'font-lock-type-face "gray90"))))
-            (if (cperl-is-face 'cperl-nonoverridable)
+            (if (cperl-is-face 'cperl-nonoverridable-face)
                 nil
-              (copy-face 'font-lock-type-face 'cperl-nonoverridable)
+              (copy-face 'font-lock-type-face 'cperl-nonoverridable-face)
               (cond
                ((eq background 'light)
-                (set-face-foreground 'cperl-nonoverridable
+                (set-face-foreground 'cperl-nonoverridable-face
                                      (if (x-color-defined-p "chartreuse3")
                                          "chartreuse3"
                                        "chartreuse")))
                ((eq background 'dark)
-                (set-face-foreground 'cperl-nonoverridable
+                (set-face-foreground 'cperl-nonoverridable-face
                                      (if (x-color-defined-p "orchid1")
                                          "orchid1"
                                        "orange")))))
@@ -5059,15 +6293,15 @@ indentation and initial hashes.  Behaves usually outside of comment."
     '(setq ps-bold-faces
            ;;                   font-lock-variable-name-face
            ;;                   font-lock-constant-face
-           (append '(cperl-array cperl-hash)
+           (append '(cperl-array-face cperl-hash-face)
                    ps-bold-faces)
            ps-italic-faces
            ;;                   font-lock-constant-face
-           (append '(cperl-nonoverridable cperl-hash)
+           (append '(cperl-nonoverridable-face cperl-hash-face)
                    ps-italic-faces)
            ps-underlined-faces
            ;;        font-lock-type-face
-           (append '(cperl-array cperl-hash underline cperl-nonoverridable)
+           (append '(cperl-array-face cperl-hash-face underline cperl-nonoverridable-face)
                    ps-underlined-faces))))
 
 (defvar ps-print-face-extension-alist)
@@ -5100,27 +6334,27 @@ Style of printout regulated by the variable `cperl-ps-print-face-properties'."
 ;;;   (defvar ps-italic-faces nil)
 ;;;   (setq ps-bold-faces
 ;;;     (append '(font-lock-emphasized-face
-;;;               cperl-array
+;;;               cperl-array-face
 ;;;               font-lock-keyword-face
 ;;;               font-lock-variable-name-face
 ;;;               font-lock-constant-face
 ;;;               font-lock-reference-face
 ;;;               font-lock-other-emphasized-face
-;;;               cperl-hash)
+;;;               cperl-hash-face)
 ;;;             ps-bold-faces))
 ;;;   (setq ps-italic-faces
-;;;     (append '(cperl-nonoverridable
+;;;     (append '(cperl-nonoverridable-face
 ;;;               font-lock-constant-face
 ;;;               font-lock-reference-face
 ;;;               font-lock-other-emphasized-face
-;;;               cperl-hash)
+;;;               cperl-hash-face)
 ;;;             ps-italic-faces))
 ;;;   (setq ps-underlined-faces
 ;;;     (append '(font-lock-emphasized-face
-;;;               cperl-array
+;;;               cperl-array-face
 ;;;               font-lock-other-emphasized-face
-;;;               cperl-hash
-;;;               cperl-nonoverridable font-lock-type-face)
+;;;               cperl-hash-face
+;;;               cperl-nonoverridable-face font-lock-type-face)
 ;;;             ps-underlined-faces))
 ;;;   (cons 'font-lock-type-face ps-underlined-faces))
 
@@ -5130,79 +6364,211 @@ Style of printout regulated by the variable `cperl-ps-print-face-properties'."
 (defconst cperl-styles-entries
   '(cperl-indent-level cperl-brace-offset cperl-continued-brace-offset
     cperl-label-offset cperl-extra-newline-before-brace
+    cperl-extra-newline-before-brace-multiline
     cperl-merge-trailing-else
     cperl-continued-statement-offset))
 
+(defconst cperl-style-examples
+"##### Numbers etc are: cperl-indent-level cperl-brace-offset
+##### cperl-continued-brace-offset cperl-label-offset
+##### cperl-continued-statement-offset
+##### cperl-merge-trailing-else cperl-extra-newline-before-brace
+
+########### (Do not forget cperl-extra-newline-before-brace-multiline)
+
+### CPerl       (=GNU - extra-newline-before-brace + merge-trailing-else) 2/0/0/-2/2/t/nil
+if (foo) {
+  bar
+    baz;
+ label:
+  {
+    boon;
+  }
+} else {
+  stop;
+}
+
+### PerlStyle   (=CPerl with 4 as indent)               4/0/0/-4/4/t/nil
+if (foo) {
+    bar
+        baz;
+ label:
+    {
+        boon;
+    }
+} else {
+    stop;
+}
+
+### GNU                                                 2/0/0/-2/2/nil/t
+if (foo)
+  {
+    bar
+      baz;
+  label:
+    {
+      boon;
+    }
+  }
+else
+  {
+    stop;
+  }
+
+### C++         (=PerlStyle with braces aligned with control words) 4/0/-4/-4/4/nil/t
+if (foo)
+{
+    bar
+        baz;
+ label:
+    {
+        boon;
+    }
+}
+else
+{
+    stop;
+}
+
+### BSD         (=C++, but will not change preexisting merge-trailing-else
+###              and extra-newline-before-brace )               4/0/-4/-4/4
+if (foo)
+{
+    bar
+        baz;
+ label:
+    {
+        boon;
+    }
+}
+else
+{
+    stop;
+}
+
+### K&R         (=C++ with indent 5 - merge-trailing-else, but will not
+###              change preexisting extra-newline-before-brace) 5/0/-5/-5/5/nil
+if (foo)
+{
+     bar
+          baz;
+ label:
+     {
+          boon;
+     }
+}
+else
+{
+     stop;
+}
+
+### Whitesmith  (=PerlStyle, but will not change preexisting
+###              extra-newline-before-brace and merge-trailing-else) 4/0/0/-4/4
+if (foo)
+    {
+        bar
+            baz;
+    label:
+        {
+            boon;
+        }
+    }
+else
+    {
+        stop;
+    }
+"
+"Examples of if/else with different indent styles (with v4.23).")
+
 (defconst cperl-style-alist
-  '(("CPerl"                         ; =GNU without extra-newline-before-brace
+  '(("CPerl" ;; =GNU - extra-newline-before-brace + cperl-merge-trailing-else
      (cperl-indent-level               .  2)
      (cperl-brace-offset               .  0)
      (cperl-continued-brace-offset     .  0)
      (cperl-label-offset               . -2)
+     (cperl-continued-statement-offset .  2)
      (cperl-extra-newline-before-brace .  nil)
-     (cperl-merge-trailing-else        .  t)
-     (cperl-continued-statement-offset .  2))
+     (cperl-extra-newline-before-brace-multiline .  nil)
+     (cperl-merge-trailing-else        .  t))
+
     ("PerlStyle"                        ; CPerl with 4 as indent
      (cperl-indent-level               .  4)
      (cperl-brace-offset               .  0)
      (cperl-continued-brace-offset     .  0)
      (cperl-label-offset               . -4)
+     (cperl-continued-statement-offset .  4)
      (cperl-extra-newline-before-brace .  nil)
-     (cperl-merge-trailing-else        .  t)
-     (cperl-continued-statement-offset .  4))
+     (cperl-extra-newline-before-brace-multiline .  nil)
+     (cperl-merge-trailing-else        .  t))
+
     ("GNU"
      (cperl-indent-level               .  2)
      (cperl-brace-offset               .  0)
      (cperl-continued-brace-offset     .  0)
      (cperl-label-offset               . -2)
+     (cperl-continued-statement-offset .  2)
      (cperl-extra-newline-before-brace .  t)
-     (cperl-merge-trailing-else        .  nil)
-     (cperl-continued-statement-offset .  2))
+     (cperl-extra-newline-before-brace-multiline .  t)
+     (cperl-merge-trailing-else        .  nil))
+
     ("K&R"
      (cperl-indent-level               .  5)
      (cperl-brace-offset               .  0)
      (cperl-continued-brace-offset     . -5)
      (cperl-label-offset               . -5)
+     (cperl-continued-statement-offset .  5)
      ;;(cperl-extra-newline-before-brace .  nil) ; ???
-     (cperl-merge-trailing-else        .  nil)
-     (cperl-continued-statement-offset .  5))
+     ;;(cperl-extra-newline-before-brace-multiline .  nil)
+     (cperl-merge-trailing-else        .  nil))
+
     ("BSD"
      (cperl-indent-level               .  4)
      (cperl-brace-offset               .  0)
      (cperl-continued-brace-offset     . -4)
      (cperl-label-offset               . -4)
+     (cperl-continued-statement-offset .  4)
      ;;(cperl-extra-newline-before-brace .  nil) ; ???
-     (cperl-continued-statement-offset .  4))
+     ;;(cperl-extra-newline-before-brace-multiline .  nil)
+     ;;(cperl-merge-trailing-else              .  nil) ; ???
+     )
+
     ("C++"
      (cperl-indent-level               .  4)
      (cperl-brace-offset               .  0)
      (cperl-continued-brace-offset     . -4)
      (cperl-label-offset               . -4)
      (cperl-continued-statement-offset .  4)
-     (cperl-merge-trailing-else        .  nil)
-     (cperl-extra-newline-before-brace .  t))
-    ("Current")
+     (cperl-extra-newline-before-brace .  t)
+     (cperl-extra-newline-before-brace-multiline .  t)
+     (cperl-merge-trailing-else        .  nil))
+
     ("Whitesmith"
      (cperl-indent-level               .  4)
      (cperl-brace-offset               .  0)
      (cperl-continued-brace-offset     .  0)
      (cperl-label-offset               . -4)
+     (cperl-continued-statement-offset .  4)
      ;;(cperl-extra-newline-before-brace .  nil) ; ???
-     (cperl-continued-statement-offset .  4)))
-  "(Experimental) list of variables to set to get a particular indentation style.
-Should be used via `cperl-set-style' or via Perl menu.")
+     ;;(cperl-extra-newline-before-brace-multiline .  nil)
+     ;;(cperl-merge-trailing-else              .  nil) ; ???
+     )
+    ("Current"))
+  "List of variables to set to get a particular indentation style.
+Should be used via `cperl-set-style' or via Perl menu.
+
+See examples in `cperl-style-examples'.")
 
 (defun cperl-set-style (style)
   "Set CPerl mode variables to use one of several different indentation styles.
 The arguments are a string representing the desired style.
 The list of styles is in `cperl-style-alist', available styles
-are GNU, K&R, BSD, C++ and Whitesmith.
+are CPerl, PerlStyle, GNU, K&R, BSD, C++ and Whitesmith.
 
 The current value of style is memorized (unless there is a memorized
 data already), may be restored by `cperl-set-style-back'.
 
 Chosing \"Current\" style will not change style, so this may be used for
-side-effect of memorizing only."
+side-effect of memorizing only.  Examples in `cperl-style-examples'."
   (interactive
    (let ((list (mapcar (function (lambda (elt) (list (car elt))))
                        cperl-style-alist)))
@@ -5373,6 +6739,8 @@ Customized by setting variables `cperl-shrink-wrap-info-frame',
    (match-beginning 1) (match-end 1)))
 
 (defun cperl-imenu-on-info ()
+  "Shows imenu for Perl Info Buffer.
+Opens Perl Info buffer if needed."
   (interactive)
   (let* ((buffer (current-buffer))
          imenu-create-index-function
@@ -5412,7 +6780,7 @@ If STEP is nil, `cperl-lineup-step' will be used
 \(or `cperl-indent-level', if `cperl-lineup-step' is nil).
 Will not move the position at the start to the left."
   (interactive "r")
-  (let (search col tcol seen b e)
+  (let (search col tcol seen b)
     (save-excursion
       (goto-char end)
       (end-of-line)
@@ -5450,22 +6818,25 @@ Will not move the position at the start to the left."
       (if (/= (% col step) 0) (setq step (* step (1+ (/ col step)))))
       (while
           (progn
-            (setq e (point))
-            (skip-chars-backward " \t")
-            (delete-region (point) e)
-            (indent-to-column col) ;(make-string (- col (current-column)) ?\s))
+            (cperl-make-indent col)
             (beginning-of-line 2)
             (and (< (point) end)
                  (re-search-forward search end t)
                  (goto-char (match-beginning 0)))))))) ; No body
 
-(defun cperl-etags (&optional add all files)
+(defun cperl-etags (&optional add all files) ;; NOT USED???
   "Run etags with appropriate options for Perl files.
 If optional argument ALL is `recursive', will process Perl files
 in subdirectories too."
   (interactive)
   (let ((cmd "etags")
-        (args '("-l" "none" "-r" "/\\<\\(package\\|sub\\)[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)[ \\t]*\\(([^()]*)[ \t]*\\)?\\([{#]\\|$\\)\\)/\\4/"))
+        (args '("-l" "none" "-r"
+                ;;       1=fullname  2=package?             3=name                       4=proto?             5=attrs? (VERY APPROX!)
+                "/\\<sub[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)\\)[ \\t]*\\(([^()]*)[ \t]*\\)?\\([ \t]*:[^#{;]*\\)?\\([{#]\\|$\\)/\\3/"
+                "-r"
+                "/\\<package[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)\\)[ \\t]*\\([#;]\\|$\\)/\\1/"
+                "-r"
+                "/\\<\\(package\\)[ \\t]*;/\\1;/"))
         res)
     (if add (setq args (cons "-a" args)))
     (or files (setq files (list buffer-file-name)))
@@ -5537,6 +6908,29 @@ Delay of auto-help controlled by `cperl-lazy-help-time'."
   (message "indent-region/indent-sexp will %sbe automatically fix whitespace."
            (if cperl-indent-region-fix-constructs "" "not ")))
 
+(defun cperl-toggle-set-debug-unwind (arg &optional backtrace)
+  "Toggle (or, with numeric argument, set) debugging state of syntaxification.
+Nonpositive numeric argument disables debugging messages.  The message
+summarizes which regions it was decided to rescan for syntactic constructs.
+
+The message looks like this:
+
+  Syxify req=123..138 actual=101..146 done-to: 112=>146 statepos: 73=>117
+
+Numbers are character positions in the buffer.  REQ provides the range to
+rescan requested by `font-lock'.  ACTUAL is the range actually resyntaxified;
+for correct operation it should start and end outside any special syntactic
+construct.  DONE-TO and STATEPOS indicate changes to internal caches maintained
+by CPerl."
+  (interactive "P")
+  (or arg
+      (setq arg (if (eq cperl-syntaxify-by-font-lock 
+                        (if backtrace 'backtrace 'message)) 0 1)))
+  (setq arg (if (> arg 0) (if backtrace 'backtrace 'message) t))
+  (setq cperl-syntaxify-by-font-lock arg)
+  (message "Debugging messages of syntax unwind %sabled."
+           (if (eq arg t) "dis" "en")))
+
 ;;;; Tags file creation.
 
 (defvar cperl-tmp-buffer " *cperl-tmp*")
@@ -5677,13 +7071,22 @@ Delay of auto-help controlled by `cperl-lazy-help-time'."
         ret))))
 
 (defun cperl-add-tags-recurse-noxs ()
-  "Add to TAGS data for Perl and XSUB files in the current directory and kids.
+  "Add to TAGS data for \"pure\" Perl files in the current directory and kids.
 Use as
   emacs -batch -q -no-site-file -l emacs/cperl-mode.el \
-        -f cperl-add-tags-recurse
+        -f cperl-add-tags-recurse-noxs
 "
   (cperl-write-tags nil nil t t nil t))
 
+(defun cperl-add-tags-recurse-noxs-fullpath ()
+  "Add to TAGS data for \"pure\" Perl in the current directory and kids.
+Writes down fullpath, so TAGS is relocatable (but if the build directory
+is relocated, the file TAGS inside it breaks). Use as
+  emacs -batch -q -no-site-file -l emacs/cperl-mode.el \
+        -f cperl-add-tags-recurse-noxs-fullpath
+"
+  (cperl-write-tags nil nil t t nil t ""))
+
 (defun cperl-add-tags-recurse ()
   "Add to TAGS file data for Perl files in the current directory and kids.
 Use as
@@ -5853,9 +7256,9 @@ One may build such TAGS files from CPerl mode menu."
               (cperl-tags-hier-fill))
           (or tags-table-list
               (call-interactively 'visit-tags-table))
-        (mapcar
-         (function
-          (lambda (tagsfile)
+          (mapcar
+           (function
+            (lambda (tagsfile)
               (message "Updating list of classes... %s" tagsfile)
             (set-buffer (get-file-buffer tagsfile))
             (cperl-tags-hier-fill)))
@@ -6017,7 +7420,7 @@ One may build such TAGS files from CPerl mode menu."
    '("[^-\t <>=+]\\(--\\|\\+\\+\\)"     ; var-- var++
      "[a-zA-Z0-9_][|&][a-zA-Z0-9_$]"    ; abc|def abc&def are often used.
      "&[(a-zA-Z0-9_$]"                  ; &subroutine &(var->field)
-     "<\\$?\\sw+\\(\\.\\sw+\\)?>"       ; <IN> <stdin.h>
+     "<\\$?\\sw+\\(\\.\\(\\sw\\|_\\)+\\)?>"     ; <IN> <stdin.h>
      "-[a-zA-Z][ \t]+[_$\"'`a-zA-Z]"    ; -f file, -t STDIN
      "-[0-9]"                           ; -5
      "\\+\\+"                           ; ++var
@@ -6049,8 +7452,7 @@ Currently it is tuned to C and Perl syntax."
   (interactive)
   (let (found-bad (p (point)))
     (setq last-nonmenu-event 13)        ; To disable popup
-    (with-no-warnings  ; It is useful to push the mark here.
-     (beginning-of-buffer))
+    (goto-char (point-min))
     (map-y-or-n-p "Insert space here? "
                   (lambda (arg) (insert " "))
                   'cperl-next-bad-style
@@ -6446,7 +7848,7 @@ endservent
 eof[([FILEHANDLE])]
 ... eq ...      String equality.
 eval(EXPR) or eval { BLOCK }
-exec(LIST)
+exec([TRUENAME] ARGV0, ARGVs)     or     exec(SHELL_COMMAND_LINE)
 exit(EXPR)
 exp(EXPR)
 fcntl(FILEHANDLE,FUNCTION,SCALAR)
@@ -6582,7 +7984,7 @@ substr(EXPR,OFFSET[,LEN])
 symlink(OLDFILE,NEWFILE)
 syscall(LIST)
 sysread(FILEHANDLE,SCALAR,LENGTH[,OFFSET])
-system(LIST)
+system([TRUENAME] ARGV0 [,ARGV])     or     system(SHELL_COMMAND_LINE)
 syswrite(FILEHANDLE,SCALAR,LENGTH[,OFFSET])
 tell[(FILEHANDLE)]
 telldir(DIRHANDLE)
@@ -6683,7 +8085,7 @@ prototype \\&SUB	Returns prototype of the function given a reference.
   ;; b is before the starting delimiter, e before the ending
   ;; e should be a marker, may be changed, but remains "correct".
   ;; EMBED is nil iff we process the whole REx.
-  ;; The REx is guarantied to have //x
+  ;; The REx is guaranteed to have //x
   ;; LEVEL shows how many levels deep to go
   ;; position at enter and at leave is not defined
   (let (s c tmp (m (make-marker)) (m1 (make-marker)) c1 spaces inline code pos)
@@ -6712,7 +8114,7 @@ prototype \\&SUB	Returns prototype of the function given a reference.
           (goto-char e)
           (delete-horizontal-space)
           (insert "\n")
-          (indent-to-column c)
+          (cperl-make-indent c)
           (set-marker e (point))))
     (goto-char b)
     (end-of-line 2)
@@ -6722,7 +8124,7 @@ prototype \\&SUB	Returns prototype of the function given a reference.
             inline t)
       (skip-chars-forward " \t")
       (delete-region s (point))
-      (indent-to-column c1)
+      (cperl-make-indent c1)
       (while (and
               inline
               (looking-at
@@ -6748,6 +8150,16 @@ prototype \\&SUB	Returns prototype of the function given a reference.
                         (eq (preceding-char) ?\{)))
                (forward-char -1)
                (forward-sexp 1))
+              ((and                     ; [], already syntaxified
+                (match-beginning 6)
+                cperl-regexp-scan
+                cperl-use-syntax-table-text-property)
+               (forward-char -1)
+               (forward-sexp 1)
+               (or (eq (preceding-char) ?\])
+                   (error "[]-group not terminated"))
+               (re-search-forward
+                "\\=\\([*+?]\\|{[0-9]+\\(,[0-9]*\\)?}\\)\\??" e t))
               ((match-beginning 6)      ; []
                (setq tmp (point))
                (if (looking-at "\\^?\\]")
@@ -6761,12 +8173,8 @@ prototype \\&SUB	Returns prototype of the function given a reference.
                    (setq pos t)))
                (or (eq (preceding-char) ?\])
                    (error "[]-group not terminated"))
-               (if (eq (following-char) ?\{)
-                   (progn
-                     (forward-sexp 1)
-                     (and (eq (following-char) ??)
-                          (forward-char 1)))
-                 (re-search-forward "\\=\\([*+?]\\??\\)" e t)))
+               (re-search-forward
+                "\\=\\([*+?]\\|{[0-9]+\\(,[0-9]*\\)?}\\)\\??" e t))
               ((match-beginning 7)      ; ()
                (goto-char (match-beginning 0))
                (setq pos (current-column))
@@ -6774,7 +8182,7 @@ prototype \\&SUB	Returns prototype of the function given a reference.
                    (progn
                      (delete-horizontal-space)
                      (insert "\n")
-                     (indent-to-column c1)))
+                     (cperl-make-indent c1)))
                (setq tmp (point))
                (forward-sexp 1)
                ;;              (or (forward-sexp 1)
@@ -6834,7 +8242,7 @@ prototype \\&SUB	Returns prototype of the function given a reference.
                      (insert "\n"))
                  ;; first at line
                  (delete-region (point) tmp))
-               (indent-to-column c)
+               (cperl-make-indent c)
                (forward-char 1)
                (skip-chars-forward " \t")
                (setq spaces nil)
@@ -6857,10 +8265,7 @@ prototype \\&SUB	Returns prototype of the function given a reference.
              (/= (current-indentation) c))
         (progn
           (beginning-of-line)
-          (setq s (point))
-          (skip-chars-forward " \t")
-          (delete-region s (point))
-          (indent-to-column c)))))
+          (cperl-make-indent c)))))
 
 (defun cperl-make-regexp-x ()
   ;; Returns position of the start
@@ -6929,7 +8334,7 @@ We suppose that the regexp is scanned already."
   (interactive)
   ;; (save-excursion            ; Can't, breaks `cperl-contract-levels'
   (cperl-regext-to-level-start)
-  (let ((b (point)) (e (make-marker)) s c)
+  (let ((b (point)) (e (make-marker)) c)
     (forward-sexp 1)
     (set-marker e (1- (point)))
     (goto-char b)
@@ -6938,10 +8343,7 @@ We suppose that the regexp is scanned already."
        ((match-beginning 1)             ; #-comment
         (or c (setq c (current-indentation)))
         (beginning-of-line 2)           ; Skip
-        (setq s (point))
-        (skip-chars-forward " \t")
-        (delete-region s (point))
-        (indent-to-column c))
+        (cperl-make-indent c))
        (t
         (delete-char -1)
         (just-one-space))))))
@@ -6980,96 +8382,197 @@ We suppose that the regexp is scanned already."
       (set-marker e (1- (point)))
       (cperl-beautify-regexp-piece b e nil deep))))
 
+(defun cperl-invert-if-unless-modifiers ()
+  "Change `B if A;' into `if (A) {B}' etc if possible.
+\(Unfinished.)"
+  (interactive)                         ; 
+  (let (A B pre-B post-B pre-if post-if pre-A post-A if-string
+          (w-rex "\\<\\(if\\|unless\\|while\\|until\\|for\\|foreach\\)\\>"))
+    (and (= (char-syntax (preceding-char)) ?w)
+         (forward-sexp -1))
+    (setq pre-if (point))
+    (cperl-backward-to-start-of-expr)
+    (setq pre-B (point))
+    (forward-sexp 1)            ; otherwise forward-to-end-of-expr is NOP
+    (cperl-forward-to-end-of-expr)
+    (setq post-A (point))
+    (goto-char pre-if)
+    (or (looking-at w-rex)
+        ;; Find the position
+        (progn (goto-char post-A)
+               (while (and
+                       (not (looking-at w-rex))
+                       (> (point) pre-B))
+                 (forward-sexp -1))
+               (setq pre-if (point))))
+    (or (looking-at w-rex)
+        (error "Can't find `if', `unless', `while', `until', `for' or `foreach'"))
+    ;; 1 B 2 ... 3 B-com ... 4 if 5 ... if-com 6 ... 7 A 8
+    (setq if-string (buffer-substring (match-beginning 0) (match-end 0)))
+    ;; First, simple part: find code boundaries
+    (forward-sexp 1)
+    (setq post-if (point))
+    (forward-sexp -2)
+    (forward-sexp 1)
+    (setq post-B (point))
+    (cperl-backward-to-start-of-expr)
+    (setq pre-B (point))
+    (setq B (buffer-substring pre-B post-B))
+    (goto-char pre-if)
+    (forward-sexp 2)
+    (forward-sexp -1)
+    ;; May be after $, @, $# etc of a variable
+    (skip-chars-backward "$@%#")
+    (setq pre-A (point))
+    (cperl-forward-to-end-of-expr)
+    (setq post-A (point))
+    (setq A (buffer-substring pre-A post-A))
+    ;; Now modify (from end, to not break the stuff)
+    (skip-chars-forward " \t;")
+    (delete-region pre-A (point))       ; we move to pre-A
+    (insert "\n" B ";\n}")
+    (and (looking-at "[ \t]*#") (cperl-indent-for-comment))
+    (delete-region pre-if post-if)
+    (delete-region pre-B post-B)
+    (goto-char pre-B)
+    (insert if-string " (" A ") {")
+    (setq post-B (point))
+    (if (looking-at "[ \t]+$")
+        (delete-horizontal-space)
+      (if (looking-at "[ \t]*#")
+          (cperl-indent-for-comment)
+        (just-one-space)))
+    (forward-line 1)
+    (if (looking-at "[ \t]*$")
+        (progn                          ; delete line
+          (delete-horizontal-space)
+          (delete-region (point) (1+ (point)))))
+    (cperl-indent-line)
+    (goto-char (1- post-B))
+    (forward-sexp 1)
+    (cperl-indent-line)
+    (goto-char pre-B)))
+
 (defun cperl-invert-if-unless ()
-  "Change `if (A) {B}' into `B if A;' etc if possible."
+  "Change `if (A) {B}' into `B if A;' etc (or visa versa) if possible.
+If the cursor is not on the leading keyword of the BLOCK flavor of
+construct, will assume it is the STATEMENT flavor, so will try to find
+the appropriate statement modifier."
   (interactive)
-  (or (looking-at "\\<")
-      (forward-sexp -1))
+  (and (= (char-syntax (preceding-char)) ?w)
+       (forward-sexp -1))
   (if (looking-at "\\<\\(if\\|unless\\|while\\|until\\|for\\|foreach\\)\\>")
-      (let ((pos1 (point))
-            pos2 pos3 pos4 pos5 s1 s2 state p pos45
-            (s0 (buffer-substring (match-beginning 0) (match-end 0))))
+      (let ((pre-if (point))
+            pre-A post-A pre-B post-B A B state p end-B-code is-block B-comment
+            (if-string (buffer-substring (match-beginning 0) (match-end 0))))
         (forward-sexp 2)
-        (setq pos3 (point))
+        (setq post-A (point))
         (forward-sexp -1)
-        (setq pos2 (point))
-        (if (eq (following-char) ?\( )
+        (setq pre-A (point))
+        (setq is-block (and (eq (following-char) ?\( )
+                            (save-excursion
+                              (condition-case nil
+                                  (progn
+                                    (forward-sexp 2)
+                                    (forward-sexp -1)
+                                    (eq (following-char) ?\{ ))
+                                (error nil)))))
+        (if is-block
             (progn
-              (goto-char pos3)
+              (goto-char post-A)
               (forward-sexp 1)
-              (setq pos5 (point))
+              (setq post-B (point))
               (forward-sexp -1)
-              (setq pos4 (point))
-              ;; XXXX In fact may be `A if (B); {C}' ...
+              (setq pre-B (point))
               (if (and (eq (following-char) ?\{ )
                        (progn
-                         (cperl-backward-to-noncomment pos3)
+                         (cperl-backward-to-noncomment post-A)
                          (eq (preceding-char) ?\) )))
                   (if (condition-case nil
                           (progn
-                            (goto-char pos5)
+                            (goto-char post-B)
                             (forward-sexp 1)
                             (forward-sexp -1)
                             (looking-at "\\<els\\(e\\|if\\)\\>"))
                         (error nil))
                       (error
-                       "`%s' (EXPR) {BLOCK} with `else'/`elsif'" s0)
-                    (goto-char (1- pos5))
-                    (cperl-backward-to-noncomment pos4)
+                       "`%s' (EXPR) {BLOCK} with `else'/`elsif'" if-string)
+                    (goto-char (1- post-B))
+                    (cperl-backward-to-noncomment pre-B)
                     (if (eq (preceding-char) ?\;)
                         (forward-char -1))
-                    (setq pos45 (point))
-                    (goto-char pos4)
-                    (while (re-search-forward "\\<\\(for\\|foreach\\|if\\|unless\\|while\\|until\\)\\>\\|;" pos45 t)
+                    (setq end-B-code (point))
+                    (goto-char pre-B)
+                    (while (re-search-forward "\\<\\(for\\|foreach\\|if\\|unless\\|while\\|until\\)\\>\\|;" end-B-code t)
                       (setq p (match-beginning 0)
-                            s1 (buffer-substring p (match-end 0))
-                            state (parse-partial-sexp pos4 p))
+                            A (buffer-substring p (match-end 0))
+                            state (parse-partial-sexp pre-B p))
                       (or (nth 3 state)
                           (nth 4 state)
                           (nth 5 state)
-                          (error "`%s' inside `%s' BLOCK" s1 s0))
+                          (error "`%s' inside `%s' BLOCK" A if-string))
                       (goto-char (match-end 0)))
                     ;; Finally got it
-                    (goto-char (1+ pos4))
+                    (goto-char (1+ pre-B))
                     (skip-chars-forward " \t\n")
-                    (setq s2 (buffer-substring (point) pos45))
-                    (goto-char pos45)
+                    (setq B (buffer-substring (point) end-B-code))
+                    (goto-char end-B-code)
                     (or (looking-at ";?[ \t\n]*}")
                         (progn
                           (skip-chars-forward "; \t\n")
-                          (setq s2 (concat s2 "\n" (buffer-substring (point) (1- pos5))))))
-                    (and (equal s2 "")
-                         (setq s2 "1"))
-                    (goto-char (1- pos3))
-                    (cperl-backward-to-noncomment pos2)
+                          (setq B-comment
+                                (buffer-substring (point) (1- post-B)))))
+                    (and (equal B "")
+                         (setq B "1"))
+                    (goto-char (1- post-A))
+                    (cperl-backward-to-noncomment pre-A)
                     (or (looking-at "[ \t\n]*)")
-                        (goto-char (1- pos3)))
+                        (goto-char (1- post-A)))
                     (setq p (point))
-                    (goto-char (1+ pos2))
+                    (goto-char (1+ pre-A))
                     (skip-chars-forward " \t\n")
-                    (setq s1 (buffer-substring (point) p))
-                    (delete-region pos4 pos5)
-                    (delete-region pos2 pos3)
-                    (goto-char pos1)
-                    (insert s2 " ")
+                    (setq A (buffer-substring (point) p))
+                    (delete-region pre-B post-B)
+                    (delete-region pre-A post-A)
+                    (goto-char pre-if)
+                    (insert B " ")
+                    (and B-comment (insert B-comment " "))
                     (just-one-space)
                     (forward-word 1)
-                    (setq pos1 (point))
-                    (insert " " s1 ";")
+                    (setq pre-A (point))
+                    (insert " " A ";")
                     (delete-horizontal-space)
+                    (setq post-B (point))
+                    (if (looking-at "#")
+                        (indent-for-comment))
+                    (goto-char post-B)
                     (forward-char -1)
                     (delete-horizontal-space)
-                    (goto-char pos1)
+                    (goto-char pre-A)
                     (just-one-space)
-                    (cperl-indent-line))
-                (error "`%s' (EXPR) not with an {BLOCK}" s0)))
-          (error "`%s' not with an (EXPR)" s0)))
-    (error "Not at `if', `unless', `while', `until', `for' or `foreach'")))
+                    (goto-char pre-if)
+                    (setq pre-A (set-marker (make-marker) pre-A))
+                    (while (<= (point) (marker-position pre-A))
+                      (cperl-indent-line)
+                      (forward-line 1))
+                    (goto-char (marker-position pre-A))
+                    (if B-comment
+                        (progn
+                          (forward-line -1)
+                          (indent-for-comment)
+                          (goto-char (marker-position pre-A)))))
+                (error "`%s' (EXPR) not with an {BLOCK}" if-string)))
+          ;; (error "`%s' not with an (EXPR)" if-string)
+          (forward-sexp -1)
+          (cperl-invert-if-unless-modifiers)))
+    ;;(error "Not at `if', `unless', `while', `until', `for' or `foreach'")
+    (cperl-invert-if-unless-modifiers)))
 
 ;;; By Anthony Foiani <afoiani@uswest.com>
 ;;; Getting help on modules in C-h f ?
 ;;; This is a modified version of `man'.
 ;;; Need to teach it how to lookup functions
+;;;###autoload
 (defun cperl-perldoc (word)
   "Run `perldoc' on WORD."
   (interactive
@@ -7101,6 +8604,7 @@ We suppose that the regexp is scanned already."
      (t
       (Man-getpage-in-background word)))))
 
+;;;###autoload
 (defun cperl-perldoc-at-point ()
   "Run a `perldoc' on the word around point."
   (interactive)
@@ -7145,7 +8649,7 @@ We suppose that the regexp is scanned already."
 (defun cperl-pod2man-build-command ()
   "Builds the entire background manpage and cleaning command."
   (let ((command (concat pod2man-program " %s 2>/dev/null"))
-        (flist Man-filter-list))
+        (flist (and (boundp 'Man-filter-list) Man-filter-list)))
     (while (and flist (car flist))
       (let ((pcom (car (car flist)))
             (pargs (cdr (car flist))))
@@ -7159,6 +8663,205 @@ We suppose that the regexp is scanned already."
         (setq flist (cdr flist))))
     command))
 
+
+(defun cperl-next-interpolated-REx-1 ()
+  "Move point to next REx which has interpolated parts without //o.
+Skips RExes consisting of one interpolated variable.
+
+Note that skipped RExen are not performance hits."
+  (interactive "")
+  (cperl-next-interpolated-REx 1))
+
+(defun cperl-next-interpolated-REx-0 ()
+  "Move point to next REx which has interpolated parts without //o."
+  (interactive "")
+  (cperl-next-interpolated-REx 0))
+
+(defun cperl-next-interpolated-REx (&optional skip beg limit)
+  "Move point to next REx which has interpolated parts.
+SKIP is a list of possible types to skip, BEG and LIMIT are the starting
+point and the limit of search (default to point and end of buffer).
+
+SKIP may be a number, then it behaves as list of numbers up to SKIP; this
+semantic may be used as a numeric argument.
+
+Types are 0 for / $rex /o (interpolated once), 1 for /$rex/ (if $rex is
+a result of qr//, this is not a performance hit), t for the rest."
+  (interactive "P")
+  (if (numberp skip) (setq skip (list 0 skip)))
+  (or beg (setq beg (point)))
+  (or limit (setq limit (point-max)))   ; needed for n-s-p-c
+  (let (pp)
+    (and (eq (get-text-property beg 'syntax-type) 'string)
+         (setq beg (next-single-property-change beg 'syntax-type nil limit)))
+    (cperl-map-pods-heres
+     (function (lambda (s e p)
+                 (if (memq (get-text-property s 'REx-interpolated) skip)
+                     t
+                   (setq pp s)
+                   nil)))       ; nil stops
+     'REx-interpolated beg limit)
+    (if pp (goto-char pp)
+      (message "No more interpolated REx"))))
+
+;;; Initial version contributed by Trey Belew
+(defun cperl-here-doc-spell (&optional beg end)
+  "Spell-check HERE-documents in the Perl buffer.
+If a region is highlighted, restricts to the region."
+  (interactive "")
+  (cperl-pod-spell t beg end))
+
+(defun cperl-pod-spell (&optional do-heres beg end)
+  "Spell-check POD documentation.
+If invoked with prefix argument, will do HERE-DOCs instead.
+If a region is highlighted, restricts to the region."
+  (interactive "P")
+  (save-excursion
+    (let (beg end)
+      (if (cperl-mark-active)
+          (setq beg (min (mark) (point))
+                end (max (mark) (point)))
+        (setq beg (point-min)
+              end (point-max)))
+      (cperl-map-pods-heres (function
+                             (lambda (s e p)
+                               (if do-heres
+                                   (setq e (save-excursion
+                                             (goto-char e)
+                                             (forward-line -1)
+                                             (point))))
+                               (ispell-region s e)
+                               t))
+                            (if do-heres 'here-doc-group 'in-pod)
+                            beg end))))
+
+(defun cperl-map-pods-heres (func &optional prop s end)
+  "Executes a function over regions of pods or here-documents.
+PROP is the text-property to search for; default to `in-pod'.  Stop when
+function returns nil."
+  (let (pos posend has-prop (cont t))
+    (or prop (setq prop 'in-pod))
+    (or s (setq s (point-min)))
+    (or end (setq end (point-max)))
+    (cperl-update-syntaxification end end)
+    (save-excursion
+      (goto-char (setq pos s))
+      (while (and cont (< pos end))
+        (setq has-prop (get-text-property pos prop))
+        (setq posend (next-single-property-change pos prop nil end))
+        (and has-prop
+             (setq cont (funcall func pos posend prop)))
+        (setq pos posend)))))
+
+;;; Based on code by Masatake YAMATO:
+(defun cperl-get-here-doc-region (&optional pos pod)
+  "Return HERE document region around the point.
+Return nil if the point is not in a HERE document region.  If POD is non-nil,
+will return a POD section if point is in a POD section."
+  (or pos (setq pos (point)))
+  (cperl-update-syntaxification pos pos)
+  (if (or (eq 'here-doc  (get-text-property pos 'syntax-type))
+          (and pod
+               (eq 'pod (get-text-property pos 'syntax-type))))
+      (let ((b (cperl-beginning-of-property pos 'syntax-type))
+            (e (next-single-property-change pos 'syntax-type)))
+        (cons b (or e (point-max))))))
+
+(defun cperl-narrow-to-here-doc (&optional pos)
+  "Narrows editing region to the HERE-DOC at POS.
+POS defaults to the point."
+  (interactive "d")
+  (or pos (setq pos (point)))
+  (let ((p (cperl-get-here-doc-region pos)))
+    (or p (error "Not inside a HERE document"))
+    (narrow-to-region (car p) (cdr p))
+    (message
+     "When you are finished with narrow editing, type C-x n w")))
+
+(defun cperl-select-this-pod-or-here-doc (&optional pos)
+  "Select the HERE-DOC (or POD section) at POS.
+POS defaults to the point."
+  (interactive "d")
+  (let ((p (cperl-get-here-doc-region pos t)))
+    (if p
+        (progn
+          (goto-char (car p))
+          (push-mark (cdr p) nil t))    ; Message, activate in transient-mode
+      (message "I do not think POS is in POD or a HERE-doc..."))))
+
+(defun cperl-facemenu-add-face-function (face end)
+  "A callback to process user-initiated font-change requests.
+Translates `bold', `italic', and `bold-italic' requests to insertion of
+corresponding POD directives, and `underline' to C<> POD directive.
+
+Such requests are usually bound to M-o LETTER."
+  (or (get-text-property (point) 'in-pod)
+      (error "Faces can only be set within POD"))
+  (setq facemenu-end-add-face (if (eq face 'bold-italic) ">>" ">"))
+  (cdr (or (assq face '((bold . "B<")
+                        (italic . "I<")
+                        (bold-italic . "B<I<")
+                        (underline . "C<")))
+           (error "Face %s not configured for cperl-mode"
+                  face))))
+
+(defun cperl-time-fontification (&optional l step lim)
+  "Times how long it takes to do incremental fontification in a region.
+L is the line to start at, STEP is the number of lines to skip when
+doing next incremental fontification, LIM is the maximal number of
+incremental fontification to perform.  Messages are accumulated in
+*Messages* buffer.
+
+May be used for pinpointing which construct slows down buffer fontification:
+start with default arguments, then refine the slowdown regions."
+  (interactive "nLine to start at: \nnStep to do incremental fontification: ")
+  (or l (setq l 1))
+  (or step (setq step 500))
+  (or lim (setq lim 40))
+  (let* ((timems (function (lambda ()
+                             (let ((tt (current-time)))
+                               (+ (* 1000 (nth 1 tt)) (/ (nth 2 tt) 1000))))))
+         (tt (funcall timems)) (c 0) delta tot)
+    (goto-line l)
+    (cperl-mode)
+    (setq tot (- (- tt (setq tt (funcall timems)))))
+    (message "cperl-mode at %s: %s" l tot)
+    (while (and (< c lim) (not (eobp)))
+      (forward-line step)
+      (setq l (+ l step))
+      (setq c (1+ c))
+      (cperl-update-syntaxification (point) (point))
+      (setq delta (- (- tt (setq tt (funcall timems)))) tot (+ tot delta))
+      (message "to %s:%6s,%7s" l delta tot))
+    tot))
+
+(defun cperl-emulate-lazy-lock (&optional window-size)
+  "Emulate `lazy-lock' without `condition-case', so `debug-on-error' works.
+Start fontifying the buffer from the start (or end) using the given
+WINDOW-SIZE (units is lines).  Negative WINDOW-SIZE starts at end, and
+goes backwards; default is -50.  This function is not CPerl-specific; it
+may be used to debug problems with delayed incremental fontification."
+  (interactive
+   "nSize of window for incremental fontification, negative goes backwards: ")
+  (or window-size (setq window-size -50))
+  (let ((pos (if (> window-size 0)
+                 (point-min)
+               (point-max)))
+        p)
+    (goto-char pos)
+    (normal-mode)
+    ;; Why needed???  With older font-locks???
+    (set (make-local-variable 'font-lock-cache-position) (make-marker))
+    (while (if (> window-size 0)
+               (< pos (point-max))
+             (> pos (point-min)))
+      (setq p (progn
+                (forward-line window-size)
+                (point)))
+      (font-lock-fontify-region (min p pos) (max p pos))
+      (setq pos p))))
+
+
 (defun cperl-lazy-install ())           ; Avoid a warning
 (defun cperl-lazy-unstall ())           ; Avoid a warning
 
@@ -7174,7 +8877,7 @@ We suppose that the regexp is scanned already."
         "Switches on Auto-Help on Perl constructs (put in the message area).
 Delay of auto-help controlled by `cperl-lazy-help-time'."
         (interactive)
-        (make-variable-buffer-local 'cperl-help-shown)
+        (make-local-variable 'cperl-help-shown)
         (if (and (cperl-val 'cperl-lazy-help-time)
                  (not cperl-lazy-installed))
             (progn
@@ -7207,48 +8910,109 @@ Delay of auto-help controlled by `cperl-lazy-help-time'."
 ;;; Plug for wrong font-lock:
 
 (defun cperl-font-lock-unfontify-region-function (beg end)
-  ;; Simplified now that font-lock-unfontify-region uses save-buffer-state.
-  (let (before-change-functions after-change-functions)
-    (remove-text-properties beg end '(face nil))))
+  (let* ((modified (buffer-modified-p)) (buffer-undo-list t)
+         (inhibit-read-only t) (inhibit-point-motion-hooks t)
+         before-change-functions after-change-functions
+         deactivate-mark buffer-file-name buffer-file-truename)
+    (remove-text-properties beg end '(face nil))
+    (if (and (not modified) (buffer-modified-p))
+      (set-buffer-modified-p nil))))
+
+(defun cperl-font-lock-fontify-region-function (beg end loudly)
+  "Extends the region to safe positions, then calls the default function.
+Newer `font-lock's can do it themselves.
+We unwind only as far as needed for fontification.  Syntaxification may
+do extra unwind via `cperl-unwind-to-safe'."
+  (save-excursion
+    (goto-char beg)
+    (while (and beg
+                (progn
+                  (beginning-of-line)
+                  (eq (get-text-property (setq beg (point)) 'syntax-type)
+                      'multiline)))
+      (if (setq beg (cperl-beginning-of-property beg 'syntax-type))
+          (goto-char beg)))
+    (setq beg (point))
+    (goto-char end)
+    (while (and end
+                (progn
+                  (or (bolp) (condition-case nil
+                                 (forward-line 1)
+                               (error nil)))
+                  (eq (get-text-property (setq end (point)) 'syntax-type)
+                      'multiline)))
+      (setq end (next-single-property-change end 'syntax-type nil (point-max)))
+      (goto-char end))
+    (setq end (point)))
+  (font-lock-default-fontify-region beg end loudly))
 
 (defvar cperl-d-l nil)
 (defun cperl-fontify-syntaxically (end)
   ;; Some vars for debugging only
   ;; (message "Syntaxifying...")
-  (let ((dbg (point)) (iend end)
+  (let ((dbg (point)) (iend end) (idone cperl-syntax-done-to)
         (istate (car cperl-syntax-state))
-        start)
-    (and cperl-syntaxify-unwind
-         (setq end (cperl-unwind-to-safe t end)))
-    (setq start (point))
+        start from-start edebug-backtrace-buffer)
+    (if (eq cperl-syntaxify-by-font-lock 'backtrace)
+        (progn
+          (require 'edebug)
+          (let ((f 'edebug-backtrace))
+            (funcall f))))      ; Avoid compile-time warning
     (or cperl-syntax-done-to
-        (setq cperl-syntax-done-to (point-min)))
-    (if (or (not (boundp 'font-lock-hot-pass))
-            (eval 'font-lock-hot-pass)
-            t)                          ; Not debugged otherwise
-        ;; Need to forget what is after `start'
-        (setq start (min cperl-syntax-done-to start))
-      ;; Fontification without a change
-      (setq start (max cperl-syntax-done-to start)))
+        (setq cperl-syntax-done-to (point-min)
+              from-start t))
+    (setq start (if (and cperl-hook-after-change
+                         (not from-start))
+                    cperl-syntax-done-to ; Fontify without change; ignore start
+                  ;; Need to forget what is after `start'
+                  (min cperl-syntax-done-to (point))))
+    (goto-char start)
+    (beginning-of-line)
+    (setq start (point))
+    (and cperl-syntaxify-unwind
+         (setq end (cperl-unwind-to-safe t end)
+               start (point)))
     (and (> end start)
          (setq cperl-syntax-done-to start) ; In case what follows fails
          (cperl-find-pods-heres start end t nil t))
-    (if (eq cperl-syntaxify-by-font-lock 'message)
-        (message "Syntaxified %s..%s from %s to %s(%s), state %s-->%s"
-                 dbg iend
-                 start end cperl-syntax-done-to
+    (if (memq cperl-syntaxify-by-font-lock '(backtrace message))
+        (message "Syxify req=%s..%s actual=%s..%s done-to: %s=>%s statepos: %s=>%s"
+                 dbg iend start end idone cperl-syntax-done-to
                  istate (car cperl-syntax-state))) ; For debugging
     nil))                               ; Do not iterate
 
 (defun cperl-fontify-update (end)
-  (let ((pos (point)) prop posend)
+  (let ((pos (point-min)) prop posend)
+    (setq end (point-max))
     (while (< pos end)
-      (setq prop (get-text-property pos 'cperl-postpone))
-      (setq posend (next-single-property-change pos 'cperl-postpone nil end))
+      (setq prop (get-text-property pos 'cperl-postpone)
+            posend (next-single-property-change pos 'cperl-postpone nil end))
       (and prop (put-text-property pos posend (car prop) (cdr prop)))
       (setq pos posend)))
   nil)                                  ; Do not iterate
 
+(defun cperl-fontify-update-bad (end)
+  ;; Since fontification happens with different region than syntaxification,
+  ;; do to the end of buffer, not to END;;; likewise, start earlier if needed
+  (let* ((pos (point)) (prop (get-text-property pos 'cperl-postpone)) posend)
+    (if prop
+        (setq pos (or (cperl-beginning-of-property
+                       (cperl-1+ pos) 'cperl-postpone)
+                      (point-min))))
+    (while (< pos end)
+      (setq posend (next-single-property-change pos 'cperl-postpone))
+      (and prop (put-text-property pos posend (car prop) (cdr prop)))
+      (setq pos posend)
+      (setq prop (get-text-property pos 'cperl-postpone))))
+  nil)                                  ; Do not iterate
+
+;; Called when any modification is made to buffer text.
+(defun cperl-after-change-function (beg end old-len)
+  ;; We should have been informed about changes by `font-lock'.  Since it
+  ;; does not inform as which calls are defered, do it ourselves
+  (if cperl-syntax-done-to
+      (setq cperl-syntax-done-to (min cperl-syntax-done-to beg))))
+
 (defun cperl-update-syntaxification (from to)
   (if (and cperl-use-syntax-table-text-property
            cperl-syntaxify-by-font-lock
@@ -7260,7 +9024,7 @@ Delay of auto-help controlled by `cperl-lazy-help-time'."
           (cperl-fontify-syntaxically to)))))
 
 (defvar cperl-version
-  (let ((v  "Revision: 5.0"))
+  (let ((v  "Revision: 5.22"))
     (string-match ":\\s *\\([0-9.]+\\)" v)
     (substring v (match-beginning 1) (match-end 1)))
   "Version of IZ-supported CPerl package this file is based on.")
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index bce4381c614..9f27c8a60f1 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -5,10 +5,10 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2005-09-18 07:27:20 deego>
+;; Time-stamp: <2006/09/26 21:49:46 vinicius>
 ;; Keywords: wp, ebnf, PostScript
-;; Version: 4.2
-;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
+;; Version: 4.3
+;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
 ;; This file is part of GNU Emacs.
 
@@ -27,8 +27,8 @@
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 
-(defconst ebnf-version "4.2"
-  "ebnf2ps.el, v 4.2 <2004/04/04 vinicius>
+(defconst ebnf-version "4.3"
+  "ebnf2ps.el, v 4.3 <2006/09/26 vinicius>
 
 Vinicius's last change version.  When reporting bugs, please also
 report the version of Emacs, if any, that ebnf2ps was running with.
@@ -73,18 +73,18 @@ Please send all bug fixes and enhancements to
 ;; ebnf2ps provides the following commands for generating PostScript syntactic
 ;; chart images of Emacs buffers:
 ;;
-;;      ebnf-print-directory
-;;      ebnf-print-file
-;;      ebnf-print-buffer
-;;      ebnf-print-region
-;;      ebnf-spool-directory
-;;      ebnf-spool-file
-;;      ebnf-spool-buffer
-;;      ebnf-spool-region
-;;      ebnf-eps-directory
-;;      ebnf-eps-file
-;;      ebnf-eps-buffer
-;;      ebnf-eps-region
+;;    ebnf-print-directory
+;;    ebnf-print-file
+;;    ebnf-print-buffer
+;;    ebnf-print-region
+;;    ebnf-spool-directory
+;;    ebnf-spool-file
+;;    ebnf-spool-buffer
+;;    ebnf-spool-region
+;;    ebnf-eps-directory
+;;    ebnf-eps-file
+;;    ebnf-eps-buffer
+;;    ebnf-eps-region
 ;;
 ;; These commands all perform essentially the same function: they generate
 ;; PostScript syntactic chart images suitable for printing on a PostScript
@@ -94,14 +94,14 @@ Please send all bug fixes and enhancements to
 ;; The word "print", "spool" and "eps" in the command name determines when the
 ;; PostScript image is sent to the printer (or file):
 ;;
-;;      print  - The PostScript image is immediately sent to the printer;
+;;    print  - The PostScript image is immediately sent to the printer;
 ;;
-;;      spool  - The PostScript image is saved temporarily in an Emacs buffer.
-;;               Many images may be spooled locally before printing them.  To
-;;               send the spooled images to the printer, use the command
-;;               `ebnf-despool'.
+;;    spool  - The PostScript image is saved temporarily in an Emacs buffer.
+;;             Many images may be spooled locally before printing them.  To
+;;             send the spooled images to the printer, use the command
+;;             `ebnf-despool'.
 ;;
-;;      eps    - The PostScript image is immediately sent to a EPS file.
+;;    eps    - The PostScript image is immediately sent to a EPS file.
 ;;
 ;; The spooling mechanism is the same as used by ps-print and was designed for
 ;; printing lots of small files to save paper that would otherwise be wasted on
@@ -120,22 +120,22 @@ Please send all bug fixes and enhancements to
 ;; The word "directory", "file", "buffer" or "region" in the command name
 ;; determines how much of the buffer is printed:
 ;;
-;;      directory  - Read files in the directory and print them.
+;;    directory  - Read files in the directory and print them.
 ;;
-;;      file       - Read file and print it.
+;;    file       - Read file and print it.
 ;;
-;;      buffer     - Print the entire buffer.
+;;    buffer     - Print the entire buffer.
 ;;
-;;      region     - Print just the current region.
+;;    region     - Print just the current region.
 ;;
 ;; Two ebnf- command examples:
 ;;
-;;      ebnf-print-buffer  - translate and print the entire buffer, and send it
-;;                           immediately to the printer.
+;;    ebnf-print-buffer  - translate and print the entire buffer, and send it
+;;                         immediately to the printer.
 ;;
-;;      ebnf-spool-region  - translate and print just the current region, and
-;;                           spool the image in Emacs to send to the printer
-;;                           later.
+;;    ebnf-spool-region  - translate and print just the current region, and
+;;                         spool the image in Emacs to send to the printer
+;;                         later.
 ;;
 ;; Note that `ebnf-eps-directory', `ebnf-eps-file', `ebnf-eps-buffer' and
 ;; `ebnf-eps-region' never spool the EPS image, so they don't use the ps-print
@@ -148,13 +148,13 @@ Please send all bug fixes and enhancements to
 ;;
 ;; To translate and print your buffer, type
 ;;
-;;        M-x ebnf-print-buffer
+;;    M-x ebnf-print-buffer
 ;;
 ;; or substitute one of the other four ebnf- commands.  The command will
 ;; generate the PostScript image and print or spool it as specified.  By giving
 ;; the command a prefix argument
 ;;
-;;        C-u M-x ebnf-print-buffer
+;;    C-u M-x ebnf-print-buffer
 ;;
 ;; it will save the PostScript image to a file instead of sending it to the
 ;; printer; you will be prompted for the name of the file to save the image to.
@@ -162,7 +162,7 @@ Please send all bug fixes and enhancements to
 ;; you may save the spooled images to a file by giving a prefix argument to
 ;; `ebnf-despool':
 ;;
-;;        C-u M-x ebnf-despool
+;;    C-u M-x ebnf-despool
 ;;
 ;; When invoked this way, `ebnf-despool' will prompt you for the name of the
 ;; file to save to.
@@ -172,9 +172,9 @@ Please send all bug fixes and enhancements to
 ;;
 ;; Any of the `ebnf-' commands can be bound to keys.  Here are some examples:
 ;;
-;;   (global-set-key 'f22 'ebnf-print-buffer) ;f22 is prsc
-;;   (global-set-key '(shift f22) 'ebnf-print-region)
-;;   (global-set-key '(control f22) 'ebnf-despool)
+;;    (global-set-key 'f22 'ebnf-print-buffer) ;f22 is prsc
+;;    (global-set-key '(shift f22) 'ebnf-print-region)
+;;    (global-set-key '(control f22) 'ebnf-despool)
 ;;
 ;;
 ;; Invoking Ebnf2ps in Batch
@@ -523,14 +523,14 @@ Please send all bug fixes and enhancements to
 ;;
 ;; The following table summarizes the results:
 ;;
-;; EPS FILE NAME    NO SORT    ASCENDING SORT    DESCENDING SORT
-;; ebnf--AA.eps     A C        A C               C A
-;; ebnf--BB.eps     C B        B C               C B
-;; ebnf--CC.eps     A C B F    A B C F           F C B A
-;; ebnf--D.eps      D          D                 D
-;; ebnf--E.eps      E          E                 E
-;; ebnf--G.eps      G          G                 G
-;; ebnf--Z.eps      Z          Z                 Z
+;;    EPS FILE NAME    NO SORT    ASCENDING SORT    DESCENDING SORT
+;;    ebnf--AA.eps     A C        A C               C A
+;;    ebnf--BB.eps     C B        B C               C B
+;;    ebnf--CC.eps     A C B F    A B C F           F C B A
+;;    ebnf--D.eps      D          D                 D
+;;    ebnf--E.eps      E          E                 E
+;;    ebnf--G.eps      G          G                 G
+;;    ebnf--Z.eps      Z          Z                 Z
 ;;
 ;; As you can see if EPS actions is not used, each single production is
 ;; generated per EPS file.  To avoid overriding EPS files, use names in ;[ that
@@ -692,6 +692,11 @@ Please send all bug fixes and enhancements to
 ;;
 ;; `ebnf-line-color'                    Specify flow line color.
 ;;
+;; `ebnf-arrow-extra-width'             Specify extra width for arrow shape
+;;                                      drawing.
+;;
+;; `ebnf-arrow-scale'                   Specify the arrow scale.
+;;
 ;; `ebnf-user-arrow'                    Specify a sexp for user arrow shape (a
 ;;                                      PostScript code).
 ;;
@@ -824,6 +829,8 @@ Please send all bug fixes and enhancements to
 ;;    entry             is the vertical position used to know where it should
 ;;                      be drawn the flow line in the current element.
 ;;
+;;    extra             is given by `ebnf-arrow-extra-width'.
+;;
 ;;
 ;;    * SPECIAL, TERMINAL and NON-TERMINAL
 ;;
@@ -835,17 +842,17 @@ Please send all bug fixes and enhancements to
 ;;       :   |   :      :   |   :  } font height / 2           }
 ;;       :   +==============+...:...............................
 ;;       :   :   :      :   :   :
-;;       :   :   :      :   :   :......................
-;;       :   :   :      :   :      } font height      }
-;;       :   :   :      :   :.......                  }
-;;       :   :   :      :          } font height / 2  }
-;;       :   :   :      :...........                  }
-;;       :   :   :                 } text width       } width
-;;       :   :   :..................                  }
-;;       :   :                     } font height / 2  }
-;;       :   :......................                  }
-;;       :                         } font height      }
-;;       :.............................................
+;;       :   :   :      :   :   :.........................
+;;       :   :   :      :   :      } font height          }
+;;       :   :   :      :   :.......                      }
+;;       :   :   :      :          } font height / 2      }
+;;       :   :   :      :...........                      }
+;;       :   :   :                 } text width           } width
+;;       :   :   :..................                      }
+;;       :   :                     } font height / 2      }
+;;       :   :......................                      }
+;;       :                         } font height + extra  }
+;;       :.................................................
 ;;
 ;;
 ;;    * OPTIONAL
@@ -976,21 +983,21 @@ Please send all bug fixes and enhancements to
 ;;       :   |  :  :  :   :   |   :  } font height / 2           }
 ;;       :   +================+...:...............................
 ;;       :   :  :  :  :   :   :   :
-;;       :   :  :  :  :   :   :   :......................
-;;       :   :  :  :  :   :   :      } font height      }
-;;       :   :  :  :  :   :   :.......                  }
-;;       :   :  :  :  :   :          } font height / 2  }
-;;       :   :  :  :  :   :...........                  }
-;;       :   :  :  :  :              } X width          }
-;;       :   :  :  :  :...............                  }
-;;       :   :  :  :                 } font height / 2  } width
-;;       :   :  :  :..................                  }
-;;       :   :  :                    } text width       }
-;;       :   :  :.....................                  }
-;;       :   :                       } font height / 2  }
-;;       :   :........................                  }
-;;       :                           } font height      }
-;;       :...............................................
+;;       :   :  :  :  :   :   :   :..........................
+;;       :   :  :  :  :   :   :      } font height          }
+;;       :   :  :  :  :   :   :.......                      }
+;;       :   :  :  :  :   :          } font height / 2      }
+;;       :   :  :  :  :   :...........                      }
+;;       :   :  :  :  :              } X width              }
+;;       :   :  :  :  :...............                      }
+;;       :   :  :  :                 } font height / 2      } width
+;;       :   :  :  :..................                      }
+;;       :   :  :                    } text width           }
+;;       :   :  :.....................                      }
+;;       :   :                       } font height / 2      }
+;;       :   :........................                      }
+;;       :                           } font height + extra  }
+;;       :...................................................
 ;;
 ;;
 ;;    * EXCEPT
@@ -1003,21 +1010,21 @@ Please send all bug fixes and enhancements to
 ;;       :   |  :   :   :   :   |   :  } font height / 2           }
 ;;       :   +==================+...:...............................
 ;;       :   :  :   :   :   :   :   :
-;;       :   :  :   :   :   :   :   :......................
-;;       :   :  :   :   :   :   :      } font height      }
-;;       :   :  :   :   :   :   :.......                  }
-;;       :   :  :   :   :   :          } font height / 2  }
-;;       :   :  :   :   :   :...........                  }
-;;       :   :  :   :   :              } Y width          }
-;;       :   :  :   :   :...............                  }
-;;       :   :  :   :                  } font height      } width
-;;       :   :  :   :...................                  }
-;;       :   :  :                      } X width          }
-;;       :   :  :.......................                  }
-;;       :   :                         } font height / 2  }
-;;       :   :..........................                  }
-;;       :                             } font height      }
-;;       :.................................................
+;;       :   :  :   :   :   :   :   :..........................
+;;       :   :  :   :   :   :   :      } font height          }
+;;       :   :  :   :   :   :   :.......                      }
+;;       :   :  :   :   :   :          } font height / 2      }
+;;       :   :  :   :   :   :...........                      }
+;;       :   :  :   :   :              } Y width              }
+;;       :   :  :   :   :...............                      }
+;;       :   :  :   :                  } font height          } width
+;;       :   :  :   :...................                      }
+;;       :   :  :                      } X width              }
+;;       :   :  :.......................                      }
+;;       :   :                         } font height / 2      }
+;;       :   :..........................                      }
+;;       :                             } font height + extra  }
+;;       :.....................................................
 ;;
 ;;       NOTE: If Y element is empty, it's draw nothing at Y place.
 ;;
@@ -1089,7 +1096,8 @@ Please send all bug fixes and enhancements to
 ;; ----------------
 ;;
 ;; Thanks to Drew Adams <drew.adams@oracle.com> for suggestions:
-;;    - `ebnf-production-name-p', `ebnf-stop-on-error',
+;;    - `ebnf-arrow-extra-width', `ebnf-arrow-scale',
+;;      `ebnf-production-name-p', `ebnf-stop-on-error',
 ;;      `ebnf-file-suffix-regexp'and `ebnf-special-show-delimiter' variables.
 ;;    - `ebnf-delete-style', `ebnf-eps-file' and `ebnf-eps-directory'
 ;;      commands.
@@ -1911,6 +1919,29 @@ special."
   :group 'ebnf2ps)
 
 
+(defcustom ebnf-arrow-extra-width
+  (if (eq ebnf-arrow-shape 'none)
+      0.0
+    (* (sqrt 5.0) 0.65 ebnf-line-width))
+  "*Specify extra width for arrow shape drawing.
+
+The extra width is used to avoid that the arrowhead and the terminal border
+overlap.  It depens on `ebnf-arrow-shape' and `ebnf-line-width'."
+  :type 'number
+  :version "22"
+  :group 'ebnf-shape)
+
+
+(defcustom ebnf-arrow-scale 1.0
+  "*Specify the arrow scale.
+
+Values lower than 1.0, shrink the arrow.
+Values greater than 1.0, expand the arrow."
+  :type 'number
+  :version "22"
+  :group 'ebnf-shape)
+
+
 (defcustom ebnf-debug-ps nil
   "*Non-nil means to generate PostScript debug procedures.
 
@@ -2859,9 +2890,9 @@ See documentation for `ebnf-terminal-shape', `ebnf-non-terminal-shape' and
 /HeightNT FontHeight FontHeight add def
 
 /T HeightT HeightNT add 0.5 mul def
-/hT T 0.5 mul def
-/hT2 hT 0.5 mul def
-/hT4 hT 0.25 mul def
+/hT   T 0.5  mul def
+/hT2 hT 0.5  mul ArrowScale mul def
+/hT4 hT 0.25 mul ArrowScale mul def
 
 /Er 0.1 def     % Error factor
 
@@ -2947,6 +2978,7 @@ See documentation for `ebnf-terminal-shape', `ebnf-non-terminal-shape' and
  RA-vector ArrowShape get exec
  Gstroke
  moveto
+ ExtraWidth 0 rmoveto
 }def
 
 % rotation DrawArrow
@@ -3245,7 +3277,7 @@ See documentation for `ebnf-terminal-shape', `ebnf-non-terminal-shape' and
 % string width prepare-width |- string
 /prepare-width
 {/width exch def
- dup stringwidth pop space add space add width exch sub 0.5 mul
+ dup stringwidth pop space add space add width exch sub ExtraWidth sub 0.5 mul
  /w exch def
 }def
 
@@ -4877,7 +4909,6 @@ killed after process termination."
          (progn
            ;; adjust creator comment
            (end-of-line)
-           (backward-char)
            (insert " & ebnf2ps v" ebnf-version)
            ;; insert ebnf settings & engine
            (goto-char (point-max))
@@ -5066,6 +5097,10 @@ killed after process termination."
               (format "/ShadowR       %s def\n"
                       (ebnf-boolean ebnf-repeat-shadow))
               ;; miscellaneous
+              (format "/ExtraWidth    %s def\n"
+                      (ebnf-format-float ebnf-arrow-extra-width))
+              (format "/ArrowScale    %s def\n"
+                      (ebnf-format-float ebnf-arrow-scale))
               (format "/DefaultWidth  %s def\n"
                       (ebnf-format-float ebnf-default-width))
               (format "/LineWidth     %s def\n"
@@ -5152,7 +5187,7 @@ killed after process termination."
         (len    (length (ebnf-node-name node))))
     (ebnf-node-entry  node (* height 0.5))
     (ebnf-node-height node height)
-    (ebnf-node-width  node (+ ebnf-basic-width space
+    (ebnf-node-width  node (+ ebnf-basic-width ebnf-arrow-extra-width space
                               (* len font-width)
                               space ebnf-basic-width))))
 
@@ -5173,6 +5208,7 @@ killed after process termination."
                                      ebnf-font-height-S)
                                 ebnf-space-R ebnf-space-R))
     (ebnf-node-width  repeat (+ (ebnf-node-width element)
+                                ebnf-arrow-extra-width
                                 ebnf-space-R ebnf-space-R ebnf-space-R
                                 ebnf-horizontal-space
                                 (* (length times) ebnf-font-width-R)))))
@@ -5194,6 +5230,7 @@ killed after process termination."
                                 ebnf-space-E ebnf-space-E))
     (ebnf-node-width  except (+ (ebnf-node-width factor)
                                 (ebnf-node-width element)
+                                ebnf-arrow-extra-width
                                 ebnf-space-E ebnf-space-E
                                 ebnf-space-E ebnf-space-E
                                 ebnf-font-width-E
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index f45bb2fe524..52360a73970 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -782,7 +782,7 @@ With arg, enter name of variable to be watched in the minibuffer."
 
 (defconst gdb-var-list-children-regexp
  "child={.*?name=\"\\(.*?\\)\",.*?exp=\"\\(.*?\\)\",.*?\
-numchild=\"\\(.*?\\)\",.*?type=\"\\(.*?\\)\".*?}")
+numchild=\"\\(.*?\\)\"\\(}\\|,.*?\\(type=\"\\(.*?\\)\"\\)?.*?}\\)")
 
 (defun gdb-var-list-children-handler (varnum)
   (goto-char (point-min))
@@ -796,7 +796,7 @@ numchild=\"\\(.*?\\)\",.*?type=\"\\(.*?\\)\".*?}")
                 (let ((varchild (list (match-string 1)
                                       (match-string 2)
                                       (match-string 3)
-                                      (match-string 4)
+                                      (match-string 6)
                                       nil nil)))
                   (if (assoc (car varchild) gdb-var-list)
                       (throw 'child-already-watched nil))
@@ -902,20 +902,23 @@ Changed values are highlighted with the face `font-lock-warning-face'."
 TEXT is the text of the button we clicked on, a + or - item.
 TOKEN is data related to this node.
 INDENT is the current indentation depth."
-  (cond ((string-match "+" text)        ;expand this node
-         (if (and
-              (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
-              (string-equal gdb-version "pre-6.4"))
-             (gdb-var-list-children token)
-           (gdb-var-list-children-1 token)))
-        ((string-match "-" text)        ;contract this node
-         (dolist (var gdb-var-list)
-           (if (string-match (concat token "\\.") (car var))
-               (setq gdb-var-list (delq var gdb-var-list))))
-         (speedbar-change-expand-button-char ?+)
-         (speedbar-delete-subblock indent))
-        (t (error "Ooops...  not sure what to do")))
-  (speedbar-center-buffer-smartly))
+  (if (and gud-comint-buffer (buffer-name gud-comint-buffer))
+      (progn
+        (cond ((string-match "+" text)  ;expand this node
+               (if (and (eq (buffer-local-value
+                             'gud-minor-mode gud-comint-buffer) 'gdba)
+                        (string-equal gdb-version "pre-6.4"))
+                   (gdb-var-list-children token)
+                 (gdb-var-list-children-1 token)))
+              ((string-match "-" text)  ;contract this node
+               (dolist (var gdb-var-list)
+                 (if (string-match (concat token "\\.") (car var))
+                     (setq gdb-var-list (delq var gdb-var-list))))
+               (speedbar-change-expand-button-char ?+)
+               (speedbar-delete-subblock indent))
+              (t (error "Ooops...  not sure what to do")))
+        (speedbar-center-buffer-smartly))
+    (message-box "GUD session has been killed")))
 
 (defun gdb-get-target-string ()
   (with-current-buffer gud-comint-buffer
@@ -1132,7 +1135,7 @@ This filter may simply queue input for a later time."
       (if gdb-prompting
           (progn
             (gdb-send-item item)
-        (setq gdb-prompting nil))
+            (setq gdb-prompting nil))
         (push item gdb-input-queue))))
 
 (defun gdb-dequeue-input ()
@@ -3346,7 +3349,8 @@ is set in them."
 
 (defconst gdb-var-list-children-regexp-1
   "child={.*?name=\"\\(.+?\\)\",.*?exp=\"\\(.+?\\)\",.*?\
-numchild=\"\\(.+?\\)\",.*?value=\\(\".*?\"\\),.*?type=\"\\(.+?\\)\".*?}")
+numchild=\"\\(.+?\\)\",.*?value=\\(\".*?\"\\)\
+\\(}\\|,.*?\\(type=\"\\(.+?\\)\"\\)?.*?}\\)")
 
 (defun gdb-var-list-children-handler-1 (varnum)
   (goto-char (point-min))
@@ -3360,7 +3364,7 @@ numchild=\"\\(.+?\\)\",.*?value=\\(\".*?\"\\),.*?type=\"\\(.+?\\)\".*?}")
                 (let ((varchild (list (match-string 1)
                                       (match-string 2)
                                       (match-string 3)
-                                      (match-string 5)
+                                      (match-string 7)
                                       (read (match-string 4))
                                       nil)))
                   (if (assoc (car varchild) gdb-var-list)
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 84b40e8ba80..b42e1b7fdc7 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -456,8 +456,8 @@ required by the caller."
           (while var-list
             (let* (char (depth 0) (start 0) (var (car var-list))
                         (varnum (car var)) (expr (nth 1 var))
-                        (type (nth 3 var)) (value (nth 4 var))
-                        (status (nth 5 var)))
+                        (type (if (nth 3 var) (nth 3 var) " "))
+                        (value (nth 4 var)) (status (nth 5 var)))
               (put-text-property
                0 (length expr) 'face font-lock-variable-name-face expr)
               (put-text-property
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 2f26c90ac21..52cfa602e59 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -75,7 +75,7 @@
 ;; of the documentation is available from the maintainers webpage (see
 ;; SOURCE).
 ;;
-;; 
+;;
 ;; ACKNOWLEDGMENTS
 ;; ===============
 ;;
@@ -125,7 +125,7 @@
 ;;   up inserting the character that expanded the abbrev after moving
 ;;   point backward, e.g., "\cl" expanded with a space becomes
 ;;   "LONG( )" with point before the close paren.  This is solved by
-;;   using a temporary function in `post-command-hook' - not pretty, 
+;;   using a temporary function in `post-command-hook' - not pretty,
 ;;   but it works.
 ;;
 ;;   Tabs and spaces are treated equally as whitespace when filling a
@@ -178,13 +178,13 @@
       nil ;; We've got what we needed
     ;; We have the old or no custom-library, hack around it!
     (defmacro defgroup (&rest args) nil)
-    (defmacro defcustom (var value doc &rest args) 
+    (defmacro defcustom (var value doc &rest args)
       `(defvar ,var ,value ,doc))))
 
 (defgroup idlwave nil
   "Major mode for editing IDL .pro files."
   :tag "IDLWAVE"
-  :link '(url-link :tag "Home Page" 
+  :link '(url-link :tag "Home Page"
                    "http://idlwave.org")
   :link '(emacs-commentary-link :tag "Commentary in idlw-shell.el"
                                 "idlw-shell.el")
@@ -298,8 +298,8 @@ extends to the end of the match for the regular expression."
 
 (defcustom idlwave-auto-fill-split-string t
   "*If non-nil then auto fill will split strings with the IDL `+' operator.
-When the line end falls within a string, string concatenation with the 
-'+' operator will be used to distribute a long string over lines.  
+When the line end falls within a string, string concatenation with the
+'+' operator will be used to distribute a long string over lines.
 If nil and a string is split then a terminal beep and warning are issued.
 
 This variable is ignored when `idlwave-fill-comment-line-only' is
@@ -418,7 +418,7 @@ t         All available
                (const :tag "When saving a buffer" save-buffer)
                (const :tag "After a buffer was killed" kill-buffer)
                (const :tag "After a buffer was compiled successfully, update shell info" compile-buffer))))
-               
+
 (defcustom idlwave-rinfo-max-source-lines 5
   "*Maximum number of source files displayed in the Routine Info window.
 When an integer, it is the maximum number of source files displayed.
@@ -453,7 +453,7 @@ value of `!DIR'.  See also `idlwave-library-path'."
   :type 'directory)
 
 ;; Configuration files
-(defcustom idlwave-config-directory 
+(defcustom idlwave-config-directory
   (convert-standard-filename "~/.idlwave")
   "*Directory for configuration files and user-library catalog."
   :group 'idlwave-routine-info
@@ -469,7 +469,7 @@ value of `!DIR'.  See also `idlwave-library-path'."
 (defcustom idlwave-special-lib-alist nil
   "Alist of regular expressions matching special library directories.
 When listing routine source locations, IDLWAVE gives a short hint where
-the file defining the routine is located.  By default it lists `SystemLib' 
+the file defining the routine is located.  By default it lists `SystemLib'
 for routines in the system library `!DIR/lib' and `Library' for anything
 else.  This variable can define additional types.  The car of each entry
 is a regular expression matching the file name (they normally will match
@@ -480,7 +480,7 @@ chars are allowed."
           (cons regexp string)))
 
 (defcustom idlwave-auto-write-paths t
-  "Write out path (!PATH) and system directory (!DIR) info automatically.  
+  "Write out path (!PATH) and system directory (!DIR) info automatically.
 Path info is needed to locate library catalog files.  If non-nil,
 whenever the path-list changes as a result of shell-query, etc., it is
 written to file.  Otherwise, the menu option \"Write Paths\" can be
@@ -511,7 +511,7 @@ used to force a write."
 This variable determines the case (UPPER/lower/Capitalized...) of
 words inserted into the buffer by completion.  The preferred case can
 be specified separately for routine names, keywords, classes and
-methods. 
+methods.
 This alist should therefore have entries for `routine' (normal
 functions and procedures, i.e. non-methods), `keyword', `class', and
 `method'.  Plausible values are
@@ -598,7 +598,7 @@ certain methods this assumption is almost always true.  The methods
 for which to assume this can be set here."
   :group 'idlwave-routine-info
   :type '(repeat (regexp :tag "Match method:")))
-  
+
 
 (defcustom idlwave-completion-show-classes 1
   "*Number of classes to show when completing object methods and keywords.
@@ -663,7 +663,7 @@ should contain at least two elements: (method-default . VALUE) and
 specify if the class should be found during method and keyword
 completion, respectively.
 
-The alist may have additional entries specifying exceptions from the 
+The alist may have additional entries specifying exceptions from the
 keyword completion rule for specific methods, like INIT or
 GETPROPERTY.  In order to turn on class specification for the INIT
 method, add an entry (\"INIT\" . t).  The method name must be ALL-CAPS."
@@ -687,7 +687,7 @@ particular object method call.  This happens during the commands
 value of the variable `idlwave-query-class'.
 
 When you specify a class, this information can be stored as a text
-property on the `->' arrow in the source code, so that during the same 
+property on the `->' arrow in the source code, so that during the same
 editing session, IDLWAVE will not have to ask again.  When this
 variable is non-nil, IDLWAVE will store and reuse the class information.
 The class stored can be checked and removed with `\\[idlwave-routine-info]'
@@ -1065,7 +1065,7 @@ IDL process is made."
   :group 'idlwave-misc
   :type 'boolean)
 
-(defcustom idlwave-default-font-lock-items 
+(defcustom idlwave-default-font-lock-items
   '(pros-and-functions batch-files idlwave-idl-keywords label goto
                        common-blocks class-arrows)
   "Items which should be fontified on the default fontification level 2.
@@ -1127,25 +1127,25 @@ As a user, you should not set this to t.")
 ;;; and Carsten Dominik...
 
 ;; The following are the reserved words in IDL.  Maybe we should
-;; highlight some more stuff as well?       
+;; highlight some more stuff as well?
 ;; Procedure declarations.  Fontify keyword plus procedure name.
 (defvar idlwave-idl-keywords
-  ;; To update this regexp, update the list of keywords and 
+  ;; To update this regexp, update the list of keywords and
   ;; evaluate the form.
-  ;;    (insert 
+  ;;    (insert
   ;;     (prin1-to-string
-  ;;      (concat 
+  ;;      (concat
   ;;       "\\<\\("
-  ;;       (regexp-opt 
+  ;;       (regexp-opt
   ;;        '("||" "&&" "and" "or" "xor" "not"
-  ;;          "eq" "ge" "gt" "le" "lt" "ne" 
+  ;;          "eq" "ge" "gt" "le" "lt" "ne"
   ;;          "for" "do" "endfor"
-  ;;          "if" "then" "endif" "else" "endelse" 
+  ;;          "if" "then" "endif" "else" "endelse"
   ;;          "case" "of" "endcase"
   ;;          "switch" "break" "continue" "endswitch"
   ;;          "begin" "end"
   ;;          "repeat" "until" "endrep"
-  ;;          "while" "endwhile" 
+  ;;          "while" "endwhile"
   ;;          "goto" "return"
   ;;          "inherits" "mod"
   ;;          "compile_opt" "forward_function"
@@ -1168,7 +1168,7 @@ As a user, you should not set this to t.")
           (2 font-lock-reference-face nil t)      ; block name
           ("[ \t]*\\(\\sw+\\)[ ,]*"
            ;; Start with point after block name and comma
-           (goto-char (match-end 0))  ; needed for XEmacs, could be nil 
+           (goto-char (match-end 0))  ; needed for XEmacs, could be nil
            nil
            (1 font-lock-variable-name-face)       ; variable names
            )))
@@ -1223,7 +1223,7 @@ As a user, you should not set this to t.")
        ;; All operators (not used because too noisy)
        (all-operators
         '("[-*^#+<>/]" (0 font-lock-keyword-face)))
-        
+
        ;; Arrows with text property `idlwave-class'
        (class-arrows
         '(idlwave-match-class-arrows (0 idlwave-class-arrow-face))))
@@ -1260,14 +1260,14 @@ As a user, you should not set this to t.")
 
 (defvar idlwave-font-lock-defaults
   '((idlwave-font-lock-keywords
-     idlwave-font-lock-keywords-1 
+     idlwave-font-lock-keywords-1
      idlwave-font-lock-keywords-2
      idlwave-font-lock-keywords-3)
-    nil t 
-    ((?$ . "w") (?_ . "w") (?. . "w") (?| . "w") (?& . "w")) 
+    nil t
+    ((?$ . "w") (?_ . "w") (?. . "w") (?| . "w") (?& . "w"))
     beginning-of-line))
 
-(put 'idlwave-mode 'font-lock-defaults 
+(put 'idlwave-mode 'font-lock-defaults
      idlwave-font-lock-defaults) ; XEmacs
 
 (defconst idlwave-comment-line-start-skip "^[ \t]*;"
@@ -1275,7 +1275,7 @@ As a user, you should not set this to t.")
 That is the _beginning_ of a line containing a comment delimiter `;' preceded
 only by whitespace.")
 
-(defconst idlwave-begin-block-reg 
+(defconst idlwave-begin-block-reg
   "\\<\\(pro\\|function\\|begin\\|case\\|switch\\)\\>"
   "Regular expression to find the beginning of a block. The case does
 not matter. The search skips matches in comments.")
@@ -1352,17 +1352,17 @@ blocks starting with a BEGIN statement.  The matches must have associations
    '(goto . ("goto\\>" nil))
    '(case . ("case\\>" nil))
    '(switch . ("switch\\>" nil))
-   (cons 'call (list (concat "\\(" idlwave-variable "\\) *= *" 
+   (cons 'call (list (concat "\\(" idlwave-variable "\\) *= *"
                              "\\(" idlwave-method-call "\\s *\\)?"
                              idlwave-identifier
                              "\\s *(") nil))
-   (cons 'call (list (concat 
+   (cons 'call (list (concat
                       "\\(" idlwave-method-call "\\s *\\)?"
-                      idlwave-identifier 
+                      idlwave-identifier
                       "\\( *\\($\\|\\$\\)\\|\\s *,\\)") nil))
-   (cons 'assign (list (concat 
+   (cons 'assign (list (concat
                         "\\(" idlwave-variable "\\) *=") nil)))
-  
+
   "Associated list of statement matching regular expressions.
 Each regular expression matches the start of an IDL statement.  The
 first element of each association is a symbol giving the statement
@@ -1385,7 +1385,7 @@ the leftover unidentified statements containing an equal sign."  )
 ;; Note that this is documented in the v18 manuals as being a string
 ;; of length one rather than a single character.
 ;; The code in this file accepts either format for compatibility.
-(defvar idlwave-comment-indent-char ?\ 
+(defvar idlwave-comment-indent-char ?\
   "Character to be inserted for IDL comment indentation.
 Normally a space.")
 
@@ -1557,15 +1557,15 @@ Capitalize system variables - action only
          (not (equal idlwave-shell-debug-modifiers '())))
   ;; Bind the debug commands also with the special modifiers.
   (let ((shift (memq 'shift idlwave-shell-debug-modifiers))
-        (mods-noshift (delq 'shift 
+        (mods-noshift (delq 'shift
                             (copy-sequence idlwave-shell-debug-modifiers))))
-    (define-key idlwave-mode-map 
+    (define-key idlwave-mode-map
       (vector (append mods-noshift (list (if shift ?C ?c))))
       'idlwave-shell-save-and-run)
-    (define-key idlwave-mode-map 
+    (define-key idlwave-mode-map
       (vector (append mods-noshift (list (if shift ?B ?b))))
       'idlwave-shell-break-here)
-    (define-key idlwave-mode-map 
+    (define-key idlwave-mode-map
       (vector (append mods-noshift (list (if shift ?E ?e))))
       'idlwave-shell-run-region)))
 (define-key idlwave-mode-map "\C-c\C-d\C-c" 'idlwave-shell-save-and-run)
@@ -1602,7 +1602,7 @@ Capitalize system variables - action only
 (define-key idlwave-mode-map "\M-\C-i" 'idlwave-complete)
 (define-key idlwave-mode-map "\C-c\C-i" 'idlwave-update-routine-info)
 (define-key idlwave-mode-map "\C-c="    'idlwave-resolve)
-(define-key idlwave-mode-map 
+(define-key idlwave-mode-map
   (if (featurep 'xemacs) [(shift button3)] [(shift mouse-3)])
   'idlwave-mouse-context-help)
 
@@ -1617,7 +1617,7 @@ Capitalize system variables - action only
 ;; to go ahead of > and <, so >= and <= will be treated correctly
 (idlwave-action-and-binding "="  '(idlwave-expand-equal -1 -1))
 
-;; Actions for > and < are complicated by >=, <=, and ->... 
+;; Actions for > and < are complicated by >=, <=, and ->...
 (idlwave-action-and-binding "<"  '(idlwave-custom-ltgtr-surround nil))
 (idlwave-action-and-binding ">"  '(idlwave-custom-ltgtr-surround 'gtr))
 
@@ -1650,7 +1650,7 @@ idlwave-mode-abbrev-table unless TABLE is non-nil."
       (error (apply 'define-abbrev args)))))
 
 (condition-case nil
-    (modify-syntax-entry (string-to-char idlwave-abbrev-start-char) 
+    (modify-syntax-entry (string-to-char idlwave-abbrev-start-char)
                          "w" idlwave-mode-syntax-table)
   (error nil))
 
@@ -1774,7 +1774,7 @@ idlwave-mode-abbrev-table unless TABLE is non-nil."
 (defvar imenu-extract-index-name-function)
 (defvar imenu-prev-index-position-function)
 ;; defined later - so just make the compiler hush
-(defvar idlwave-mode-menu)  
+(defvar idlwave-mode-menu)
 (defvar idlwave-mode-debug-menu)
 
 ;;;###autoload
@@ -1858,7 +1858,7 @@ The main features of this mode are
    \\i         IF statement template
    \\elif      IF-ELSE statement template
    \\b         BEGIN
-   
+
    For a full list, use \\[idlwave-list-abbrevs].  Some templates also
    have direct keybindings - see the list of keybindings below.
 
@@ -1900,19 +1900,19 @@ The main features of this mode are
 
   (interactive)
   (kill-all-local-variables)
-  
+
   (if idlwave-startup-message
       (message "Emacs IDLWAVE mode version %s." idlwave-mode-version))
   (setq idlwave-startup-message nil)
-  
+
   (setq local-abbrev-table idlwave-mode-abbrev-table)
   (set-syntax-table idlwave-mode-syntax-table)
-  
+
   (set (make-local-variable 'indent-line-function) 'idlwave-indent-and-action)
-  
+
   (make-local-variable idlwave-comment-indent-function)
   (set idlwave-comment-indent-function 'idlwave-comment-hook)
-  
+
   (set (make-local-variable 'comment-start-skip) ";+[ \t]*")
   (set (make-local-variable 'comment-start) ";")
   (set (make-local-variable 'comment-add) 1) ; ";;" for new and regions
@@ -1920,7 +1920,7 @@ The main features of this mode are
   (set (make-local-variable 'abbrev-all-caps) t)
   (set (make-local-variable 'indent-tabs-mode) nil)
   (set (make-local-variable 'completion-ignore-case) t)
-  
+
   (use-local-map idlwave-mode-map)
 
   (when (featurep 'easymenu)
@@ -1930,11 +1930,11 @@ The main features of this mode are
   (setq mode-name "IDLWAVE")
   (setq major-mode 'idlwave-mode)
   (setq abbrev-mode t)
-  
+
   (set (make-local-variable idlwave-fill-function) 'idlwave-auto-fill)
   (setq comment-end "")
   (set (make-local-variable 'comment-multi-line) nil)
-  (set (make-local-variable 'paragraph-separate) 
+  (set (make-local-variable 'paragraph-separate)
        "[ \t\f]*$\\|[ \t]*;+[ \t]*$\\|;+[+=-_*]+$")
   (set (make-local-variable 'paragraph-start) "[ \t\f]\\|[ \t]*;+[ \t]")
   (set (make-local-variable 'paragraph-ignore-fill-prefix) nil)
@@ -1943,7 +1943,7 @@ The main features of this mode are
   ;; Set tag table list to use IDLTAGS as file name.
   (if (boundp 'tag-table-alist)
       (add-to-list 'tag-table-alist '("\\.pro$" . "IDLTAGS")))
-  
+
   ;; Font-lock additions - originally Phil Williams, then Ulrik Dickow
   ;; Following line is for Emacs - XEmacs uses the corresponding property
   ;; on the `idlwave-mode' symbol.
@@ -1968,7 +1968,7 @@ The main features of this mode are
                      idlwave-end-block-reg
                      ";"
                      'idlwave-forward-block nil))
-  
+
 
   ;; Make a local post-command-hook and add our hook to it
   ;; NB: `make-local-hook' needed for older/alternative Emacs compatibility
@@ -2000,16 +2000,16 @@ The main features of this mode are
   (unless idlwave-setup-done
     (if (not (file-directory-p idlwave-config-directory))
         (make-directory idlwave-config-directory))
-    (setq 
-     idlwave-user-catalog-file (expand-file-name 
-                                idlwave-user-catalog-file 
+    (setq
+     idlwave-user-catalog-file (expand-file-name
+                                idlwave-user-catalog-file
                                 idlwave-config-directory)
-     idlwave-xml-system-rinfo-converted-file 
-     (expand-file-name 
+     idlwave-xml-system-rinfo-converted-file
+     (expand-file-name
       idlwave-xml-system-rinfo-converted-file
       idlwave-config-directory)
-     idlwave-path-file (expand-file-name 
-                        idlwave-path-file 
+     idlwave-path-file (expand-file-name
+                        idlwave-path-file
                         idlwave-config-directory))
     (idlwave-read-paths)  ; we may need these early
     (setq idlwave-setup-done t)))
@@ -2028,7 +2028,7 @@ The main features of this mode are
 
 ;;
 ;; Code Formatting ----------------------------------------------------
-;; 
+;;
 
 (defun idlwave-hard-tab ()
   "Inserts TAB in buffer in current position."
@@ -2171,7 +2171,7 @@ Also checks if the correct end statement has been used."
         (if (> end-pos eol-pos)
             (setq end-pos pos))
         (goto-char end-pos)
-        (setq end (buffer-substring 
+        (setq end (buffer-substring
                    (progn
                      (skip-chars-backward "a-zA-Z")
                      (point))
@@ -2193,7 +2193,7 @@ Also checks if the correct end statement has been used."
             (sit-for 1))
            (t
             (beep)
-            (message "Warning: Shouldn't this be \"%s\" instead of \"%s\"?" 
+            (message "Warning: Shouldn't this be \"%s\" instead of \"%s\"?"
                      end1 end)
             (sit-for 1))))))))
   ;;(delete-char 1))
@@ -2205,8 +2205,8 @@ Also checks if the correct end statement has been used."
        ((looking-at "pro\\|case\\|switch\\|function\\>")
         (assoc (downcase (match-string 0)) idlwave-block-matches))
        ((looking-at "begin\\>")
-        (let ((limit (save-excursion 
-                       (idlwave-beginning-of-statement) 
+        (let ((limit (save-excursion
+                       (idlwave-beginning-of-statement)
                        (point))))
           (cond
            ((re-search-backward ":[ \t]*\\=" limit t)
@@ -2490,7 +2490,7 @@ Returns non-nil if successfull."
         (let ((eos (save-excursion
                      (idlwave-block-jump-out -1 'nomark)
                      (point))))
-          (if (setq status (idlwave-find-key 
+          (if (setq status (idlwave-find-key
                             idlwave-end-block-reg -1 'nomark eos))
               (idlwave-beginning-of-statement)
             (message "No nested block before beginning of containing block.")))
@@ -2498,7 +2498,7 @@ Returns non-nil if successfull."
       (let ((eos (save-excursion
                    (idlwave-block-jump-out 1 'nomark)
                    (point))))
-        (if (setq status (idlwave-find-key 
+        (if (setq status (idlwave-find-key
                           idlwave-begin-block-reg 1 'nomark eos))
             (idlwave-end-of-statement)
           (message "No nested block before end of containing block."))))
@@ -2512,7 +2512,7 @@ The marks are pushed."
         (here (point)))
     (goto-char (point-max))
     (if (re-search-backward idlwave-doclib-start nil t)
-        (progn 
+        (progn
           (setq beg (progn (beginning-of-line) (point)))
           (if (re-search-forward idlwave-doclib-end nil t)
               (progn
@@ -2545,7 +2545,7 @@ actual statement."
    ((eq major-mode 'idlwave-shell-mode)
     (if (re-search-backward idlwave-shell-prompt-pattern nil t)
         (goto-char (match-end 0))))
-   (t   
+   (t
     (if (save-excursion (forward-line -1) (idlwave-is-continuation-line))
         (idlwave-previous-statement)
       (beginning-of-line)))))
@@ -2622,7 +2622,7 @@ If not in a statement just moves to end of line. Returns position."
   (let ((save-point (point)))
     (when (re-search-forward ".*&" lim t)
       (goto-char (match-end 0))
-      (if (idlwave-quoted) 
+      (if (idlwave-quoted)
           (goto-char save-point)
         (if (eq (char-after (- (point) 2)) ?&) (goto-char save-point))))
     (point)))
@@ -2639,7 +2639,7 @@ If there is no label point is not moved and nil is returned."
   ;; - not in parenthesis (like a[0:3])
   ;; - not followed by another ":" in explicit class, ala a->b::c
   ;; As many in this mode, this function is heuristic and not an exact
-  ;; parser. 
+  ;; parser.
   (let* ((start (point))
          (eos (save-excursion (idlwave-end-of-statement) (point)))
          (end (idlwave-find-key ":" 1 'nomark eos)))
@@ -2716,7 +2716,7 @@ equal sign will be surrounded by BEFORE and AFTER blanks.  If
 `idlwave-pad-keyword' is t then keyword assignment is treated just
 like assignment statements.  When nil, spaces are removed for keyword
 assignment.  Any other value keeps the current space around the `='.
-Limits in for loops are treated as keyword assignment.  
+Limits in for loops are treated as keyword assignment.
 
 Starting with IDL 6.0, a number of op= assignments are available.
 Since ambiguities of the form:
@@ -2733,25 +2733,25 @@ IS-ACTION is ignored.
 
 See `idlwave-surround'."
   (if idlwave-surround-by-blank
-      (let 
+      (let
           ((non-an-ops "\\(##\\|\\*\\|\\+\\|-\\|/\\|<\\|>\\|\\^\\)\\=")
-           (an-ops 
+           (an-ops
             "\\s-\\(AND\\|EQ\\|GE\\|GT\\|LE\\|LT\\|MOD\\|NE\\|OR\\|XOR\\)\\=")
            (len 1))
-        
-        (save-excursion 
+
+        (save-excursion
           (let ((case-fold-search t))
             (backward-char)
-            (if (or 
+            (if (or
                  (re-search-backward non-an-ops nil t)
                  ;; Why doesn't ##? work for both?
-                 (re-search-backward "\\(#\\)\\=" nil t)) 
+                 (re-search-backward "\\(#\\)\\=" nil t))
                 (setq len (1+ (length (match-string 1))))
               (when (re-search-backward an-ops nil t)
                 ;(setq begin nil) ; won't modify begin
                 (setq len (1+ (length (match-string 1))))))))
-        
-        (if (eq t idlwave-pad-keyword)  
+
+        (if (eq t idlwave-pad-keyword)
             ;; Everything gets padded equally
             (idlwave-surround before after len)
           ;; Treating keywords/for variables specially...
@@ -2762,22 +2762,22 @@ See `idlwave-surround'."
                         (skip-chars-backward "= \t")
                         (nth 2 (idlwave-where)))))
             (cond ((or (memq what '(function-keyword procedure-keyword))
-                       (memq (caar st) '(for pdef))) 
-                   (cond 
+                       (memq (caar st) '(for pdef)))
+                   (cond
                     ((null idlwave-pad-keyword)
                      (idlwave-surround 0 0)
                      ) ; remove space
                     (t))) ; leave any spaces alone
                   (t (idlwave-surround before after len))))))))
-              
+
 
 (defun idlwave-indent-and-action (&optional arg)
   "Call `idlwave-indent-line' and do expand actions.
 With prefix ARG non-nil, indent the entire sub-statement."
   (interactive "p")
   (save-excursion
-    (if (and idlwave-expand-generic-end 
-             (re-search-backward "\\<\\(end\\)\\s-*\\=" 
+    (if (and idlwave-expand-generic-end
+             (re-search-backward "\\<\\(end\\)\\s-*\\="
                                  (max 0 (- (point) 10)) t)
              (looking-at "\\(end\\)\\([ \n\t]\\|\\'\\)"))
         (progn (goto-char (match-end 1))
@@ -2787,7 +2787,7 @@ With prefix ARG non-nil, indent the entire sub-statement."
   (when (and (not arg) current-prefix-arg)
     (setq arg current-prefix-arg)
     (setq current-prefix-arg nil))
-  (if arg 
+  (if arg
       (idlwave-indent-statement)
     (idlwave-indent-line t)))
 
@@ -2922,7 +2922,7 @@ Inserts spaces before markers at point."
                 (save-excursion
                   (cond
                    ;; Beginning of file
-                   ((prog1 
+                   ((prog1
                         (idlwave-previous-statement)
                       (setq beg-prev-pos (point)))
                     0)
@@ -2932,7 +2932,7 @@ Inserts spaces before markers at point."
                        idlwave-main-block-indent))
                    ;; Begin block
                    ((idlwave-look-at idlwave-begin-block-reg t)
-                    (+ (idlwave-min-current-statement-indent) 
+                    (+ (idlwave-min-current-statement-indent)
                        idlwave-block-indent))
                    ;; End Block
                    ((idlwave-look-at idlwave-end-block-reg t)
@@ -2943,7 +2943,7 @@ Inserts spaces before markers at point."
                       (idlwave-min-current-statement-indent)))
                       ;;                      idlwave-end-offset
                       ;;                      idlwave-block-indent))
-                   
+
                    ;; Default to current indent
                    ((idlwave-current-statement-indent))))))
           ;; adjust the indentation based on the current statement
@@ -2959,7 +2959,7 @@ Inserts spaces before markers at point."
 
 (defun idlwave-calculate-paren-indent (beg-reg end-reg close-exp)
   "Calculate the continuation indent inside a paren group.
-Returns a cons-cell with (open . indent), where open is the 
+Returns a cons-cell with (open . indent), where open is the
 location of the open paren"
   (let ((open (nth 1 (parse-partial-sexp beg-reg end-reg))))
     ;; Found an innermost open paren.
@@ -3000,24 +3000,24 @@ groupings, are treated separately."
            (end-reg (progn (beginning-of-line) (point)))
            (beg-last-statement (save-excursion (idlwave-previous-statement)
                                                (point)))
-           (beg-reg (progn (idlwave-start-of-substatement 'pre) 
+           (beg-reg (progn (idlwave-start-of-substatement 'pre)
                            (if (eq (line-beginning-position) end-reg)
                                (goto-char beg-last-statement)
                              (point))))
            (basic-indent (+ (idlwave-min-current-statement-indent end-reg)
                             idlwave-continuation-indent))
            fancy-nonparen-indent fancy-paren-indent)
-      (cond 
+      (cond
        ;; Align then with its matching if, etc.
        ((let ((matchers '(("\\<if\\>" . "[ \t]*then")
                           ("\\<\\(if\\|end\\(if\\)?\\)\\>" . "[ \t]*else")
                           ("\\<\\(for\\|while\\)\\>" . "[ \t]*do")
-                          ("\\<\\(repeat\\|end\\(rep\\)?\\)\\>" . 
+                          ("\\<\\(repeat\\|end\\(rep\\)?\\)\\>" .
                            "[ \t]*until")
                           ("\\<case\\>" . "[ \t]*of")))
               match cont-re)
           (goto-char end-reg)
-          (and 
+          (and
            (setq cont-re
                  (catch 'exit
                    (while (setq match (car matchers))
@@ -3026,7 +3026,7 @@ groupings, are treated separately."
                      (setq matchers (cdr matchers)))))
            (idlwave-find-key cont-re -1 'nomark beg-last-statement)))
         (if (looking-at "end") ;; that one's special
-            (- (idlwave-current-indent) 
+            (- (idlwave-current-indent)
                (+ idlwave-block-indent idlwave-end-offset))
           (idlwave-current-indent)))
 
@@ -3052,7 +3052,7 @@ groupings, are treated separately."
               (let* ((end-reg end-reg)
                     (close-exp (progn
                                  (goto-char end-reg)
-                                 (skip-chars-forward " \t") 
+                                 (skip-chars-forward " \t")
                                  (looking-at "\\s)")))
                     indent-cons)
                 (catch 'loop
@@ -3086,12 +3086,12 @@ groupings, are treated separately."
                    (if (save-match-data (looking-at "[ \t$]*\\(;.*\\)?$"))
                        nil
                      (current-column)))
-                  
+
                   ;; Continued assignment (with =):
                   ((catch 'assign ;
                      (while (looking-at "[^=\n\r]*\\(=\\)[ \t]*")
                        (goto-char (match-end 0))
-                       (if (null (idlwave-what-function beg-reg)) 
+                       (if (null (idlwave-what-function beg-reg))
                            (throw 'assign t))))
                    (unless (or
                             (idlwave-in-quote)
@@ -3153,7 +3153,7 @@ possibility of unbalanced blocks."
   (let* ((here (point))
          (case-fold-search t)
          (limit (if (>= dir 0) (point-max) (point-min)))
-         (block-limit (if (>= dir 0) 
+         (block-limit (if (>= dir 0)
                           idlwave-begin-block-reg
                         idlwave-end-block-reg))
          found
@@ -3164,7 +3164,7 @@ possibility of unbalanced blocks."
                                (idlwave-find-key
                                 idlwave-begin-unit-reg dir t limit)
                              (end-of-line)
-                             (idlwave-find-key 
+                             (idlwave-find-key
                               idlwave-end-unit-reg dir t limit)))
                          limit)))
     (if (>= dir 0) (end-of-line)) ;Make sure we are in current block
@@ -3189,7 +3189,7 @@ possibility of unbalanced blocks."
                   (or (null end-reg) (< (point) end-reg)))
         (unless comm-or-empty (setq min (min min (idlwave-current-indent)))))
       (if (or comm-or-empty (and end-reg (>= (point) end-reg)))
-          min 
+          min
         (min min (idlwave-current-indent))))))
 
 (defun idlwave-current-statement-indent (&optional last-line)
@@ -3216,10 +3216,10 @@ Blank or comment-only lines following regular continuation lines (with
 `$') count as continuations too."
   (let (p)
     (save-excursion
-      (or 
+      (or
        (idlwave-look-at "\\<\\$")
        (catch 'loop
-         (while (and (looking-at "^[ \t]*\\(;.*\\)?$") 
+         (while (and (looking-at "^[ \t]*\\(;.*\\)?$")
                      (eq (forward-line -1) 0))
            (if (setq p (idlwave-look-at "\\<\\$")) (throw 'loop p))))))))
 
@@ -3317,7 +3317,7 @@ ignored."
                                           (beginning-of-line) (point))
                                         (point))))
                "[^;]"))
-        
+
         ;; Mark the beginning and end of the paragraph
         (goto-char bcl)
         (while (and (looking-at fill-prefix-reg)
@@ -3381,7 +3381,7 @@ ignored."
                       (insert (make-string diff ?\ ))))
                 (forward-line -1))
               )
-          
+
           ;; No hang. Instead find minimum indentation of paragraph
           ;; after first line.
           ;; For the following while statement, since START is at the
@@ -3413,7 +3413,7 @@ ignored."
                   t)
                  (current-column))
                indent))
-        
+
         ;; try to keep point at its original place
         (goto-char here)
 
@@ -3462,7 +3462,7 @@ If not found returns nil."
           (current-column)))))
 
 (defun idlwave-auto-fill ()
-  "Called to break lines in auto fill mode.  
+  "Called to break lines in auto fill mode.
 Only fills non-comment lines if `idlwave-fill-comment-line-only' is
 non-nil.  Places a continuation character at the end of the line if
 not in a comment.  Splits strings with IDL concatenation operator `+'
@@ -3613,7 +3613,7 @@ is non-nil."
   (insert (current-time-string))
   (insert ", " (user-full-name))
   (if (boundp 'user-mail-address)
-      (insert " <" user-mail-address ">") 
+      (insert " <" user-mail-address ">")
     (insert " <" (user-login-name) "@" (system-name) ">"))
   ;; Remove extra spaces from line
   (idlwave-fill-paragraph)
@@ -3639,7 +3639,7 @@ location on mark ring so that the user can return to previous point."
              (setq end (match-end 0)))
         (progn
           (goto-char beg)
-          (if (re-search-forward 
+          (if (re-search-forward
                (concat idlwave-doc-modifications-keyword ":")
                end t)
               (end-of-line)
@@ -3737,7 +3737,7 @@ constants - a double quote followed by an octal digit."
      (not (idlwave-in-quote))
      (save-excursion
        (forward-char)
-       (re-search-backward (concat "\\(" idlwave-idl-keywords 
+       (re-search-backward (concat "\\(" idlwave-idl-keywords
                                    "\\|[[(*+-/=,^><]\\)\\s-*\\*") limit t)))))
 
 
@@ -3783,7 +3783,7 @@ unless the optional second argument NOINDENT is non-nil."
           (indent-region beg end nil))
       (if (stringp prompt)
           (message prompt)))))
-  
+
 (defun idlwave-rw-case (string)
   "Make STRING have the case required by `idlwave-reserved-word-upcase'."
   (if idlwave-reserved-word-upcase
@@ -3801,7 +3801,7 @@ unless the optional second argument NOINDENT is non-nil."
 (defun idlwave-case ()
   "Build skeleton IDL case statement."
   (interactive)
-  (idlwave-template 
+  (idlwave-template
    (idlwave-rw-case "case")
    (idlwave-rw-case " of\n\nendcase")
    "Selector expression"))
@@ -3809,7 +3809,7 @@ unless the optional second argument NOINDENT is non-nil."
 (defun idlwave-switch ()
   "Build skeleton IDL switch statement."
   (interactive)
-  (idlwave-template 
+  (idlwave-template
    (idlwave-rw-case "switch")
    (idlwave-rw-case " of\n\nendswitch")
    "Selector expression"))
@@ -3817,7 +3817,7 @@ unless the optional second argument NOINDENT is non-nil."
 (defun idlwave-for ()
   "Build skeleton for loop statment."
   (interactive)
-  (idlwave-template 
+  (idlwave-template
    (idlwave-rw-case "for")
    (idlwave-rw-case " do begin\n\nendfor")
    "Loop expression"))
@@ -3832,14 +3832,14 @@ unless the optional second argument NOINDENT is non-nil."
 
 (defun idlwave-procedure ()
   (interactive)
-  (idlwave-template 
+  (idlwave-template
    (idlwave-rw-case "pro")
    (idlwave-rw-case "\n\nreturn\nend")
    "Procedure name"))
 
 (defun idlwave-function ()
   (interactive)
-  (idlwave-template 
+  (idlwave-template
    (idlwave-rw-case "function")
    (idlwave-rw-case "\n\nreturn\nend")
    "Function name"))
@@ -3853,7 +3853,7 @@ unless the optional second argument NOINDENT is non-nil."
 
 (defun idlwave-while ()
   (interactive)
-  (idlwave-template 
+  (idlwave-template
    (idlwave-rw-case "while")
    (idlwave-rw-case " do begin\n\nendwhile")
    "Entry condition"))
@@ -3932,8 +3932,8 @@ Buffer containing unsaved changes require confirmation before they are killed."
 (defun idlwave-count-outlawed-buffers (tag)
   "How many outlawed buffers have tag TAG?"
   (length (delq nil
-                (mapcar 
-                 (lambda (x) (eq (cdr x) tag)) 
+                (mapcar
+                 (lambda (x) (eq (cdr x) tag))
                  idlwave-outlawed-buffers))))
 
 (defun idlwave-do-kill-autoloaded-buffers (&rest reasons)
@@ -3947,9 +3947,9 @@ Buffer containing unsaved changes require confirmation before they are killed."
                    (memq (cdr entry) reasons))
                (kill-buffer (car entry))
                (incf cnt)
-               (setq idlwave-outlawed-buffers 
+               (setq idlwave-outlawed-buffers
                      (delq entry idlwave-outlawed-buffers)))
-        (setq idlwave-outlawed-buffers 
+        (setq idlwave-outlawed-buffers
               (delq entry idlwave-outlawed-buffers))))
     (message "%d buffer%s killed" cnt (if (= cnt 1) "" "s"))))
 
@@ -3961,7 +3961,7 @@ Intended for `after-save-hook'."
          (entry (assq buf idlwave-outlawed-buffers)))
     ;; Revoke license
     (if entry
-        (setq idlwave-outlawed-buffers 
+        (setq idlwave-outlawed-buffers
               (delq entry idlwave-outlawed-buffers)))
     ;; Remove this function from the hook.
     (remove-hook 'after-save-hook 'idlwave-revoke-license-to-kill 'local)))
@@ -3980,7 +3980,7 @@ Intended for `after-save-hook'."
 (defun idlwave-expand-lib-file-name (file)
   ;; Find FILE on the scanned lib path and return a buffer visiting it
   ;; This is for, e.g., finding source with no user catalog
-  (cond 
+  (cond
    ((null file) nil)
    ((file-name-absolute-p file) file)
    (t (idlwave-locate-lib-file file))))
@@ -3995,7 +3995,7 @@ you specify /."
   (interactive)
   (let (directory directories cmd append status numdirs dir getsubdirs
                   buffer save_buffer files numfiles item errbuf)
-    
+
     ;;
     ;; Read list of directories
     (setq directory (read-string "Tag Directories: " "."))
@@ -4047,7 +4047,7 @@ you specify /."
                     (message "%s" (concat "Tagging " item "..."))
                     (setq errbuf (get-buffer-create "*idltags-error*"))
                     (setq status (+ status
-                                    (if (eq 0 (call-process 
+                                    (if (eq 0 (call-process
                                                "sh" nil errbuf nil "-c"
                                                (concat cmd append item)))
                                         0
@@ -4061,13 +4061,13 @@ you specify /."
                   (setq numfiles (1+ numfiles))
                   (setq item (nth numfiles files))
                   )))
-            
+
             (setq numdirs (1+ numdirs))
             (setq dir (nth numdirs directories)))
         (progn
           (setq numdirs (1+ numdirs))
           (setq dir (nth numdirs directories)))))
-    
+
     (setq errbuf (get-buffer-create "*idltags-error*"))
     (if (= status 0)
         (kill-buffer errbuf))
@@ -4143,7 +4143,7 @@ blank lines."
   ;; Make sure the hash functions are accessible.
   (if (or (not (fboundp 'gethash))
           (not (fboundp 'puthash)))
-      (progn 
+      (progn
         (require 'cl)
         (or (fboundp 'puthash)
             (defalias 'puthash 'cl-puthash))))
@@ -4162,7 +4162,7 @@ blank lines."
               (null (cdr idlwave-sint-routines)))
       (loop for entry in entries
         for var = (car entry) for size = (nth 1 entry)
-        do (setcdr (symbol-value var) 
+        do (setcdr (symbol-value var)
                    (make-hash-table ':size size ':test 'equal)))
       (setq idlwave-sint-dirs nil
             idlwave-sint-libnames nil))
@@ -4172,7 +4172,7 @@ blank lines."
               (null (car idlwave-sint-routines)))
       (loop for entry in entries
         for var = (car entry) for size = (nth 1 entry)
-        do (setcar (symbol-value var) 
+        do (setcar (symbol-value var)
                    (make-hash-table ':size size ':test 'equal))))))
 
 (defun idlwave-sintern-routine-or-method (name &optional class set)
@@ -4259,11 +4259,11 @@ If DEFAULT-DIR is passed, it is used as the base of the directory"
             (setq class (idlwave-sintern-class class set))
             (setq name (idlwave-sintern-method name set)))
         (setq name (idlwave-sintern-routine name set)))
-      
+
       ;; The source
       (let ((source-type (car source))
             (source-file  (nth 1 source))
-            (source-dir  (if default-dir  
+            (source-dir  (if default-dir
                              (file-name-as-directory default-dir)
                            (nth 2 source)))
             (source-lib (nth 3 source)))
@@ -4272,7 +4272,7 @@ If DEFAULT-DIR is passed, it is used as the base of the directory"
         (if (stringp source-lib)
             (setq source-lib (idlwave-sintern-libname source-lib set)))
         (setq source (list source-type source-file source-dir source-lib)))
-      
+
       ;; The keywords
       (setq kwds (mapcar (lambda (x)
                            (idlwave-sintern-keyword-list x set))
@@ -4407,15 +4407,15 @@ will re-read the catalog."
           (not (stringp idlwave-user-catalog-file))
           (not (file-regular-p idlwave-user-catalog-file)))
       (error "No catalog has been produced yet"))
-  (let* ((emacs (expand-file-name (invocation-name) (invocation-directory)))
+  (let* ((emacs (concat invocation-directory invocation-name))
          (args (list "-batch"
                      "-l" (expand-file-name "~/.emacs")
                      "-l" "idlwave"
                      "-f" "idlwave-rescan-catalog-directories"))
-         (process (apply 'start-process "idlcat" 
+         (process (apply 'start-process "idlcat"
                          nil emacs args)))
     (setq idlwave-catalog-process process)
-    (set-process-sentinel 
+    (set-process-sentinel
      process
      (lambda (pro why)
        (when (string-match "finished" why)
@@ -4432,7 +4432,7 @@ will re-read the catalog."
 ;; ("ROUTINE" type class
 ;;  (system) | (lib pro_file dir "LIBNAME") | (user pro_file dir "USERLIB") |
 ;;  (buffer pro_file dir) | (compiled pro_file dir)
-;;   "calling_string" ("HELPFILE" (("KWD1" . link1) ...)) 
+;;   "calling_string" ("HELPFILE" (("KWD1" . link1) ...))
 ;;                    ("HELPFILE2" (("KWD2" . link) ...)) ...)
 ;;
 ;; DIR will be supplied dynamically while loading library catalogs,
@@ -4491,7 +4491,7 @@ information updated immediately, leave NO-CONCATENATE nil."
            ;; The override-idle means, even if the idle timer has done some
            ;; preparing work, load and renormalize everything anyway.
            (override-idle (or arg idlwave-buffer-case-takes-precedence)))
-      
+
       (setq idlwave-buffer-routines nil
             idlwave-compiled-routines nil
             idlwave-unresolved-routines nil)
@@ -4502,7 +4502,7 @@ information updated immediately, leave NO-CONCATENATE nil."
         (idlwave-reset-sintern (cond (load t)
                                      ((null idlwave-system-routines) t)
                                      (t 'bufsh))))
-      
+
       (if idlwave-buffer-case-takes-precedence
           ;; We can safely scan the buffer stuff first
           (progn
@@ -4517,9 +4517,9 @@ information updated immediately, leave NO-CONCATENATE nil."
                                     (idlwave-shell-is-running)))
              (ask-shell (and shell-is-running
                              idlwave-query-shell-for-routine-info)))
-      
+
         ;; Load the library catalogs again, first re-scanning the path
-        (when arg 
+        (when arg
           (if shell-is-running
               (idlwave-shell-send-command idlwave-shell-path-query
                                           '(progn
@@ -4539,7 +4539,7 @@ information updated immediately, leave NO-CONCATENATE nil."
             ;;    Therefore, we do a concatenation now, even though
             ;;    the shell might do it again.
             (idlwave-concatenate-rinfo-lists nil 'run-hooks))
-      
+
         (when ask-shell
           ;; Ask the shell about the routines it knows of.
           (message "Querying the shell")
@@ -4576,26 +4576,26 @@ information updated immediately, leave NO-CONCATENATE nil."
   ;; which, if necessary, will be re-created from the XML file on
   ;; disk.  As a last fallback, load the (likely outdated) idlw-rinfo
   ;; file distributed with older IDLWAVE versions (<6.0)
-  (unless (and (load idlwave-xml-system-rinfo-converted-file 
+  (unless (and (load idlwave-xml-system-rinfo-converted-file
                      'noerror 'nomessage)
                (idlwave-xml-system-routine-info-up-to-date))
     ;; See if we can create it from XML source
     (condition-case nil
         (idlwave-convert-xml-system-routine-info)
-      (error 
-       (unless (load idlwave-xml-system-rinfo-converted-file 
+      (error
+       (unless (load idlwave-xml-system-rinfo-converted-file
                      'noerror 'nomessage)
          (if idlwave-system-routines
-             (message 
+             (message
               "Failed to load converted routine info, using old conversion.")
-           (message 
+           (message
             "Failed to convert XML routine info, falling back on idlw-rinfo.")
            (if (not (load "idlw-rinfo" 'noerror 'nomessage))
-               (message 
+               (message
                 "Could not locate any system routine information."))))))))
 
 (defun idlwave-xml-system-routine-info-up-to-date()
-  (let* ((dir (file-name-as-directory 
+  (let* ((dir (file-name-as-directory
                (expand-file-name "help/online_help" (idlwave-sys-dir))))
          (catalog-file (expand-file-name "idl_catalog.xml" dir)))
     (file-newer-than-file-p ;converted file is newer than catalog
@@ -4610,15 +4610,15 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
   "Alist of system variables and their help files.")
 (defvar idlwave-help-special-topic-words nil)
 
-                
+
 (defun idlwave-shorten-syntax (syntax name &optional class)
   ;; From a list of syntax statments, shorten with %s and group with "or"
   (let ((case-fold-search t))
-    (mapconcat 
+    (mapconcat
      (lambda (x)
        (while (string-match name x)
          (setq x (replace-match "%s" t t x)))
-       (if class 
+       (if class
            (while (string-match class x)
              (setq x (replace-match "%s" t t x))))
        x)
@@ -4670,8 +4670,8 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
                   (put 'set-props 'matched t)
                   set-props)
                  (t nil)))
-          (setq methods-entry 
-                (nconc (idlwave-xml-create-rinfo-list pelem class extra-kwds) 
+          (setq methods-entry
+                (nconc (idlwave-xml-create-rinfo-list pelem class extra-kwds)
                        methods-entry)))
          (t)))
       (setq params (cdr params)))
@@ -4681,12 +4681,12 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
     ;  (message "Failed to match GetProperty in class %s" class))
     ;(unless (get 'set-props 'matched)
     ;  (message "Failed to match SetProperty in class %s" class))
-    (setq class-entry 
-          (if inherits 
+    (setq class-entry
+          (if inherits
               (list class (append '(inherits) inherits) (list 'link link))
             (list class (list 'link link))))
     (cons class-entry methods-entry)))
-    
+
 (defun idlwave-xml-create-rinfo-list (xml-entry &optional class extra-kws)
   ;; Create correctly structured list elements from ROUTINE or METHOD
   ;; XML list structures.  Return a list of list elements, with more
@@ -4722,8 +4722,8 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
           (setq kwd (cdr (assq 'name props))
                 klink (cdr (assq 'link props)))
           (if (string-match "^\\[XY\\(Z?\\)\\]" kwd)
-              (progn 
-                (setq pref-list 
+              (progn
+                (setq pref-list
                       (if (match-string 1 kwd) '("X" "Y" "Z") '("X" "Y"))
                       kwd (substring kwd (match-end 0)))
                 (loop for x in pref-list do
@@ -4732,7 +4732,7 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
 
          (t))); Do nothing for the others
       (setq params (cdr params)))
-    
+
     ;; Debug
 ;    (if (and (null (aref syntax-vec 0))
 ;            (null (aref syntax-vec 1))
@@ -4749,16 +4749,16 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
       (setq kwds (idlwave-rinfo-group-keywords kwds link))
       (loop for idx from 0 to 1 do
             (if (aref syntax-vec idx)
-                (push (append (list name (if (eq idx 0) 'pro 'fun) 
+                (push (append (list name (if (eq idx 0) 'pro 'fun)
                                     class '(system)
-                                    (idlwave-shorten-syntax 
+                                    (idlwave-shorten-syntax
                                      (aref syntax-vec idx) name class))
                               kwds) result)))
       result)))
 
 
 (defun idlwave-rinfo-group-keywords (kwds master-link)
-  ;; Group keywords by link file, as a list with elements 
+  ;; Group keywords by link file, as a list with elements
   ;; (linkfile ( ("KWD1" . link1) ("KWD2" . link2))
   (let (kwd link anchor linkfiles block master-elt)
     (while kwds
@@ -4777,7 +4777,7 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
             linkfiles
           (cons master-elt (delq master-elt linkfiles)))
       (push (list master-link) linkfiles))))
-      
+
 (defun idlwave-convert-xml-clean-statement-aliases (aliases)
   ;; Clean up the syntax of routines which are actually aliases by
   ;; removing the "OR" from the statements
@@ -4790,7 +4790,7 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
 
 (defun idlwave-convert-xml-clean-routine-aliases (aliases)
   ;; Duplicate and trim original routine aliases from rinfo list
-  ;; This if for, e.g. OPENR/OPENW/OPENU 
+  ;; This if for, e.g. OPENR/OPENW/OPENU
   (let (alias remove-list new parts all-parts)
     (loop for x in aliases do
           (when (setq parts (split-string (cdr x) "/"))
@@ -4799,7 +4799,7 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
               (setq new (cons (cdr x) parts))
               (push new all-parts))
             (setcdr new (delete (car x) (cdr new)))))
-    
+
     ;; Add any missing aliases (separate by slashes)
     (loop for x in all-parts do
           (if (cdr x)
@@ -4843,7 +4843,7 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
               props (car (cdr pelem)))
         (cond
          ((eq ptype 'FIELD)
-          (push (cons (cdr (assq 'name props)) 
+          (push (cons (cdr (assq 'name props))
                       (cdr
                        (idlwave-split-link-target (cdr (assq 'link props)))))
                 tags))))
@@ -4857,10 +4857,10 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
 (defun idlwave-save-routine-info ()
   (if idlwave-xml-routine-info-file
       (with-temp-file idlwave-xml-system-rinfo-converted-file
-        (insert 
+        (insert
          (concat ";; *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-;; IDLWAVE Routine Information File (IDLWAVE version " idlwave-mode-version ") 
-;; Automatically generated from source file: 
+;; IDLWAVE Routine Information File (IDLWAVE version " idlwave-mode-version ")
+;; Automatically generated from source file:
 ;;  " idlwave-xml-routine-info-file "
 ;; on " (current-time-string) "
 ;; Do not edit."))
@@ -4886,11 +4886,11 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
   "Convert XML supplied IDL routine info into internal form.
 Cache to disk for quick recovery."
   (interactive)
-  (let* ((dir (file-name-as-directory 
+  (let* ((dir (file-name-as-directory
                (expand-file-name "help/online_help" (idlwave-sys-dir))))
          (catalog-file (expand-file-name "idl_catalog.xml" dir))
          (elem-cnt 0)
-         props rinfo msg-cnt elem type nelem class-result alias 
+         props rinfo msg-cnt elem type nelem class-result alias
          routines routine-aliases statement-aliases sysvar-aliases
          buf version-string)
     (if (not (file-exists-p catalog-file))
@@ -4898,7 +4898,7 @@ Cache to disk for quick recovery."
       (if (not (file-readable-p catalog-file))
           (error "Cannot read XML routine info file: %s" catalog-file)))
     (require 'xml)
-    (message "Reading XML routine info...")   
+    (message "Reading XML routine info...")
     (unwind-protect
         (progn
           ;; avoid warnings about read-only files
@@ -4909,13 +4909,13 @@ Cache to disk for quick recovery."
     (setq rinfo (assq 'CATALOG rinfo))
     (unless rinfo (error "Failed to parse XML routine info"))
     ;;(setq rinfo (car rinfo)) ; Skip the catalog stuff.
-    
+
     (setq version-string (cdr (assq 'version (nth 1 rinfo)))
           rinfo (cddr rinfo))
 
     (setq nelem (length rinfo)
           msg-cnt (/ nelem 20))
-    
+
     (setq idlwave-xml-routine-info-file nil)
     (message "Converting XML routine info...")
     (setq idlwave-system-routines nil
@@ -4932,12 +4932,12 @@ Cache to disk for quick recovery."
         (setq type (car elem)
               props (car (cdr elem)))
         (if (= (mod elem-cnt msg-cnt) 0)
-            (message "Converting XML routine info...%2d%%" 
+            (message "Converting XML routine info...%2d%%"
                      (/ (* elem-cnt 100) nelem)))
-        (cond 
+        (cond
          ((eq type 'ROUTINE)
           (if (setq alias (assq 'alias_to props))
-              (push (cons (cdr (assq 'name props)) (cdr alias)) 
+              (push (cons (cdr (assq 'name props)) (cdr alias))
                     routine-aliases)
             (setq routines (idlwave-xml-create-rinfo-list elem))
             (if (listp (cdr routines))
@@ -4945,7 +4945,7 @@ Cache to disk for quick recovery."
                       (nconc idlwave-system-routines routines))
               ;; a cons cell is an executive commands
               (push routines idlwave-executive-commands-alist))))
-         
+
          ((eq type 'CLASS)
           (setq class-result (idlwave-xml-create-class-method-lists elem))
           (push (car class-result) idlwave-system-class-info)
@@ -4963,10 +4963,10 @@ Cache to disk for quick recovery."
 
          ((eq type 'SYSVAR)
           (if (setq alias (cdr (assq 'alias_to props)))
-              (push (cons (substring (cdr (assq 'name props)) 1) 
+              (push (cons (substring (cdr (assq 'name props)) 1)
                           (substring alias 1))
                     sysvar-aliases)
-            (push (idlwave-xml-create-sysvar-alist elem) 
+            (push (idlwave-xml-create-sysvar-alist elem)
                   idlwave-system-variables-alist)))
          (t))))
     (idlwave-convert-xml-clean-routine-aliases routine-aliases)
@@ -4976,12 +4976,12 @@ Cache to disk for quick recovery."
     (setq idlwave-xml-routine-info-file catalog-file)
     (idlwave-save-routine-info)
     (message "Converting XML routine info...done")))
-      
-    
+
+
 ;; ("ROUTINE" type class
 ;;  (system) | (lib pro_file dir "LIBNAME") | (user pro_file dir "USERLIB") |
 ;;  (buffer pro_file dir) | (compiled pro_file dir)
-;;   "calling_string" ("HELPFILE" (("KWD1" . link1) ...)) 
+;;   "calling_string" ("HELPFILE" (("KWD1" . link1) ...))
 ;;                    ("HELPFILE2" (("KWD2" . link) ...)) ...)
 
 
@@ -4996,7 +4996,7 @@ Cache to disk for quick recovery."
             (message "Loading system routine info in idle time...done")
             (aset arr 0 t)
             (throw 'exit t))
-          
+
           (when (not (aref arr 1))
             (message "Normalizing idlwave-system-routines in idle time...")
             (idlwave-reset-sintern t)
@@ -5021,7 +5021,7 @@ Cache to disk for quick recovery."
                   (progn
                     (setq idlwave-library-routines nil)
                     (ding)
-                    (message "Outdated user catalog: %s... recreate" 
+                    (message "Outdated user catalog: %s... recreate"
                              idlwave-user-catalog-file))
                 (message "Loading user catalog in idle time...done")))
             (aset arr 2 t)
@@ -5030,16 +5030,16 @@ Cache to disk for quick recovery."
           (when (not (aref arr 3))
             (when idlwave-user-catalog-routines
               (message "Normalizing user catalog routines in idle time...")
-              (setq idlwave-user-catalog-routines 
+              (setq idlwave-user-catalog-routines
                     (idlwave-sintern-rinfo-list
                      idlwave-user-catalog-routines 'sys))
-              (message 
+              (message
                "Normalizing user catalog routines in idle time...done"))
             (aset arr 3 t)
             (throw 'exit t))
 
           (when (not (aref arr 4))
-            (idlwave-scan-library-catalogs 
+            (idlwave-scan-library-catalogs
              "Loading and normalizing library catalogs in idle time...")
             (aset arr 4 t)
             (throw 'exit t))
@@ -5047,7 +5047,7 @@ Cache to disk for quick recovery."
             (message "Finishing initialization in idle time...")
             (idlwave-routines)
             (message "Finishing initialization in idle time...done")
-            (aset arr 5 t)          
+            (aset arr 5 t)
             (throw 'exit nil)))
         ;; restart the timer
         (if (sit-for 1)
@@ -5082,17 +5082,17 @@ Cache to disk for quick recovery."
         (when (or force (not (aref idlwave-load-rinfo-steps-done 2)))
           (load-file idlwave-user-catalog-file))
       (error nil))
-    (when (and 
+    (when (and
            (boundp 'idlwave-library-routines)
            idlwave-library-routines)
       (setq idlwave-library-routines nil)
-      (error "Outdated user catalog: %s... recreate" 
+      (error "Outdated user catalog: %s... recreate"
              idlwave-user-catalog-file))
     (setq idlwave-true-path-alist nil)
     (when (or force (not (aref idlwave-load-rinfo-steps-done 3)))
       (message "Normalizing user catalog routines...")
-      (setq idlwave-user-catalog-routines 
-            (idlwave-sintern-rinfo-list 
+      (setq idlwave-user-catalog-routines
+            (idlwave-sintern-rinfo-list
              idlwave-user-catalog-routines 'sys))
       (message "Normalizing user catalog routines...done")))
 
@@ -5105,11 +5105,11 @@ Cache to disk for quick recovery."
 
 (defun idlwave-update-buffer-routine-info ()
   (let (res)
-    (cond 
+    (cond
      ((eq idlwave-scan-all-buffers-for-routine-info t)
       ;; Scan all buffers, current buffer last
       (message "Scanning all buffers...")
-      (setq res (idlwave-get-routine-info-from-buffers 
+      (setq res (idlwave-get-routine-info-from-buffers
                  (reverse (buffer-list)))))
      ((null idlwave-scan-all-buffers-for-routine-info)
       ;; Don't scan any buffers
@@ -5122,12 +5122,12 @@ Cache to disk for quick recovery."
             (setq res (idlwave-get-routine-info-from-buffers
                        (list (current-buffer))))))))
     ;; Put the result into the correct variable
-    (setq idlwave-buffer-routines 
+    (setq idlwave-buffer-routines
           (idlwave-sintern-rinfo-list res 'set))))
 
 (defun idlwave-concatenate-rinfo-lists (&optional quiet run-hook)
   "Put the different sources for routine information together."
-  ;; The sequence here is important because earlier definitions shadow 
+  ;; The sequence here is important because earlier definitions shadow
   ;; later ones.  We assume that if things in the buffers are newer
   ;; then in the shell of the system, they are meant to be different.
   (setcdr idlwave-last-system-routine-info-cons-cell
@@ -5139,7 +5139,7 @@ Cache to disk for quick recovery."
 
   ;; Give a message with information about the number of routines we have.
   (unless quiet
-    (message 
+    (message
      "Routines Found: buffer(%d) compiled(%d) library(%d) user(%d) system(%d)"
      (length idlwave-buffer-routines)
      (length idlwave-compiled-routines)
@@ -5157,7 +5157,7 @@ Cache to disk for quick recovery."
           (when (and (setq class (nth 2 x))
                      (not (assq class idlwave-class-alist)))
             (push (list class) idlwave-class-alist)))
-        idlwave-class-alist)))      
+        idlwave-class-alist)))
 
 ;; Three functions for the hooks
 (defun idlwave-save-buffer-update ()
@@ -5190,7 +5190,7 @@ Cache to disk for quick recovery."
 
 (defun idlwave-replace-buffer-routine-info (file new)
   "Cut the part from FILE out of `idlwave-buffer-routines' and add NEW."
-  (let ((list idlwave-buffer-routines) 
+  (let ((list idlwave-buffer-routines)
         found)
     (while list
       ;; The following test uses eq to make sure it works correctly
@@ -5201,7 +5201,7 @@ Cache to disk for quick recovery."
             (setcar list nil)
             (setq found t))
         (if found
-            ;; End of that section reached. Jump. 
+            ;; End of that section reached. Jump.
             (setq list nil)))
       (setq list (cdr list)))
     (setq idlwave-buffer-routines
@@ -5233,11 +5233,11 @@ Cache to disk for quick recovery."
       (save-restriction
         (widen)
         (goto-char (point-min))
-        (while (re-search-forward 
+        (while (re-search-forward
                 "^[ \t]*\\(pro\\|function\\)[ \t]" nil t)
           (setq string (buffer-substring-no-properties
                         (match-beginning 0)
-                        (progn 
+                        (progn
                           (idlwave-end-of-statement)
                           (point))))
           (setq entry (idlwave-parse-definition string))
@@ -5275,7 +5275,7 @@ Cache to disk for quick recovery."
         (push (match-string 1 string) args)))
     ;; Normalize and sort.
     (setq args (nreverse args))
-    (setq keywords (sort keywords (lambda (a b) 
+    (setq keywords (sort keywords (lambda (a b)
                                     (string< (downcase a) (downcase b)))))
     ;; Make and return the entry
     ;; We don't know which argument are optional, so this information
@@ -5285,7 +5285,7 @@ Cache to disk for quick recovery."
           class
           (cond ((not (boundp 'idlwave-scanning-lib))
                  (list  'buffer (buffer-file-name)))
-;               ((string= (downcase 
+;               ((string= (downcase
 ;                          (file-name-sans-extension
 ;                           (file-name-nondirectory (buffer-file-name))))
 ;                         (downcase name))
@@ -5293,7 +5293,7 @@ Cache to disk for quick recovery."
 ;               (t (cons 'lib (file-name-nondirectory (buffer-file-name))))
                 (t (list 'user (file-name-nondirectory (buffer-file-name))
                          idlwave-scanning-lib-dir "UserLib")))
-          (concat 
+          (concat
            (if (string= type "function") "Result = " "")
            (if class "Obj ->[%s::]" "")
            "%s"
@@ -5339,10 +5339,10 @@ time - so no widget will pop up."
                (> (length idlwave-user-catalog-file) 0)
                (file-accessible-directory-p
                 (file-name-directory idlwave-user-catalog-file))
-               (not (string= "" (file-name-nondirectory 
+               (not (string= "" (file-name-nondirectory
                                  idlwave-user-catalog-file))))
     (error "`idlwave-user-catalog-file' does not point to a file in an accessible directory"))
-  
+
   (cond
     ;; Rescan the known directories
    ((and arg idlwave-path-alist
@@ -5352,13 +5352,13 @@ time - so no widget will pop up."
    ;; Expand the directories from library-path and run the widget
    (idlwave-library-path
     (idlwave-display-user-catalog-widget
-     (if idlwave-true-path-alist 
+     (if idlwave-true-path-alist
          ;; Propagate any flags on the existing path-alist
          (mapcar (lambda (x)
                    (let ((path-entry (assoc (file-truename x)
                                             idlwave-true-path-alist)))
                      (if path-entry
-                         (cons x (cdr path-entry)) 
+                         (cons x (cdr path-entry))
                        (list x))))
                  (idlwave-expand-path idlwave-library-path))
        (mapcar 'list (idlwave-expand-path idlwave-library-path)))))
@@ -5383,7 +5383,7 @@ time - so no widget will pop up."
     (idlwave-scan-library-catalogs "Locating library catalogs..." 'no-load)
     (idlwave-display-user-catalog-widget idlwave-path-alist)))
 
-(defconst idlwave-user-catalog-widget-help-string 
+(defconst idlwave-user-catalog-widget-help-string
   "This is the front-end to the creation of the IDLWAVE user catalog.
 Please select the directories on IDL's search path from which you
 would like to extract routine information, to be stored in the file:
@@ -5418,7 +5418,7 @@ directories and save the routine info.
   (make-local-variable 'idlwave-widget)
   (widget-insert (format idlwave-user-catalog-widget-help-string
                          idlwave-user-catalog-file))
-  
+
   (widget-create 'push-button
                  :notify 'idlwave-widget-scan-user-lib-files
                  "Scan & Save")
@@ -5428,7 +5428,7 @@ directories and save the routine info.
                  "Delete File")
   (widget-insert "  ")
   (widget-create 'push-button
-                 :notify 
+                 :notify
                  '(lambda (&rest ignore)
                     (let ((path-list (widget-get idlwave-widget :path-dirs)))
                       (mapcar (lambda (x)
@@ -5439,7 +5439,7 @@ directories and save the routine info.
                  "Select All Non-Lib")
   (widget-insert "  ")
   (widget-create 'push-button
-                 :notify 
+                 :notify
                  '(lambda (&rest ignore)
                     (let ((path-list (widget-get idlwave-widget :path-dirs)))
                       (mapcar (lambda (x)
@@ -5455,18 +5455,18 @@ directories and save the routine info.
   (widget-insert "\n\n")
 
   (widget-insert "Select Directories: \n")
-  
+
   (setq idlwave-widget
         (apply 'widget-create
                'checklist
-               :value  (delq nil (mapcar (lambda (x) 
-                                           (if (memq 'user (cdr x)) 
+               :value  (delq nil (mapcar (lambda (x)
+                                           (if (memq 'user (cdr x))
                                                (car x)))
                                          dirs-list))
                :greedy t
                :tag "List of directories"
-               (mapcar (lambda (x) 
-                         (list 'item 
+               (mapcar (lambda (x)
+                         (list 'item
                                (if (memq 'lib (cdr x))
                                    (concat "[LIB] " (car x) )
                                  (car x)))) dirs-list)))
@@ -5476,7 +5476,7 @@ directories and save the routine info.
   (widget-setup)
   (goto-char (point-min))
   (delete-other-windows))
-  
+
 (defun idlwave-delete-user-catalog-file (&rest ignore)
   (if (yes-or-no-p
        (format "Delete file %s " idlwave-user-catalog-file))
@@ -5492,7 +5492,7 @@ directories and save the routine info.
          (this-path-alist path-alist)
          dir-entry)
     (while (setq dir-entry (pop this-path-alist))
-      (if (member 
+      (if (member
            (if (memq 'lib (cdr dir-entry))
                (concat "[LIB] " (car dir-entry))
              (car dir-entry))
@@ -5589,7 +5589,7 @@ directories and save the routine info.
     ;; Define the variable which knows the value of "!DIR"
     (insert (format "\n(setq idlwave-system-directory \"%s\")\n"
                     idlwave-system-directory))
-  
+
     ;; Define the variable which contains a list of all scanned directories
     (insert "\n(setq idlwave-path-alist\n    '(")
     (let ((standard-output (current-buffer)))
@@ -5629,7 +5629,7 @@ directories and save the routine info.
       (when (file-directory-p dir)
         (setq files (nreverse (directory-files dir t "[^.]")))
         (while (setq file (pop files))
-          (if (file-directory-p file) 
+          (if (file-directory-p file)
               (push (file-name-as-directory file) path)))
         (push dir path1)))
     path1))
@@ -5641,7 +5641,7 @@ directories and save the routine info.
 
 
 (defun idlwave-scan-library-catalogs (&optional message-base no-load)
-  "Scan for library catalog files (.idlwave_catalog) and ingest.  
+  "Scan for library catalog files (.idlwave_catalog) and ingest.
 
 All directories on `idlwave-path-alist' (or `idlwave-library-path'
 instead, if present) are searched.  Print MESSAGE-BASE along with the
@@ -5649,7 +5649,7 @@ libraries being loaded, if passed, and skip loading/normalizing if
 NO-LOAD is non-nil.  The variable `idlwave-use-library-catalogs' can
 be set to nil to disable library catalog scanning."
   (when idlwave-use-library-catalogs
-    (let ((dirs 
+    (let ((dirs
            (if idlwave-library-path
                (idlwave-expand-path idlwave-library-path)
              (mapcar 'car idlwave-path-alist)))
@@ -5658,7 +5658,7 @@ be set to nil to disable library catalog scanning."
       (if message-base (message message-base))
       (while (setq dir (pop dirs))
         (catch 'continue
-          (when (file-readable-p 
+          (when (file-readable-p
                  (setq catalog (expand-file-name ".idlwave_catalog" dir)))
             (unless no-load
               (setq idlwave-library-catalog-routines nil)
@@ -5666,20 +5666,20 @@ be set to nil to disable library catalog scanning."
               (condition-case nil
                   (load catalog t t t)
                 (error (throw 'continue t)))
-              (when (and 
-                     message-base 
-                     (not (string= idlwave-library-catalog-libname 
+              (when (and
+                     message-base
+                     (not (string= idlwave-library-catalog-libname
                                    old-libname)))
-                (message "%s" (concat message-base 
+                (message "%s" (concat message-base
                                       idlwave-library-catalog-libname))
                 (setq old-libname idlwave-library-catalog-libname))
               (when idlwave-library-catalog-routines
                 (setq all-routines
-                      (append 
+                      (append
                        (idlwave-sintern-rinfo-list
                         idlwave-library-catalog-routines 'sys dir)
                        all-routines))))
-            
+
             ;;  Add a 'lib flag if on path-alist
             (when (and idlwave-path-alist
                        (setq dir-entry (assoc dir idlwave-path-alist)))
@@ -5690,7 +5690,7 @@ be set to nil to disable library catalog scanning."
 ;;----- Communicating with the Shell -------------------
 
 ;; First, here is the idl program which can be used to query IDL for
-;; defined routines. 
+;; defined routines.
 (defconst idlwave-routine-info.pro
   "
 ;; START OF IDLWAVE SUPPORT ROUTINES
@@ -5708,10 +5708,10 @@ end
 pro idlwave_print_info_entry,name,func=func,separator=sep
   ;; See if it's an object method
   if name eq '' then return
-  func    = keyword_set(func) 
+  func    = keyword_set(func)
   methsep = strpos(name,'::')
   meth    = methsep ne -1
-  
+
   ;; Get routine info
   pars   = routine_info(name,/parameters,functions=func)
   source = routine_info(name,/source,functions=func)
@@ -5719,12 +5719,12 @@ pro idlwave_print_info_entry,name,func=func,separator=sep
   nkw    = pars.num_kw_args
   if nargs gt 0 then args = pars.args
   if nkw   gt 0 then kwargs = pars.kw_args
-  
+
   ;; Trim the class, and make the name
-  if meth then begin 
+  if meth then begin
       class = strmid(name,0,methsep)
       name  = strmid(name,methsep+2,strlen(name)-1)
-      if nargs gt 0 then begin 
+      if nargs gt 0 then begin
           ;; remove the self argument
           wh = where(args ne 'SELF',nargs)
           if nargs gt 0 then args = args[wh]
@@ -5733,7 +5733,7 @@ pro idlwave_print_info_entry,name,func=func,separator=sep
       ;; No class, just a normal routine.
       class = \"\"
   endelse
-   
+
   ;; Calling sequence
   cs = \"\"
   if func then cs = 'Result = '
@@ -5754,9 +5754,9 @@ pro idlwave_print_info_entry,name,func=func,separator=sep
           kwstring = kwstring + ' ' + kwargs[j]
       endfor
   endif
-  
+
   ret=(['IDLWAVE-PRO','IDLWAVE-FUN'])[func]
-  
+
   print,ret + ': ' + name + sep + class + sep + source[0].path  $
     + sep + cs + sep + kwstring
 end
@@ -5768,19 +5768,19 @@ pro idlwave_routine_info,file
   all = routine_info()
   fileQ=n_elements(file) ne 0
   if fileQ then file=strtrim(file,2)
-  for i=0L,n_elements(all)-1L do begin 
-     if fileQ then begin 
+  for i=0L,n_elements(all)-1L do begin
+     if fileQ then begin
         if (routine_info(all[i],/SOURCE)).path eq file then $
            idlwave_print_info_entry,all[i],separator=sep
      endif else idlwave_print_info_entry,all[i],separator=sep
-  endfor 
+  endfor
   all = routine_info(/functions)
-  for i=0L,n_elements(all)-1L do begin 
-     if fileQ then begin 
+  for i=0L,n_elements(all)-1L do begin
+     if fileQ then begin
         if (routine_info(all[i],/FUNCTIONS,/SOURCE)).path eq file then $
            idlwave_print_info_entry,all[i],separator=sep,/FUNC
      endif else idlwave_print_info_entry,all[i],separator=sep,/FUNC
-  endfor 
+  endfor
   print,'>>>END OF IDLWAVE ROUTINE INFO'
 end
 
@@ -5806,7 +5806,7 @@ pro idlwave_get_class_tags, class
   if res then print,'IDLWAVE-CLASS-TAGS: '+class+' '+strjoin(tags,' ',/single)
 end
 ;; END OF IDLWAVE SUPPORT ROUTINES
-" 
+"
   "The idl programs to get info from the shell.")
 
 (defvar idlwave-idlwave_routine_info-compiled nil
@@ -5824,11 +5824,11 @@ end
       (erase-buffer)
       (insert idlwave-routine-info.pro)
       (save-buffer 0))
-    (idlwave-shell-send-command 
+    (idlwave-shell-send-command
      (concat ".run \"" idlwave-shell-temp-pro-file "\"")
      nil 'hide wait)
     (idlwave-shell-send-command
-     (format "save,'idlwave_print_safe','idlwave_routine_info','idlwave_print_info_entry','idlwave_get_class_tags','idlwave_get_sysvars',FILE='%s',/ROUTINES" 
+     (format "save,'idlwave_print_safe','idlwave_routine_info','idlwave_print_info_entry','idlwave_get_class_tags','idlwave_get_sysvars',FILE='%s',/ROUTINES"
              (idlwave-shell-temp-file 'rinfo))
      nil 'hide)
     (setq idlwave-idlwave_routine_info-compiled t))
@@ -5929,7 +5929,7 @@ When we force a method or a method keyword, CLASS can specify the class."
          (completion-regexp-list
           (if (equal arg '(16))
               (list (read-string (concat "Completion Regexp: "))))))
-    
+
     (if (and module (string-match "::" module))
         (setq class (substring module 0 (match-beginning 0))
               module (substring module (match-end 0))))
@@ -5950,7 +5950,7 @@ When we force a method or a method keyword, CLASS can specify the class."
      ;; Check for any special completion functions
      ((and idlwave-complete-special
            (idlwave-call-special idlwave-complete-special)))
-     
+
      ((null what)
       (error "Nothing to complete here"))
 
@@ -5967,7 +5967,7 @@ When we force a method or a method keyword, CLASS can specify the class."
                               (idlwave-all-class-inherits class-selector)))
              (isa (concat "procedure" (if class-selector "-method" "")))
              (type-selector 'pro))
-        (setq idlwave-completion-help-info 
+        (setq idlwave-completion-help-info
               (list 'routine nil type-selector class-selector nil super-classes))
         (idlwave-complete-in-buffer
          'procedure (if class-selector 'method 'routine)
@@ -5975,8 +5975,8 @@ When we force a method or a method keyword, CLASS can specify the class."
          (format "Select a %s name%s"
                  isa
                  (if class-selector
-                     (format " (class is %s)" 
-                             (if (eq class-selector t) 
+                     (format " (class is %s)"
+                             (if (eq class-selector t)
                                  "unknown" class-selector))
                    ""))
          isa
@@ -5990,7 +5990,7 @@ When we force a method or a method keyword, CLASS can specify the class."
                               (idlwave-all-class-inherits class-selector)))
              (isa (concat "function" (if class-selector "-method" "")))
              (type-selector 'fun))
-        (setq idlwave-completion-help-info 
+        (setq idlwave-completion-help-info
               (list 'routine nil type-selector class-selector nil super-classes))
         (idlwave-complete-in-buffer
          'function (if class-selector 'method 'routine)
@@ -5998,7 +5998,7 @@ When we force a method or a method keyword, CLASS can specify the class."
          (format "Select a %s name%s"
                  isa
                  (if class-selector
-                     (format " (class is %s)" 
+                     (format " (class is %s)"
                              (if (eq class-selector t)
                                  "unknown" class-selector))
                    ""))
@@ -6026,18 +6026,18 @@ When we force a method or a method keyword, CLASS can specify the class."
         (unless (or entry (eq class t))
           (error "Nothing known about procedure %s"
                  (idlwave-make-full-name class name)))
-        (setq list (idlwave-fix-keywords name 'pro class list 
+        (setq list (idlwave-fix-keywords name 'pro class list
                                          super-classes system))
         (unless list (error "No keywords available for procedure %s"
                             (idlwave-make-full-name class name)))
-        (setq idlwave-completion-help-info 
+        (setq idlwave-completion-help-info
               (list 'keyword name type-selector class-selector entry super-classes))
         (idlwave-complete-in-buffer
          'keyword 'keyword list nil
          (format "Select keyword for procedure %s%s"
                  (idlwave-make-full-name class name)
                  (if (or (member '("_EXTRA") list)
-                         (member '("_REF_EXTRA") list))                  
+                         (member '("_REF_EXTRA") list))
                      " (note _EXTRA)" ""))
          isa
          'idlwave-attach-keyword-classes)))
@@ -6060,7 +6060,7 @@ When we force a method or a method keyword, CLASS can specify the class."
         (unless (or entry (eq class t))
           (error "Nothing known about function %s"
                  (idlwave-make-full-name class name)))
-        (setq list (idlwave-fix-keywords name 'fun class list 
+        (setq list (idlwave-fix-keywords name 'fun class list
                                          super-classes system))
         ;; OBJ_NEW: Messages mention the proper Init method
         (setq msg-name (if (and (null class)
@@ -6070,13 +6070,13 @@ When we force a method or a method keyword, CLASS can specify the class."
                          (idlwave-make-full-name class name)))
         (unless list (error "No keywords available for function %s"
                             msg-name))
-        (setq idlwave-completion-help-info 
+        (setq idlwave-completion-help-info
               (list 'keyword name type-selector class-selector nil super-classes))
         (idlwave-complete-in-buffer
          'keyword 'keyword list nil
          (format "Select keyword for function %s%s" msg-name
                  (if (or (member '("_EXTRA") list)
-                         (member '("_REF_EXTRA") list))                  
+                         (member '("_REF_EXTRA") list))
                      " (note _EXTRA)" ""))
          isa
          'idlwave-attach-keyword-classes)))
@@ -6114,10 +6114,10 @@ other completions will be tried.")
                       ("class")))
          (module (idlwave-sintern-routine-or-method module class))
          (class (idlwave-sintern-class class))
-         (what (cond 
+         (what (cond
                 ((equal what 0)
                  (setq what
-                       (intern (completing-read 
+                       (intern (completing-read
                                 "Complete what? " what-list nil t))))
                 ((integerp what)
                  (setq what (intern (car (nth (1- what) what-list)))))
@@ -6139,7 +6139,7 @@ other completions will be tried.")
              (super-classes nil)
              (type-selector 'pro)
              (pro (or module
-                      (idlwave-completing-read 
+                      (idlwave-completing-read
                        "Procedure: " (idlwave-routines) 'idlwave-selector))))
         (setq pro (idlwave-sintern-routine pro))
         (list nil-list nil-list 'procedure-keyword
@@ -6153,7 +6153,7 @@ other completions will be tried.")
              (super-classes nil)
              (type-selector 'fun)
              (func (or module
-                       (idlwave-completing-read 
+                       (idlwave-completing-read
                         "Function: " (idlwave-routines) 'idlwave-selector))))
         (setq func (idlwave-sintern-routine func))
         (list nil-list nil-list 'function-keyword
@@ -6193,7 +6193,7 @@ other completions will be tried.")
 
      ((eq what 'class)
       (list nil-list nil-list 'class nil-list nil))
-     
+
      (t (error "Invalid value for WHAT")))))
 
 (defun idlwave-completing-read (&rest args)
@@ -6216,7 +6216,7 @@ other completions will be tried.")
                     (stringp idlwave-shell-default-directory)
                     (file-directory-p idlwave-shell-default-directory))
                idlwave-shell-default-directory
-             default-directory)))          
+             default-directory)))
     (comint-dynamic-complete-filename)))
 
 (defun idlwave-make-full-name (class name)
@@ -6225,7 +6225,7 @@ other completions will be tried.")
 
 (defun idlwave-rinfo-assoc (name type class list)
   "Like `idlwave-rinfo-assq', but sintern strings first."
-  (idlwave-rinfo-assq 
+  (idlwave-rinfo-assq
    (idlwave-sintern-routine-or-method name class)
    type (idlwave-sintern-class class) list))
 
@@ -6249,7 +6249,7 @@ other completions will be tried.")
           (setq classes nil)))
     rtn))
 
-(defun idlwave-best-rinfo-assq (name type class list &optional with-file 
+(defun idlwave-best-rinfo-assq (name type class list &optional with-file
                                      keep-system)
   "Like `idlwave-rinfo-assq', but get all twins and sort, then return first.
 If WITH-FILE is passed, find the best rinfo entry with a file
@@ -6274,7 +6274,7 @@ syslib files."
                                     twins)))))
     (car twins)))
 
-(defun idlwave-best-rinfo-assoc (name type class list &optional with-file 
+(defun idlwave-best-rinfo-assoc (name type class list &optional with-file
                                      keep-system)
   "Like `idlwave-best-rinfo-assq', but sintern strings first."
   (idlwave-best-rinfo-assq
@@ -6365,7 +6365,7 @@ INFO is as returned by idlwave-what-function or -procedure."
 Must accept two arguments: `apos' and `info'")
 
 (defun idlwave-determine-class (info type)
-  ;; Determine the class of a routine call.  
+  ;; Determine the class of a routine call.
   ;; INFO is the `cw-list' structure as returned by idlwave-where.
   ;; The second element in this structure is the class.  When nil, we
   ;; return nil.  When t, try to get the class from text properties at
@@ -6385,7 +6385,7 @@ Must accept two arguments: `apos' and `info'")
                       (dassoc (cdr dassoc))
                       (t t)))
          (arrow (and apos (string= (buffer-substring apos (+ 2 apos)) "->")))
-         (is-self 
+         (is-self
           (and arrow
                (save-excursion (goto-char apos)
                                (forward-word -1)
@@ -6406,19 +6406,19 @@ Must accept two arguments: `apos' and `info'")
           (setq class (or (nth 2 (idlwave-current-routine)) class)))
 
       ;; Before prompting, try any special class determination routines
-      (when (and (eq t class) 
+      (when (and (eq t class)
                  idlwave-determine-class-special
                  (not force-query))
-        (setq special-class 
+        (setq special-class
               (idlwave-call-special idlwave-determine-class-special apos))
-        (if special-class 
+        (if special-class
             (setq class (idlwave-sintern-class special-class)
                   store idlwave-store-inquired-class)))
-      
+
       ;; Prompt for a class, if we need to
       (when (and (eq class t)
                  (or force-query query))
-        (setq class-alist 
+        (setq class-alist
               (mapcar 'list (idlwave-all-method-classes (car info) type)))
         (setq class
               (idlwave-sintern-class
@@ -6427,9 +6427,9 @@ Must accept two arguments: `apos' and `info'")
                  (error "No classes available with method %s" (car info)))
                 ((and (= (length class-alist) 1) (not force-query))
                  (car (car class-alist)))
-                (t 
+                (t
                  (setq store idlwave-store-inquired-class)
-                 (idlwave-completing-read 
+                 (idlwave-completing-read
                   (format "Class%s: " (if (stringp (car info))
                                           (format " for %s method %s"
                                                   type (car info))
@@ -6441,9 +6441,9 @@ Must accept two arguments: `apos' and `info'")
         ;; We have a real class here
         (when (and store arrow)
           (condition-case ()
-              (add-text-properties 
-               apos (+ apos 2) 
-               `(idlwave-class ,class face ,idlwave-class-arrow-face 
+              (add-text-properties
+               apos (+ apos 2)
+               `(idlwave-class ,class face ,idlwave-class-arrow-face
                                rear-nonsticky t))
             (error nil)))
         (setf (nth 2 info) class))
@@ -6471,14 +6471,14 @@ Must accept two arguments: `apos' and `info'")
 
 
 (defun idlwave-where ()
-  "Find out where we are. 
+  "Find out where we are.
 The return value is a list with the following stuff:
 \(PRO-LIST FUNC-LIST COMPLETE-WHAT CW-LIST LAST-CHAR)
 
 PRO-LIST       (PRO POINT CLASS ARROW)
 FUNC-LIST      (FUNC POINT CLASS ARROW)
 COMPLETE-WHAT  a symbol indicating what kind of completion makes sense here
-CW-LIST        (PRO-OR-FUNC POINT CLASS ARROW)  Like PRO-LIST, for what can 
+CW-LIST        (PRO-OR-FUNC POINT CLASS ARROW)  Like PRO-LIST, for what can
                be completed here.
 LAST-CHAR      last relevant character before point (non-white non-comment,
                not part of current identifier or leading slash).
@@ -6490,7 +6490,7 @@ POINT:  Where is this
 CLASS:  What class has the routine (nil=no, t=is method, but class unknown)
 ARROW:  Location of the arrow"
   (idlwave-routines)
-  (let* (;(bos (save-excursion (idlwave-beginning-of-statement) (point))) 
+  (let* (;(bos (save-excursion (idlwave-beginning-of-statement) (point)))
          (bos (save-excursion (idlwave-start-of-substatement 'pre) (point)))
          (func-entry (idlwave-what-function bos))
          (func (car func-entry))
@@ -6512,8 +6512,8 @@ ARROW:  Location of the arrow"
      ((string-match "\\`[ \t]*\\(pro\\|function\\)[ \t]+[a-zA-Z0-9_]*\\'"
                     match-string)
       (setq cw 'class))
-     ((string-match 
-       "\\`[ \t]*\\([a-zA-Z][a-zA-Z0-9$_]*\\)?\\'" 
+     ((string-match
+       "\\`[ \t]*\\([a-zA-Z][a-zA-Z0-9$_]*\\)?\\'"
        (if (> pro-point 0)
            (buffer-substring pro-point (point))
          match-string))
@@ -6524,11 +6524,11 @@ ARROW:  Location of the arrow"
       nil)
      ((string-match "OBJ_NEW([ \t]*['\"]\\([a-zA-Z0-9$_]*\\)?\\'"
                     match-string)
-      (setq cw 'class))                    
+      (setq cw 'class))
      ((string-match "\\<inherits\\s-+\\([a-zA-Z0-9$_]*\\)?\\'"
                     match-string)
-      (setq cw 'class))                    
-     ((and func 
+      (setq cw 'class))
+     ((and func
            (> func-point pro-point)
            (= func-level 1)
            (memq last-char '(?\( ?,)))
@@ -6574,7 +6574,7 @@ ARROW:  Location of the arrow"
   ;;    searches to this point.
 
   (catch 'exit
-    (let (pos 
+    (let (pos
           func-point
           (cnt 0)
           func arrow-start class)
@@ -6589,18 +6589,18 @@ ARROW:  Location of the arrow"
              (setq pos (point))
              (incf cnt)
              (when (and (= (following-char) ?\()
-                        (re-search-backward 
+                        (re-search-backward
                          "\\(::\\|\\<\\)\\([a-zA-Z][a-zA-Z0-9$_]*\\)[ \t]*\\="
                          bound t))
                (setq func (match-string 2)
                      func-point (goto-char (match-beginning 2))
                      pos func-point)
-               (if (re-search-backward 
+               (if (re-search-backward
                     "->[ \t]*\\(\\([a-zA-Z][a-zA-Z0-9$_]*\\)::\\)?\\=" bound t)
                    (setq arrow-start (copy-marker (match-beginning 0))
                          class (or (match-string 2) t)))
-               (throw 
-                'exit 
+               (throw
+                'exit
                 (list
                  (idlwave-sintern-routine-or-method func class)
                  (idlwave-sintern-class class)
@@ -6616,18 +6616,18 @@ ARROW:  Location of the arrow"
   ;;    searches to this point.
   (let ((pos (point)) pro-point
         pro class arrow-start string)
-    (save-excursion 
+    (save-excursion
       ;;(idlwave-beginning-of-statement)
       (idlwave-start-of-substatement 'pre)
       (setq string (buffer-substring (point) pos))
-      (if (string-match 
+      (if (string-match
            "\\`[ \t]*\\([a-zA-Z][a-zA-Z0-9$_]*\\)[ \t]*\\(,\\|\\'\\)" string)
           (setq pro (match-string 1 string)
                 pro-point (+ (point) (match-beginning 1)))
         (if (and (idlwave-skip-object)
                  (setq string (buffer-substring (point) pos))
-                 (string-match 
-                  "\\`[ \t]*\\(->\\)[ \t]*\\(\\([a-zA-Z][a-zA-Z0-9$_]*\\)::\\)?\\([a-zA-Z][a-zA-Z0-9$_]*\\)?[ \t]*\\(,\\|\\(\\$\\s *\\(;.*\\)?\\)?$\\)" 
+                 (string-match
+                  "\\`[ \t]*\\(->\\)[ \t]*\\(\\([a-zA-Z][a-zA-Z0-9$_]*\\)::\\)?\\([a-zA-Z][a-zA-Z0-9$_]*\\)?[ \t]*\\(,\\|\\(\\$\\s *\\(;.*\\)?\\)?$\\)"
                   string))
             (setq pro (if (match-beginning 4)
                           (match-string 4 string))
@@ -6671,7 +6671,7 @@ ARROW:  Location of the arrow"
               (throw 'exit nil))))
         (goto-char pos)
       nil)))
-  
+
 (defun idlwave-last-valid-char ()
   "Return the last character before point which is not white or a comment
 and also not part of the current identifier.  Since we do this in
@@ -6761,23 +6761,23 @@ accumulate information on matching completions."
      ((or (eq completion t)
           (and (= 1 (length (setq all-completions
                                   (idlwave-uniquify
-                                   (all-completions part list 
-                                                    (or special-selector 
+                                   (all-completions part list
+                                                    (or special-selector
                                                         selector))))))
                (equal dpart dcompletion)))
       ;; This is already complete
       (idlwave-after-successful-completion type slash beg)
       (message "%s is already the complete %s" part isa)
       nil)
-     (t        
+     (t
       ;; We cannot add something - offer a list.
       (message "Making completion list...")
-      
+
       (unless idlwave-completion-help-links ; already set somewhere?
         (mapcar (lambda (x)  ; Pass link prop through to highlight-linked
                   (let ((link (get-text-property 0 'link (car x))))
                     (if link
-                        (push (cons (car x) link) 
+                        (push (cons (car x) link)
                               idlwave-completion-help-links))))
                 list))
       (let* ((list all-completions)
@@ -6787,7 +6787,7 @@ accumulate information on matching completions."
 ;            (completion-fixup-function               ; Emacs
 ;             (lambda () (and (eq (preceding-char) ?>)
 ;                             (re-search-backward " <" beg t)))))
-             
+
         (setq list (sort list (lambda (a b)
                                 (string< (downcase a) (downcase b)))))
         (if prepare-display-function
@@ -6797,7 +6797,7 @@ accumulate information on matching completions."
                      idlwave-complete-empty-string-as-lower-case)
                  (not idlwave-completion-force-default-case))
             (setq list (mapcar (lambda (x)
-                                 (if (listp x) 
+                                 (if (listp x)
                                      (setcar x (downcase (car x)))
                                    (setq x (downcase x)))
                                  x)
@@ -6817,19 +6817,19 @@ accumulate information on matching completions."
            (re-search-backward "\\<\\(pro\\|function\\)[ \t]+\\="
                                (- (point) 15) t)
            (goto-char (point-min))
-           (re-search-forward 
+           (re-search-forward
             "^[ \t]*\\(pro\\|function\\)[ \t]+\\([a-zA-Z0-9_]+::\\)" nil t))))
       ;; Yank the full class specification
       (insert (match-string 2))
     ;; Do the completion, using list gathered from `idlwave-routines'
-    (idlwave-complete-in-buffer 
-     'class 'class (idlwave-class-alist) nil 
+    (idlwave-complete-in-buffer
+     'class 'class (idlwave-class-alist) nil
      "Select a class" "class"
      '(lambda (list)  ;; Push it to help-links if system help available
         (mapcar (lambda (x)
                   (let* ((entry (idlwave-class-info x))
                          (link (nth 1 (assq 'link entry))))
-                    (if link (push (cons x link) 
+                    (if link (push (cons x link)
                                    idlwave-completion-help-links))
                     x))
                 list)))))
@@ -6841,7 +6841,7 @@ accumulate information on matching completions."
   ;; SHOW-CLASSES is the value of `idlwave-completion-show-classes'.
   (if (or (null show-classes)           ; don't want to see classes
           (null class-selector)         ; not a method call
-          (and 
+          (and
            (stringp class-selector) ; the class is already known
            (not super-classes)))    ; no possibilities for inheritance
       ;; In these cases, we do not have to do anything
@@ -6856,13 +6856,13 @@ accumulate information on matching completions."
            (max (abs show-classes))
            (lmax (if do-dots (apply 'max (mapcar 'length list))))
           classes nclasses class-info space)
-      (mapcar 
+      (mapcar
        (lambda (x)
          ;; get the classes
          (if (eq type 'class-tag)
              ;; Just one class for tags
              (setq classes
-                   (list 
+                   (list
                     (idlwave-class-or-superclass-with-tag class-selector x)))
            ;; Multiple classes for method or method-keyword
            (setq classes
@@ -6871,7 +6871,7 @@ accumulate information on matching completions."
                       method-selector x type-selector)
                    (idlwave-all-method-classes x type-selector)))
            (if inherit
-               (setq classes 
+               (setq classes
                      (delq nil
                            (mapcar (lambda (x) (if (memq x inherit) x nil))
                                    classes)))))
@@ -6908,7 +6908,7 @@ accumulate information on matching completions."
 (defun idlwave-attach-class-tag-classes (list)
   ;; Call idlwave-attach-classes with class structure tags
   (idlwave-attach-classes list 'class-tag idlwave-completion-show-classes))
-                                        
+
 
 ;;----------------------------------------------------------------------
 ;;----------------------------------------------------------------------
@@ -6929,7 +6929,7 @@ sort the list before displaying"
           ((= 1 (length list))
            (setq rtn (car list)))
           ((featurep 'xemacs)
-           (if sort (setq list (sort list (lambda (a b) 
+           (if sort (setq list (sort list (lambda (a b)
                                             (string< (upcase a) (upcase b))))))
            (setq menu
                  (append (list title)
@@ -6940,7 +6940,7 @@ sort the list before displaying"
            (setq resp (get-popup-menu-response menu))
            (funcall (event-function resp) (event-object resp)))
           (t
-           (if sort (setq list (sort list (lambda (a b) 
+           (if sort (setq list (sort list (lambda (a b)
                                             (string< (upcase a) (upcase b))))))
            (setq menu (cons title
                             (list
@@ -7031,7 +7031,7 @@ sort the list before displaying"
     (setq idlwave-before-completion-wconf (current-window-configuration)))
 
   (if (featurep 'xemacs)
-      (idlwave-display-completion-list-xemacs 
+      (idlwave-display-completion-list-xemacs
        list)
     (idlwave-display-completion-list-emacs list))
 
@@ -7112,7 +7112,7 @@ If these don't exist, a letter in the string is automatically selected."
             (mapcar (lambda(x)
                       (princ (nth 1 x))
                       (princ "\n"))
-                    keys-alist))            
+                    keys-alist))
           (setq char (read-char)))
       (setq char (read-char)))
     (message nil)
@@ -7232,7 +7232,7 @@ If these don't exist, a letter in the string is automatically selected."
 (defun idlwave-make-modified-completion-map-emacs (old-map)
   "Replace `choose-completion' and `mouse-choose-completion' in OLD-MAP."
   (let ((new-map (copy-keymap old-map)))
-    (substitute-key-definition 
+    (substitute-key-definition
      'choose-completion 'idlwave-choose-completion new-map)
     (substitute-key-definition
      'mouse-choose-completion 'idlwave-mouse-choose-completion new-map)
@@ -7258,8 +7258,8 @@ If these don't exist, a letter in the string is automatically selected."
 ;;
 ;; - Go again over the documentation how to write a completion
 ;;   plugin.  It is in self.el, but currently still very bad.
-;;   This could be in a separate file in the distribution, or 
-;;   in an appendix for the manual.  
+;;   This could be in a separate file in the distribution, or
+;;   in an appendix for the manual.
 
 (defvar idlwave-struct-skip
   "[ \t]*\\(\\$.*\n\\(^[ \t]*\\(\\$[ \t]*\\)?\\(;.*\\)?\n\\)*\\)?[ \t]*"
@@ -7298,7 +7298,7 @@ Point is expected just before the opening `{' of the struct definition."
          (beg (car borders))
          (end (cdr borders))
          (case-fold-search t))
-    (re-search-forward (concat "\\(^[ \t]*\\|[,{][ \t]*\\)" tag "[ \t]*:") 
+    (re-search-forward (concat "\\(^[ \t]*\\|[,{][ \t]*\\)" tag "[ \t]*:")
                        end t)))
 
 (defun idlwave-struct-inherits ()
@@ -7313,7 +7313,7 @@ Point is expected just before the opening `{' of the struct definition."
       (goto-char beg)
       (save-restriction
         (narrow-to-region beg end)
-        (while (re-search-forward 
+        (while (re-search-forward
                 (concat "[{,]"  ;leading comma/brace
                         idlwave-struct-skip ; 4 groups
                         "inherits"    ; The INHERITS tag
@@ -7363,9 +7363,9 @@ backward."
                   (concat "\\<" (regexp-quote (downcase var)) "\\>" ws)
                 "\\(\\)")
               "=" ws "\\({\\)"
-              (if name 
+              (if name
                   (if (stringp name)
-                      (concat ws "\\(\\<" (downcase name) "\\)[^a-zA-Z0-9_$]") 
+                      (concat ws "\\(\\<" (downcase name) "\\)[^a-zA-Z0-9_$]")
                     ;; Just a generic name
                     (concat ws "\\<\\([a-zA-Z_0-9$]+\\)" ws ","))
                 ""))))
@@ -7376,7 +7376,7 @@ backward."
           (goto-char (match-beginning 3))
           (match-string-no-properties 5)))))
 
-(defvar idlwave-class-info nil) 
+(defvar idlwave-class-info nil)
 (defvar idlwave-class-reset nil) ; to reset buffer-local classes
 
 (add-hook 'idlwave-update-rinfo-hook
@@ -7388,13 +7388,13 @@ backward."
   (let (list entry)
     (if idlwave-class-info
         (if idlwave-class-reset
-            (setq           
+            (setq
              idlwave-class-reset nil
              idlwave-class-info ; Remove any visited in a buffer
-             (delq nil (mapcar 
-                        (lambda (x) 
-                          (let ((filebuf 
-                                 (idlwave-class-file-or-buffer 
+             (delq nil (mapcar
+                        (lambda (x)
+                          (let ((filebuf
+                                 (idlwave-class-file-or-buffer
                                   (or (cdr (assq 'found-in x)) (car x)))))
                             (if (cdr filebuf)
                                 nil
@@ -7432,7 +7432,7 @@ class/struct definition"
           (progn
             ;; For everything there
             (setq end-lim (save-excursion (idlwave-end-of-subprogram) (point)))
-            (while (setq name 
+            (while (setq name
                          (idlwave-find-structure-definition nil t end-lim))
               (funcall all-hook name)))
         (idlwave-find-structure-definition nil (or alt-class class))))))
@@ -7470,11 +7470,11 @@ class/struct definition"
           (insert-file-contents file))
         (save-excursion
           (goto-char 1)
-          (idlwave-find-class-definition class 
+          (idlwave-find-class-definition class
            ;; Scan all of the structures found there
            (lambda (name)
              (let* ((this-class (idlwave-sintern-class name))
-                    (entry 
+                    (entry
                      (list this-class
                            (cons 'tags (idlwave-struct-tags))
                            (cons 'inherits (idlwave-struct-inherits)))))
@@ -7499,7 +7499,7 @@ class/struct definition"
   (condition-case err
       (apply 'append (mapcar 'idlwave-class-tags
                              (cons class (idlwave-all-class-inherits class))))
-    (error           
+    (error
      (idlwave-class-tag-reset)
      (error "%s" (error-message-string err)))))
 
@@ -7536,24 +7536,24 @@ The list is cached in `idlwave-class-info' for faster access."
           all-inherits))))))
 
 (defun idlwave-entry-keywords (entry &optional record-link)
-  "Return the flat entry keywords alist from routine-info entry.  
+  "Return the flat entry keywords alist from routine-info entry.
 If RECORD-LINK is non-nil, the keyword text is copied and a text
 property indicating the link is added."
   (let (kwds)
     (mapcar
-     (lambda (key-list) 
+     (lambda (key-list)
        (let ((file (car key-list)))
          (mapcar (lambda (key-cons)
                    (let ((key (car key-cons))
                          (link (cdr key-cons)))
                      (when (and record-link file)
                          (setq key (copy-sequence key))
-                         (put-text-property 
+                         (put-text-property
                           0 (length key)
-                          'link 
-                          (concat 
-                           file 
-                           (if link 
+                          'link
+                          (concat
+                           file
+                           (if link
                                (concat idlwave-html-link-sep
                                        (number-to-string link))))
                           key))
@@ -7566,13 +7566,13 @@ property indicating the link is added."
   "Find keyword KEYWORD in entry ENTRY, and return (with link) if set"
   (catch 'exit
     (mapc
-     (lambda (key-list) 
+     (lambda (key-list)
        (let ((file (car key-list))
              (kwd (assoc keyword (cdr key-list))))
          (when kwd
-           (setq kwd (cons (car kwd) 
+           (setq kwd (cons (car kwd)
                            (if (and file (cdr kwd))
-                               (concat file 
+                               (concat file
                                        idlwave-html-link-sep
                                        (number-to-string (cdr kwd)))
                              (cdr kwd))))
@@ -7610,14 +7610,14 @@ property indicating the link is added."
           ;; Check if we need to update the "current" class
           (if (not (equal class-selector idlwave-current-tags-class))
               (idlwave-prepare-class-tag-completion class-selector))
-          (setq idlwave-completion-help-info 
+          (setq idlwave-completion-help-info
                 (list 'idlwave-complete-class-structure-tag-help
-                      (idlwave-sintern-routine 
+                      (idlwave-sintern-routine
                        (concat class-selector "__define"))
                       nil))
           (let  ((idlwave-cpl-bold idlwave-current-native-class-tags))
             (idlwave-complete-in-buffer
-             'class-tag 'class-tag 
+             'class-tag 'class-tag
              idlwave-current-class-tags nil
              (format "Select a tag of class %s" class-selector)
              "class tag"
@@ -7663,7 +7663,7 @@ property indicating the link is added."
              (skip-chars-backward "[a-zA-Z0-9_$]")
              (equal (char-before) ?!))
            (setq idlwave-completion-help-info '(idlwave-complete-sysvar-help))
-           (idlwave-complete-in-buffer 'sysvar 'sysvar 
+           (idlwave-complete-in-buffer 'sysvar 'sysvar
                                        idlwave-system-variables-alist nil
                                        "Select a system variable"
                                        "system variable")
@@ -7682,7 +7682,7 @@ property indicating the link is added."
              (or tags (error "System variable !%s is not a structure" var))
              (setq idlwave-completion-help-info
                    (list 'idlwave-complete-sysvar-tag-help var))
-             (idlwave-complete-in-buffer 'sysvartag 'sysvartag 
+             (idlwave-complete-in-buffer 'sysvartag 'sysvartag
                                          tags nil
                                          "Select a system variable tag"
                                          "system variable tag")
@@ -7711,8 +7711,8 @@ property indicating the link is added."
      ((eq mode 'test) ; we can at least link the main
       (and (stringp word) entry main))
      ((eq mode 'set)
-      (if entry 
-          (setq link 
+      (if entry
+          (setq link
                 (if (setq target (cdr (assoc word tags)))
                   (idlwave-substitute-link-target main target)
                 main)))) ;; setting dynamic!!!
@@ -7736,7 +7736,7 @@ property indicating the link is added."
 
 ;; Fake help in the source buffer for class structure tags.
 ;; KWD AND NAME ARE GLOBAL-VARIABLES HERE.
-(defvar name) 
+(defvar name)
 (defvar kwd)
 (defvar idlwave-help-do-class-struct-tag nil)
 (defun idlwave-complete-class-structure-tag-help (mode word)
@@ -7745,11 +7745,11 @@ property indicating the link is added."
     nil)
    ((eq mode 'set)
     (let (class-with found-in)
-      (when (setq class-with 
-                (idlwave-class-or-superclass-with-tag 
+      (when (setq class-with
+                (idlwave-class-or-superclass-with-tag
                  idlwave-current-tags-class
                  word))
-        (if (assq (idlwave-sintern-class class-with) 
+        (if (assq (idlwave-sintern-class class-with)
                   idlwave-system-class-info)
             (error "No help available for system class tags"))
         (if (setq found-in (idlwave-class-found-in class-with))
@@ -7762,7 +7762,7 @@ property indicating the link is added."
 (defun idlwave-class-or-superclass-with-tag (class tag)
   "Find and return the CLASS or one of its superclass with the
 associated TAG, if any."
-  (let ((sclasses (cons class (cdr (assq 'all-inherits 
+  (let ((sclasses (cons class (cdr (assq 'all-inherits
                                          (idlwave-class-info class)))))
         cl)
    (catch 'exit
@@ -7771,7 +7771,7 @@ associated TAG, if any."
        (let ((tags (idlwave-class-tags cl)))
          (while tags
            (if (eq t (compare-strings tag 0 nil (car tags) 0 nil t))
-             (throw 'exit cl))         
+             (throw 'exit cl))
            (setq tags (cdr tags))))))))
 
 
@@ -7794,8 +7794,8 @@ associated TAG, if any."
       (setcar entry (idlwave-sintern-sysvar (car entry) 'set))
       (setq tags (assq 'tags entry))
       (if tags
-          (setcdr tags 
-                  (mapcar (lambda (x) 
+          (setcdr tags
+                  (mapcar (lambda (x)
                             (cons (idlwave-sintern-sysvartag (car x) 'set)
                                   (cdr x)))
                           (cdr tags)))))))
@@ -7812,19 +7812,19 @@ associated TAG, if any."
                          text start)
       (setq start (match-end 0)
             var (match-string 1 text)
-            tags (if (match-end 3) 
+            tags (if (match-end 3)
                      (idlwave-split-string (match-string 3 text))))
       ;; Maintain old links, if present
       (setq old-entry (assq (idlwave-sintern-sysvar var) old))
       (setq link (assq 'link old-entry))
       (setq idlwave-system-variables-alist
-            (cons (list var 
-                        (cons 
-                         'tags 
-                         (mapcar (lambda (x) 
-                                   (cons x 
-                                         (cdr (assq 
-                                               (idlwave-sintern-sysvartag x) 
+            (cons (list var
+                        (cons
+                         'tags
+                         (mapcar (lambda (x)
+                                   (cons x
+                                         (cdr (assq
+                                               (idlwave-sintern-sysvartag x)
                                                (cdr (assq 'tags old-entry))))))
                                  tags)) link)
                   idlwave-system-variables-alist)))
@@ -7846,9 +7846,9 @@ associated TAG, if any."
 
 (defun idlwave-uniquify (list)
   (let ((ht (make-hash-table :size (length list) :test 'equal)))
-    (delq nil 
+    (delq nil
           (mapcar (lambda (x)
-                    (unless (gethash x ht) 
+                    (unless (gethash x ht)
                       (puthash x t ht)
                       x))
                   list))))
@@ -7876,11 +7876,11 @@ Restore the pre-completion window configuration if possible."
       nil)))
 
   ;; Restore the pre-completion window configuration if this is safe.
-  
-  (if (or (eq verify 'force)                                    ; force 
-          (and 
+
+  (if (or (eq verify 'force)                                    ; force
+          (and
            (get-buffer-window "*Completions*")                  ; visible
-           (idlwave-local-value 'idlwave-completion-p 
+           (idlwave-local-value 'idlwave-completion-p
                                 "*Completions*")                ; cib-buffer
            (eq (marker-buffer idlwave-completion-mark)
                (current-buffer))                                ; buffer OK
@@ -7978,7 +7978,7 @@ With ARG, enforce query for the class of object methods."
     (if (string-match "\\(pro\\|function\\)[ \t]+\\(\\(.*\\)::\\)?\\(.*\\)"
                       resolve)
         (setq type (match-string 1 resolve)
-              class (if (match-beginning 2) 
+              class (if (match-beginning 2)
                         (match-string 3 resolve)
                       nil)
               name (match-string 4 resolve)))
@@ -7987,15 +7987,15 @@ With ARG, enforce query for the class of object methods."
 
     (cond
      ((null class)
-      (idlwave-shell-send-command 
+      (idlwave-shell-send-command
        (format "resolve_routine,'%s'%s" (downcase name) kwd)
        'idlwave-update-routine-info
        nil t))
      (t
-      (idlwave-shell-send-command 
+      (idlwave-shell-send-command
        (format "resolve_routine,'%s__define'%s" (downcase class) kwd)
-       (list 'idlwave-shell-send-command 
-             (format "resolve_routine,'%s__%s'%s" 
+       (list 'idlwave-shell-send-command
+             (format "resolve_routine,'%s__%s'%s"
                      (downcase class) (downcase name) kwd)
              '(idlwave-update-routine-info)
              nil t))))))
@@ -8016,19 +8016,19 @@ force class query for object methods."
          (this-buffer (equal arg '(4)))
          (module (idlwave-fix-module-if-obj_new (idlwave-what-module)))
          (default (if module
-                      (concat (idlwave-make-full-name 
+                      (concat (idlwave-make-full-name
                                (nth 2 module) (car module))
                               (if (eq (nth 1 module) 'pro) "<p>" "<f>"))
                     "none"))
-         (list 
+         (list
           (idlwave-uniquify
            (delq nil
-                 (mapcar (lambda (x) 
+                 (mapcar (lambda (x)
                            (if (eq 'system (car-safe (nth 3 x)))
                                ;; Take out system routines with no source.
                                nil
                              (list
-                              (concat (idlwave-make-full-name 
+                              (concat (idlwave-make-full-name
                                        (nth 2 x) (car x))
                                       (if (eq (nth 1 x) 'pro) "<p>" "<f>")))))
                          (if this-buffer
@@ -8057,10 +8057,10 @@ force class query for object methods."
                      (t t)))
     (idlwave-do-find-module name type class nil this-buffer)))
 
-(defun idlwave-do-find-module (name type class 
+(defun idlwave-do-find-module (name type class
                                     &optional force-source this-buffer)
   (let ((name1 (idlwave-make-full-name class name))
-        source buf1 entry 
+        source buf1 entry
         (buf (current-buffer))
         (pos (point))
         file name2)
@@ -8070,11 +8070,11 @@ force class query for object methods."
           name2 (if (nth 2 entry)
                     (idlwave-make-full-name (nth 2 entry) name)
                   name1))
-    (if source  
+    (if source
         (setq file (idlwave-routine-source-file source)))
     (unless file  ; Try to find it on the path.
-      (setq file 
-            (idlwave-expand-lib-file-name 
+      (setq file
+            (idlwave-expand-lib-file-name
              (if class
                  (format "%s__define.pro" (downcase class))
                (format "%s.pro" (downcase name))))))
@@ -8082,14 +8082,14 @@ force class query for object methods."
      ((or (null name) (equal name ""))
       (error "Abort"))
      ((eq (car source) 'system)
-      (error "Source code for system routine %s is not available" 
+      (error "Source code for system routine %s is not available"
              name2))
      ((or (not file) (not (file-regular-p file)))
       (error "Source code for routine %s is not available"
              name2))
      (t
       (when (not this-buffer)
-        (setq buf1 
+        (setq buf1
               (idlwave-find-file-noselect file 'find))
         (pop-to-buffer buf1 t))
       (goto-char (point-max))
@@ -8099,7 +8099,7 @@ force class query for object methods."
                      (cond ((eq type 'fun) "function")
                            ((eq type 'pro) "pro")
                            (t "\\(pro\\|function\\)"))
-                     "\\>[ \t]+" 
+                     "\\>[ \t]+"
                      (regexp-quote (downcase name2))
                      "[^a-zA-Z0-9_$]")
              nil t)
@@ -8136,17 +8136,17 @@ Used by `idlwave-routine-info' and `idlwave-find-module'."
       (cond
        ((and (eq cw 'procedure)
              (not (equal this-word "")))
-        (setq this-word (idlwave-sintern-routine-or-method 
+        (setq this-word (idlwave-sintern-routine-or-method
                          this-word (nth 2 (nth 3 where))))
         (list this-word 'pro
-              (idlwave-determine-class 
+              (idlwave-determine-class
                (cons this-word (cdr (nth 3 where)))
                'pro)))
-       ((and (eq cw 'function) 
+       ((and (eq cw 'function)
              (not (equal this-word ""))
              (or (eq next-char ?\()     ; exclude arrays, vars.
                  (looking-at "[a-zA-Z0-9_]*[ \t]*(")))
-        (setq this-word (idlwave-sintern-routine-or-method 
+        (setq this-word (idlwave-sintern-routine-or-method
                          this-word (nth 2 (nth 3 where))))
         (list this-word 'fun
               (idlwave-determine-class
@@ -8183,7 +8183,7 @@ Used by `idlwave-routine-info' and `idlwave-find-module'."
       class)))
 
 (defun idlwave-fix-module-if-obj_new (module)
-  "Check if MODULE points to obj_new.  
+  "Check if MODULE points to obj_new.
 If yes, and if the cursor is in the keyword region, change to the
 appropriate Init method."
   (let* ((name (car module))
@@ -8204,7 +8204,7 @@ appropriate Init method."
                              (idlwave-sintern-class class)))))
     module))
 
-(defun idlwave-fix-keywords (name type class keywords 
+(defun idlwave-fix-keywords (name type class keywords
                                   &optional super-classes system)
   "Update a list of keywords.
 Translate OBJ_NEW, adding all super-class keywords, or all keywords
@@ -8225,34 +8225,34 @@ demand _EXTRA in the keyword list."
                              string)
                (setq class (idlwave-sintern-class (match-string 1 string)))
                (setq idlwave-current-obj_new-class class)
-               (setq keywords 
-                     (append keywords 
+               (setq keywords
+                     (append keywords
                              (idlwave-entry-keywords
                               (idlwave-rinfo-assq
                                (idlwave-sintern-method "INIT")
                                'fun
                                class
                                (idlwave-routines)) 'do-link))))))
-    
+
     ;; If the class is `t', combine all keywords of all methods NAME
     (when (eq class t)
       (mapc (lambda (entry)
               (and
                (nth 2 entry)             ; non-nil class
                (eq (nth 1 entry) type)   ; correct type
-               (setq keywords 
-                     (append keywords 
+               (setq keywords
+                     (append keywords
                              (idlwave-entry-keywords entry 'do-link)))))
             (idlwave-all-assq name (idlwave-routines)))
       (setq keywords (idlwave-uniquify keywords)))
-    
+
     ;; If we have inheritance, add all keywords from superclasses, if
     ;; the user indicated that method in `idlwave-keyword-class-inheritance'
-    (when (and 
+    (when (and
            super-classes
            idlwave-keyword-class-inheritance
            (stringp class)
-           (or 
+           (or
             system
             (assq (idlwave-sintern-keyword "_extra") keywords)
             (assq (idlwave-sintern-keyword "_ref_extra") keywords))
@@ -8270,7 +8270,7 @@ demand _EXTRA in the keyword list."
                  (mapcar (lambda (k) (add-to-list 'keywords k))
                          (idlwave-entry-keywords entry 'do-link))))
       (setq keywords (idlwave-uniquify keywords)))
-    
+
     ;; Return the final list
     keywords))
 
@@ -8295,14 +8295,14 @@ If we do not know about MODULE, just return KEYWORD literally."
                     (assq (idlwave-sintern-keyword "_REF_EXTRA") kwd-alist)))
          (completion-ignore-case t)
          candidates)
-    (cond ((assq kwd kwd-alist) 
+    (cond ((assq kwd kwd-alist)
            kwd)
           ((setq candidates (all-completions kwd kwd-alist))
            (if (= (length candidates) 1)
                (car candidates)
              candidates))
           ((and entry extra)
-           ;; Inheritance may cause this keyword to be correct 
+           ;; Inheritance may cause this keyword to be correct
            keyword)
           (entry
            ;; We do know the function, which does not have the keyword.
@@ -8314,13 +8314,13 @@ If we do not know about MODULE, just return KEYWORD literally."
 
 (defvar idlwave-rinfo-mouse-map (make-sparse-keymap))
 (defvar idlwave-rinfo-map (make-sparse-keymap))
-(define-key idlwave-rinfo-mouse-map 
+(define-key idlwave-rinfo-mouse-map
   (if (featurep 'xemacs) [button2] [mouse-2])
   'idlwave-mouse-active-rinfo)
-(define-key idlwave-rinfo-mouse-map 
+(define-key idlwave-rinfo-mouse-map
   (if (featurep 'xemacs) [(shift button2)] [(shift mouse-2)])
   'idlwave-mouse-active-rinfo-shift)
-(define-key idlwave-rinfo-mouse-map 
+(define-key idlwave-rinfo-mouse-map
   (if (featurep 'xemacs) [button3] [mouse-3])
   'idlwave-mouse-active-rinfo-right)
 (define-key idlwave-rinfo-mouse-map " " 'idlwave-active-rinfo-space)
@@ -8346,7 +8346,7 @@ If we do not know about MODULE, just return KEYWORD literally."
   (let* ((initial-class (or initial-class class))
          (entry (or (idlwave-best-rinfo-assq name type class
                                              (idlwave-routines))
-                    (idlwave-rinfo-assq name type class 
+                    (idlwave-rinfo-assq name type class
                                         idlwave-unresolved-routines)))
          (name (or (car entry) name))
          (class (or (nth 2 entry) class))
@@ -8371,7 +8371,7 @@ If we do not know about MODULE, just return KEYWORD literally."
          (km-prop (if (featurep 'xemacs) 'keymap 'local-map))
          (face 'idlwave-help-link)
          beg props win cnt total)
-    ;; Fix keywords, but don't add chained super-classes, since these 
+    ;; Fix keywords, but don't add chained super-classes, since these
     ;; are shown separately for that super-class
     (setq keywords (idlwave-fix-keywords name type class keywords))
     (cond
@@ -8413,7 +8413,7 @@ If we do not know about MODULE, just return KEYWORD literally."
                           km-prop idlwave-rinfo-mouse-map
                           'help-echo help-echo-use
                           'data (cons 'usage data)))
-        (if html-file (setq props (append (list 'face face 'link html-file) 
+        (if html-file (setq props (append (list 'face face 'link html-file)
                                           props)))
         (insert "Usage:    ")
         (setq beg (point))
@@ -8422,14 +8422,14 @@ If we do not know about MODULE, just return KEYWORD literally."
                   (format calling-seq name name name name))
                 "\n")
         (add-text-properties beg (point) props)
-        
+
         (insert "Keywords:")
         (if (null keywords)
             (insert " No keywords accepted.")
           (setq col 9)
           (mapcar
            (lambda (x)
-             (if (>= (+ col 1 (length (car x))) 
+             (if (>= (+ col 1 (length (car x)))
                      (window-width))
                  (progn
                    (insert "\n         ")
@@ -8447,7 +8447,7 @@ If we do not know about MODULE, just return KEYWORD literally."
              (add-text-properties beg (point) props)
              (setq col (+ col 1 (length (car x)))))
            keywords))
-        
+
         (setq cnt 1 total (length all))
         ;; Here entry is (key file (list of type-conses))
         (while (setq entry (pop all))
@@ -8460,7 +8460,7 @@ If we do not know about MODULE, just return KEYWORD literally."
                                           (cdr (car (nth 2 entry))))
                             'data (cons 'source data)))
           (idlwave-insert-source-location
-           (format "\n%-8s  %s" 
+           (format "\n%-8s  %s"
                    (if (equal cnt 1)
                        (if (> total 1) "Sources:" "Source:")
                      "")
@@ -8469,7 +8469,7 @@ If we do not know about MODULE, just return KEYWORD literally."
           (incf cnt)
           (when (and all (> cnt idlwave-rinfo-max-source-lines))
             ;; No more source lines, please
-            (insert (format 
+            (insert (format
                      "\n          Source information truncated to %d entries."
                      idlwave-rinfo-max-source-lines))
             (setq all nil)))
@@ -8483,7 +8483,7 @@ If we do not know about MODULE, just return KEYWORD literally."
               (unwind-protect
                   (progn
                     (select-window win)
-                    (enlarge-window (- (/ (frame-height) 2) 
+                    (enlarge-window (- (/ (frame-height) 2)
                                        (window-height)))
                     (shrink-window-if-larger-than-buffer))
                 (select-window ww)))))))))
@@ -8520,9 +8520,9 @@ it."
      ((and (not file) shell-flag)
       (insert "Unresolved"))
 
-     ((null file)               
+     ((null file)
       (insert "ERROR"))
-     
+
      ((idlwave-syslib-p file)
       (if (string-match "obsolete" (file-name-directory file))
           (insert "Obsolete  ")
@@ -8536,7 +8536,7 @@ it."
      ;; Old special syntax: a matching regexp
      ((setq special (idlwave-special-lib-test file))
       (insert (format "%-10s" special)))
-     
+
      ;; Catch-all with file
      ((idlwave-lib-p file)      (insert "Library   "))
 
@@ -8551,7 +8551,7 @@ it."
                (if shell-flag "S" "-")
                (if buffer-flag "B" "-")
                "] ")))
-    (when (> ndupl 1) 
+    (when (> ndupl 1)
       (setq beg (point))
       (insert (format "(%dx) " ndupl))
       (add-text-properties beg (point) (list 'face 'bold)))
@@ -8575,7 +8575,7 @@ Return the name of the special lib if there is a match."
                   alist nil)))
       rtn)
      (t nil))))
-  
+
 (defun idlwave-mouse-active-rinfo-right (ev)
   (interactive "e")
   (idlwave-mouse-active-rinfo ev 'right))
@@ -8594,7 +8594,7 @@ Optional args RIGHT and SHIFT indicate, if mouse-3 was used, and if SHIFT
 was pressed."
   (interactive "e")
   (if ev (mouse-set-point ev))
-  (let (data id name type class buf bufwin source link keyword 
+  (let (data id name type class buf bufwin source link keyword
              word initial-class)
     (setq data (get-text-property (point) 'data)
           source (get-text-property (point) 'source)
@@ -8609,9 +8609,9 @@ was pressed."
 
     (cond ((eq id 'class) ; Switch class being displayed
            (if (window-live-p bufwin) (select-window bufwin))
-           (idlwave-display-calling-sequence 
+           (idlwave-display-calling-sequence
             (idlwave-sintern-method name)
-            type (idlwave-sintern-class word) 
+            type (idlwave-sintern-class word)
             initial-class))
           ((eq id 'usage) ; Online help on this routine
            (idlwave-online-help link name type class))
@@ -8652,9 +8652,9 @@ was pressed."
       (setq bwin (get-buffer-window buffer)))
     (if (eq (preceding-char) ?/)
         (insert keyword)
-      (unless (save-excursion 
+      (unless (save-excursion
                 (re-search-backward
-                 "[(,][ \t]*\\(\\$[ \t]*\\(;.*\\)?\n\\)?[ \t]*\\=" 
+                 "[(,][ \t]*\\(\\$[ \t]*\\(;.*\\)?\n\\)?[ \t]*\\="
                  (min (- (point) 100) (point-min)) t))
         (insert ", "))
       (if shift (insert "/"))
@@ -8706,7 +8706,7 @@ the load path in order to find a definition.  The output of this
 command can be used to detect possible name clashes during this process."
   (idlwave-routines)  ; Make sure everything is loaded.
   (unless (or idlwave-user-catalog-routines idlwave-library-catalog-routines)
-    (or (y-or-n-p 
+    (or (y-or-n-p
          "You don't have any user or library catalogs.  Continue anyway? ")
         (error "Abort")))
   (let* ((routines (append idlwave-system-routines
@@ -8719,7 +8719,7 @@ command can be used to detect possible name clashes during this process."
          (keymap (make-sparse-keymap))
          (props (list 'mouse-face 'highlight
                       km-prop keymap
-                      'help-echo "Mouse2: Find source"))      
+                      'help-echo "Mouse2: Find source"))
          (nroutines (length (or special-routines routines)))
          (step (/ nroutines 100))
          (n 0)
@@ -8742,13 +8742,13 @@ command can be used to detect possible name clashes during this process."
     (message "Sorting routines...done")
 
     (define-key keymap (if (featurep 'xemacs) [(button2)] [(mouse-2)])
-      (lambda (ev) 
+      (lambda (ev)
         (interactive "e")
         (mouse-set-point ev)
         (apply 'idlwave-do-find-module
                (get-text-property (point) 'find-args))))
     (define-key keymap [(return)]
-      (lambda () 
+      (lambda ()
         (interactive)
         (apply 'idlwave-do-find-module
                (get-text-property (point) 'find-args))))
@@ -8774,13 +8774,13 @@ command can be used to detect possible name clashes during this process."
                   (> (idlwave-count-memq 'buffer (nth 2 (car dtwins))) 1))
           (incf cnt)
           (insert (format "\n%s%s"
-                          (idlwave-make-full-name (nth 2 routine) 
+                          (idlwave-make-full-name (nth 2 routine)
                                                   (car routine))
                           (if (eq (nth 1 routine) 'fun) "()" "")))
           (while (setq twin (pop dtwins))
             (setq props1 (append (list 'find-args
-                                       (list (nth 0 routine) 
-                                             (nth 1 routine) 
+                                       (list (nth 0 routine)
+                                             (nth 1 routine)
                                              (nth 2 routine)))
                                  props))
             (idlwave-insert-source-location "\n   - " twin props1))))
@@ -8803,7 +8803,7 @@ command can be used to detect possible name clashes during this process."
              (or (not (stringp sfile))
                  (not (string-match "\\S-" sfile))))
         (setq stype 'unresolved))
-    (princ (format "      %-10s %s\n" 
+    (princ (format "      %-10s %s\n"
                    stype
                    (if sfile sfile "No source code available")))))
 
@@ -8822,20 +8822,20 @@ ENTRY will also be returned, as the first item of this list."
                (eq type (nth 1 candidate))
                (eq class (nth 2 candidate)))
           (push candidate twins)))
-    (if (setq candidate (idlwave-rinfo-assq name type class 
+    (if (setq candidate (idlwave-rinfo-assq name type class
                                             idlwave-unresolved-routines))
         (push candidate twins))
     (cons entry (nreverse twins))))
 
 (defun idlwave-study-twins (entries)
-  "Return dangerous twins of first entry in ENTRIES.  
+  "Return dangerous twins of first entry in ENTRIES.
 Dangerous twins are routines with same name, but in different files on
 the load path.  If a file is in the system library and has an entry in
 the `idlwave-system-routines' list, we omit the latter as
 non-dangerous because many IDL routines are implemented as library
 routines, and may have been scanned."
   (let* ((entry (car entries))
-         (name (car entry))      ; 
+         (name (car entry))      ;
          (type (nth 1 entry))    ; Must be bound for
          (class (nth 2 entry))   ;  idlwave-routine-twin-compare
          (cnt 0)
@@ -8853,23 +8853,23 @@ routines, and may have been scanned."
                       (t 'unresolved)))
 
       ;; Check for an entry in the system library
-      (if (and file 
+      (if (and file
                (not syslibp)
                (idlwave-syslib-p file))
           (setq syslibp t))
-      
+
       ;; If there's more than one matching entry for the same file, just
       ;; append the type-cons to the type list.
       (if (setq entry (assoc key alist))
           (push type-cons (nth 2 entry))
         (push (list key file (list type-cons)) alist)))
-    
+
     (setq alist (nreverse alist))
-    
+
     (when syslibp
       ;; File is in system *library* - remove any 'system entry
       (setq alist (delq (assq 'system alist) alist)))
-    
+
     ;; If 'system remains and we've scanned the syslib, it's a builtin
     ;; (rather than a !DIR/lib/.pro file bundled as source).
     (when (and (idlwave-syslib-scanned-p)
@@ -8905,7 +8905,7 @@ compares twins on the basis of their file names and path locations."
      ((not (eq type (nth 1 b)))
       ;; Type decides
       (< (if (eq type 'fun) 1 0) (if (eq (nth 1 b) 'fun) 1 0)))
-     (t 
+     (t
       ;; A and B are twins - so the decision is more complicated.
       ;; Call twin-compare with the proper arguments.
       (idlwave-routine-entry-compare-twins a b)))))
@@ -8957,7 +8957,7 @@ This expects NAME TYPE CLASS to be bound to the right values."
          (tpath-alist (idlwave-true-path-alist))
          (apathp (and (stringp akey)
                       (assoc (file-name-directory akey) tpath-alist)))
-         (bpathp (and (stringp bkey) 
+         (bpathp (and (stringp bkey)
                       (assoc (file-name-directory bkey) tpath-alist)))
          ;; How early on search path?  High number means early since we
          ;; measure the tail of the path list
@@ -8993,7 +8993,7 @@ This expects NAME TYPE CLASS to be bound to the right values."
      (t                                nil))))  ; Default
 
 (defun idlwave-routine-source-file (source)
-  (if (nth 2 source) 
+  (if (nth 2 source)
       (expand-file-name (nth 1 source) (nth 2 source))
     (nth 1 source)))
 
@@ -9083,7 +9083,7 @@ Assumes that point is at the beginning of the unit as found by
   (forward-sexp 2)
   (forward-sexp -1)
   (let ((begin (point)))
-    (re-search-forward 
+    (re-search-forward
      "[a-zA-Z_][a-zA-Z0-9$_]+\\(::[a-zA-Z_][a-zA-Z0-9$_]+\\)?")
     (if (fboundp 'buffer-substring-no-properties)
         (buffer-substring-no-properties begin (point))
@@ -9123,7 +9123,7 @@ Assumes that point is at the beginning of the unit as found by
   (start-process "idldeclient" nil
                  idlwave-shell-explicit-file-name "-c" "-e"
                  (buffer-file-name)))
-  
+
 (defvar idlwave-help-use-assistant)
 (defun idlwave-launch-idlhelp ()
   "Start the IDLhelp application."
@@ -9131,7 +9131,7 @@ Assumes that point is at the beginning of the unit as found by
   (if idlwave-help-use-assistant
       (idlwave-help-assistant-raise)
     (start-process "idlhelp" nil idlwave-help-application)))
- 
+
 ;; Menus - using easymenu.el
 (defvar idlwave-mode-menu-def
   `("IDLWAVE"
@@ -9150,7 +9150,7 @@ Assumes that point is at the beginning of the unit as found by
      ["Block" idlwave-mark-block t]
      ["Header" idlwave-mark-doclib t])
     ("Format"
-     ["Indent Entire Statement" idlwave-indent-statement 
+     ["Indent Entire Statement" idlwave-indent-statement
       :active t :keys "C-u \\[indent-for-tab-command]" ]
      ["Indent Subprogram" idlwave-indent-subprogram t]
      ["(Un)Comment Region" idlwave-toggle-comment-region t]
@@ -9220,7 +9220,7 @@ Assumes that point is at the beginning of the unit as found by
     ("Customize"
      ["Browse IDLWAVE Group" idlwave-customize t]
      "--"
-     ["Build Full Customize Menu" idlwave-create-customize-menu 
+     ["Build Full Customize Menu" idlwave-create-customize-menu
       (fboundp 'customize-menu-create)])
     ("Documentation"
      ["Describe Mode" describe-mode t]
@@ -9237,22 +9237,22 @@ Assumes that point is at the beginning of the unit as found by
   '("Debug"
     ["Start IDL shell" idlwave-shell t]
     ["Save and .RUN buffer" idlwave-shell-save-and-run
-     (and (boundp 'idlwave-shell-automatic-start) 
+     (and (boundp 'idlwave-shell-automatic-start)
           idlwave-shell-automatic-start)]))
 
 (if (or (featurep 'easymenu) (load "easymenu" t))
     (progn
-      (easy-menu-define idlwave-mode-menu idlwave-mode-map 
-                        "IDL and WAVE CL editing menu" 
+      (easy-menu-define idlwave-mode-menu idlwave-mode-map
+                        "IDL and WAVE CL editing menu"
                         idlwave-mode-menu-def)
-      (easy-menu-define idlwave-mode-debug-menu idlwave-mode-map 
-                        "IDL and WAVE CL editing menu" 
+      (easy-menu-define idlwave-mode-debug-menu idlwave-mode-map
+                        "IDL and WAVE CL editing menu"
                         idlwave-mode-debug-menu-def)))
 
 (defun idlwave-customize ()
   "Call the customize function with idlwave as argument."
   (interactive)
-  ;; Try to load the code for the shell, so that we can customize it 
+  ;; Try to load the code for the shell, so that we can customize it
   ;; as well.
   (or (featurep 'idlw-shell)
       (load "idlw-shell" t))
@@ -9263,11 +9263,11 @@ Assumes that point is at the beginning of the unit as found by
   (interactive)
   (if (fboundp 'customize-menu-create)
       (progn
-        ;; Try to load the code for the shell, so that we can customize it 
+        ;; Try to load the code for the shell, so that we can customize it
         ;; as well.
         (or (featurep 'idlw-shell)
             (load "idlw-shell" t))
-        (easy-menu-change 
+        (easy-menu-change
          '("IDLWAVE") "Customize"
          `(["Browse IDLWAVE group" idlwave-customize t]
            "--"
@@ -9315,7 +9315,7 @@ This function was written since `list-abbrevs' looks terrible for IDLWAVE mode."
   (let ((table (symbol-value 'idlwave-mode-abbrev-table))
         abbrevs
         str rpl func fmt (len-str 0) (len-rpl 0))
-    (mapatoms 
+    (mapatoms
      (lambda (sym)
        (if (symbol-value sym)
            (progn
@@ -9341,7 +9341,7 @@ This function was written since `list-abbrevs' looks terrible for IDLWAVE mode."
     (with-output-to-temp-buffer "*Help*"
       (if arg
           (progn
-            (princ "Abbreviations and Actions in IDLWAVE-Mode\n") 
+            (princ "Abbreviations and Actions in IDLWAVE-Mode\n")
             (princ "=========================================\n\n")
             (princ (format fmt "KEY" "REPLACE" "HOOK"))
             (princ (format fmt "---" "-------" "----")))
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 109455e9e61..c7341a9f871 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -836,8 +836,8 @@ Makefile mode can be configured by modifying the following variables:
           nil nil
           ((?$ . "."))
           backward-paragraph
-          (font-lock-syntactic-keywords . makefile-font-lock-syntactic-keywords)
-          (font-lock-support-mode)))    ; JIT breaks on long series of continuation lines.
+          (font-lock-syntactic-keywords
+           . makefile-font-lock-syntactic-keywords)))
 
   ;; Add-log.
   (make-local-variable 'add-log-current-defun-function)
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 14b47475eb1..c29a259c3a6 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -41,27 +41,27 @@
 
 
 (defcustom prolog-program-name
-  (let ((names '("prolog" "gprolog")))
+  (let ((names '("prolog" "gprolog" "swipl")))
     (while (and names
                 (not (executable-find (car names))))
       (setq names (cdr names)))
     (or (car names) "prolog"))
-  "*Program name for invoking an inferior Prolog with `run-prolog'."
+  "Program name for invoking an inferior Prolog with `run-prolog'."
   :type 'string
   :group 'prolog)
 
 (defcustom prolog-consult-string "reconsult(user).\n"
-  "*(Re)Consult mode (for C-Prolog and Quintus Prolog). "
+  "(Re)Consult mode (for C-Prolog and Quintus Prolog). "
   :type 'string
   :group 'prolog)
 
 (defcustom prolog-compile-string "compile(user).\n"
-  "*Compile mode (for Quintus Prolog)."
+  "Compile mode (for Quintus Prolog)."
   :type 'string
   :group 'prolog)
 
 (defcustom prolog-eof-string "end_of_file.\n"
-  "*String that represents end of file for Prolog.
+  "String that represents end of file for Prolog.
 When nil, send actual operating system end of file."
   :type 'string
   :group 'prolog)
@@ -121,7 +121,21 @@ When nil, send actual operating system end of file."
 (defvar prolog-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map "\e\C-x" 'prolog-consult-region)
+    (define-key map "\C-c\C-l" 'inferior-prolog-load-file)
+    (define-key map "\C-c\C-z" 'switch-to-prolog)
     map))
+ 
+(easy-menu-define prolog-mode-menu prolog-mode-map "Menu for Prolog mode."
+  ;; Mostly copied from scheme-mode's menu.
+  ;; Not tremendously useful, but it's a start.
+  '("Prolog"
+    ["Indent line" indent-according-to-mode t]
+    ["Indent region" indent-region t]
+    ["Comment region" comment-region t]
+    ["Uncomment region" uncomment-region t]
+    "--"
+    ["Run interactive Prolog session" run-prolog t]
+    ))
 
 ;;;###autoload
 (defun prolog-mode ()
@@ -138,29 +152,24 @@ if that value is non-nil."
   (setq major-mode 'prolog-mode)
   (setq mode-name "Prolog")
   (prolog-mode-variables)
+  (set (make-local-variable 'comment-add) 1)
   ;; font lock
   (setq font-lock-defaults '(prolog-font-lock-keywords
                              nil nil nil
                              beginning-of-line))
   (run-mode-hooks 'prolog-mode-hook))
 
-(defun prolog-indent-line (&optional whole-exp)
+(defun prolog-indent-line ()
   "Indent current line as Prolog code.
 With argument, indent any additional lines of the same clause
 rigidly along with this one (not yet)."
   (interactive "p")
   (let ((indent (prolog-indent-level))
-        (pos (- (point-max) (point))) beg)
+        (pos (- (point-max) (point))))
     (beginning-of-line)
-    (setq beg (point))
-    (skip-chars-forward " \t")
-    (if (zerop (- indent (current-column)))
-        nil
-      (delete-region beg (point))
-      (indent-to indent))
+    (indent-line-to indent)
     (if (> (- (point-max) pos) (point))
-        (goto-char (- (point-max) pos)))
-    ))
+        (goto-char (- (point-max) pos)))))
 
 (defun prolog-indent-level ()
   "Compute Prolog indentation level."
@@ -224,6 +233,8 @@ rigidly along with this one (not yet)."
   (let ((map (make-sparse-keymap)))
     ;; This map will inherit from `comint-mode-map' when entering
     ;; inferior-prolog-mode.
+    (define-key map [remap self-insert-command]
+      'inferior-prolog-self-insert-command)
     map))
 
 (defvar inferior-prolog-mode-syntax-table prolog-mode-syntax-table)
@@ -256,36 +267,129 @@ Return not at end copies rest of line to end and sends it.
   (setq comint-prompt-regexp "^| [ ?][- ] *")
   (prolog-mode-variables))
 
+(defvar inferior-prolog-buffer nil)
+
+(defun inferior-prolog-run (&optional name)
+  (with-current-buffer (make-comint "prolog" (or name prolog-program-name))
+    (inferior-prolog-mode)
+    (setq-default inferior-prolog-buffer (current-buffer))
+    (make-local-variable 'inferior-prolog-buffer)
+    (when (and name (not (equal name prolog-program-name)))
+      (set (make-local-variable 'prolog-program-name) name))
+    (set (make-local-variable 'inferior-prolog-flavor)
+         ;; Force re-detection.
+         (let* ((proc (get-buffer-process (current-buffer)))
+                (pmark (and proc (marker-position (process-mark proc)))))
+           (cond
+            ((null pmark) (1- (point-min)))
+            ;; The use of insert-before-markers in comint.el together with
+            ;; the potential use of comint-truncate-buffer in the output
+            ;; filter, means that it's difficult to reliably keep track of
+            ;; the buffer position where the process's output started.
+            ;; If possible we use a marker at "start - 1", so that
+            ;; insert-before-marker at `start' won't shift it.  And if not,
+            ;; we fall back on using a plain integer.
+            ((> pmark (point-min)) (copy-marker (1- pmark)))
+            (t (1- pmark)))))
+    (add-hook 'comint-output-filter-functions
+              'inferior-prolog-guess-flavor nil t)))
+
+(defun inferior-prolog-process (&optional dontstart)
+  (or (and (buffer-live-p inferior-prolog-buffer)
+           (get-buffer-process inferior-prolog-buffer))
+      (unless dontstart
+        (inferior-prolog-run)
+        ;; Try again.
+        (inferior-prolog-process))))
+
+(defvar inferior-prolog-flavor 'unknown
+  "Either a symbol or a buffer position offset by one.
+If a buffer position, the flavor has not been determined yet and
+it is expected that the process's output has been or will
+be inserted at that position plus one.")
+
+(defun inferior-prolog-guess-flavor (&optional ignored)
+  (save-excursion
+    (goto-char (1+ inferior-prolog-flavor))
+    (setq inferior-prolog-flavor
+          (cond
+           ((looking-at "GNU Prolog") 'gnu)
+           ((looking-at "Welcome to SWI-Prolog") 'swi)
+           ((looking-at ".*\n") 'unknown) ;There's at least one line.
+           (t inferior-prolog-flavor))))
+  (when (symbolp inferior-prolog-flavor)
+    (remove-hook 'comint-output-filter-functions
+                 'inferior-prolog-guess-flavor t)
+    (if (eq inferior-prolog-flavor 'gnu)
+        (set (make-local-variable 'comint-process-echoes) t))))
+
 ;;;###autoload
-(defun run-prolog ()
-  "Run an inferior Prolog process, input and output via buffer *prolog*."
+(defalias 'run-prolog 'switch-to-prolog)
+;;;###autoload
+(defun switch-to-prolog (&optional name)
+  "Run an inferior Prolog process, input and output via buffer *prolog*.
+With prefix argument \\[universal-prefix], prompt for the program to use."
+  (interactive
+   (list (when current-prefix-arg
+           (let ((proc (inferior-prolog-process 'dontstart)))
+             (if proc
+                 (if (yes-or-no-p "Kill current process before starting new one? ")
+                     (kill-process proc)
+                   (error "Abort")))
+             (read-string "Run Prolog: " prolog-program-name)))))
+  (unless (inferior-prolog-process 'dontstart)
+    (inferior-prolog-run name))
+  (pop-to-buffer inferior-prolog-buffer))
+
+(defun inferior-prolog-self-insert-command ()
+  "Insert the char in the buffer or pass it directly to the process."
   (interactive)
-  (require 'comint)
-  (pop-to-buffer (make-comint "prolog" prolog-program-name))
-  (inferior-prolog-mode))
+  (let* ((proc (get-buffer-process (current-buffer)))
+         (pmark (and proc (marker-position (process-mark proc)))))
+    (if (and (eq inferior-prolog-flavor 'gnu)
+             pmark
+             (null current-prefix-arg)
+             (eobp)
+             (eq (point) pmark)
+             (save-excursion
+               (goto-char (- pmark 3))
+               (looking-at " \\? ")))
+        (comint-send-string proc (string last-command-char))
+      (call-interactively 'self-insert-command))))
 
 (defun prolog-consult-region (compile beg end)
   "Send the region to the Prolog process made by \"M-x run-prolog\".
 If COMPILE (prefix arg) is not nil, use compile mode rather than consult mode."
   (interactive "P\nr")
-  (save-excursion
-    (if compile
-        (process-send-string "prolog" prolog-compile-string)
-      (process-send-string "prolog" prolog-consult-string))
-    (process-send-region "prolog" beg end)
-    (process-send-string "prolog" "\n")         ;May be unnecessary
+  (let ((proc (inferior-prolog-process)))
+    (comint-send-string proc
+                        (if compile prolog-compile-string
+                          prolog-consult-string))
+    (comint-send-region proc beg end)
+    (comint-send-string proc "\n")              ;May be unnecessary
     (if prolog-eof-string
-        (process-send-string "prolog" prolog-eof-string)
-      (process-send-eof "prolog")))) ;Send eof to prolog process.
+        (comint-send-string proc prolog-eof-string)
+      (with-current-buffer (process-buffer proc)
+        (comint-send-eof))))) ;Send eof to prolog process.
 
 (defun prolog-consult-region-and-go (compile beg end)
   "Send the region to the inferior Prolog, and switch to *prolog* buffer.
 If COMPILE (prefix arg) is not nil, use compile mode rather than consult mode."
   (interactive "P\nr")
   (prolog-consult-region compile beg end)
-  (switch-to-buffer "*prolog*"))
+  (pop-to-buffer inferior-prolog-buffer))
+
+(defun inferior-prolog-load-file ()
+  "Pass the current buffer's file to the inferior prolog process."
+  (interactive)
+  (save-buffer)
+  (let ((file buffer-file-name)
+        (proc (inferior-prolog-process)))
+    (with-current-buffer (process-buffer proc)
+      (comint-send-string proc (concat "['" (file-relative-name file) "'].\n"))
+      (pop-to-buffer (current-buffer)))))
 
 (provide 'prolog)
 
-;;; arch-tag: f3ec6748-1272-4ab6-8826-c50cb1607636
+;; arch-tag: f3ec6748-1272-4ab6-8826-c50cb1607636
 ;;; prolog.el ends here
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index c38a6e82f83..0387c05134e 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -67,7 +67,8 @@
 (eval-when-compile
   (require 'cl)
   (require 'compile)
-  (require 'comint))
+  (require 'comint)
+  (require 'hippie-exp))
 
 (autoload 'comint-mode "comint")
 
@@ -95,7 +96,9 @@
              "import" "in" "is" "lambda" "not" "or" "pass" "print"
              "raise" "return" "try" "while" "yield"
              ;; Future keywords
-             "as" "None")
+             "as" "None"
+             ;; Not real keywords, but close enough to be fontified as such
+             "self" "True" "False")
          symbol-end)
     ;; Definitions
     (,(rx symbol-start (group "class") (1+ space) (group (1+ (or word ?_))))
@@ -1286,7 +1289,7 @@ Don't save anything for STR matching `inferior-python-filter-regexp'."
                     ;; Maybe we could be more selective here.
                     (if (zerop (length res))
                         (not (bolp))
-                      (string-match res ".\\'"))))
+                      (string-match ".\\'" res))))
            ;; The need for this seems to be system-dependent:
            ;; What is this all about, exactly?  --Stef
            ;; (if (and (eq ?. (aref s 0)))
@@ -1330,30 +1333,30 @@ buffer for a list of commands.)"
   ;; (not a name) in Python buffers from which `run-python' &c is
   ;; invoked.  Would support multiple processes better.
   (when (or new (not (comint-check-proc python-buffer)))
-    (save-current-buffer
-      (let* ((cmdlist (append (python-args-to-list cmd) '("-i")))
-             (path (getenv "PYTHONPATH"))
-             (process-environment       ; to import emacs.py
-              (cons (concat "PYTHONPATH=" data-directory
-                            (if path (concat ":" path)))
-                    process-environment)))
-        (set-buffer (apply 'make-comint-in-buffer "Python"
-                           (generate-new-buffer "*Python*")
-                           (car cmdlist) nil (cdr cmdlist)))
-        (setq-default python-buffer (current-buffer))
-        (setq python-buffer (current-buffer)))
+    (with-current-buffer
+        (let* ((cmdlist (append (python-args-to-list cmd) '("-i")))
+               (path (getenv "PYTHONPATH"))
+               (process-environment     ; to import emacs.py
+                (cons (concat "PYTHONPATH=" data-directory
+                              (if path (concat ":" path)))
+                      process-environment)))
+          (apply 'make-comint-in-buffer "Python"
+                 (if new (generate-new-buffer "*Python*") "*Python*")
+                 (car cmdlist) nil (cdr cmdlist)))
+      (setq-default python-buffer (current-buffer))
+      (setq python-buffer (current-buffer))
       (accept-process-output (get-buffer-process python-buffer) 5)
-      (inferior-python-mode)))
+      (inferior-python-mode)
+      ;; Load function definitions we need.
+      ;; Before the preoutput function was used, this was done via -c in
+      ;; cmdlist, but that loses the banner and doesn't run the startup
+      ;; file.  The code might be inline here, but there's enough that it
+      ;; seems worth putting in a separate file, and it's probably cleaner
+      ;; to put it in a module.
+      ;; Ensure we're at a prompt before doing anything else.
+      (python-send-receive "import emacs; print '_emacs_out ()'")))
   (if (derived-mode-p 'python-mode)
       (setq python-buffer (default-value 'python-buffer))) ; buffer-local
-  ;; Load function definitions we need.
-  ;; Before the preoutput function was used, this was done via -c in
-  ;; cmdlist, but that loses the banner and doesn't run the startup
-  ;; file.  The code might be inline here, but there's enough that it
-  ;; seems worth putting in a separate file, and it's probably cleaner
-  ;; to put it in a module.
-  ;; Ensure we're at a prompt before doing anything else.
-  (python-send-receive "import emacs; print '_emacs_out ()'")
   ;; Without this, help output goes into the inferior python buffer if
   ;; the process isn't already running.
   (sit-for 1 t)        ;Should we use accept-process-output instead?  --Stef
@@ -1369,15 +1372,20 @@ buffer for a list of commands.)"
 (defun python-send-command (command)
   "Like `python-send-string' but resets `compilation-shell-minor-mode'.
 COMMAND should be a single statement."
-  (assert (not (string-match "\n" command)))
-  (let ((end (marker-position (process-mark (python-proc)))))
+  ;; (assert (not (string-match "\n" command)))
+  ;; (let ((end (marker-position (process-mark (python-proc)))))
     (with-current-buffer python-buffer (goto-char (point-max)))
     (compilation-forget-errors)
-    ;; Must wait until this has completed before re-setting variables below.
-    (python-send-receive (concat command "; print '_emacs_out ()'"))
+    (python-send-string command)
     (with-current-buffer python-buffer
-      (set-marker compilation-parsing-end end)
-      (setq compilation-last-buffer (current-buffer)))))
+      (setq compilation-last-buffer (current-buffer)))
+    ;; No idea what this is for but it breaks the call to
+    ;; compilation-fake-loc in python-send-region.  -- Stef
+    ;; Must wait until this has completed before re-setting variables below.
+    ;; (python-send-receive "print '_emacs_out ()'")
+    ;; (with-current-buffer python-buffer
+    ;;   (set-marker compilation-parsing-end end))
+    ) ;;)
 
 (defun python-send-region (start end)
   "Send the region to the inferior Python process."
@@ -1419,11 +1427,13 @@ COMMAND should be a single statement."
   "Evaluate STRING in inferior Python process."
   (interactive "sPython command: ")
   (comint-send-string (python-proc) string)
-  (comint-send-string (python-proc)
-                      ;; If the string is single-line or if it ends with \n,
-                      ;; only add a single \n, otherwise add 2, so as to
-                      ;; make sure we terminate the multiline instruction.
-                      (if (string-match "\n.+\\'" string) "\n\n" "\n")))
+  (unless (string-match "\n\\'" string)
+    ;; Make sure the text is properly LF-terminated.
+    (comint-send-string (python-proc) "\n"))
+  (when (string-match "\n[ \t].*\n?\\'" string)
+    ;; If the string contains a final indented line, add a second newline so
+    ;; as to make sure we terminate the multiline instruction.
+    (comint-send-string (python-proc) "\n")))
 
 (defun python-send-buffer ()
   "Send the current buffer to the inferior Python process."
@@ -1594,24 +1604,26 @@ Only works when point is in a function name, not its arg list, for
 instance.  Assumes an inferior Python is running."
   (let ((symbol (with-syntax-table python-dotty-syntax-table
                   (current-word))))
-    ;; First try the symbol we're on.
-    (or (and symbol
-             (python-send-receive (format "emacs.eargs(%S, %s)"
-                                          symbol python-imports)))
-        ;; Try moving to symbol before enclosing parens.
-        (let ((s (syntax-ppss)))
-          (unless (zerop (car s))
-            (when (eq ?\( (char-after (nth 1 s)))
-              (save-excursion
-                (goto-char (nth 1 s))
-                (skip-syntax-backward "-")
-                (let ((point (point)))
-                  (skip-chars-backward "a-zA-Z._")
-                  (if (< (point) point)
-                      (python-send-receive
-                       (format "emacs.eargs(%S, %s)"
-                               (buffer-substring-no-properties (point) point)
-                               python-imports)))))))))))
+    ;; This is run from timers, so inhibit-quit tends to be set.
+    (with-local-quit
+      ;; First try the symbol we're on.
+      (or (and symbol
+               (python-send-receive (format "emacs.eargs(%S, %s)"
+                                            symbol python-imports)))
+          ;; Try moving to symbol before enclosing parens.
+          (let ((s (syntax-ppss)))
+            (unless (zerop (car s))
+              (when (eq ?\( (char-after (nth 1 s)))
+                (save-excursion
+                  (goto-char (nth 1 s))
+                  (skip-syntax-backward "-")
+                  (let ((point (point)))
+                    (skip-chars-backward "a-zA-Z._")
+                    (if (< (point) point)
+                        (python-send-receive
+                         (format "emacs.eargs(%S, %s)"
+                                 (buffer-substring-no-properties (point) point)
+                                 python-imports))))))))))))
 
 ;;;; Info-look functionality.
 
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index f828c36917b..83b4bdea759 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -2460,46 +2460,45 @@ we go to the end of the previous line and do not check for continuations."
   ;;
   (if (bolp)
       nil
-    (let (c min-point
-          (start (point)))
-      (save-restriction
-        (narrow-to-region
-        (if (sh-this-is-a-continuation)
-            (setq min-point (sh-prev-line nil))
-          (save-excursion
-            (beginning-of-line)
-            (setq min-point (point))))
-        (point))
-        (skip-chars-backward " \t;")
-        (unless (looking-at "\\s-*;;")
-        (skip-chars-backward "^)}];\"'`({[")
-        (setq c (char-before))))
-      (sh-debug "stopping at %d c is %s  start=%d min-point=%d"
-                (point) c start min-point)
-      (if (< (point) min-point)
-          (error "point %d < min-point %d" (point) min-point))
-      (cond
-       ((looking-at "\\s-*;;")
-        ;; (message "Found ;; !")
-       ";;")
-       ((or (eq c ?\n)
-            (eq c nil)
-            (eq c ?\;))
-       (save-excursion
-         ;; skip forward over white space newline and \ at eol
-         (skip-chars-forward " \t\n\\\\")
-         (sh-debug "Now at %d   start=%d" (point) start)
-         (if (>= (point) start)
-             (progn
-               (sh-debug "point: %d >= start: %d" (point) start)
-               nil)
-           (sh-get-word))
-         ))
-       (t
-        ;; c    -- return a string
-       (char-to-string c)
-       ))
-      )))
+    (let ((start (point))
+          (min-point (if (sh-this-is-a-continuation)
+                         (sh-prev-line nil)
+                       (line-beginning-position))))
+      (skip-chars-backward " \t;" min-point)
+      (if (looking-at "\\s-*;;")
+          ;; (message "Found ;; !")
+          ";;"
+        (skip-chars-backward "^)}];\"'`({[" min-point)
+        (let ((c (if (> (point) min-point) (char-before))))
+          (sh-debug "stopping at %d c is %s  start=%d min-point=%d"
+                    (point) c start min-point)
+          (if (not (memq c '(?\n nil ?\;)))
+              ;; c      -- return a string
+              (char-to-string c)
+            ;; Return the leading keyword of the "command" we supposedly
+            ;; skipped over.  Maybe we skipped too far (e.g. past a `do' or
+            ;; `then' that precedes the actual command), so check whether
+            ;; we're looking at such a keyword and if so, move back forward.
+            (let ((boundary (point))
+                  kwd next)
+              (while
+                  (progn
+                    ;; Skip forward over white space newline and \ at eol.
+                    (skip-chars-forward " \t\n\\\\" start)
+                    (if (>= (point) start)
+                        (progn
+                          (sh-debug "point: %d >= start: %d" (point) start)
+                          nil)
+                      (if next (setq boundary next))
+                      (sh-debug "Now at %d   start=%d" (point) start)
+                      (setq kwd (sh-get-word))
+                      (if (member kwd (sh-feature sh-leading-keywords))
+                          (progn
+                            (setq next (point))
+                            t)
+                        nil))))
+              (goto-char boundary)
+              kwd)))))))
 
 
 (defun sh-this-is-a-continuation ()
@@ -2518,7 +2517,7 @@ If AND-MOVE is non-nil then move to end of word."
         (goto-char where))
     (prog1
         (buffer-substring (point)
-                          (progn (skip-chars-forward "^ \t\n;&")(point)))
+                          (progn (skip-chars-forward "^ \t\n;&|()")(point)))
       (unless and-move
         (goto-char start)))))
 
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 5307e1bf97c..32f2b881890 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -12,7 +12,7 @@
 ;; Keywords: wp, print, PostScript
 ;; Time-stamp: <2005/06/27 00:57:22 vinicius>
 ;; Version: 6.6.7
-;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
+;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
 (defconst ps-print-version "6.6.7"
   "ps-print.el, v 6.6.7 <2005/06/27 vinicius>
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index a2bc18e9de1..cfaf87852d4 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -238,7 +238,7 @@ may have changed\) back to `save-place-alist'."
           ;; load it if it exists:
           (if (file-readable-p file)
               (save-excursion
-                (message "Loading places from %s..." save-place-file)
+                (message "Loading places from %s..." file)
                 ;; don't want to use find-file because we have been
                 ;; adding hooks to it.
                 (set-buffer (get-buffer-create " *Saved Places*"))
diff --git a/lisp/select.el b/lisp/select.el
index 01d1af6edf1..cbdeaf12fe3 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -223,8 +223,11 @@ Cut buffers are considered obsolete; you should use selections instead."
               (setq str (encode-coding-string str coding))))
 
            ((eq type 'UTF8_STRING)
-            (setq str (encode-coding-string str 'utf-8)))
-
+            (let ((charsets (find-charset-string str)))
+              (if (or (memq 'eight-bit-control charsets)
+                      (memq 'eight-bit-graphic charsets))
+                  (setq type 'STRING)
+                (setq str (encode-coding-string str 'utf-8)))))
            (t
             (error "Unknow selection type: %S" type))
            )))
diff --git a/lisp/server.el b/lisp/server.el
index c40b36fa752..73d36ca4b18 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -792,7 +792,7 @@ The following commands are accepted by the client:
                         ;; This looks scary because `fancy-splash-screens'
                         ;; will call `recursive-edit' from a process filter.
                         ;; However, that should be safe to do now.
-                        (display-splash-screen)
+                        (display-splash-screen t)
                       ;; `recursive-edit' will throw an error if Emacs is
                       ;; already doing a recursive edit elsewhere.  Catch it
                       ;; here so that we can finish normally.
diff --git a/lisp/ses.el b/lisp/ses.el
index fc594167187..85f6f8db378 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -237,13 +237,6 @@ Each function is called with ARG=1."
           ses-initial-file-trailer)
   "The initial contents of an empty spreadsheet.")
 
-(defconst ses-paramlines-plist
-  '(ses--col-widths  2 ses--col-printers  3 ses--default-printer  4
-    ses--header-row  5 ses--file-format   8 ses--numrows          9
-    ses--numcols    10)
-  "Offsets from last cell line to various parameter lines in the data area
-of a spreadsheet.")
-
 (defconst ses-box-prop '(:box (:line-width 2 :style released-button))
   "Display properties to create a raised box for cells in the header line.")
 
@@ -255,13 +248,19 @@ functions.  None of these standard-printer functions is suitable for use as a
 column printer or a global-default printer because they invoke the column or
 default printer and then modify its output.")
 
+
+;;----------------------------------------------------------------------------
+;; Local variables and constants
+;;----------------------------------------------------------------------------
+
 (eval-and-compile
   (defconst ses-localvars
     '(ses--blank-line ses--cells ses--col-printers ses--col-widths ses--curcell
       ses--curcell-overlay ses--default-printer ses--deferred-narrow
       ses--deferred-recalc ses--deferred-write ses--file-format
       ses--header-hscroll ses--header-row ses--header-string ses--linewidth
-      ses--numcols ses--numrows ses--symbolic-formulas
+      ses--numcols ses--numrows ses--symbolic-formulas ses--data-marker
+      ses--params-marker
       ;;Global variables that we override
       mode-line-process next-line-add-newlines transient-mark-mode)
     "Buffer-local variables used by SES."))
@@ -272,6 +271,13 @@ default printer and then modify its output.")
     (make-local-variable x)
     (set x nil)))
 
+(defconst ses-paramlines-plist
+  '(ses--col-widths  -5 ses--col-printers -4 ses--default-printer -3
+    ses--header-row  -2 ses--file-format   1 ses--numrows          2
+    ses--numcols      3)
+  "Offsets from 'Global parameters' line to various parameter lines in the
+data area of a spreadsheet.")
+
 
 ;;
 ;;  "Side-effect variables".  They are set in one function, altered in
@@ -408,6 +414,7 @@ for safety.  This is a macro to prevent propagate-on-load viruses."
   "Execute BODY repeatedly, with the variables `row' and `col' set to each
 cell in the range specified by CURCELL.  The range is available in the
 variables `minrow', `maxrow', `mincol', and `maxcol'."
+  (declare (indent defun) (debug (form body)))
   (let ((cur (make-symbol "cur"))
         (min (make-symbol "min"))
         (max (make-symbol "max"))
@@ -429,9 +436,6 @@ variables `minrow', `maxrow', `mincol', and `maxcol'."
              (setq col (+ ,c mincol))
              ,@body))))))
 
-(put 'ses-dorange 'lisp-indent-function 'defun)
-(def-edebug-spec ses-dorange (form body))
-
 ;;Support for coverage testing.
 (defmacro 1value (form)
   "For code-coverage testing, indicate that FORM is expected to always have
@@ -650,7 +654,7 @@ the old and FORCE is nil."
 (defun ses-update-cells (list &optional force)
   "Recalculate cells in LIST, checking for dependency loops.  Prints
 progress messages every second.  Dependent cells are not recalculated
-if the cell's value is unchanged if FORCE is nil."
+if the cell's value is unchanged and FORCE is nil."
   (let ((ses--deferred-recalc list)
         (nextlist             list)
         (pos                  (point))
@@ -709,7 +713,7 @@ if the cell's value is unchanged if FORCE is nil."
 
 (defun ses-in-print-area ()
   "Returns t if point is in print area of spreadsheet."
-  (eq (get-text-property (point) 'keymap) 'ses-mode-print-map))
+  (<= (point) ses--data-marker))
 
 ;;We turn off point-motion-hooks and explicitly position the cursor, in case
 ;;the intangible properties have gotten screwed up (e.g., when
@@ -953,14 +957,16 @@ is one of the symbols ses--col-widths, ses--col-printers,
 ses--default-printer, ses--numrows, or ses--numcols."
   (ses-widen)
   (let ((inhibit-point-motion-hooks t)) ;In case intangible attrs are wrong
-    (goto-char (point-min))
     (if col
-      ;;It's a cell
-      (forward-line (+ ses--numrows 2 (* def (1+ ses--numcols)) col))
-    ;;Convert def-symbol to offset
-    (setq def (plist-get ses-paramlines-plist def))
-    (or def (signal 'args-out-of-range nil))
-    (forward-line (+ (* ses--numrows (+ ses--numcols 2)) def)))))
+        ;;It's a cell
+        (progn
+          (goto-char ses--data-marker)
+          (forward-line (+ 1 (* def (1+ ses--numcols)) col)))
+      ;;Convert def-symbol to offset
+      (setq def (plist-get ses-paramlines-plist def))
+      (or def (signal 'args-out-of-range nil))
+      (goto-char ses--params-marker)
+      (forward-line def))))
 
 (defun ses-set-parameter (def value &optional elem)
   "Set parameter DEF to VALUE (with undo) and write the value to the data area.
@@ -1070,6 +1076,23 @@ or t to get a wrong-type-argument error when the first reference is found."
         ))))
   result-so-far)
 
+(defsubst ses-relocate-symbol (sym rowcol startrow startcol rowincr colincr)
+  "Relocate one symbol SYM, whichs corresponds to ROWCOL (a cons of ROW and
+COL).  Cells starting at (STARTROW,STARTCOL) are being shifted
+by (ROWINCR,COLINCR)."
+  (let ((row (car rowcol))
+        (col (cdr rowcol)))
+    (if (or (< row startrow) (< col startcol))
+        sym
+      (setq row (+ row rowincr)
+            col (+ col colincr))
+      (if (and (>= row startrow) (>= col startcol)
+               (< row ses--numrows) (< col ses--numcols))
+          ;;Relocate this variable
+          (ses-create-cell-symbol row col)
+        ;;Delete reference to a deleted cell
+        nil))))
+
 (defun ses-relocate-formula (formula startrow startcol rowincr colincr)
   "Produce a copy of FORMULA where all symbols that refer to cells in row
 STARTROW or above and col STARTCOL or above are altered by adding ROWINCR
@@ -1114,23 +1137,6 @@ Sets `ses-relocate-return' to 'delete if cell-references were removed."
                 result))))
       (nreverse result))))
 
-(defun ses-relocate-symbol (sym rowcol startrow startcol rowincr colincr)
-  "Relocate one symbol SYM, whichs corresponds to ROWCOL (a cons of ROW and
-COL).  Cells starting at (STARTROW,STARTCOL) are being shifted
-by (ROWINCR,COLINCR)."
-  (let ((row (car rowcol))
-        (col (cdr rowcol)))
-    (if (or (< row startrow) (< col startcol))
-        sym
-      (setq row (+ row rowincr)
-            col (+ col colincr))
-      (if (and (>= row startrow) (>= col startcol)
-               (< row ses--numrows) (< col ses--numcols))
-          ;;Relocate this variable
-          (ses-create-cell-symbol row col)
-        ;;Delete reference to a deleted cell
-        nil))))
-
 (defun ses-relocate-range (range startrow startcol rowincr colincr)
   "Relocate one RANGE, of the form '(ses-range min max).  Cells starting
 at (STARTROW,STARTCOL) are being shifted by (ROWINCR,COLINCR).  Result is the
@@ -1337,6 +1343,7 @@ execute cell formulas or print functions."
   (goto-char (point-max))
   (search-backward ";; Local Variables:\n" nil t)
   (backward-list 1)
+  (setq ses--params-marker (point-marker))
   (let ((params (condition-case nil (read (current-buffer)) (error nil))))
     (or (and (= (safe-length params) 3)
              (numberp (car params))
@@ -1366,7 +1373,9 @@ execute cell formulas or print functions."
   (forward-line ses--numrows)
   (or (looking-at ses-print-data-boundary)
       (error "Missing marker between print and data areas"))
-  (forward-char (length ses-print-data-boundary))
+  (forward-char 1)
+  (setq ses--data-marker (point-marker))
+  (forward-char (1- (length ses-print-data-boundary)))
   ;;Initialize printer and symbol lists
   (mapc 'ses-printer-record ses-standard-printer-functions)
   (setq ses--symbolic-formulas nil)
@@ -1573,10 +1582,7 @@ narrows the buffer now."
           ;;We're not allowed to narrow the buffer until after-find-file has
           ;;read the local variables at the end of the file.  Now it's safe to
           ;;do the narrowing.
-          (save-excursion
-            (goto-char (point-min))
-            (forward-line ses--numrows)
-            (narrow-to-region (point-min) (point)))
+          (narrow-to-region (point-min) ses--data-marker)
           (setq ses--deferred-narrow nil))
         ;;Update the modeline
         (let ((oldcell ses--curcell))
@@ -1803,11 +1809,17 @@ cells."
     (dotimes (row ses--numrows)
       (insert ses--blank-line))
     (insert ses-print-data-boundary)
+    (backward-char (1- (length ses-print-data-boundary)))
+    (setq ses--data-marker (point-marker))
+    (forward-char (1- (length ses-print-data-boundary)))
     ;;Placeholders for cell data
     (insert (make-string (* ses--numrows (1+ ses--numcols)) ?\n))
     ;;Placeholders for col-widths, col-printers, default-printer, header-row
     (insert "\n\n\n\n")
-    (insert ses-initial-global-parameters))
+    (insert ses-initial-global-parameters)
+    (backward-char (1- (length ses-initial-global-parameters)))
+    (setq ses--params-marker (point-marker))
+    (forward-char (1- (length ses-initial-global-parameters))))
   (ses-set-parameter 'ses--col-widths ses--col-widths)
   (ses-set-parameter 'ses--col-printers ses--col-printers)
   (ses-set-parameter 'ses--default-printer ses--default-printer)
@@ -2880,7 +2892,8 @@ TEST is evaluated."
     (cons 'list result)))
 
 ;;All standard formulas are safe
-(dolist (x '(ses-range ses-delete-blanks ses+ ses-average ses-select))
+(dolist (x '(ses-cell-value ses-range ses-delete-blanks ses+ ses-average
+             ses-select))
   (put x 'side-effect-free t))
 
 
diff --git a/lisp/shell.el b/lisp/shell.el
index 6a145ae1569..2adfc79618a 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -272,6 +272,8 @@ This is effective only if directory tracking is enabled."
   :type '(choice (const :tag "None" nil) file)
   :group 'shell)
 
+;; Note: There are no explicit references to the variable `explicit-csh-args'.
+;; It is used implicitly by M-x shell when the shell is `csh'.
 (defcustom explicit-csh-args
   (if (eq system-type 'hpux)
       ;; -T persuades HP's csh not to think it is smarter
@@ -283,12 +285,15 @@ Value is a list of strings, which may be nil."
   :type '(repeat (string :tag "Argument"))
   :group 'shell)
 
+;; Note: There are no explicit references to the variable `explicit-bash-args'.
+;; It is used implicitly by M-x shell when the interactive shell is `bash'.
 (defcustom explicit-bash-args
-  ;; Tell bash not to use readline, except for bash 1.x which doesn't grook --noediting.
-  ;; Bash 1.x has -nolineediting, but process-send-eof cannot terminate bash if we use it.
   (let* ((prog (or (and (boundp 'explicit-shell-file-name) explicit-shell-file-name)
                    (getenv "ESHELL") shell-file-name))
          (name (file-name-nondirectory prog)))
+    ;; Tell bash not to use readline, except for bash 1.x which
+    ;; doesn't grook --noediting.  Bash 1.x has -nolineediting, but
+    ;; process-send-eof cannot terminate bash if we use it.
     (if (and (not purify-flag)
              (equal name "bash")
              (file-executable-p prog)
@@ -483,7 +488,9 @@ This function can be put on `comint-output-filter-functions'.
 The argument STRING is ignored."
   (let ((pmark (process-mark (get-buffer-process (current-buffer)))))
     (save-excursion
-      (goto-char (or comint-last-output-start (point-min)))
+      (goto-char (or (and (markerp comint-last-output-start)
+                          (marker-position comint-last-output-start))
+                     (point-min)))
       (while (re-search-forward "[\C-a\C-b]" pmark t)
         (replace-match "")))))
 
diff --git a/lisp/simple.el b/lisp/simple.el
index f07006b5cc8..0dff1c73795 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -116,29 +116,29 @@ If no other buffer exists, the buffer `*scratch*' is returned."
   :group 'next-error
   :version "22.1")
 
-(defcustom next-error-highlight 0.1
+(defcustom next-error-highlight 0.5
   "*Highlighting of locations in selected source buffers.
 If number, highlight the locus in `next-error' face for given time in seconds.
-If t, use persistent overlays fontified in `next-error' face.
+If t, highlight the locus indefinitely until some other locus replaces it.
 If nil, don't highlight the locus in the source buffer.
 If `fringe-arrow', indicate the locus by the fringe arrow."
-  :type '(choice (number :tag "Delay")
-                 (const :tag "Persistent overlay" t)
+  :type '(choice (number :tag "Highlight for specified time")
+                 (const :tag "Semipermanent highlighting" t)
                  (const :tag "No highlighting" nil)
-                 (const :tag "Fringe arrow" 'fringe-arrow))
+                 (const :tag "Fringe arrow" fringe-arrow))
   :group 'next-error
   :version "22.1")
 
-(defcustom next-error-highlight-no-select 0.1
-  "*Highlighting of locations in non-selected source buffers.
+(defcustom next-error-highlight-no-select 0.5
+  "*Highlighting of locations in `next-error-no-select'.
 If number, highlight the locus in `next-error' face for given time in seconds.
-If t, use persistent overlays fontified in `next-error' face.
+If t, highlight the locus indefinitely until some other locus replaces it.
 If nil, don't highlight the locus in the source buffer.
 If `fringe-arrow', indicate the locus by the fringe arrow."
-  :type '(choice (number :tag "Delay")
-                 (const :tag "Persistent overlay" t)
+  :type '(choice (number :tag "Highlight for specified time")
+                 (const :tag "Semipermanent highlighting" t)
                  (const :tag "No highlighting" nil)
-                 (const :tag "Fringe arrow" 'fringe-arrow))
+                 (const :tag "Fringe arrow" fringe-arrow))
   :group 'next-error
   :version "22.1")
 
@@ -1489,8 +1489,7 @@ Call `undo-start' to get ready to undo recent changes,
 then call `undo-more' one or more times to undo them."
   (or (listp pending-undo-list)
       (error (concat "No further undo information"
-                     (and transient-mark-mode mark-active
-                          " for region"))))
+                     (and undo-in-region " for region"))))
   (let ((undo-in-progress t))
     (setq pending-undo-list (primitive-undo n pending-undo-list))
     (if (null pending-undo-list)
@@ -1637,12 +1636,12 @@ is not *inside* the region START...END."
         ((null (car undo-elt))
          ;; (nil PROPERTY VALUE BEG . END)
          (let ((tail (nthcdr 3 undo-elt)))
-           (not (or (< (car tail) end)
-                    (> (cdr tail) start)))))
+           (and (< (car tail) end)
+                (> (cdr tail) start))))
         ((integerp (car undo-elt))
          ;; (BEGIN . END)
-         (not (or (< (car undo-elt) end)
-                  (> (cdr undo-elt) start))))))
+         (and (< (car undo-elt) end)
+              (> (cdr undo-elt) start)))))
 
 ;; Return the first affected buffer position and the delta for an undo element
 ;; delta is defined as the change in subsequent buffer positions if we *did*
@@ -1664,7 +1663,7 @@ is not *inside* the region START...END."
 Normally, Emacs discards the undo info for the current command if
 it exceeds `undo-outer-limit'.  But if you set this option
 non-nil, it asks in the echo area whether to discard the info.
-If you answer no, there a slight risk that Emacs might crash, so
+If you answer no, there is a slight risk that Emacs might crash, so
 only do it if you really want to undo the command.
 
 This option is mainly intended for debugging.  You have to be
@@ -2546,6 +2545,8 @@ text.  See `insert-for-yank'."
   ;; Pass point first, then mark, because the order matters
   ;; when calling kill-append.
   (interactive (list (point) (mark)))
+  (unless (and beg end)
+    (error "The mark is not set now, so there is no region"))
   (condition-case nil
       (let ((string (filter-buffer-substring beg end t)))
         (when string                    ;STRING is nil if BEG = END
@@ -2649,7 +2650,7 @@ The argument is used for internal purposes; do not supply one."
 ;; This is actually used in subr.el but defcustom does not work there.
 (defcustom yank-excluded-properties
   '(read-only invisible intangible field mouse-face help-echo local-map keymap
-    yank-handler follow-link)
+    yank-handler follow-link fontified)
   "*Text properties to discard when yanking.
 The value should be a list of text properties to discard or t,
 which means to discard all text properties."
@@ -3467,6 +3468,63 @@ Outline mode sets this."
       (or (memq prop buffer-invisibility-spec)
           (assq prop buffer-invisibility-spec)))))
 
+;; Returns non-nil if partial move was done.
+(defun line-move-partial (arg noerror to-end)
+  (if (< arg 0)
+      ;; Move backward (up).
+      ;; If already vscrolled, reduce vscroll
+      (let ((vs (window-vscroll nil t)))
+        (when (> vs (frame-char-height))
+          (set-window-vscroll nil (- vs (frame-char-height)) t)))
+
+    ;; Move forward (down).
+    (let* ((lh (window-line-height -1))
+           (vpos (nth 1 lh))
+           (ypos (nth 2 lh))
+           (rbot (nth 3 lh))
+           ppos py vs)
+      (when (or (null lh)
+                (>= rbot (frame-char-height))
+                (<= ypos (- (frame-char-height))))
+        (unless lh
+          (let ((wend (pos-visible-in-window-p t nil t)))
+            (setq rbot (nth 3 wend)
+                  vpos (nth 5 wend))))
+        (cond
+         ;; If last line of window is fully visible, move forward.
+         ((or (null rbot) (= rbot 0))
+          nil)
+         ;; If cursor is not in the bottom scroll margin, move forward.
+         ((and (> vpos 0)
+               (< (setq py
+                        (or (nth 1 (window-line-height))
+                            (let ((ppos (posn-at-point)))
+                              (cdr (or (posn-actual-col-row ppos)
+                                       (posn-col-row ppos))))))
+                  (min (- (window-text-height) scroll-margin 1) (1- vpos))))
+          nil)
+         ;; When already vscrolled, we vscroll some more if we can,
+         ;; or clear vscroll and move forward at end of tall image.
+         ((> (setq vs (window-vscroll nil t)) 0)
+          (when (> rbot 0)
+            (set-window-vscroll nil (+ vs (min rbot (frame-char-height))) t)))
+         ;; If cursor just entered the bottom scroll margin, move forward,
+         ;; but also vscroll one line so redisplay wont recenter.
+         ((and (> vpos 0)
+               (= py (min (- (window-text-height) scroll-margin 1)
+                          (1- vpos))))
+          (set-window-vscroll nil (frame-char-height) t)
+          (line-move-1 arg noerror to-end)
+          t)
+         ;; If there are lines above the last line, scroll-up one line.
+         ((> vpos 0)
+          (scroll-up 1)
+          t)
+         ;; Finally, start vscroll.
+         (t
+          (set-window-vscroll nil (frame-char-height) t)))))))
+
+
 ;; This is like line-move-1 except that it also performs
 ;; vertical scrolling of tall images if appropriate.
 ;; That is not really a clean thing to do, since it mixes
@@ -3474,37 +3532,14 @@ Outline mode sets this."
 ;; a cleaner solution to the problem of making C-n do something
 ;; useful given a tall image.
 (defun line-move (arg &optional noerror to-end try-vscroll)
-  (if (and auto-window-vscroll try-vscroll
-           ;; But don't vscroll in a keyboard macro.
-           (not defining-kbd-macro)
-           (not executing-kbd-macro))
-      (let ((forward (> arg 0))
-            (part (nth 2 (pos-visible-in-window-p (point) nil t))))
-        (if (and (consp part)
-                 (> (if forward (cdr part) (car part)) 0))
-            (set-window-vscroll nil
-                                (if forward
-                                    (+ (window-vscroll nil t)
-                                       (min (cdr part)
-                                            (* (frame-char-height) arg)))
-                                  (max 0
-                                       (- (window-vscroll nil t)
-                                          (min (car part)
-                                               (* (frame-char-height) (- arg))))))
-                                t)
-          (set-window-vscroll nil 0)
-          (when (line-move-1 arg noerror to-end)
-            (when (not forward)
-              ;; Update display before calling pos-visible-in-window-p,
-              ;; because it depends on window-start being up-to-date.
-              (sit-for 0)
-              ;; If the current line is partly hidden at the bottom,
-              ;; scroll it partially up so as to unhide the bottom.
-              (if (and (setq part (nth 2 (pos-visible-in-window-p
-                                          (line-beginning-position) nil t)))
-                       (> (cdr part) 0))
-                  (set-window-vscroll nil (cdr part) t)))
-            t)))
+  (unless (and auto-window-vscroll try-vscroll
+               ;; Only vscroll for single line moves
+               (= (abs arg) 1)
+               ;; But don't vscroll in a keyboard macro.
+               (not defining-kbd-macro)
+               (not executing-kbd-macro)
+               (line-move-partial arg noerror to-end))
+    (set-window-vscroll nil 0 t)
     (line-move-1 arg noerror to-end)))
 
 ;; This is the guts of next-line and previous-line.
@@ -3515,7 +3550,7 @@ Outline mode sets this."
   ;; for intermediate positions.
   (let ((inhibit-point-motion-hooks t)
         (opoint (point))
-        (forward (> arg 0)))
+        (orig-arg arg))
     (unwind-protect
         (progn
           (if (not (memq last-command '(next-line previous-line)))
@@ -3548,14 +3583,18 @@ Outline mode sets this."
                               'end-of-buffer)
                             nil)))
             ;; Move by arg lines, but ignore invisible ones.
-            (let (done)
+            (let (done line-end)
               (while (and (> arg 0) (not done))
                 ;; If the following character is currently invisible,
                 ;; skip all characters with that same `invisible' property value.
                 (while (and (not (eobp)) (line-move-invisible-p (point)))
                   (goto-char (next-char-property-change (point))))
-                ;; Now move a line.
-                (end-of-line)
+                ;; Move a line.
+                ;; We don't use `end-of-line', since we want to escape
+                ;; from field boundaries ocurring exactly at point.
+                (let ((inhibit-field-text-motion t))
+                  (setq line-end (line-end-position)))
+                (goto-char (constrain-to-field line-end (point) t t))
                 ;; If there's no invisibility here, move over the newline.
                 (cond
                  ((eobp)
@@ -3613,7 +3652,7 @@ Outline mode sets this."
              (beginning-of-line))
             (t
              (line-move-finish (or goal-column temporary-goal-column)
-                               opoint forward))))))
+                               opoint (> orig-arg 0)))))))
 
 (defun line-move-finish (column opoint forward)
   (let ((repeat t))
@@ -3622,6 +3661,7 @@ Outline mode sets this."
       (setq repeat nil)
 
       (let (new
+            (old (point))
             (line-beg (save-excursion (beginning-of-line) (point)))
             (line-end
              ;; Compute the end of the line
@@ -3636,6 +3676,17 @@ Outline mode sets this."
 
         ;; Move to the desired column.
         (line-move-to-column column)
+
+        ;; Corner case: suppose we start out in a field boundary in
+        ;; the middle of a continued line.  When we get to
+        ;; line-move-finish, point is at the start of a new *screen*
+        ;; line but the same text line; then line-move-to-column would
+        ;; move us backwards. Test using C-n with point on the "x" in
+        ;;   (insert "a" (propertize "x" 'field t) (make-string 89 ?y))
+        (and forward
+             (< (point) old)
+             (goto-char old))
+
         (setq new (point))
 
         ;; Process intangibility within a line.
@@ -3675,8 +3726,15 @@ Outline mode sets this."
         (goto-char opoint)
         (let ((inhibit-point-motion-hooks nil))
           (goto-char
-           (constrain-to-field new opoint nil t
-                               'inhibit-line-move-field-capture)))
+           ;; Ignore field boundaries if the initial and final
+           ;; positions have the same `field' property, even if the
+           ;; fields are non-contiguous.  This seems to be "nicer"
+           ;; behavior in many situations.
+           (if (eq (get-char-property new 'field)
+                   (get-char-property opoint 'field))
+               new
+             (constrain-to-field new opoint t t
+                                 'inhibit-line-move-field-capture))))
 
         ;; If all this moved us to a different line,
         ;; retry everything within that new line.
@@ -3691,10 +3749,7 @@ because what we really need is for `move-to-column'
 and `current-column' to be able to ignore invisible text."
   (if (zerop col)
       (beginning-of-line)
-    (let ((opoint (point)))
-      (move-to-column col)
-      ;; move-to-column doesn't respect field boundaries.
-      (goto-char (constrain-to-field (point) opoint))))
+    (move-to-column col))
 
   (when (and line-move-ignore-invisible
              (not (bolp)) (line-move-invisible-p (1- (point))))
@@ -4330,21 +4385,21 @@ in the mode line.
 Line numbers do not appear for very large buffers and buffers
 with very long lines; see variables `line-number-display-limit'
 and `line-number-display-limit-width'."
-  :init-value t :global t :group 'editing-basics)
+  :init-value t :global t :group 'mode-line)
 
 (define-minor-mode column-number-mode
   "Toggle Column Number mode.
 With arg, turn Column Number mode on iff arg is positive.
 When Column Number mode is enabled, the column number appears
 in the mode line."
-  :global t :group 'editing-basics)
+  :global t :group 'mode-line)
 
 (define-minor-mode size-indication-mode
   "Toggle Size Indication mode.
 With arg, turn Size Indication mode on iff arg is positive.  When
 Size Indication mode is enabled, the size of the accessible part
 of the buffer appears in the mode line."
-  :global t :group 'editing-basics)
+  :global t :group 'mode-line)
 
 (defgroup paren-blinking nil
   "Blinking matching of parens and expressions."
@@ -4974,6 +5029,12 @@ value of `completion-common-substring'. See also `display-completion-list'.")
 
 ;; Variables and faces used in `completion-setup-function'.
 
+(defcustom completion-show-help t
+  "Non-nil means show help message in *Completions* buffer."
+  :type 'boolean
+  :version "22.1"
+  :group 'completion)
+
 (defface completions-first-difference
   '((t (:inherit bold)))
   "Face put on the first uncommon character in completions in *Completions* buffer."
@@ -5060,14 +5121,15 @@ of the minibuffer before point is always the common substring.)")
               (if (get-char-property element-common-end 'mouse-face)
                   (put-text-property element-common-end (1+ element-common-end)
                                      'font-lock-face 'completions-first-difference))))))
-      ;; Insert help string.
-      (goto-char (point-min))
-      (if (display-mouse-p)
-          (insert (substitute-command-keys
-                   "Click \\[mouse-choose-completion] on a completion to select it.\n")))
-      (insert (substitute-command-keys
-               "In this buffer, type \\[choose-completion] to \
-select the completion near point.\n\n")))))
+      ;; Maybe insert help string.
+      (when completion-show-help
+        (goto-char (point-min))
+        (if (display-mouse-p)
+            (insert (substitute-command-keys
+                     "Click \\[mouse-choose-completion] on a completion to select it.\n")))
+        (insert (substitute-command-keys
+                 "In this buffer, type \\[choose-completion] to \
+select the completion near point.\n\n"))))))
 
 (add-hook 'completion-setup-hook 'completion-setup-function)
 
diff --git a/lisp/startup.el b/lisp/startup.el
index b96503603c2..59bcabf4a9e 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -784,6 +784,7 @@ opening the first frame (e.g. open a connection to an X server).")
   (custom-reevaluate-setting 'mouse-wheel-up-event)
   (custom-reevaluate-setting 'file-name-shadow-mode)
   (custom-reevaluate-setting 'send-mail-function)
+  (custom-reevaluate-setting 'focus-follows-mouse)
 
   (normal-erase-is-backspace-setup-frame)
 
@@ -1097,10 +1098,7 @@ regardless of the value of this variable."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defvar fancy-splash-text
-  '((:face variable-pitch
-           "You can do basic editing with the menu bar and scroll bar \
-using the mouse.\n\n"
-           :face (variable-pitch :weight bold)
+  '((:face (variable-pitch :weight bold)
            "Important Help menu items:\n"
            :face variable-pitch
            (lambda ()
@@ -1124,8 +1122,8 @@ using the mouse.\n\n"
                 "\n")))
            :face variable-pitch "\
 Emacs FAQ\tFrequently asked questions and answers
-Read the Emacs Manual\tView the Emacs manual using Info
-\(Non)Warranty\tGNU Emacs comes with "
+View Emacs Manual\tView the Emacs manual using Info
+Absence of Warranty\tGNU Emacs comes with "
            :face (variable-pitch :slant oblique)
            "ABSOLUTELY NO WARRANTY\n"
            :face variable-pitch
@@ -1133,18 +1131,16 @@ Read the Emacs Manual\tView the Emacs manual using Info
 Copying Conditions\tConditions for redistributing and changing Emacs
 Getting New Versions\tHow to obtain the latest version of Emacs
 More Manuals / Ordering Manuals       Buying printed manuals from the FSF\n")
-  (:face variable-pitch
-           "You can do basic editing with the menu bar and scroll bar \
-using the mouse.\n\n"
-           :face (variable-pitch :weight bold)
-           "Useful File menu items:\n"
-           :face variable-pitch "\
-Exit Emacs\t(Or type Control-x followed by Control-c)
+  (:face (variable-pitch :weight bold)
+         "Useful File menu items:\n"
+         :face variable-pitch "\
+Exit Emacs\t\t(Or type Control-x followed by Control-c)
 Recover Crashed Session\tRecover files you were editing before a crash
 
 
 
 
+
 "
            ))
   "A list of texts to show in the middle part of splash screens.
@@ -1249,6 +1245,10 @@ where FACE is a valid face specification, as it can be used with
        "GNU Emacs is one component of the GNU/Linux operating system."
      "GNU Emacs is one component of the GNU operating system."))
   (insert "\n")
+  (fancy-splash-insert
+   :face 'variable-pitch
+   "You can do basic editing with the menu bar and scroll bar \
+using the mouse.\n\n")
   (if fancy-splash-outer-buffer
       (fancy-splash-insert
        :face 'variable-pitch
@@ -1285,7 +1285,7 @@ where FACE is a valid face specification, as it can be used with
           t)
          (fancy-splash-insert :face '(variable-pitch :foreground "red")
                               "\n\nIf an Emacs session crashed recently, "
-                              "type M-x recover-session RET\nto recover"
+                              "type Meta-x recover-session RET\nto recover"
                               " the files you were editing."))))
 
 (defun fancy-splash-screens-1 (buffer)
@@ -1340,7 +1340,6 @@ mouse."
 
 (defun fancy-splash-screens (&optional hide-on-input)
   "Display fancy splash screens when Emacs starts."
-  (setq fancy-splash-help-echo (startup-echo-area-message))
   (if hide-on-input
       (let ((old-hourglass display-hourglass)
             (fancy-splash-outer-buffer (current-buffer))
@@ -1352,11 +1351,11 @@ mouse."
         (save-selected-window
           (select-frame frame)
           (switch-to-buffer "GNU Emacs")
-          (setq tab-width 20)
           (setq splash-buffer (current-buffer))
           (catch 'stop-splashing
             (unwind-protect
                 (let* ((map (make-sparse-keymap))
+                       (cursor-type nil)
                        (overriding-local-map map)
                        ;; Catch if our frame is deleted; the delete-frame
                        ;; event is unreliable and is handled by
@@ -1367,8 +1366,7 @@ mouse."
                   (define-key map [mouse-movement] 'ignore)
                   (define-key map [mode-line t] 'ignore)
                   (define-key map [select-window] 'ignore)
-                  (setq cursor-type nil
-                        display-hourglass nil
+                  (setq display-hourglass nil
                         minor-mode-map-alist nil
                         emulation-mode-map-alists nil
                         buffer-undo-list t
@@ -1379,6 +1377,7 @@ mouse."
                         timer (run-with-timer 0 fancy-splash-delay
                                               #'fancy-splash-screens-1
                                               splash-buffer))
+                  (message "%s" (startup-echo-area-message))
                   (recursive-edit))
               (cancel-timer timer)
               (setq display-hourglass old-hourglass
@@ -1388,11 +1387,12 @@ mouse."
               (when (frame-live-p frame)
                 (select-frame frame)
                 (switch-to-buffer fancy-splash-outer-buffer))))))
-    ;; If hide-on-input is non-nil, don't hide the buffer on input.
+    ;; If hide-on-input is nil, don't hide the buffer on input.
     (if (or (window-minibuffer-p)
             (window-dedicated-p (selected-window)))
         (pop-to-buffer (current-buffer))
-      (switch-to-buffer "GNU Emacs"))
+      (switch-to-buffer "*About GNU Emacs*"))
+    (setq buffer-read-only nil)
     (erase-buffer)
     (if pure-space-overflow
         (insert "\
@@ -1401,9 +1401,16 @@ Warning Warning!!!  Pure space overflow    !!!Warning Warning
     (let (fancy-splash-outer-buffer)
       (fancy-splash-head)
       (dolist (text fancy-splash-text)
-        (apply #'fancy-splash-insert text))
+        (apply #'fancy-splash-insert text)
+        (insert "\n"))
+      (skip-chars-backward "\n")
+      (delete-region (point) (point-max))
+      (insert "\n")
       (fancy-splash-tail)
       (set-buffer-modified-p nil)
+      (setq buffer-read-only t)
+      (if (and view-read-only (not view-mode))
+          (view-mode-enter nil 'kill-buffer))
       (goto-char (point-min)))))
 
 
@@ -1441,6 +1448,7 @@ we put it on this frame."
   (let ((prev-buffer (current-buffer)))
     (unwind-protect
         (with-current-buffer (get-buffer-create "GNU Emacs")
+          (setq buffer-read-only nil)
           (erase-buffer)
           (set (make-local-variable 'tab-width) 8)
           (if hide-on-input
@@ -1575,26 +1583,32 @@ Type \\[describe-distribution] for information on getting the latest version."))
                                        auto-save-list-file-prefix)))
                 t)
                (insert "\n\nIf an Emacs session crashed recently, "
-                       "type M-x recover-session RET\nto recover"
+                       "type Meta-x recover-session RET\nto recover"
                        " the files you were editing."))
 
           ;; Display the input that we set up in the buffer.
           (set-buffer-modified-p nil)
+          (setq buffer-read-only t)
+          (if (and view-read-only (not view-mode))
+              (view-mode-enter nil 'kill-buffer))
           (goto-char (point-min))
-          (if (or (window-minibuffer-p)
-                  (window-dedicated-p (selected-window)))
-              ;; If hide-on-input is nil, creating a new frame will
-              ;; generate enough events that the subsequent `sit-for'
-              ;; will immediately return anyway.
-              (pop-to-buffer (current-buffer))
-            (if hide-on-input
+          (if hide-on-input
+              (if (or (window-minibuffer-p)
+                      (window-dedicated-p (selected-window)))
+                  ;; If hide-on-input is nil, creating a new frame will
+                  ;; generate enough events that the subsequent `sit-for'
+                  ;; will immediately return anyway.
+                  nil ;; (pop-to-buffer (current-buffer))
                 (save-window-excursion
                   (switch-to-buffer (current-buffer))
                   (sit-for 120))
-              (switch-to-buffer (current-buffer)))))
+                (condition-case nil
+                    (switch-to-buffer (current-buffer))))))
       ;; Unwind ... ensure splash buffer is killed
       (if hide-on-input
-          (kill-buffer "GNU Emacs")))))
+          (kill-buffer "GNU Emacs")
+        (switch-to-buffer "GNU Emacs")
+        (rename-buffer "*About GNU Emacs*" t)))))
 
 
 (defun startup-echo-area-message ()
@@ -1651,8 +1665,9 @@ Type \\[describe-distribution] for information on getting the latest version."))
 (defun display-splash-screen (&optional hide-on-input)
   "Display splash screen according to display.
 Fancy splash screens are used on graphic displays,
-normal otherwise."
-  (interactive)
+normal otherwise.
+With a prefix argument, any user input hides the splash screen."
+  (interactive "P")
   ;; Prevent recursive calls from server-process-filter.
   (if (not (get-buffer "GNU Emacs"))
       (if (use-fancy-splash-screens-p)
diff --git a/lisp/strokes.el b/lisp/strokes.el
index bcf7656347e..8d2b021ce61 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -142,6 +142,8 @@
 ;; the user to enter strokes which "remove the pencil from the paper"
 ;; so to speak, so one character can have multiple strokes.
 
+;; NOTE (Oct 7, 2006): The URLs below seem to be invalid!!!
+
 ;; You can read more about strokes at:
 
 ;; http://www.mit.edu/people/cadet/strokes-help.html
@@ -211,7 +213,6 @@ static char * stroke_xpm[] = {
 (defgroup strokes nil
   "Control Emacs through mouse strokes."
   :link '(emacs-commentary-link "strokes")
-  :link '(url-link "http://www.mit.edu/people/cadet/strokes-help.html")
   :group 'mouse)
 
 (defcustom strokes-modeline-string " Strokes"
diff --git a/lisp/subr.el b/lisp/subr.el
index 6d35171bf04..ad3e732c6c6 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1085,9 +1085,10 @@ the hook's buffer-local value rather than its default value."
             (kill-local-variable hook)
           (set hook hook-value))))))
 
-(defun add-to-list (list-var element &optional append)
+(defun add-to-list (list-var element &optional append compare-fn)
   "Add ELEMENT to the value of LIST-VAR if it isn't there yet.
-The test for presence of ELEMENT is done with `equal'.
+The test for presence of ELEMENT is done with `equal',
+or with COMPARE-FN if that's non-nil.
 If ELEMENT is added, it is added at the beginning of the list,
 unless the optional argument APPEND is non-nil, in which case
 ELEMENT is added at the end.
@@ -1099,7 +1100,13 @@ until a certain package is loaded, you should put the call to `add-to-list'
 into a hook function that will be run only after loading the package.
 `eval-after-load' provides one way to do this.  In some cases
 other hooks, such as major mode hooks, can do the job."
-  (if (member element (symbol-value list-var))
+  (if (if compare-fn
+          (let (present)
+            (dolist (elt (symbol-value list-var))
+              (if (funcall compare-fn element elt)
+                  (setq present t)))
+            present)
+        (member element (symbol-value list-var)))
       (symbol-value list-var)
     (set list-var
          (if append
@@ -1733,13 +1740,20 @@ floating point support.
   (when (or obsolete (numberp nodisp))
     (setq seconds (+ seconds (* 1e-3 nodisp)))
     (setq nodisp obsolete))
-  (if noninteractive
-      (progn (sleep-for seconds) t)
-    (unless nodisp (redisplay))
-    (or (<= seconds 0)
-        (let ((read (read-event nil nil seconds)))
-          (or (null read)
-              (progn (push read unread-command-events) nil))))))
+  (cond
+   (noninteractive
+    (sleep-for seconds)
+    t)
+   ((input-pending-p)
+    nil)
+   ((<= seconds 0)
+    (or nodisp (redisplay)))
+   (t
+    (or nodisp (redisplay))
+    (let ((read (read-event nil nil seconds)))
+      (or (null read)
+          (progn (push read unread-command-events)
+                 nil))))))
 
 ;;; Atomic change groups.
 
@@ -2039,7 +2053,8 @@ a system-dependent default device name is used."
 
 (defun shell-quote-argument (argument)
   "Quote an argument for passing as argument to an inferior shell."
-  (if (eq system-type 'ms-dos)
+  (if (or (eq system-type 'ms-dos)
+          (and (eq system-type 'windows-nt) (w32-shell-dos-semantics)))
       ;; Quote using double quotes, but escape any existing quotes in
       ;; the argument with backslashes.
       (let ((result "")
@@ -2053,19 +2068,17 @@ a system-dependent default device name is used."
                                    "\\" (substring argument end (1+ end)))
                     start (1+ end))))
         (concat "\"" result (substring argument start) "\""))
-    (if (eq system-type 'windows-nt)
-        (concat "\"" argument "\"")
-      (if (equal argument "")
-          "''"
-        ;; Quote everything except POSIX filename characters.
-        ;; This should be safe enough even for really weird shells.
-        (let ((result "") (start 0) end)
-          (while (string-match "[^-0-9a-zA-Z_./]" argument start)
-            (setq end (match-beginning 0)
-                  result (concat result (substring argument start end)
-                                 "\\" (substring argument end (1+ end)))
-                  start (1+ end)))
-          (concat result (substring argument start)))))))
+    (if (equal argument "")
+        "''"
+      ;; Quote everything except POSIX filename characters.
+      ;; This should be safe enough even for really weird shells.
+      (let ((result "") (start 0) end)
+        (while (string-match "[^-0-9a-zA-Z_./]" argument start)
+          (setq end (match-beginning 0)
+                result (concat result (substring argument start end)
+                               "\\" (substring argument end (1+ end)))
+                start (1+ end)))
+        (concat result (substring argument start))))))
 
 (defun string-or-null-p (object)
   "Return t if OBJECT is a string or nil.
@@ -2154,11 +2167,32 @@ If UNDO is present and non-nil, it is a function that will be called
   (let* ((handler (and (stringp string)
                        (get-text-property 0 'yank-handler string)))
          (param (or (nth 1 handler) string))
-         (opoint (point)))
+         (opoint (point))
+         end)
+
     (setq yank-undo-function t)
     (if (nth 0 handler) ;; FUNCTION
         (funcall (car handler) param)
       (insert param))
+    (setq end (point))
+
+    ;; What should we do with `font-lock-face' properties?
+    (if font-lock-defaults
+        ;; No, just wipe them.
+        (remove-list-of-text-properties opoint end '(font-lock-face))
+      ;; Convert them to `face'.
+      (save-excursion
+        (goto-char opoint)
+        (while (< (point) end)
+          (let ((face (get-text-property (point) 'font-lock-face))
+                run-end)
+            (setq run-end
+                  (next-single-property-change (point) 'font-lock-face nil end))
+            (when face
+              (remove-text-properties (point) run-end '(font-lock-face nil))
+              (put-text-property (point) run-end 'face face))
+            (goto-char run-end)))))
+
     (unless (nth 2 handler) ;; NOEXCLUDE
       (remove-yank-excluded-properties opoint (point)))
     (if (eq yank-undo-function t)  ;; not set by FUNCTION
@@ -2201,7 +2235,9 @@ BUFFER is the buffer (or buffer name) to associate with the process.
  BUFFER may be also nil, meaning that this process is not associated
  with any buffer
 COMMAND is the name of a shell command.
-Remaining arguments are the arguments for the command.
+Remaining arguments are the arguments for the command; they are all
+spliced together with blanks separating between each two of them, before
+passing the command to the shell.
 Wildcards and redirection are handled as usual in the shell.
 
 \(fn NAME BUFFER COMMAND &rest COMMAND-ARGS)"
@@ -2404,8 +2440,8 @@ If BODY finishes, `while-no-input' returns whatever value BODY produced."
     `(with-local-quit
        (catch ',catch-sym
          (let ((throw-on-input ',catch-sym))
-           (or (not (sit-for 0 0 t))
-             ,@body))))))
+           (or (input-pending-p)
+               ,@body))))))
 
 (defmacro combine-after-change-calls (&rest body)
   "Execute BODY, but don't call the after-change functions till the end.
@@ -3109,8 +3145,8 @@ Usually the separator is \".\", but it can be any other string.")
 
 (defvar version-regexp-alist
   '(("^[-_+ ]?a\\(lpha\\)?$"   . -3)
-    ("^[-_+]$" . -3)    ; treat "1.2.3-20050920" and "1.2-3" as alpha releases
-    ("^[-_+ ]cvs$" . -3)        ; treat "1.2.3-CVS" as alpha release
+    ("^[-_+]$"                 . -3)    ; treat "1.2.3-20050920" and "1.2-3" as alpha releases
+    ("^[-_+ ]cvs$"             . -3)    ; treat "1.2.3-CVS" as alpha release
     ("^[-_+ ]?b\\(eta\\)?$"    . -2)
     ("^[-_+ ]?\\(pre\\|rc\\)$" . -1))
   "*Specify association between non-numeric version part and a priority.
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 9e3393b04a1..3e86c2a8ead 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1287,14 +1287,19 @@ correspoinding TextEncodingBase value."
                      (find-coding-systems-string string)))
       (setq coding-system
             (coding-system-change-eol-conversion coding-system 'mac))
-      (when (and (eq system-type 'darwin)
-                 (eq coding-system 'japanese-shift-jis-mac))
-        (setq encoding mac-text-encoding-mac-japanese-basic-variant)
-        (setq string (subst-char-in-string ?\\ ?\x80 string))
-        (subst-char-in-string ?\(J\(B ?\x5c string t))
-      (setq data (mac-code-convert-string
-                  (encode-coding-string string coding-system)
-                  (or encoding coding-system) nil)))
+      (let ((str string))
+        (when (and (eq system-type 'darwin)
+                   (eq coding-system 'japanese-shift-jis-mac))
+          (setq encoding mac-text-encoding-mac-japanese-basic-variant)
+          (setq str (subst-char-in-string ?\\ ?\x80 str))
+          (subst-char-in-string ?\(J\(B ?\x5c str t)
+          ;; ASCII-only?
+          (if (string-match "\\`[\x00-\x7f]*\\'" str)
+              (setq str nil)))
+        (and str
+             (setq data (mac-code-convert-string
+                         (encode-coding-string str coding-system)
+                         (or encoding coding-system) nil)))))
     (or data (encode-coding-string string (if (eq (byteorder) ?B)
                                               'utf-16be-mac
                                             'utf-16le-mac)))))
@@ -1528,19 +1533,20 @@ in `selection-converter-alist', which see."
 
 ;;; Event IDs
 ;; kCoreEventClass
-(put 'open-application   'mac-apple-event-id "oapp") ; kAEOpenApplication
-(put 'reopen-application 'mac-apple-event-id "rapp") ; kAEReopenApplication
-(put 'open-documents     'mac-apple-event-id "odoc") ; kAEOpenDocuments
-(put 'print-documents    'mac-apple-event-id "pdoc") ; kAEPrintDocuments
-(put 'open-contents      'mac-apple-event-id "ocon") ; kAEOpenContents
-(put 'quit-application   'mac-apple-event-id "quit") ; kAEQuitApplication
-(put 'application-died   'mac-apple-event-id "obit") ; kAEApplicationDied
-(put 'show-preferences   'mac-apple-event-id "pref") ; kAEShowPreferences
-(put 'autosave-now       'mac-apple-event-id "asav") ; kAEAutosaveNow
+(put 'open-application     'mac-apple-event-id "oapp") ; kAEOpenApplication
+(put 'reopen-application   'mac-apple-event-id "rapp") ; kAEReopenApplication
+(put 'open-documents       'mac-apple-event-id "odoc") ; kAEOpenDocuments
+(put 'print-documents      'mac-apple-event-id "pdoc") ; kAEPrintDocuments
+(put 'open-contents        'mac-apple-event-id "ocon") ; kAEOpenContents
+(put 'quit-application     'mac-apple-event-id "quit") ; kAEQuitApplication
+(put 'application-died     'mac-apple-event-id "obit") ; kAEApplicationDied
+(put 'show-preferences     'mac-apple-event-id "pref") ; kAEShowPreferences
+(put 'autosave-now         'mac-apple-event-id "asav") ; kAEAutosaveNow
 ;; kAEInternetEventClass
-(put 'get-url            'mac-apple-event-id "GURL") ; kAEGetURL
+(put 'get-url              'mac-apple-event-id "GURL") ; kAEGetURL
 ;; Converted HI command events
-(put 'about              'mac-apple-event-id "abou") ; kHICommandAbout
+(put 'about                'mac-apple-event-id "abou") ; kHICommandAbout
+(put 'show-hide-font-panel 'mac-apple-event-id "shfp") ; kHICommandShowHideFontPanel
 
 (defmacro mac-event-spec (event)
   `(nth 1 ,event))
@@ -1796,6 +1802,8 @@ With numeric ARG, display the font panel if and only if ARG is positive."
   'mac-handle-font-panel-closed)
 ;; kEventClassFont/kEventFontSelection
 (define-key mac-apple-event-map [font selection] 'mac-handle-font-selection)
+(define-key mac-apple-event-map [hi-command show-hide-font-panel]
+  'mac-font-panel-mode)
 
 (define-key-after menu-bar-showhide-menu [mac-font-panel-mode]
   (menu-bar-make-mm-toggle mac-font-panel-mode
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index fe774a4125f..967d9918b59 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -2393,6 +2393,12 @@ order until succeed.")
         (kill-new clipboard-text))
     (yank)))
 
+(defun x-menu-bar-open (&optional frame)
+  "Open the menu bar if `menu-bar-mode' is on. otherwise call `tmm-menubar'."
+  (interactive "i")
+  (if menu-bar-mode (menu-bar-open frame)
+    (tmm-menubar)))
+
 
 ;;; Window system initialization.
 
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 2e498a8de86..e574c34543f 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -162,17 +162,20 @@
 ;; These keys are available in xterm starting from version 216
 ;; if the modifyOtherKeys resource is set to 1.
 
+(define-key xterm-function-map "\e[27;5;9~"   [C-tab])
+(define-key xterm-function-map "\e[27;5;13~"  [C-return])
 (define-key xterm-function-map "\e[27;5;39~"  [?\C-\'])
+(define-key xterm-function-map "\e[27;5;44~"  [?\C-,])
 (define-key xterm-function-map "\e[27;5;45~"  [?\C--])
-
+(define-key xterm-function-map "\e[27;5;46~"  [?\C-.])
+(define-key xterm-function-map "\e[27;5;47~"  [?\C-/])
 (define-key xterm-function-map "\e[27;5;48~"  [?\C-0])
 (define-key xterm-function-map "\e[27;5;49~"  [?\C-1])
 ;; Not all C-DIGIT keys have a distinct binding.
 (define-key xterm-function-map "\e[27;5;57~"  [?\C-9])
-
-(define-key xterm-function-map "\e[27;5;59~"  [?\C-\;])
+(define-key xterm-function-map "\e[27;5;59~"  [(C-\;)])
 (define-key xterm-function-map "\e[27;5;61~"  [?\C-=])
-
+(define-key xterm-function-map "\e[27;5;92~"  [?\C-\\])
 
 (define-key xterm-function-map "\e[27;6;33~"  [?\C-!])
 (define-key xterm-function-map "\e[27;6;34~"  [?\C-\"])
@@ -184,26 +187,93 @@
 (define-key xterm-function-map "\e[27;6;41~"  [?\C-)])
 (define-key xterm-function-map "\e[27;6;42~"  [?\C-*])
 (define-key xterm-function-map "\e[27;6;43~"  [?\C-+])
-
 (define-key xterm-function-map "\e[27;6;58~"  [?\C-:])
 (define-key xterm-function-map "\e[27;6;60~"  [?\C-<])
 (define-key xterm-function-map "\e[27;6;62~"  [?\C->])
 (define-key xterm-function-map "\e[27;6;63~"  [(C-\?)])
 
-(define-key xterm-function-map "\e[27;5;9~"  [C-tab])
-(define-key xterm-function-map "\e[27;5;13~" [C-return])
-(define-key xterm-function-map "\e[27;5;44~" [?\C-,])
-(define-key xterm-function-map "\e[27;5;46~" [?\C-.])
-(define-key xterm-function-map "\e[27;5;47~" [?\C-/])
-(define-key xterm-function-map "\e[27;5;92~" [?\C-\\])
-
-(define-key xterm-function-map "\e[27;2;9~" [S-tab])
-(define-key xterm-function-map "\e[27;2;13~" [S-return])
-
-(define-key xterm-function-map "\e[27;6;9~" [(C-S-tab)])
+;; These are the strings emitted for various C-M- combinations
+;; for keyboards that the Meta and Alt modifiers are on the same
+;; key (usually labeled "Alt").
+(define-key xterm-function-map "\e[27;13;9~"  [(C-M-tab)])
+(define-key xterm-function-map "\e[27;13;13~" [(C-M-return)])
 
+(define-key xterm-function-map "\e[27;13;39~" [?\C-\M-\'])
+(define-key xterm-function-map "\e[27;13;44~" [?\C-\M-,])
+(define-key xterm-function-map "\e[27;13;45~" [?\C-\M--])
 (define-key xterm-function-map "\e[27;13;46~" [?\C-\M-.])
-
+(define-key xterm-function-map "\e[27;13;47~" [?\C-\M-/])
+(define-key xterm-function-map "\e[27;13;48~" [?\C-\M-0])
+(define-key xterm-function-map "\e[27;13;49~" [?\C-\M-1])
+(define-key xterm-function-map "\e[27;13;50~" [?\C-\M-2])
+(define-key xterm-function-map "\e[27;13;51~" [?\C-\M-3])
+(define-key xterm-function-map "\e[27;13;52~" [?\C-\M-4])
+(define-key xterm-function-map "\e[27;13;53~" [?\C-\M-5])
+(define-key xterm-function-map "\e[27;13;54~" [?\C-\M-6])
+(define-key xterm-function-map "\e[27;13;55~" [?\C-\M-7])
+(define-key xterm-function-map "\e[27;13;56~" [?\C-\M-8])
+(define-key xterm-function-map "\e[27;13;57~" [?\C-\M-9])
+(define-key xterm-function-map "\e[27;13;59~" [?\C-\M-\;])
+(define-key xterm-function-map "\e[27;13;61~" [?\C-\M-=])
+(define-key xterm-function-map "\e[27;13;92~" [?\C-\M-\\])
+
+(define-key xterm-function-map "\e[27;14;33~"  [?\C-\M-!])
+(define-key xterm-function-map "\e[27;14;34~"  [?\C-\M-\"])
+(define-key xterm-function-map "\e[27;14;35~"  [?\C-\M-#])
+(define-key xterm-function-map "\e[27;14;36~"  [?\C-\M-$])
+(define-key xterm-function-map "\e[27;14;37~"  [?\C-\M-%])
+(define-key xterm-function-map "\e[27;14;38~"  [(C-M-&)])
+(define-key xterm-function-map "\e[27;14;40~"  [?\C-\M-(])
+(define-key xterm-function-map "\e[27;14;41~"  [?\C-\M-)])
+(define-key xterm-function-map "\e[27;14;42~"  [?\C-\M-*])
+(define-key xterm-function-map "\e[27;14;43~"  [?\C-\M-+])
+(define-key xterm-function-map "\e[27;14;58~"  [?\C-\M-:])
+(define-key xterm-function-map "\e[27;14;60~"  [?\C-\M-<])
+(define-key xterm-function-map "\e[27;14;62~"  [?\C-\M->])
+(define-key xterm-function-map "\e[27;14;63~"  [(C-M-\?)])
+
+(define-key xterm-function-map "\e[27;7;9~"  [(C-M-tab)])
+(define-key xterm-function-map "\e[27;7;13~" [(C-M-return)])
+
+(define-key xterm-function-map "\e[27;7;39~" [?\C-\M-\'])
+(define-key xterm-function-map "\e[27;7;44~" [?\C-\M-,])
+(define-key xterm-function-map "\e[27;7;45~" [?\C-\M--])
+(define-key xterm-function-map "\e[27;7;46~" [?\C-\M-.])
+(define-key xterm-function-map "\e[27;7;47~" [?\C-\M-/])
+(define-key xterm-function-map "\e[27;7;48~" [?\C-\M-0])
+(define-key xterm-function-map "\e[27;7;49~" [?\C-\M-1])
+(define-key xterm-function-map "\e[27;7;50~" [?\C-\M-2])
+(define-key xterm-function-map "\e[27;7;51~" [?\C-\M-3])
+(define-key xterm-function-map "\e[27;7;52~" [?\C-\M-4])
+(define-key xterm-function-map "\e[27;7;53~" [?\C-\M-5])
+(define-key xterm-function-map "\e[27;7;54~" [?\C-\M-6])
+(define-key xterm-function-map "\e[27;7;55~" [?\C-\M-7])
+(define-key xterm-function-map "\e[27;7;56~" [?\C-\M-8])
+(define-key xterm-function-map "\e[27;7;57~" [?\C-\M-9])
+(define-key xterm-function-map "\e[27;7;59~" [?\C-\M-\;])
+(define-key xterm-function-map "\e[27;7;61~" [?\C-\M-=])
+(define-key xterm-function-map "\e[27;7;92~" [?\C-\M-\\])
+
+(define-key xterm-function-map "\e[27;8;33~"  [?\C-\M-!])
+(define-key xterm-function-map "\e[27;8;34~"  [?\C-\M-\"])
+(define-key xterm-function-map "\e[27;8;35~"  [?\C-\M-#])
+(define-key xterm-function-map "\e[27;8;36~"  [?\C-\M-$])
+(define-key xterm-function-map "\e[27;8;37~"  [?\C-\M-%])
+(define-key xterm-function-map "\e[27;8;38~"  [(C-M-&)])
+(define-key xterm-function-map "\e[27;8;40~"  [?\C-\M-(])
+(define-key xterm-function-map "\e[27;8;41~"  [?\C-\M-)])
+(define-key xterm-function-map "\e[27;8;42~"  [?\C-\M-*])
+(define-key xterm-function-map "\e[27;8;43~"  [?\C-\M-+])
+(define-key xterm-function-map "\e[27;8;58~"  [?\C-\M-:])
+(define-key xterm-function-map "\e[27;8;60~"  [?\C-\M-<])
+(define-key xterm-function-map "\e[27;8;62~"  [?\C-\M->])
+(define-key xterm-function-map "\e[27;8;63~"  [(C-M-\?)])
+
+(define-key xterm-function-map "\e[27;2;9~"   [S-tab])
+(define-key xterm-function-map "\e[27;2;13~"  [S-return])
+
+(define-key xterm-function-map "\e[27;6;9~"   [(C-S-tab)])
+(define-key xterm-function-map "\e[27;6;13~"  [(C-S-return)])
 
 ;; Other versions of xterm might emit these.
 (define-key xterm-function-map "\e[A" [up])
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index e762f87f328..f7a725242ed 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -75,8 +75,8 @@ not align (only setting space according to `conf-assignment-space')."
     (define-key map "\C-c\C-u" 'conf-unix-mode)
     (define-key map "\C-c\C-w" 'conf-windows-mode)
     (define-key map "\C-c\C-j" 'conf-javaprop-mode)
-    (define-key map "\C-c\C-s" 'conf-space-mode)
-    (define-key map "\C-c " 'conf-space-mode)
+    (define-key map "\C-c\C-s" 'conf-space-keywords)
+    (define-key map "\C-c " 'conf-space-keywords)
     (define-key map "\C-c\C-c" 'conf-colon-mode)
     (define-key map "\C-c:" 'conf-colon-mode)
     (define-key map "\C-c\C-x" 'conf-xdefaults-mode)
@@ -168,7 +168,7 @@ not align (only setting space according to `conf-assignment-space')."
     ("/resmgr\\.conf" . "class\\|add\\|allow\\|deny")
     ("/dictionary\\.lst\\'" . "DICT\\|HYPH\\|THES")
     ("/tuxracer/options" . "set"))
-  "File name based settings for `conf-space-keywords'.")
+  "File-name-based settings for the variable `conf-space-keywords'.")
 
 (defvar conf-space-keywords nil
   "Regexps for functions that may come before a space assignment.
@@ -188,7 +188,7 @@ This variable is best set in the file local variables, or through
                 '(1 'font-lock-keyword-face)
                 '(2 'font-lock-variable-name-face))
           '("^[ \t]*\\([^\000- ]+\\)" 1 'font-lock-variable-name-face)))
-  "Keywords to hilight in Conf Space mode.")
+  "Keywords to highlight in Conf Space mode.")
 
 (defvar conf-colon-font-lock-keywords
   `(;; [section] (do this first because it may look like a parameter)
@@ -446,10 +446,11 @@ x.2.y.1.z.2.zz ="
 (define-derived-mode conf-space-mode conf-unix-mode "Conf[Space]"
   "Conf Mode starter for space separated conf files.
 \"Assignments\" are with ` '.  Keywords before the parameters are
-recognized according to `conf-space-keywords'.  Interactively
-with a prefix ARG of `0' no keywords will be recognized.  With
-any other prefix arg you will be prompted for a regexp to match
-the keywords.
+recognized according to the variable `conf-space-keywords-alist'.
+Alternatively, you can specify a value for the file local variable
+`conf-space-keywords'.
+Use the function `conf-space-keywords' if you want to specify keywords
+in an interactive fashion instead.
 
 For details see `conf-mode'.  Example:
 
@@ -465,34 +466,61 @@ class desktop
 add /dev/audio          desktop
 add /dev/mixer          desktop"
   (conf-mode-initialize "#" 'conf-space-font-lock-keywords)
-  (set (make-local-variable 'conf-assignment-sign)
-       nil)
-  ;; This doesn't seem right, but the next two depend on conf-space-keywords
-  ;; being set, while after-change-major-mode-hook might set up imenu, needing
-  ;; the following result:
-  (hack-local-variables-prop-line)
-  (hack-local-variables)
-  (cond (current-prefix-arg
-         (set (make-local-variable 'conf-space-keywords)
-              (if (> (prefix-numeric-value current-prefix-arg) 0)
-                  (read-string "Regexp to match keywords: "))))
-        (conf-space-keywords)
-        (buffer-file-name
-         (set (make-local-variable 'conf-space-keywords)
-              (assoc-default buffer-file-name conf-space-keywords-alist
-                             'string-match))))
-  (set (make-local-variable 'conf-assignment-regexp)
-       (if conf-space-keywords
-           (concat "\\(?:" conf-space-keywords "\\)[ \t]+.+?\\([ \t]+\\|$\\)")
-         ".+?\\([ \t]+\\|$\\)"))
+  (make-local-variable 'conf-assignment-sign)
+  (setq conf-assignment-sign nil)
+  (make-local-variable 'conf-space-keywords)
+  (cond (buffer-file-name
+         ;; We set conf-space-keywords directly, but a value which is
+         ;; in the local variables list or interactively specified
+         ;; (see the function conf-space-keywords) takes precedence.
+         (setq conf-space-keywords
+               (assoc-default buffer-file-name conf-space-keywords-alist
+                              'string-match))))
+  (conf-space-mode-internal)
+  ;; In case the local variables list specifies conf-space-keywords,
+  ;; recompute other things from that afterward.
+  (add-hook 'hack-local-variables-hook 'conf-space-mode-internal nil t))
+
+;;;###autoload
+(defun conf-space-keywords (keywords)
+  "Enter Conf Space mode using regexp KEYWORDS to match the keywords.
+See `conf-space-mode'."
+  (interactive "sConf Space keyword regexp: ")
+  (delay-mode-hooks
+    (conf-space-mode))
+  (if (string-equal keywords "")
+      (setq keywords nil))
+  (setq conf-space-keywords keywords)
+  (conf-space-mode-internal)
+  (run-mode-hooks))
+
+(defun conf-space-mode-internal ()
+  (make-local-variable 'conf-assignment-regexp)
+  (setq conf-assignment-regexp
+        (if conf-space-keywords
+            (concat "\\(?:" conf-space-keywords "\\)[ \t]+.+?\\([ \t]+\\|$\\)")
+          ".+?\\([ \t]+\\|$\\)"))
+  ;; If Font Lock is already enabled, reenable it with new
+  ;; conf-assignment-regexp.
+  (when (and font-lock-mode
+             (boundp 'font-lock-keywords)) ;see `normal-mode'
+    (font-lock-add-keywords nil nil)
+    (font-lock-mode 1))
+  ;; Copy so that we don't destroy shared structure.
+  (setq imenu-generic-expression (copy-sequence imenu-generic-expression))
+  ;; Get rid of any existing Parameters element.
+  (setq imenu-generic-expression
+        (delq (assoc "Parameters" imenu-generic-expression)
+              imenu-generic-expression))
+  ;; Add a new one based on conf-space-keywords.
   (setq imenu-generic-expression
-        `(,@(cdr imenu-generic-expression)
-          ("Parameters"
-           ,(if conf-space-keywords
-                (concat "^[ \t]*\\(?:" conf-space-keywords
-                        "\\)[ \t]+\\([^ \t\n]+\\)\\(?:[ \t]\\|$\\)")
-              "^[ \t]*\\([^ \t\n[]+\\)\\(?:[ \t]\\|$\\)")
-           1))))
+        (cons `("Parameters"
+                ,(if conf-space-keywords
+                     (concat "^[ \t]*\\(?:" conf-space-keywords
+                             "\\)[ \t]+\\([^ \t\n]+\\)\\(?:[ \t]\\|$\\)")
+                   "^[ \t]*\\([^ \t\n[]+\\)\\(?:[ \t]\\|$\\)")
+                1)
+              imenu-generic-expression)))
 
 ;;;###autoload
 (define-derived-mode conf-colon-mode conf-unix-mode "Conf[Colon]"
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 95f73b56952..514350119fe 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -89,7 +89,8 @@ reinserts the fill prefix in each resulting line."
 (defcustom adaptive-fill-regexp
   ;; Added `!' for doxygen comments starting with `//!' or `/*!'.
   ;; Added `%' for TeX comments.
-  (purecopy "[ \t]*\\([-!|#%;>*,A7$,1s"s#sC$,2"F(B]+[ \t]*\\|(?[0-9]+[.)][ \t]*\\)*")
+  ;; RMS: deleted the code to match `1.' and `(1)'.
+  "[ \t]*\\([-!|#%;>*,A7$,1s"s#sC$,2"F(B]+[ \t]*\\)*"
   "*Regexp to match text at start of line that constitutes indentation.
 If Adaptive Fill mode is enabled, a prefix matching this pattern
 on the first and second lines of a paragraph is used as the
@@ -292,7 +293,9 @@ act as a paragraph-separator."
 
 (defun fill-single-word-nobreak-p ()
   "Don't break a line after the first or before the last word of a sentence."
-  (or (looking-at (concat "[ \t]*\\sw+" "\\(?:" (sentence-end) "\\)"))
+  ;; Actually, allow breaking before the last word of a sentence, so long as
+  ;; it's not the last word of the paragraph.
+  (or (looking-at (concat "[ \t]*\\sw+" "\\(?:" (sentence-end) "\\)[ \t]*$"))
       (save-excursion
         (skip-chars-backward " \t")
         (and (/= (skip-syntax-backward "w") 0)
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 23f4756f4a7..ebee4691e8c 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -992,7 +992,7 @@ Mostly we check word delimiters."
     (flyspell-accept-buffer-local-defs)
     (let* ((cursor-location (point))
            (flyspell-word (flyspell-get-word following))
-           start end poss word)
+           start end poss word ispell-filter)
       (if (or (eq flyspell-word nil)
               (and (fboundp flyspell-generic-check-word-predicate)
                    (not (funcall flyspell-generic-check-word-predicate))))
@@ -1050,7 +1050,12 @@ Mostly we check word delimiters."
                        (not (string= "" (car ispell-filter))))))
             ;; (ispell-send-string "!\n")
             ;; back to terse mode.
+            ;; Remove leading empty element
             (setq ispell-filter (cdr ispell-filter))
+            ;; ispell process should return something after word is sent.
+            ;; Tag word as valid (i.e., skip) otherwise
+            (or ispell-filter
+                (setq ispell-filter '(*)))
             (if (consp ispell-filter)
                 (setq poss (ispell-parse-output (car ispell-filter))))
             (let ((res (cond ((eq poss t)
@@ -1455,6 +1460,22 @@ The buffer to mark them in is `flyspell-large-region-buffer'."
             (while (re-search-forward regexp nil t)
               (delete-region (match-beginning 0) (match-end 0)))))))))
 
+;;* ---------------------------------------------------------------
+;;*     flyspell-check-region-doublons
+;;* ---------------------------------------------------------------
+(defun flyspell-check-region-doublons (beg end)
+  "Check for adjacent duplicated words (doublons) in the given region."
+  (save-excursion
+    (goto-char beg)
+    (flyspell-word)     ; Make sure current word is checked
+    (backward-word 1)
+    (while (and (< (point) end)
+                (re-search-forward "\\b\\([^ \n\t]+\\)[ \n\t]+\\1\\b"
+                                   end 'move))
+      (flyspell-word)
+      (backward-word 1))
+    (flyspell-word)))
+
 ;;*---------------------------------------------------------------------*/
 ;;*    flyspell-large-region ...                                        */
 ;;*---------------------------------------------------------------------*/
@@ -1499,7 +1520,8 @@ The buffer to mark them in is `flyspell-large-region-buffer'."
           (progn
             (flyspell-process-localwords buffer)
             (with-current-buffer curbuf
-              (flyspell-delete-region-overlays beg end))
+              (flyspell-delete-region-overlays beg end)
+              (flyspell-check-region-doublons beg end))
             (flyspell-external-point-words))
         (error "Can't check region...")))))
 
@@ -1830,7 +1852,7 @@ This command proposes various successive corrections for the current word."
             (let ((start (car (cdr word)))
                   (end (car (cdr (cdr word))))
                   (word (car word))
-                  poss)
+                  poss ispell-filter)
               (setq flyspell-auto-correct-word word)
               ;; now check spelling of word.
               (ispell-send-string "%\n") ;put in verbose mode
@@ -1839,7 +1861,12 @@ This command proposes various successive corrections for the current word."
               (while (progn
                        (accept-process-output ispell-process)
                        (not (string= "" (car ispell-filter)))))
+              ;; Remove leading empty element
               (setq ispell-filter (cdr ispell-filter))
+              ;; ispell process should return something after word is sent.
+              ;; Tag word as valid (i.e., skip) otherwise
+              (or ispell-filter
+                  (setq ispell-filter '(*)))
               (if (consp ispell-filter)
                   (setq poss (ispell-parse-output (car ispell-filter))))
               (cond
@@ -1980,7 +2007,7 @@ The word checked is the word at the mouse position."
           (let ((start (car (cdr word)))
                 (end (car (cdr (cdr word))))
                 (word (car word))
-                poss)
+                poss ispell-filter)
             ;; now check spelling of word.
             (ispell-send-string "%\n") ;put in verbose mode
             (ispell-send-string (concat "^" word "\n"))
@@ -1988,7 +2015,12 @@ The word checked is the word at the mouse position."
             (while (progn
                      (accept-process-output ispell-process)
                      (not (string= "" (car ispell-filter)))))
+            ;; Remove leading empty element
             (setq ispell-filter (cdr ispell-filter))
+            ;; ispell process should return something after word is sent.
+            ;; Tag word as valid (i.e., skip) otherwise
+            (or ispell-filter
+                (setq ispell-filter '(*)))
             (if (consp ispell-filter)
                 (setq poss (ispell-parse-output (car ispell-filter))))
             (cond
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index a0eb147d9c8..2a42a91f7e7 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2613,8 +2613,9 @@ By just answering RET you can find out what the current dictionary is."
   (cond ((equal dict "")
          (ispell-internal-change-dictionary)
          (message "Using %s dictionary"
-                  (or ispell-local-dictionary ispell-dictionary "default")))
-        ((equal dict (or ispell-local-dictionary
+                  (or (and (not arg) ispell-local-dictionary)
+                      ispell-dictionary "default")))
+        ((equal dict (or (and (not arg) ispell-local-dictionary)
                          ispell-dictionary "default"))
          ;; Specified dictionary is the default already. Could reload
          ;; the dictionaries if needed.
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index ecbcd86d043..caca6a6ae7d 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -2690,7 +2690,7 @@ Also put tags into group 4 if tags are present.")
 (make-variable-buffer-local 'org-keyword-time-regexp)
 
 (defconst org-rm-props '(invisible t face t keymap t intangible t mouse-face t
-                                   mouse-map t)
+                                   rear-nonsticky t mouse-map t)
   "Properties to remove when a string without properties is wanted.")
 
 (defsubst org-match-string-no-properties (num &optional string)
@@ -3140,6 +3140,7 @@ that will be added to PLIST.  Returns the string that was modified."
       (progn
         (add-text-properties (match-beginning 0) (match-end 0)
                              (list 'mouse-face 'highlight
+                                   'rear-nonsticky t
                                    'keymap org-mouse-map
                                    ))
         t)))
@@ -3150,6 +3151,7 @@ that will be added to PLIST.  Returns the string that was modified."
       (progn
         (add-text-properties (match-beginning 0) (match-end 0)
                              (list 'mouse-face 'highlight
+                                   'rear-nonsticky t
                                    'keymap org-mouse-map
                                    ))
         t)))
@@ -3188,6 +3190,7 @@ that will be added to PLIST.  Returns the string that was modified."
       (progn
         (add-text-properties (match-beginning 0) (match-end 0)
                              (list 'mouse-face 'highlight
+                                   'rear-nonsticky t
                                    'keymap org-mouse-map))
         t)))
 
@@ -3206,6 +3209,7 @@ that will be added to PLIST.  Returns the string that was modified."
           (progn
             (add-text-properties (match-beginning 0) (match-end 0)
                                  (list 'mouse-face 'highlight
+                                       'rear-nonsticky t
                                        'keymap org-mouse-map
                                        'help-echo "Radio target link"
                                        'org-linked-text t))
@@ -3271,6 +3275,7 @@ between words."
       (progn
         (add-text-properties (match-beginning 0) (match-end 0)
                              (list 'mouse-face 'highlight
+                                   'rear-nonsticky t
                                    'keymap org-mouse-map))
         t)))
 
@@ -3279,6 +3284,7 @@ between words."
       (progn
         (add-text-properties (match-beginning 1) (match-end 1)
                              (list 'mouse-face 'highlight
+                                   'rear-nonsticky t
                                    'keymap org-mouse-map))
         t)))
 
@@ -3380,6 +3386,7 @@ between words."
          deactivate-mark buffer-file-name buffer-file-truename)
     (remove-text-properties beg end
                             '(mouse-face nil keymap nil org-linked-text nil
+                                         rear-nonsticky nil
                                          invisible nil intangible nil))))
 ;;; Visibility cycling
 
@@ -4569,7 +4576,7 @@ this heading. "
                 ;; Make the subtree visible
                 (show-subtree)
                 (org-end-of-subtree t)
-                (skip-chars-backward " \t\r\n]")
+                (skip-chars-backward " \t\r\n")
                 (and (looking-at "[ \t\r\n]*")
                      (replace-match "\n\n")))
             ;; No specific heading, just go to end of file.
@@ -6204,15 +6211,15 @@ the returned times will be formatted strings."
     (while (setq p (next-single-property-change (point) :org-clock-minutes))
       (goto-char p)
       (when (setq time (get-text-property p :org-clock-minutes))
-        (beginning-of-line 1)
-        (when (and (looking-at "\\(\\*+\\)[ \t]+\\(.*?\\)\\([ \t]+:[0-9a-zA-Z_@:]+:\\)?[ \t]*$")
-                   (setq level (- (match-end 1) (match-beginning 1)))
-                   (<= level maxlevel))
-          (setq hlc (if emph (or (cdr (assoc level hlchars)) "") "")
-                hdl (match-string 2)
-                h (/ time 60)
-                m (- time (* 60 h)))
-          (save-excursion
+        (save-excursion
+          (beginning-of-line 1)
+          (when (and (looking-at "\\(\\*+\\)[ \t]+\\(.*?\\)\\([ \t]+:[0-9a-zA-Z_@:]+:\\)?[ \t]*$")
+                     (setq level (- (match-end 1) (match-beginning 1)))
+                     (<= level maxlevel))
+            (setq hlc (if emph (or (cdr (assoc level hlchars)) "") "")
+                  hdl (match-string 2)
+                  h (/ time 60)
+                  m (- time (* 60 h)))
             (goto-char ins)
             (if (= level 1) (insert-before-markers "|-\n"))
             (insert-before-markers
@@ -8660,7 +8667,7 @@ are included in the output."
               (push txt rtn))
             ;; if we are to skip sublevels, jump to end of subtree
             (point)
-            (or org-tags-match-list-sublevels (org-end-of-subtree))))))
+            (or org-tags-match-list-sublevels (org-end-of-subtree t))))))
     (when (and (eq action 'sparse-tree)
                (not org-sparse-tree-open-archived-trees))
       (org-hide-archived-subtrees (point-min) (point-max)))
@@ -9816,7 +9823,7 @@ on the system \"/user@host:\"."
         ((fboundp 'tramp-handle-file-remote-p)
          (tramp-handle-file-remote-p file))
         ((and (boundp 'ange-ftp-name-format)
-              (string-match ange-ftp-name-format file))
+              (string-match (car ange-ftp-name-format) file))
          t)
         (t nil)))
 
diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el
index e1ae98a59df..b878c288735 100644
--- a/lisp/textmodes/reftex-global.el
+++ b/lisp/textmodes/reftex-global.el
@@ -38,7 +38,8 @@ The TAGS file is also immediately visited with `visit-tags-table'."
   (reftex-access-scan-info current-prefix-arg)
   (let* ((master (reftex-TeX-master-file))
          (files  (reftex-all-document-files))
-         (cmd    (format "etags %s" (mapconcat 'identity files " "))))
+         (cmd    (format "etags %s" (mapconcat 'shell-quote-argument
+                                               files " "))))
     (save-excursion
       (set-buffer (reftex-get-file-buffer-force master))
       (message "Running etags to create TAGS file...")
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index f4334fbbd70..0f8a948e363 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -232,7 +232,7 @@ distribution.  Mixed-case symbols are convenience aliases.")
   "LaTeX label and citation support."
   :tag "RefTeX"
   :link '(url-link :tag "Home Page" 
-                   "http://zon.astro.uva.nl/~dominik/Tools/")
+                   "http://staff.science.uva.nl/~dominik/Tools/reftex/")
   :link '(emacs-commentary-link :tag "Commentary in reftex.el" "reftex.el")
   :link '(custom-manual "(reftex)Top")
   :prefix "reftex-"
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index b8ab100c19d..958ef179b26 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -340,9 +340,9 @@ The appearance of the screen can be customized by the variables
 ;;;###autoload
 (defun 2C-two-columns (&optional buffer)
   "Split current window vertically for two-column editing.
-When called the first time, associates a buffer with the current
-buffer in two-column minor mode (see  \\[describe-mode] ).
-Runs `2C-other-buffer-hook' in the new buffer.
+\\<global-map>When called the first time, associates a buffer with the current
+buffer in two-column minor mode (use \\[describe-mode] once in the mode,
+for details.).  It runs `2C-other-buffer-hook' in the new buffer.
 When called again, restores the screen layout with the current buffer
 first and the associated buffer to its right."
   (interactive "P")
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index c0aa80ef1ae..e2618bca8fd 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -240,7 +240,7 @@ This may contain whitespace (including newlines) .")
   (let ((strip (thing-at-point-looking-at
                          thing-at-point-markedup-url-regexp))) ;; (url "") short
     (if (or strip
-`           (thing-at-point-looking-at thing-at-point-url-regexp)
+            (thing-at-point-looking-at thing-at-point-url-regexp)
             ;; Access scheme omitted?
             ;; (setq short (thing-at-point-looking-at
             ;;           thing-at-point-short-url-regexp))
diff --git a/lisp/time.el b/lisp/time.el
index 115681c1b58..74812bf9f94 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -31,7 +31,7 @@
 
 (defgroup display-time nil
   "Display time and load in mode line of Emacs."
-  :group 'modeline
+  :group 'mode-line
   :group 'mail)
 
 
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index e4b54f9fc92..2aa14af8983 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,49 @@
+2006-10-12  Magnus Henoch  <mange@freemail.hu>
+
+        * url-http.el (url-http-find-free-connection): Handle
+        url-open-stream returning nil.
+
+2006-10-11  Magnus Henoch  <mange@freemail.hu>
+
+        * url-https.el: Remove (clashes with url-http on 8+3 systems).
+
+        * url-http.el: Move contents of url-https.el here.  Add autoloads.
+
+2006-10-09  Magnus Henoch  <mange@freemail.hu>
+
+        * url-parse.el (url-generic-parse-url): Handle URLs with empty
+        path component and non-empty query component.  Untangle path,
+        query and fragment parsing code.  Add references to RFC 3986 in
+        comments.
+        (url-recreate-url-attributes): Start query string with "?", not ";".
+
+2006-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * url-dav.el (url-dav-file-attributes): Simplify.
+
+        * url-http.el (url-http-head-file-attributes): Add device "info".
+
+2006-09-18  Michael Olson  <mwolson@gnu.org>
+
+        * url-methods.el (url-scheme-register-proxy): Handle case where
+        getenv returns an empty string for http_proxy.  This prevents an
+        error when calling `format' later on.
+
+2006-08-31  Diane Murray  <disumu@x3y2z1.net>
+
+        * url-parse.el (url-recreate-url-attributes): New function, code
+        simply moved from `url-recreate-url'.
+        (url-recreate-url): Use it.
+        Put the `url-target' at the end of the URL after the attributes.
+
+        * url-http.el (url-http-create-request):
+        Use `url-recreate-url-attributes' when setting real-fname.
+
+2006-08-29  Diane Murray  <disumu@x3y2z1.net>
+
+        * url-cookie.el (url-cookie-write-file): Really don't use versioned
+        backups.
+
 2006-08-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * url-handlers.el (url-file-local-copy): Tell url-copy-file that the
@@ -393,32 +439,19 @@
 
 2004-10-10  Lars Hansen  <larsh@math.ku.dk>
 
-        * url-auth.el: Update header and footer.
-
-        * url-cache.el: Update header and footer.
-
-        * url-cid.el: Update header and footer.
-
-        * url-dired.el: Update header and footer.
-
-        * url-expand.el: Update header and footer.
-
-        * url-ftp.el: Update header and footer.
-
-        * url-gw.el: Update header and footer.
-
-        * url-imap.el: Update header and footer.
-
-        * url-irc.el: Update header and footer.
-
-        * url-misc.el: Update header and footer.
-
-        * url-news.el: Update header and footer.
-
-        * url-ns.el: Update header and footer.
-
-        * url-privacy.el: Update header and footer.
-
+        * url-auth.el:
+        * url-cache.el:
+        * url-cid.el:
+        * url-dired.el:
+        * url-expand.el:
+        * url-ftp.el:
+        * url-gw.el:
+        * url-imap.el:
+        * url-irc.el:
+        * url-misc.el:
+        * url-news.el:
+        * url-ns.el:
+        * url-privacy.el:
         * url-proxy.el: Update header and footer.
 
         * url-vars.el: Update header.
@@ -463,42 +496,24 @@
 
 2004-10-10  Lars Hansen  <larsh@math.ku.dk>
 
-        * url-auth.el: Fix copyright notice.
-
-        * url-cache.el: Fix copyright notice.
-
-        * url-cookie.el: Fix copyright notice.
-
-        * url-dired.el: Fix copyright notice.
-
-        * url-file.el: Fix copyright notice.
-
-        * url-ftp.el: Fix copyright notice.
-
-        * url-handlers.el: Fix copyright notice.
-
-        * url-history.el: Fix copyright notice.
-
-        * url-irc.el: Fix copyright notice.
-
-        * url-mailto.el: Fix copyright notice.
-
-        * url-methods.el: Fix copyright notice.
-
-        * url-misc.el: Fix copyright notice.
-
-        * url-news.el: Fix copyright notice.
-
-        * url-nfs.el: Fix copyright notice.
-
-        * url-parse.el: Fix copyright notice.
-
-        * url-privacy.el: Fix copyright notice.
-
-        * url-vars.el: Fix copyright notice.
-
-        * url.el: Fix copyright notice.
-
+        * url-auth.el:
+        * url-cache.el:
+        * url-cookie.el:
+        * url-dired.el:
+        * url-file.el:
+        * url-ftp.el:
+        * url-handlers.el:
+        * url-history.el:
+        * url-irc.el:
+        * url-mailto.el:
+        * url-methods.el:
+        * url-misc.el:
+        * url-news.el:
+        * url-nfs.el:
+        * url-parse.el:
+        * url-privacy.el:
+        * url-vars.el:
+        * url.el:
         * url-util.el: Fix copyright notice.
 
 2004-10-06  Stefan Monnier  <monnier@iro.umontreal.ca>
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index e74d4989117..f3902619c89 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -168,11 +168,11 @@ telling Microsoft that."
       (insert ")\n(setq url-cookie-secure-storage\n '")
       (pp url-cookie-secure-storage (current-buffer))
       (insert ")\n")
-      (insert ";; Local Variables:\n"
+      (insert "\n;; Local Variables:\n"
               ";; version-control: never\n"
               ";; no-byte-compile: t\n"
               ";; End:\n")
-      (set (make-local-variable 'version-control) t)
+      (set (make-local-variable 'version-control) 'never)
       (write-file fname)
       (setq url-cookies-changed-since-last-save nil)
       (kill-buffer (current-buffer))))))
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index 449d8a510b5..546d744558d 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -621,59 +621,56 @@ Returns t iff the lock was successfully released."
 (autoload 'url-http-head-file-attributes "url-http")
 
 (defun url-dav-file-attributes (url &optional id-format)
-  (let ((properties (cdar (url-dav-get-properties url)))
-        (attributes nil))
+  (let ((properties (cdar (url-dav-get-properties url))))
     (if (and properties
              (url-dav-http-success-p (plist-get properties 'DAV:status)))
         ;; We got a good DAV response back..
-        (setq attributes
-              (list
-               ;; t for directory, string for symbolic link, or nil
-               ;; Need to support DAV Bindings to figure out the
-               ;; symbolic link issues.
-               (if (memq 'DAV:collection (plist-get properties 'DAV:resourcetype)) t nil)
+        (list
+         ;; t for directory, string for symbolic link, or nil
+         ;; Need to support DAV Bindings to figure out the
+         ;; symbolic link issues.
+         (if (memq 'DAV:collection (plist-get properties 'DAV:resourcetype)) t nil)
 
-               ;; Number of links to file... Needs DAV Bindings.
-               1
+         ;; Number of links to file... Needs DAV Bindings.
+         1
 
-               ;; File uid - no way to figure out?
-               0
+         ;; File uid - no way to figure out?
+         0
 
-               ;; File gid - no way to figure out?
-               0
+         ;; File gid - no way to figure out?
+         0
 
-               ;; Last access time - ???
-               nil
+         ;; Last access time - ???
+         nil
 
-               ;; Last modification time
-               (plist-get properties 'DAV:getlastmodified)
+         ;; Last modification time
+         (plist-get properties 'DAV:getlastmodified)
 
-               ;; Last status change time... just reuse last-modified
-               ;; for now.
-               (plist-get properties 'DAV:getlastmodified)
+         ;; Last status change time... just reuse last-modified
+         ;; for now.
+         (plist-get properties 'DAV:getlastmodified)
 
-               ;; size in bytes
-               (or (plist-get properties 'DAV:getcontentlength) 0)
+         ;; size in bytes
+         (or (plist-get properties 'DAV:getcontentlength) 0)
 
-               ;; file modes as a string like `ls -l'
-               ;; 
-               ;; Should be able to build this up from the
-               ;; DAV:supportedlock attribute pretty easily.  Getting
-               ;; the group info could be impossible though.
-               (url-dav-file-attributes-mode-string properties)
+         ;; file modes as a string like `ls -l'
+         ;; 
+         ;; Should be able to build this up from the
+         ;; DAV:supportedlock attribute pretty easily.  Getting
+         ;; the group info could be impossible though.
+         (url-dav-file-attributes-mode-string properties)
 
-               ;; t iff file's gid would change if it were deleted &
-               ;; recreated.  No way for us to know that thru DAV.
-               nil
+         ;; t iff file's gid would change if it were deleted &
+         ;; recreated.  No way for us to know that thru DAV.
+         nil
 
-               ;; inode number - meaningless
-               nil
+         ;; inode number - meaningless
+         nil
 
-               ;; device number - meaningless
-               nil))
+         ;; device number - meaningless
+         nil)
       ;; Fall back to just the normal http way of doing things.
-      (setq attributes (url-http-head-file-attributes url id-format)))
-    attributes))
+      (url-http-head-file-attributes url id-format))))
 
 (defun url-dav-save-resource (url obj &optional content-type lock-token)
   "Save OBJ as URL using WebDAV.
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index ae3a4b3e070..bf8069ded7e 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -123,8 +123,10 @@ request.")
            ;; like authentication.  But we use another buffer afterwards.
            (unwind-protect
                (let ((proc (url-open-stream host buf host port)))
-                 ;; Drop the temp buffer link before killing the buffer.
-                 (set-process-buffer proc nil)
+                 ;; url-open-stream might return nil.
+                 (when (processp proc)
+                   ;; Drop the temp buffer link before killing the buffer.
+                   (set-process-buffer proc nil))
                  proc)
              (kill-buffer buf)))))))
 
@@ -160,7 +162,8 @@ request.")
                        (let ((url-basic-auth-storage
                               'url-http-proxy-basic-auth-storage))
                          (url-get-authentication url nil 'any nil))))
-         (real-fname (url-filename (or proxy-obj url)))
+         (real-fname (concat (url-filename (or proxy-obj url))
+                             (url-recreate-url-attributes (or proxy-obj url))))
          (host (url-host (or proxy-obj url)))
          (auth (if (cdr-safe (assoc "Authorization" url-request-extra-headers))
                    nil
@@ -1150,19 +1153,19 @@ CBARGS as the arguments."
 (defalias 'url-http-file-readable-p 'url-http-file-exists-p)
 
 (defun url-http-head-file-attributes (url &optional id-format)
-  (let ((buffer (url-http-head url))
-        (attributes nil))
+  (let ((buffer (url-http-head url)))
     (when buffer
-      (setq attributes (make-list 11 nil))
-      (setf (nth 1 attributes) 1)       ; Number of links to file
-      (setf (nth 2 attributes) 0)       ; file uid
-      (setf (nth 3 attributes) 0)       ; file gid
-      (setf (nth 7 attributes)          ; file size
-            (url-http-symbol-value-in-buffer 'url-http-content-length
-                                             buffer -1))
-      (setf (nth 8 attributes) (eval-when-compile (make-string 10 ?-)))
-      (kill-buffer buffer))
-    attributes))
+      (prog1
+          (list
+           nil                          ;dir / link / normal file
+           1                            ;number of links to file.
+           0 0                          ;uid ; gid
+           nil nil nil                  ;atime ; mtime ; ctime
+           (url-http-symbol-value-in-buffer 'url-http-content-length
+                                            buffer -1)
+           (eval-when-compile (make-string 10 ?-))
+           nil nil nil)          ;whether gid would change ; inode ; device.
+        (kill-buffer buffer)))))
 
 ;;;###autoload
 (defun url-http-file-attributes (url &optional id-format)
@@ -1244,6 +1247,35 @@ p3p
     (if buffer (kill-buffer buffer))
     options))
 
+;; HTTPS.  This used to be in url-https.el, but that file collides
+;; with url-http.el on systems with 8-character file names.
+(require 'tls)
+
+;;;###autoload
+(defconst url-https-default-port 443 "Default HTTPS port.")
+;;;###autoload
+(defconst url-https-asynchronous-p t "HTTPS retrievals are asynchronous.")
+;;;###autoload
+(defalias 'url-https-expand-file-name 'url-http-expand-file-name)
+
+(defmacro url-https-create-secure-wrapper (method args)
+  `(defun ,(intern (format (if method "url-https-%s" "url-https") method)) ,args
+    ,(format "HTTPS wrapper around `%s' call." (or method "url-http"))
+    (let ((url-gateway-method (condition-case ()
+                                  (require 'ssl)
+                                (error 'tls))))
+      (,(intern (format (if method "url-http-%s" "url-http") method))
+       ,@(remove '&rest (remove '&optional args))))))
+
+;;;###autoload (autoload 'url-https "url-http")
+(url-https-create-secure-wrapper nil (url callback cbargs))
+;;;###autoload (autoload 'url-https-file-exists-p "url-http")
+(url-https-create-secure-wrapper file-exists-p (url))
+;;;###autoload (autoload 'url-https-file-readable-p "url-http")
+(url-https-create-secure-wrapper file-readable-p (url))
+;;;###autoload (autoload 'url-https-file-attributes "url-http")
+(url-https-create-secure-wrapper file-attributes (url &optional id-format))
+
 (provide 'url-http)
 
 ;; arch-tag: ba7c59ae-c0f4-4a31-9617-d85f221732ee
diff --git a/lisp/url/url-https.el b/lisp/url/url-https.el
deleted file mode 100644
index a7440a76535..00000000000
--- a/lisp/url/url-https.el
+++ /dev/null
@@ -1,56 +0,0 @@
-;;; url-https.el --- HTTP over SSL/TLS routines
-
-;; Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
-
-;; Keywords: comm, data, processes
-
-;; This file is part of GNU Emacs.
-;;
-;; GNU Emacs 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.
-;;
-;; GNU Emacs 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:
-
-;;; Code:
-
-(require 'url-gw)
-(require 'url-util)
-(require 'url-parse)
-(require 'url-cookie)
-(require 'url-http)
-(require 'tls)
-
-(defconst url-https-default-port 443 "Default HTTPS port.")
-(defconst url-https-asynchronous-p t "HTTPS retrievals are asynchronous.")
-(defalias 'url-https-expand-file-name 'url-http-expand-file-name)
-
-(defmacro url-https-create-secure-wrapper (method args)
-  `(defun ,(intern (format (if method "url-https-%s" "url-https") method)) ,args
-    ,(format "HTTPS wrapper around `%s' call." (or method "url-http"))
-    (let ((url-gateway-method (condition-case ()
-                                  (require 'ssl)
-                                (error 'tls))))
-      (,(intern (format (if method "url-http-%s" "url-http") method))
-       ,@(remove '&rest (remove '&optional args))))))
-
-(url-https-create-secure-wrapper nil (url callback cbargs))
-(url-https-create-secure-wrapper file-exists-p (url))
-(url-https-create-secure-wrapper file-readable-p (url))
-(url-https-create-secure-wrapper file-attributes (url &optional id-format))
-
-(provide 'url-https)
-
-;; arch-tag: c3645ac5-c248-4d12-ad41-7c4b6f7b6d19
-;;; url-https.el ends here
diff --git a/lisp/url/url-methods.el b/lisp/url/url-methods.el
index 6854d62af03..55166ee46f4 100644
--- a/lisp/url/url-methods.el
+++ b/lisp/url/url-methods.el
@@ -75,6 +75,11 @@
          (cur-proxy (assoc scheme url-proxy-services))
          (urlobj nil))
 
+    ;; If env-proxy is an empty string, treat it as if it were nil
+    (when (and (stringp env-proxy)
+               (string= env-proxy ""))
+      (setq env-proxy nil))
+
     ;; Store any proxying information - this will not overwrite an old
     ;; entry, so that people can still set this information in their
     ;; .emacs file
diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el
index f84bf1a7ba2..2e4fc8a9f27 100644
--- a/lisp/url/url-parse.el
+++ b/lisp/url/url-parse.el
@@ -100,28 +100,36 @@
                    (not (equal (url-port urlobj)
                                (url-scheme-get-property (url-type urlobj) 'default-port))))
               (format ":%d" (url-port urlobj)))
-          (or (url-filename urlobj) "/")
+          (or (url-filename urlobj) "/")          
+          (url-recreate-url-attributes urlobj)
           (if (url-target urlobj)
-              (concat "#" (url-target urlobj)))
-          (if (url-attributes urlobj)
-              (concat ";"
-                      (mapconcat
-                       (function
-                        (lambda (x)
-                          (if (cdr x)
-                              (concat (car x) "=" (cdr x))
-                            (car x)))) (url-attributes urlobj) ";")))))
+              (concat "#" (url-target urlobj)))))
+
+(defun url-recreate-url-attributes (urlobj)
+  "Recreate the attributes of an URL string from the parsed URLOBJ."
+  (when (url-attributes urlobj)
+    (concat "?"
+            (mapconcat (lambda (x)
+                         (if (cdr x)
+                             (concat (car x) "=" (cdr x))
+                           (car x)))
+                       (url-attributes urlobj) ";"))))
 
 ;;;###autoload
 (defun url-generic-parse-url (url)
   "Return a vector of the parts of URL.
 Format is:
 \[TYPE USER PASSWORD HOST PORT FILE TARGET ATTRIBUTES FULL\]"
+  ;; See RFC 3986.
   (cond
    ((null url)
     (make-vector 9 nil))
    ((or (not (string-match url-nonrelative-link url))
         (= ?/ (string-to-char url)))
+    ;; This isn't correct, as a relative URL can be a fragment link
+    ;; (e.g. "#foo") and many other things (see section 4.2).
+    ;; However, let's not fix something that isn't broken, especially
+    ;; when close to a release.
     (let ((retval (make-vector 9 nil)))
       (url-set-filename retval url)
       (url-set-full retval nil)
@@ -145,6 +153,8 @@ Format is:
         (insert url)
         (goto-char (point-min))
         (setq save-pos (point))
+
+        ;; 3.1. Scheme
         (if (not (looking-at "//"))
             (progn
               (skip-chars-forward "a-zA-Z+.\\-")
@@ -153,13 +163,13 @@ Format is:
               (skip-chars-forward ":")
               (setq save-pos (point))))
 
-        ;; We are doing a fully specified URL, with hostname and all
+        ;; 3.2. Authority
         (if (looking-at "//")
             (progn
               (setq full t)
               (forward-char 2)
               (setq save-pos (point))
-              (skip-chars-forward "^/")
+              (skip-chars-forward "^/\\?#")
               (setq host (buffer-substring save-pos (point)))
               (if (string-match "^\\([^@]+\\)@" host)
                   (setq user (match-string 1 host)
@@ -167,6 +177,7 @@ Format is:
               (if (and user (string-match "\\([^:]+\\):\\(.*\\)" user))
                   (setq pass (match-string 2 user)
                         user (match-string 1 user)))
+              ;; This gives wrong results for IPv6 literal addresses.
               (if (string-match ":\\([0-9+]+\\)" host)
                   (setq port (string-to-number (match-string 1 host))
                         host (substring host 0 (match-beginning 0))))
@@ -178,29 +189,26 @@ Format is:
         (if (not port)
             (setq port (url-scheme-get-property prot 'default-port)))
 
-        ;; Gross hack to preserve ';' in data URLs
-
+        ;; 3.3. Path
         (setq save-pos (point))
+        (skip-chars-forward "^#?")
+        (setq file (buffer-substring save-pos (point)))
 
-        (if (string= "data" prot)
-            (goto-char (point-max))
-          ;; Now check for references
+        ;; 3.4. Query
+        (when (looking-at "\\?")
+          (forward-char 1)
+          (setq save-pos (point))
           (skip-chars-forward "^#")
-          (if (eobp)
-              nil
-            (delete-region
-             (point)
-             (progn
-               (skip-chars-forward "#")
-               (setq refs (buffer-substring (point) (point-max)))
-               (point-max))))
-          (goto-char save-pos)
-          (skip-chars-forward "^;")
-          (if (not (eobp))
-              (setq attr (url-parse-args (buffer-substring (point) (point-max)) t)
-                    attr (nreverse attr))))
+          ;; RFC 3986 specifies no general way of parsing the query
+          ;; string, but `url-parse-args' seems universal enough.
+          (setq attr (url-parse-args (buffer-substring save-pos (point)) t)
+                attr (nreverse attr)))
+
+        ;; 3.5. Fragment
+        (when (looking-at "#")
+          (forward-char 1)
+          (setq refs (buffer-substring (point) (point-max))))
 
-        (setq file (buffer-substring save-pos (point)))
         (if (and host (string-match "%[0-9][0-9]" host))
             (setq host (url-unhex-string host)))
         (vector prot user pass host port file refs attr full))))))
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 13425391647..8b9973acab1 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -52,11 +52,13 @@ BACKEND, use `vc-handled-backends'.")
 (defvar vc-header-alist ())
 (make-obsolete-variable 'vc-header-alist 'vc-BACKEND-header)
 
-(defvar vc-ignore-dir-regexp "\\`\\([\\/][\\/]\\|/net/\\|/afs/\\)\\'"
- "Regexp matching directory names that are not under VC's control.
+(defcustom vc-ignore-dir-regexp "\\`\\([\\/][\\/]\\|/net/\\|/afs/\\)\\'"
+  "Regexp matching directory names that are not under VC's control.
 The default regexp prevents fruitless and time-consuming attempts
 to determine the VC status in directories in which filenames are
-interpreted as hostnames.")
+interpreted as hostnames."
+  :type 'regexp
+  :group 'vc)
 
 (defcustom vc-handled-backends '(RCS CVS SVN SCCS Arch MCVS)
   ;; Arch and MCVS come last because they are per-tree rather than per-dir.
@@ -308,6 +310,9 @@ non-nil if FILE exists and its contents were successfully inserted."
   "Find the root of a checked out project.
 The function walks up the directory tree from FILE looking for WITNESS.
 If WITNESS if not found, return nil, otherwise return the root."
+  ;; Represent /home/luser/foo as ~/foo so that we don't try to look for
+  ;; witnesses in /home or in /.
+  (setq file (abbreviate-file-name file))
   (let ((root nil))
     (while (not (or root
                    (equal file (setq file (file-name-directory file)))
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index fc64dd5f361..af41424ca75 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -912,6 +912,10 @@ Recommended as a parent keymap for modes using widgets.")
 ;; backward-compatibility alias
 (put 'widget-button-pressed-face 'face-alias 'widget-button-pressed)
 
+(defvar widget-button-click-moves-point nil
+  "If non-nil, `widget-button-click' moves point to a button after invoking it.
+If nil, point returns to its original position after invoking a button.")
+
 (defun widget-button-click (event)
   "Invoke the button that the mouse is pointing at."
   (interactive "e")
@@ -922,7 +926,8 @@ Recommended as a parent keymap for modes using widgets.")
              (start (event-start event))
              (button (get-char-property
                       pos 'button (and (windowp (posn-window start))
-                                       (window-buffer (posn-window start))))))
+                                       (window-buffer (posn-window start)))))
+             newpoint)
         (when (or (null button)
                   (catch 'button-press-cancelled
               ;; Mouse click on a widget button.  Do the following
@@ -959,24 +964,30 @@ Recommended as a parent keymap for modes using widgets.")
                                   (push event unread-command-events)
                                   (setq event oevent)
                                   (throw 'button-press-cancelled t))
-                                (setq pos (widget-event-point event))
-                                (if (and pos
-                                         (eq (get-char-property pos 'button)
-                                             button))
-                                    (when face
-                                      (overlay-put overlay 'face pressed-face)
-                                      (overlay-put overlay 'mouse-face pressed-face))
-                                  (overlay-put overlay 'face face)
-                                  (overlay-put overlay 'mouse-face mouse-face)))))
+                                (unless (or (integerp event)
+                                            (memq (car event) '(switch-frame select-window))
+                                            (eq (car event) 'scroll-bar-movement))
+                                  (setq pos (widget-event-point event))
+                                  (if (and pos
+                                           (eq (get-char-property pos 'button)
+                                               button))
+                                      (when face
+                                        (overlay-put overlay 'face pressed-face)
+                                        (overlay-put overlay 'mouse-face pressed-face))
+                                    (overlay-put overlay 'face face)
+                                    (overlay-put overlay 'mouse-face mouse-face))))))
 
                           ;; When mouse is released over the button, run
                           ;; its action function.
-                          (when (and pos
-                                     (eq (get-char-property pos 'button) button))
-                            (widget-apply-action button event)))
+                          (when (and pos (eq (get-char-property pos 'button) button))
+                            (goto-char pos)
+                            (widget-apply-action button event)
+                            (if widget-button-click-moves-point
+                                (setq newpoint (point)))))
                       (overlay-put overlay 'face face)
                       (overlay-put overlay 'mouse-face mouse-face))))
 
+                (if newpoint (goto-char newpoint))
                 ;; This loses if the widget action switches windows. -- cyd
                 ;; (unless (pos-visible-in-window-p (widget-event-point event))
                 ;;   (mouse-set-point event)
@@ -1862,7 +1873,7 @@ If END is omitted, it defaults to the length of LIST."
   "History of field minibuffer edits.")
 
 (defun widget-field-prompt-internal (widget prompt initial history)
-  "Read string for WIDGET promptinhg with PROMPT.
+  "Read string for WIDGET prompting with PROMPT.
 INITIAL is the initial input and HISTORY is a symbol containing
 the earlier input."
   (read-string prompt initial history))
@@ -2853,7 +2864,7 @@ The first group should be the link itself."
 
 (defcustom widget-documentation-link-p 'intern-soft
   "Predicate used to test if a string is useful as a link.
-The value should be a function.  The function will be called one
+The value should be a function.  The function will be called with one
 argument, a string, and should return non-nil if there should be a
 link for that string."
   :type 'function
diff --git a/lisp/window.el b/lisp/window.el
index 7810ba4c5be..0c50bc63a08 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -777,21 +777,134 @@ and the buffer that is killed or buried is the one in that window."
     ;; Maybe get rid of the window.
     (and window (not window-handled) (not window-solitary)
          (delete-window window))))
+
+(defvar mouse-autoselect-window-timer nil
+  "Timer used by delayed window autoselection.")
+
+(defvar mouse-autoselect-window-position nil
+  "Last mouse position recorded by delayed window autoselection.")
+
+(defvar mouse-autoselect-window-window nil
+  "Last window recorded by delayed window autoselection.")
+
+(defvar mouse-autoselect-window-now nil
+  "When non-nil don't delay autoselection in `handle-select-window'.")
+
+(defun mouse-autoselect-window-cancel (&optional force)
+  "Cancel delayed window autoselection.
+Optional argument FORCE means cancel unconditionally."
+  (unless (and (not force)
+               ;; Don't cancel while the user drags a scroll bar.
+               (eq this-command 'scroll-bar-toolkit-scroll)
+               (memq (nth 4 (event-end last-input-event))
+                     '(handle end-scroll)))
+    (setq mouse-autoselect-window-now nil)
+    (when (timerp mouse-autoselect-window-timer)
+      (cancel-timer mouse-autoselect-window-timer))
+    (remove-hook 'pre-command-hook 'mouse-autoselect-window-cancel)))
+
+(defun mouse-autoselect-window-start (window)
+  "Start delayed window autoselection.
+Called when Emacs detects that the mouse has moved to the non-selected
+window WINDOW and the variable `mouse-autoselect-window' has a numeric,
+non-zero value.  The return value is non-nil iff delayed autoselection
+started successfully.  Delayed window autoselection is canceled when the
+mouse position has stabilized or a command is executed."
+  ;; Cancel any active window autoselection.
+  (mouse-autoselect-window-cancel t)
+  ;; Record current mouse position in `mouse-autoselect-window-position' and
+  ;; WINDOW in `mouse-autoselect-window-window'.
+  (setq mouse-autoselect-window-position (mouse-position))
+  (setq mouse-autoselect-window-window window)
+  ;; Install timer which runs `mouse-autoselect-window-select' every
+  ;; `mouse-autoselect-window' seconds.
+  (setq mouse-autoselect-window-timer
+        (run-at-time
+         (abs mouse-autoselect-window) (abs mouse-autoselect-window)
+         'mouse-autoselect-window-select))
+  ;; Executing a command cancels window autoselection.
+  (add-hook 'pre-command-hook 'mouse-autoselect-window-cancel))
+
+(defun mouse-autoselect-window-select ()
+  "Select window with delayed window autoselection.
+If the mouse position has stabilized in a non-selected window, select
+that window.  The minibuffer window is selected iff the minibuffer is
+active.  This function is run by `mouse-autoselect-window-timer'."
+  (condition-case nil
+      (let* ((mouse-position (mouse-position))
+             (window (window-at (cadr mouse-position) (cddr mouse-position)
+                                (car mouse-position))))
+        (cond
+         ((and window (not (eq window (selected-window)))
+               (or (not (numberp mouse-autoselect-window))
+                   (and (> mouse-autoselect-window 0)
+                        ;; If `mouse-autoselect-window' is positive, select
+                        ;; window if the window is the same as before.
+                        (eq window mouse-autoselect-window-window))
+                   ;; Otherwise select window iff the mouse is at the same
+                   ;; position as before.  Observe that the first test after
+                   ;; `mouse-autoselect-window-start' usually fails since the
+                   ;; value of `mouse-autoselect-window-position' recorded there
+                   ;; is the position where the mouse has entered the new window
+                   ;; and not necessarily where the mouse has stopped moving.
+                   (equal mouse-position mouse-autoselect-window-position))
+               ;; The minibuffer is a candidate window iff it's active.
+               (or (not (window-minibuffer-p window))
+                   (eq window (active-minibuffer-window))))
+          ;; Mouse position has stabilized in non-selected window: Cancel window
+          ;; autoselection and try to select that window.
+          (mouse-autoselect-window-cancel t)
+          ;; Select window where mouse appears unless the selected window is the
+          ;; minibuffer.  Use `unread-command-events' in order to execute pre-
+          ;; and post-command hooks and trigger idle timers.  To avoid delaying
+          ;; autoselection again, temporarily set `mouse-autoselect-window-now'
+          ;; to t.
+          (unless (window-minibuffer-p (selected-window))
+            (setq mouse-autoselect-window-now t)
+            (setq unread-command-events
+                  (cons (list 'select-window (list window))
+                        unread-command-events))))
+         ((or (and window (eq window (selected-window)))
+              (not (numberp mouse-autoselect-window))
+              (equal mouse-position mouse-autoselect-window-position))
+          ;; Mouse position has either stabilized in the selected window or at
+          ;; `mouse-autoselect-window-position': Cancel window autoselection.
+          (mouse-autoselect-window-cancel t))
+         (t
+          ;; Mouse position has not stabilized yet, record new mouse position in
+          ;; `mouse-autoselect-window-position' and any window at that position
+          ;; in `mouse-autoselect-window-window'.
+          (setq mouse-autoselect-window-position mouse-position)
+          (setq mouse-autoselect-window-window window))))
+    (error nil)))
 
 (defun handle-select-window (event)
   "Handle select-window events."
   (interactive "e")
   (let ((window (posn-window (event-start event))))
-    (if (and (window-live-p window)
-             ;; Don't switch if we're currently in the minibuffer.
-             ;; This tries to work around problems where the minibuffer gets
-             ;; unselected unexpectedly, and where you then have to move
-             ;; your mouse all the way down to the minibuffer to select it.
-             (not (window-minibuffer-p (selected-window)))
-             ;; Don't switch to a minibuffer window unless it's active.
-             (or (not (window-minibuffer-p window))
-                 (minibuffer-window-active-p window)))
-        (select-window window))))
+    (when (and (window-live-p window)
+               ;; Don't switch if we're currently in the minibuffer.
+               ;; This tries to work around problems where the minibuffer gets
+               ;; unselected unexpectedly, and where you then have to move
+               ;; your mouse all the way down to the minibuffer to select it.
+               (not (window-minibuffer-p (selected-window)))
+               ;; Don't switch to a minibuffer window unless it's active.
+               (or (not (window-minibuffer-p window))
+                   (minibuffer-window-active-p window)))
+      (unless (and (numberp mouse-autoselect-window)
+                   (not (zerop mouse-autoselect-window))
+                   (not mouse-autoselect-window-now)
+                   ;; When `mouse-autoselect-window' has a numeric, non-zero
+                   ;; value, delay window autoselection by that value.
+                   ;; `mouse-autoselect-window-start' returns non-nil iff it
+                   ;; successfully installed a timer for this purpose.
+                   (mouse-autoselect-window-start window))
+        ;; Re-enable delayed window autoselection.
+        (setq mouse-autoselect-window-now nil)
+        (when mouse-autoselect-window
+          ;; Run `mouse-leave-buffer-hook' when autoselecting window.
+          (run-hooks 'mouse-leave-buffer-hook))
+        (select-window window)))))
 
 (define-key ctl-x-map "2" 'split-window-vertically)
 (define-key ctl-x-map "3" 'split-window-horizontally)
diff --git a/lisp/woman.el b/lisp/woman.el
index 2392d0bfa4c..13fa3147487 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -438,6 +438,7 @@
 
 (eval-when-compile                      ; to avoid compiler warnings
   (require 'dired)
+  (require 'cl)
   (require 'apropos))
 
 (defun woman-mapcan (fn x)
@@ -1196,7 +1197,7 @@ It is saved to the file named by the variable `woman-cache-filename'."
           (kill-buffer standard-output)
           ))))
 
-(defvar woman-topic-history nil "Topic read history.")
+(defvaralias 'woman-topic-history 'Man-topic-history)
 (defvar woman-file-history nil "File-name read history.")
 
 (defun woman-file-name (topic &optional re-cache)
@@ -1750,7 +1751,18 @@ Leave point at end of new text.  Return length of inserted text."
   (define-key woman-mode-map [M-mouse-2] 'woman-follow-word)
 
   ;; We don't need to call `man' when we are in `woman-mode'.
-  (define-key woman-mode-map [remap man] 'woman))
+  (define-key woman-mode-map [remap man] 'woman)
+  (define-key woman-mode-map [remap man-follow] 'woman-follow))
+
+(defun woman-follow (topic)
+  "Get a Un*x manual page of the item under point and put it in a buffer."
+  (interactive (list (Man-default-man-entry)))
+  (if (or (not topic)
+          (string= topic ""))
+      (error "No item under point")
+    (woman (if (string-match Man-reference-regexp topic)
+               (substring topic 0 (match-end 1))
+             topic))))
 
 (defun woman-follow-word (event)
   "Run WoMan with word under mouse as topic.
@@ -2456,6 +2468,7 @@ Start at FROM and re-scan new text as appropriate."
         (woman0-search-regex
          (concat woman0-search-regex-start woman0-search-regex-end))
         woman0-rename-alist)
+    (set-marker-insertion-type woman0-if-to t)
     (while (re-search-forward woman0-search-regex nil t)
       (setq request (match-string 1))
       (cond ((string= request "ig") (woman0-ig))
@@ -2529,7 +2542,7 @@ REQUEST is the invoking directive without the leading dot."
         ;; String delimiter can be any non-numeric character,
         ;; including a special character escape:
         (looking-at "\\(\\\\(..\\|[^0-9]\\)\\(.*\\)\\1\\(.*\\)\\1\\'"))
-      (let ((end1 (copy-marker (match-end 2)))) ; end of first string
+      (let ((end1 (copy-marker (match-end 2) t))) ; End of first string.
         ;; Delete 2nd and 3rd delimiters to avoid processing them:
         (delete-region (match-end 3) woman0-if-to)
         (delete-region (match-end 2) (match-beginning 3))
@@ -2644,10 +2657,9 @@ If DELETE is non-nil then delete from point."
         (error "File `%s' not found" name))
     (beginning-of-line)
     (woman-delete-line 1)
-    (let ((from (point))
-          (to (make-marker))
-          (length (woman-insert-file-contents filename 0)))
-      (set-marker to (+ from length))
+    (let* ((from (point))
+           (length (woman-insert-file-contents filename 0))
+           (to (copy-marker (+ from length) t)))
       (woman-pre-process-region from to)
       (set-marker to nil)
       (goto-char from)
@@ -3431,9 +3443,7 @@ Also bound locally in `woman2-roff-buffer'.")
 (defsubst woman2-process-escapes-to-eol (&optional numeric)
   "Process remaining escape sequences up to eol.
 Handle numeric arguments specially if optional argument NUMERIC is non-nil."
-  (woman2-process-escapes
-   (save-excursion (end-of-line) (point-marker))
-   numeric))
+  (woman2-process-escapes (copy-marker (line-end-position) t) numeric))
 
 (defun woman2-nr (to)
   ".nr R +/-N M -- Assign +/-N (wrt to previous value, if any) to register R.
@@ -3634,6 +3644,7 @@ expression in parentheses.  Leaves point after the value."
         (woman-registers woman-registers)
         fn request translations
         tab-stop-list)
+    (set-marker-insertion-type to t)
     ;; ?roff does not squeeze multiple spaces, but does fill, so...
     (fset 'canonically-space-region 'ignore)
     ;; Try to avoid spaces inheriting underlines from preceding text!
@@ -3676,7 +3687,8 @@ expression in parentheses.  Leaves point after the value."
             ;; Call the appropriate function:
             (funcall fn to)))
       (if (not (eobp))                  ; This should not happen, but ...
-          (woman2-format-paragraphs (point-max-marker) woman-left-margin))
+          (woman2-format-paragraphs (copy-marker (point-max) t)
+                                    woman-left-margin))
       (fset 'canonically-space-region canonically-space-region)
       (fset 'set-text-properties set-text-properties)
       (fset 'insert-and-inherit insert-and-inherit)
@@ -3888,6 +3900,7 @@ Leave 1 blank line.  Format paragraphs upto TO."
 (defun woman2-process-escapes (to &optional numeric)
   "Process remaining escape sequences up to marker TO, preserving point.
 Optional argument NUMERIC, if non-nil, means the argument is numeric."
+  (assert (and (markerp to) (marker-insertion-type to)))
   ;; The first two cases below could be merged (maybe)!
   (let ((from (point)))
     ;; Discard zero width filler character used to hide leading dots
@@ -3957,15 +3970,13 @@ Optional argument NUMERIC, if non-nil, means the argument is numeric."
   (delete-char -1)
   (delete-char 1)
   (looking-at "\\(.\\)\\(.*\\)\\1")
-  (let ((to (make-marker)) from N c)
-    (set-marker to (match-end 2))
-    (delete-char 1)
-    (setq from (point)
-          N (woman-parse-numeric-arg))
-    (setq c (if (< (point) to) (following-char) ?_))
+  (forward-char 1)
+  (let* ((to (match-end 2))
+         (from (match-beginning 0))
+         (N (woman-parse-numeric-arg))
+         (c (if (< (point) to) (following-char) ?_)))
     (delete-region from to)
     (delete-char 1)
-    (set-marker to nil)
     (insert (make-string N c))
     ))