Upgrade to cperl-mode 5.0, from IlyaZ.

p4raw-id: //depot/perl@18909

1 files changed, 1835 insertions, 1609 deletions

diff --git a/emacs/cperl-mode.el b/emacs/cperl-mode.el
index 7ed963daf4..4bf1eabd1f 100644
--- a/emacs/cperl-mode.el
+++ b/emacs/cperl-mode.el
@@ -1,12 +1,10 @@
 ;;; cperl-mode.el --- Perl code editing commands for Emacs
 
-;;;; The following message is relative to GNU version of the module:
-
-;; Copyright (C) 1985, 86, 87, 1991--2000
+;; Copyright (C) 1985, 86, 87, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2003
 ;;     Free Software Foundation, Inc.
 
 ;; Author: Ilya Zakharevich and Bob Olson
-;; Maintainer: Ilya Zakharevich <ilya@math.ohio-state.edu>
+;; Maintainer: Ilya Zakharevich <cperl@ilyaz.org>
 ;; Keywords: languages, Perl
 
 ;; This file is part of GNU Emacs.
@@ -41,12 +39,12 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-;;; Corrections made by Ilya Zakharevich ilya@math.mps.ohio-state.edu
+;;; Corrections made by Ilya Zakharevich cperl@ilyaz.org
 ;;; XEmacs changes by Peter Arius arius@informatik.uni-erlangen.de
 
 ;;; Commentary:
 
-;; $Id: cperl-mode.el,v 4.32 2000/05/31 05:13:15 ilya Exp ilya $
+;; $Id: cperl-mode.el,v 5.0 2003/02/17 01:33:20 vera Exp vera $
 
 ;;; If your Emacs does not default to `cperl-mode' on Perl files:
 ;;; To use this mode put the following into
@@ -54,52 +52,59 @@
 
 ;; (autoload 'perl-mode "cperl-mode" "alternate mode for editing Perl programs" t)
 
-;;; You can either fine-tune the bells and whistles of this mode or
-;;; bulk enable them by putting
+;; You can either fine-tune the bells and whistles of this mode or
+;; bulk enable them by putting
 
 ;; (setq cperl-hairy t)
 
-;;; in your .emacs file.  (Emacs rulers do not consider it politically
-;;; correct to make whistles enabled by default.)
+;; in your .emacs file.  (Emacs rulers do not consider it politically
+;; correct to make whistles enabled by default.)
 
-;;; DO NOT FORGET to read micro-docs (available from `Perl' menu)   <<<<<<
-;;; or as help on variables `cperl-tips', `cperl-problems',         <<<<<<
-;;; `cperl-non-problems', `cperl-praise', `cperl-speed'.            <<<<<<
+;; DO NOT FORGET to read micro-docs (available from `Perl' menu)   <<<<<<
+;; or as help on variables `cperl-tips', `cperl-problems',         <<<<<<
+;; `cperl-non-problems', `cperl-praise', `cperl-speed'.            <<<<<<
 
-;;; Additional useful commands to put into your .emacs file (before
-;;; RMS Emacs 20.3):
+;; Additional useful commands to put into your .emacs file (before
+;; RMS Emacs 20.3):
 
 ;; (setq auto-mode-alist
 ;;      (append '(("\\.\\([pP][Llm]\\|al\\)$" . perl-mode))  auto-mode-alist ))
 ;; (setq interpreter-mode-alist (append interpreter-mode-alist
 ;; 				        '(("miniperl" . perl-mode))))
 
-;;; The mode information (on C-h m) provides some customization help.
-;;; If you use font-lock feature of this mode, it is advisable to use
-;;; either lazy-lock-mode or fast-lock-mode.  I prefer lazy-lock.
+;; The mode information (on C-h m) provides some customization help.
+;; If you use font-lock feature of this mode, it is advisable to use
+;; either lazy-lock-mode or fast-lock-mode.  I prefer lazy-lock.
 
-;;; Faces used now: three faces for first-class and second-class keywords
-;;; and control flow words, one for each: comments, string, labels,
-;;; functions definitions and packages, arrays, hashes, and variable
-;;; definitions.  If you do not see all these faces, your font-lock does
-;;; not define them, so you need to define them manually.  Maybe you have 
-;;; an obsolete font-lock from 19.28 or earlier.  Upgrade.
+;; Faces used now: three faces for first-class and second-class keywords
+;; and control flow words, one for each: comments, string, labels,
+;; functions definitions and packages, arrays, hashes, and variable
+;; definitions.  If you do not see all these faces, your font-lock does
+;; not define them, so you need to define them manually.
+;; Maybe you have an obsolete font-lock from 19.28 or earlier.  Upgrade.
 
-;;; If you have a grayscale monitor, and do not have the variable
-;;; font-lock-display-type bound to 'grayscale, insert 
+;; If you have a grayscale monitor, and do not have the variable
+;; font-lock-display-type bound to 'grayscale, insert
 
-;;; (setq font-lock-display-type 'grayscale)
+;; (setq font-lock-display-type 'grayscale)
 
-;;; into your .emacs file (this is relevant before RMS Emacs 20).
+;; into your .emacs file (this is relevant before RMS Emacs 20).
 
-;;;; This mode supports font-lock, imenu and mode-compile.  In the
-;;;; hairy version font-lock is on, but you should activate imenu
-;;;; yourself (note that mode-compile is not standard yet).  Well, you
-;;;; can use imenu from keyboard anyway (M-x imenu), but it is better
-;;;; to bind it like that:
+;; This mode supports font-lock, imenu and mode-compile.  In the
+;; hairy version font-lock is on, but you should activate imenu
+;; yourself (note that mode-compile is not standard yet).  Well, you
+;; can use imenu from keyboard anyway (M-x imenu), but it is better
+;; to bind it like that:
 
 ;; (define-key global-map [M-S-down-mouse-3] 'imenu)
 
+;;; Font lock bugs as of v4.32:
+
+;; The following kinds of Perl code erroneously start strings:
+;; \$`  \$'  \$"
+;; $opt::s  $opt_s  $opt{s}  (s => ...)  /\s+.../
+;; likewise with m, tr, y, q, qX instead of s
+
 ;;; In fact the version of font-lock that this version supports can be
 ;;; much newer than the version you actually have. This means that a
 ;;; lot of faces can be set up, but are not visible on your screen
@@ -107,16 +112,16 @@
 
 ;;; Updates: ========================================
 
-;;; Made less hairy by default: parentheses not electric, 
+;;; Made less hairy by default: parentheses not electric,
 ;;; linefeed not magic. Bug with abbrev-mode corrected.
 
 ;;;; After 1.4:
 ;;;  Better indentation:
-;;;  subs inside braces should work now, 
+;;;  subs inside braces should work now,
 ;;;  Toplevel braces obey customization.
 ;;;  indent-for-comment knows about bad cases, cperl-indent-for-comment
 ;;;  moves cursor to a correct place.
-;;;  cperl-indent-exp written from the scratch! Slow... (quadratic!) :-( 
+;;;  cperl-indent-exp written from the scratch! Slow... (quadratic!) :-(
 ;;;        (50 secs on DB::DB (sub of 430 lines), 486/66)
 ;;;  Minor documentation fixes.
 ;;;  Imenu understands packages as prefixes (including nested).
@@ -129,7 +134,7 @@
 ;;;  `cperl-fill-paragraph' done.
 ;;;  Better package support for `imenu'.
 ;;;  Progress indicator for indentation (with `imenu' loaded).
-;;;  `Cperl-set' was busted, now setting the individual hairy option 
+;;;  `Cperl-set' was busted, now setting the individual hairy option
 ;;;     should be better.
 
 ;;;; After 1.6:
@@ -138,7 +143,7 @@
 ;;; Menu done.
 ;;; New config variables `cperl-close-paren-offset' and `cperl-comment-column'.
 ;;; Bugs with `cperl-auto-newline' corrected.
-;;; `cperl-electric-lbrace' can work with `cperl-auto-newline' in situation 
+;;; `cperl-electric-lbrace' can work with `cperl-auto-newline' in situation
 ;;; like $hash{.
 
 ;;;; 1.7 XEmacs (arius@informatik.uni-erlangen.de):
@@ -155,17 +160,17 @@
 ;;; Todo (at least):
 ;;; - use emacs-vers.el (http://www.cs.utah.edu/~eeide/emacs/emacs-vers.el.gz)
 ;;;   for portable code?
-;;; - should `cperl-mode' do a 
+;;; - should `cperl-mode' do a
 ;;;	(if (featurep 'easymenu) (easy-menu-add cperl-menu))
 ;;;   or should this be left to the user's `cperl-mode-hook'?
 
 ;;; Some bugs introduced by the above fix corrected (IZ ;-).
 ;;; Some bugs under XEmacs introduced by the correction corrected.
 
-;;; Some more can remain since there are two many different variants. 
+;;; Some more can remain since there are two many different variants.
 ;;; Please feedback!
 
-;;; We do not support fontification of arrays and hashes under 
+;;; We do not support fontification of arrays and hashes under
 ;;; obsolete font-lock any more. Upgrade.
 
 ;;;; after 1.8 Minor bug with parentheses.
@@ -191,7 +196,7 @@
 ;;; Arglist for auto-fill-mode was incorrect.
 
 ;;;; After 1.12:
-;;; `cperl-lineup-step' and `cperl-lineup' added: lineup constructions 
+;;; `cperl-lineup-step' and `cperl-lineup' added: lineup constructions
 ;;; vertically.
 ;;; `cperl-do-auto-fill' updated for 19.29 style.
 ;;; `cperl-info-on-command' now has a default.
@@ -231,7 +236,7 @@
 ;;; May highlight pods and here-documents: see `cperl-pod-here-scan',
 ;;; `cperl-pod-here-fontify', `cperl-pod-face'. Does not use this info
 ;;; for indentation so far.
-;;; Fontification updated to 19.30 style. 
+;;; Fontification updated to 19.30 style.
 ;;; The change 19.29->30 did not add all the required functionality,
 ;;;     but broke "font-lock-extra.el". Get "choose-color.el" from
 ;;;       ftp://ftp.math.ohio-state.edu/pub/users/ilya/emacs
@@ -241,7 +246,7 @@
 ;;;    recognized as a start of a block.
 ;;;  Two different font-lock-levels provided.
 ;;;  `cperl-pod-head-face' introduced. Used for highlighting.
-;;;  `imenu' marks pods, +Packages moved to the head. 
+;;;  `imenu' marks pods, +Packages moved to the head.
 
 ;;;; After 1.17:
 ;;;  Scan for pods highlights here-docs too.
@@ -251,7 +256,7 @@
 ;;;  POD headers were supposed to fill one line only.
 
 ;;;; After 1.18:
-;;;  `font-lock-keywords' were set in 19.30 style _always_. Current scheme 
+;;;  `font-lock-keywords' were set in 19.30 style _always_. Current scheme
 ;;;    may  break under XEmacs.
 ;;;  `cperl-calculate-indent' dis suppose that `parse-start' was defined.
 ;;;  `fontified' tag is added to fontified text as well as `lazy-lock' (for
@@ -312,10 +317,10 @@
 ;;;  Minor bugs with POD marking.
 
 ;;;; After 1.25 (probably not...)
-;;;  `cperl-info-page' introduced.  
+;;;  `cperl-info-page' introduced.
 ;;;  To make `uncomment-region' working, `comment-region' would
 ;;;  not insert extra space.
-;;;  Here documents delimiters better recognized 
+;;;  Here documents delimiters better recognized
 ;;;  (empty one, and non-alphanums in quotes handled). May be wrong with 1<<14?
 ;;;  `cperl-db' added, used in menu.
 ;;;  imenu scan removes text-properties, for better debugging
@@ -380,12 +385,12 @@
 ;;;  with patched Emaxen), controlled by
 ;;;  `cperl-use-syntax-table-text-property'. Currently recognized:
 ;;;    All quote-like operators: m, s, y, tr, qq, qw, qx, q,
-;;;    // in most frequent context: 
+;;;    // in most frequent context:
 ;;;          after block or
 ;;;                    ~ { ( = | & + - * ! , ;
-;;;          or 
+;;;          or
 ;;;                    while if unless until and or not xor split grep map
-;;;    Here-documents, formats, PODs, 
+;;;    Here-documents, formats, PODs,
 ;;;    ${...}
 ;;;    'abc$'
 ;;;    sub a ($); sub a ($) {}
@@ -472,7 +477,7 @@
 ;;;  This handles s# blah # foo #e too;
 ;;;  s//blah/, s///, s/blah// works again, and s#blah## too, the algorithm
 ;;;   is much simpler now;
-;;;  Next round of changes: s\\\ works, s<blah>/foo/, 
+;;;  Next round of changes: s\\\ works, s<blah>/foo/,
 ;;;   comments between the first and the second part allowed
 ;;;  Another problem discovered:
 ;;;;;;;  s[foo] <blah>e	- e part delimited by different <> (will not match)
@@ -491,7 +496,7 @@
 ;;;  `cperl-add-tags-recurse', `cperl-add-tags-recurse-noxs'
 ;;;    added (for -batch mode);
 ;;;  Better handling of errors when scanning for Perl constructs;
-;;;;;;;  Possible "problem" with class hierarchy in Perl distribution 
+;;;;;;;  Possible "problem" with class hierarchy in Perl distribution
 ;;;;;;;    directory: ./ext duplicates ./lib;
 ;;;  Write relative paths for generated TAGS;
 
@@ -527,7 +532,7 @@
 ;;;  `cperl-clobber-lisp-bindings' added.
 ;;;  $a->y() is not y///.
 ;;;  `cperl-after-block-p' was missing a `save-excursion' => wrong results.
-;;;  `cperl-val' was defined too late. 
+;;;  `cperl-val' was defined too late.
 ;;;  `cperl-init-faces' was failing.
 ;;;  Init faces when loading `ps-print'.
 
@@ -562,7 +567,7 @@
 ;;;  `cperl-invert-if-unless' implemented (C-c C-t and in Menu).
 ;;;  Upgraded hints to mention 20.2's goods/bads.
 ;;;  Started to use `cperl-extra-newline-before-brace-multiline',
-;;;    `cperl-break-one-line-blocks-when-indent', 
+;;;    `cperl-break-one-line-blocks-when-indent',
 ;;;    `cperl-fix-hanging-brace-when-indent', `cperl-merge-trailing-else'.
 
 ;;;; After 2.9:
@@ -571,7 +576,7 @@
 ;;;  At last, may work with `font-lock' without setting `cperl-font-lock'.
 ;;;    (We expect that starting from 19.33, `font-lock' supports keywords
 ;;;     being a function - what is a correct version?)
-;;;  Rename `cperl-indent-region-fix-else' to 
+;;;  Rename `cperl-indent-region-fix-else' to
 ;;;    `cperl-indent-region-fix-constructs'.
 ;;;  `cperl-fix-line-spacing' could be triggered inside strings, would not
 ;;;     know what to do with BLOCKs of map/printf/etc.
@@ -593,11 +598,11 @@
 
 ;;;; After 2.12:
 ;;;  Remove some commented out chunks.
-;;;  Styles are slightly updated (a lot of work is needed, especially 
+;;;  Styles are slightly updated (a lot of work is needed, especially
 ;;;    with new `cperl-fix-line-spacing').
 
 ;;;; After 2.13:
-;;;  Old value of style is memorized when choosing a new style, may be 
+;;;  Old value of style is memorized when choosing a new style, may be
 ;;;    restored from the same menu.
 ;;;  Mode-documentation added to micro-docs.
 ;;;  `cperl-praise' updated.
@@ -646,12 +651,12 @@
 
 ;;;; After 3.4:
 ;;;  (`cperl-mode'):		Make lazy syntaxification possible.
-;;;  (`cperl-find-pods-heres'): Safe a position in buffer where it is safe to 
+;;;  (`cperl-find-pods-heres'): Safe a position in buffer where it is safe to
 ;;;				restart syntaxification.
 ;;;  (`cperl-syntaxify-by-font-lock'): Set to t, should be safe now.
 
 ;;;; After 3.5:
-;;;  (`cperl-syntaxify-by-font-lock'): Better default, customizes to 
+;;;  (`cperl-syntaxify-by-font-lock'): Better default, customizes to
 ;;;				`message' too.
 
 ;;;; After 3.6:
@@ -804,7 +809,7 @@
 ;;;; After 4.5:
 ;;;  (`cperl-init-faces-weak'):	use `cperl-force-face'.
 ;;;  (`cperl-after-block-p'):	After END/BEGIN we are a block.
-;;;  (`cperl-mode'):		`font-lock-unfontify-region-function' 
+;;;  (`cperl-mode'):		`font-lock-unfontify-region-function'
 ;;;				was set to a wrong function.
 ;;;  (`cperl-comment-indent'):	Commenting __END__ was not working.
 ;;;  (`cperl-indent-for-comment'):	Likewise.
@@ -813,7 +818,7 @@
 ;;;; After 4.5:
 ;;;  (`cperl-unwind-to-safe'):	Signature changed, unwinds end too.
 ;;;  (`cperl-find-pods-heres'):	mark qq[]-etc sections as syntax-type=string
-;;;  (`cperl-fontify-syntaxically'): Unwinds start and end to go out of 
+;;;  (`cperl-fontify-syntaxically'): Unwinds start and end to go out of
 ;;;				     long strings (not very successful).
 
 ;;;   >>>>  CPerl should be usable in write mode too now <<<<
@@ -838,11 +843,11 @@
 ;;;  (`cperl-xemacs-p')		defined when compile too
 ;;;  (`cperl-tags-hier-init'):	Another try to work around XEmacs problems
 ;;;				Better progress messages.
-;;;  (`cperl-find-tags'):	Was writing line/pos in a wrong order, 
+;;;  (`cperl-find-tags'):	Was writing line/pos in a wrong order,
 ;;;				pos off by 1 and not at beg-of-line.
 ;;;  (`cperl-etags-snarf-tag'): New macro
 ;;;  (`cperl-etags-goto-tag-location'): New macro
-;;;  (`cperl-write-tags'):	When removing old TAGS info was not 
+;;;  (`cperl-write-tags'):	When removing old TAGS info was not
 ;;;				relativizing filename
 
 ;;;; After 4.9:
@@ -906,7 +911,7 @@
 ;;;; After 4.18:
 ;;;  (`cperl-find-pods-heres'):	/ and ? after : start a REx.
 ;;;  (`cperl-after-expr-p'):	Skip labels when checking
-;;;  (`cperl-calculate-indent'): Correct for labels when calculating 
+;;;  (`cperl-calculate-indent'): Correct for labels when calculating
 ;;;					indentation of continuations.
 ;;;				Docstring updated.
 
@@ -963,7 +968,7 @@
 ;;; C-x C-e the above three lines (at end-of-line).  First evaluation
 ;;; of `foo' inserts (t), second one inserts (BUG) ?!
 ;;;
-;;; In CPerl it was triggered by inserting then deleting `/' at start of 
+;;; In CPerl it was triggered by inserting then deleting `/' at start of
 ;;;      /  a (?# asdf  {[(}asdf )ef,/;
 
 ;;;; After 4.25:
@@ -1045,6 +1050,90 @@
 ;;; (`cperl-write-tags'):	Use `cperl-unreadable-ok', do not fail
 ;;;				on an unreadable directory
 
+;;;; After 4.32:
+;;;  Syncronized with v1.60 from Emacs 21.3.
+;;;  Mostly docstring and formatting changes, and:
+
+;;;  (`cperl-noscan-files-regexp'): Do not scan CVS subdirs
+;;;  (`cperl-problems'):	Note that newer XEmacsen may syntaxify too
+;;;  (`imenu-example--create-perl-index'):
+;;;				Renamed to `cperl-imenu--create-perl-index'
+;;;  (`cperl-mode'):		Replace `make-variable-buffer-local' by `make-local-variable'
+;;;  (`cperl-setup-tmp-buf'):	Likewise
+;;;  (`cperl-fix-line-spacing'): Fix a misprint of "t" for "\t"
+;;;  (`cperl-next-bad-style'):  Fix misprints in character literals
+
+;;;; After 4.33:
+;;;  (`cperl-font-lock-keywords'): +etc: Aliased to perl-font-lock-keywords.
+
+;;;; After 4.34:
+;;;  Further updates of whitespace and spelling w.r.t. RMS version.
+;;;  (`cperl-font-lock-keywords'): +etc: Avoid warnings when aliasing.
+;;;  (`cperl-mode'):		Use `normal-auto-fill-function' if present.
+;;;  (`cperl-use-major-mode'):	New variable
+;;;  (`cperl-can-font-lock'):	New variable; replaces `window-system'
+;;;  (`cperl-tags-hier-init'):	use `display-popup-menus-p' (if present)
+;;;				to choose `x-popup-menu' vs `tmm-prompt'
+
+;;;; 4.35 has the following differences from version 1.40+ of RMS Emacs:
+
+;;; New variables `cperl-use-major-mode', `cperl-can-font-lock';
+;;; `cperl-use-major-mode' is (effectively) 'cperl-mode in RMS.
+;;; `cperl-under-as-char'  is nil in RMS.
+;;; Minor differences in docstrings, and `cperl-non-problems'.
+;;; Backward compatibility addressed: (`); (function (lambda ...)); font-lock;
+;;; (:italic t bold t) vs (:slant italic :weight bold) in faces;
+;;; `normal-auto-fill-function'.
+;;; RMS version has wrong logic in `cperl-calculate-indent': $a = { } is
+;;; wrongly indented if the closing brace is on a separate line.
+;;; Different choice of ordering if's for is-x-REx and (eq (char-after b) ?\#)
+;;; in `cperl-find-pods-heres'. [Cosmetic]
+
+;;;; After 4.35:
+;;;  (`cperl-find-pods-heres'):	If no end of HERE-doc found, mark to the end
+;;;				of buffer.  This enables recognition of end
+;;;				of HERE-doc "as one types".
+;;;				Require "\n" after trailing tag of HERE-doc.
+;;;				\( made non-quoting outside of string/comment
+;;;				(gdj-contributed).
+;;;				Likewise for \$.
+;;;				Remove `here-doc-group' text property at start
+;;;				(makes this property reliable).
+;;;				Text property `first-format-line' ==> t.
+;;;				Do not recognize $opt_s and $opt::s as s///.
+;;;  (`cperl-perldoc'):		Use case-sensitive search (contributed).
+;;;  (`cperl-fix-line-spacing'): Allow "_" in $vars of foreach etc. when
+;;;				underscore isn't a word char (gdj-contributed).
+;;;  (`defun-prompt-regexp'):	Allow prototypes.
+;;;  (`cperl-vc-header-alist'):	Extract numeric version from the Id.
+;;;  Toplevel:			Put toggle-autohelp into the mode menu.
+;;;				Better docs for toggle/set/unset autohelp.
+;;;  (`cperl-electric-backspace-untabify'): New customization variable
+;;;  (`cperl-after-expr-p'):	Works after here-docs, formats, and PODs too
+;;;				(affects many electric constructs).
+;;;  (`cperl-calculate-indent'): Takes into account `first-format-line' ==>
+;;;				works after format.
+;;;  (`cperl-short-docs'):	Make it work with ... too.
+;;;				"array context" ==> "list context"
+;;;  (`cperl-electric-keyword'): make $if (etc: "$@%&*") non-electric
+;;;				'(' after keyword would insert a doubled paren
+;;;  (`cperl-electric-paren'):	documented affected by `cperl-electric-parens'
+;;;  (`cperl-electric-rparen'):	Likewise
+;;;  (`cperl-build-manpage'):	New function by Nick Roberts
+;;;  (`cperl-perldoc'):		Make it work in XEmacs too
+
+;;;; After 4.36:
+;;;  (`cperl-find-pods-heres'):	Recognize s => 1 and {s} (as a key or varname),
+;;;				{ s:: } and { s::bar::baz } as varnames.
+;;;  (`cperl-after-expr-p'):	Updates syntaxification before checks
+;;;  (`cperl-calculate-indent'): Likewise
+;;;				Fix wrong indent of blocks starting with POD
+;;;  (`cperl-after-block-p'):	Optional argument for checking for a pre-block
+;;;				Recognize `continue' blocks too.
+;;;  (`cperl-electric-brace'):	use `cperl-after-block-p' for detection;
+;;;				Now works for else/continue/sub blocks
+;;;  (`cperl-short-docs'):	Minor edits; make messages fit 80-column screen
+
 ;;; Code:
 
 
@@ -1053,7 +1142,21 @@
       (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
       (or (fboundp 'defgroup)
 	  (defmacro defgroup (name val doc &rest arr)
 	    nil))
@@ -1061,10 +1164,10 @@
 	  (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
+	       (string< "19.31" emacs-version))	;  Checked with 19.30: defface does not work
 	  (defmacro defface (&rest arr)
 	    nil))
-            ;; Avoid warning (tmp definitions)
+      ;; 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))))
@@ -1074,26 +1177,26 @@
 		  ((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))))))
+	(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
-	       (` (defconst (, arg) (quote (, arg)) (, descr))))))
+	       (` (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
-		 (defconst (, arg) (quote (, arg)) (, descr))))))
+		 (defvar (, arg) (quote (, arg)) (, descr))))))
       (if cperl-xemacs-p
 	  (defmacro cperl-etags-snarf-tag (file line)
 	    (` (progn
@@ -1103,17 +1206,25 @@
 	  (` (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)))))
-	    ;;)
+	    (`;;(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))
+
+(defvar cperl-can-font-lock
+  (or cperl-xemacs-p
+      (and (boundp 'emacs-major-version)
+	   (or window-system
+	       (> emacs-major-version 20)))))
+
 (condition-case nil
     (require 'custom)
   (error nil))				; Already fixed by eval-when-compile
@@ -1176,12 +1287,11 @@ and do constructs look like:
 instead of:
 
 	if () {
-	}
-"
+	}"
   :type 'boolean
   :group 'cperl-autoinsert-details)
 
-(defcustom cperl-extra-newline-before-brace-multiline 
+(defcustom cperl-extra-newline-before-brace-multiline
   cperl-extra-newline-before-brace
   "*Non-nil means the same as `cperl-extra-newline-before-brace', but
 for constructs with multiline if/unless/while/until/for/foreach condition."
@@ -1195,7 +1305,7 @@ for constructs with multiline if/unless/while/until/for/foreach condition."
 
 (defcustom cperl-lineup-step nil
   "*`cperl-lineup' will always lineup at multiple of this number.
-If `nil', the value of `cperl-indent-level' will be used."
+If nil, the value of `cperl-indent-level' will be used."
   :type '(choice (const nil) integer)
   :group 'cperl-indentation-details)
 
@@ -1236,7 +1346,7 @@ This is in addition to cperl-continued-statement-offset."
   "*Non-nil means automatically newline before and after braces,
 and after colons and semicolons, inserted in CPerl code.  The following
 \\[cperl-electric-backspace] will remove the inserted whitespace.
-Insertion after colons requires both this variable and 
+Insertion after colons requires both this variable and
 `cperl-auto-newline-after-colon' set."
   :type 'boolean
   :group 'cperl-autoinsert-details)
@@ -1260,13 +1370,13 @@ regardless of where in the line point is when the TAB command is used."
   :group 'cperl-indentation-details)
 
 (defcustom cperl-font-lock nil
-  "*Non-nil (and non-null) means CPerl buffers will use font-lock-mode.
+  "*Non-nil (and non-null) means CPerl buffers will use `font-lock-mode'.
 Can be overwritten by `cperl-hairy' if nil."
   :type '(choice (const null) boolean)
   :group 'cperl-affected-by-hairy)
 
 (defcustom cperl-electric-lbrace-space nil
-  "*Non-nil (and non-null) means { after $ in CPerl buffers should be preceded by ` '.
+  "*Non-nil (and non-null) means { after $ should be preceded by ` '.
 Can be overwritten by `cperl-hairy' if nil."
   :type '(choice (const null) boolean)
   :group 'cperl-affected-by-hairy)
@@ -1285,7 +1395,7 @@ Can be overwritten by `cperl-hairy' if nil."
 
 (defvar zmacs-regions)			; Avoid warning
 
-(defcustom cperl-electric-parens-mark  
+(defcustom cperl-electric-parens-mark
   (and window-system
        (or (and (boundp 'transient-mark-mode) ; For Emacs
 		transient-mark-mode)
@@ -1309,9 +1419,14 @@ Can be overwritten by `cperl-hairy' if nil."
   :type '(choice (const null) boolean)
   :group 'cperl-affected-by-hairy)
 
+(defcustom cperl-electric-backspace-untabify t
+  "*Not-nil means electric-backspace will untabify in CPerl."
+  :type 'boolean
+  :group 'cperl-autoinsert-details)
+
 (defcustom cperl-hairy nil
   "*Not-nil means most of the bells and whistles are enabled in CPerl.
-Affects: `cperl-font-lock', `cperl-electric-lbrace-space', 
+Affects: `cperl-font-lock', `cperl-electric-lbrace-space',
 `cperl-electric-parens', `cperl-electric-linefeed', `cperl-electric-keywords',
 `cperl-info-on-command-no-prompt', `cperl-clobber-lisp-bindings',
 `cperl-lazy-help-time'."
@@ -1323,13 +1438,13 @@ Affects: `cperl-font-lock', `cperl-electric-lbrace-space',
   :type 'integer
   :group 'cperl-indentation-details)
 
-(defcustom cperl-vc-header-alist '((SCCS "$sccs = '%W\%' ;")
-				   (RCS "$rcs = ' $Id\$ ' ;"))
+(defcustom cperl-vc-header-alist '((SCCS "($sccs) = ('%W\%' =~ /(\\d+(\\.\\d+)+)/) ;")
+				   (RCS "($rcs) = (' $Id\$ ' =~ /(\\d+(\\.\\d+)+)/) ;"))
   "*What to use as `vc-header-alist' in CPerl."
   :type '(repeat (list symbol string))
   :group 'cperl)
 
-(defcustom cperl-clobber-mode-lists 
+(defcustom cperl-clobber-mode-lists
   (not
    (and
     (boundp 'interpreter-mode-alist)
@@ -1360,12 +1475,12 @@ Can be overwritten by `cperl-hairy' to be 5 sec if nil."
   :group 'cperl-affected-by-hairy)
 
 (defcustom cperl-pod-face 'font-lock-comment-face
-  "*The result of evaluation of this expression is used for pod highlighting."
+  "*The result of evaluation of this expression is used for POD highlighting."
   :type 'face
   :group 'cperl-faces)
 
 (defcustom cperl-pod-head-face 'font-lock-variable-name-face
-  "*The result of evaluation of this expression is used for pod highlighting.
+  "*The result of evaluation of this expression is used for POD highlighting.
 Font for POD headers."
   :type 'face
   :group 'cperl-faces)
@@ -1381,7 +1496,7 @@ Font for POD headers."
   :group 'cperl-faces)
 
 (defcustom cperl-pod-here-fontify '(featurep 'font-lock)
-  "*Not-nil after evaluation means to highlight pod and here-docs sections."
+  "*Not-nil after evaluation means to highlight POD and here-docs sections."
   :type 'boolean
   :group 'cperl-faces)
 
@@ -1391,16 +1506,16 @@ Font for POD headers."
   :group 'cperl-faces)
 
 (defcustom cperl-highlight-variables-indiscriminately nil
-  "*Not-nil means perform additional hightlighting on variables.
-Currently only changes how scalar variables are hightlighted.
+  "*Non-nil means perform additional highlighting on variables.
+Currently only changes how scalar variables are highlighted.
 Note that that variable is only read at initialization time for
-the variable perl-font-lock-keywords-2, so changing it after you've
-entered cperl-mode the first time will have no effect."
+the variable `perl-font-lock-keywords-2', so changing it after you've
+entered CPerl mode the first time will have no effect."
   :type 'boolean
   :group 'cperl)
 
 (defcustom cperl-pod-here-scan t
-  "*Not-nil means look for pod and here-docs sections during startup.
+  "*Not-nil means look for POD and here-docs sections during startup.
 You can always make lookup from menu or using \\[cperl-find-pods-heres]."
   :type 'boolean
   :group 'cperl-speed)
@@ -1433,13 +1548,13 @@ Older version of this page was called `perl5', newer `perl'."
   :type 'string
   :group 'cperl-help-system)
 
-(defcustom cperl-use-syntax-table-text-property 
+(defcustom cperl-use-syntax-table-text-property
   (boundp 'parse-sexp-lookup-properties)
   "*Non-nil means CPerl sets up and uses `syntax-table' text property."
   :type 'boolean
   :group 'cperl-speed)
 
-(defcustom cperl-use-syntax-table-text-property-for-tags 
+(defcustom cperl-use-syntax-table-text-property-for-tags
   cperl-use-syntax-table-text-property
   "*Non-nil means: set up and use `syntax-table' text property generating TAGS."
   :type 'boolean
@@ -1450,14 +1565,15 @@ Older version of this page was called `perl5', newer `perl'."
   :type 'regexp
   :group 'cperl)
 
-(defcustom cperl-noscan-files-regexp "/\\(\\.\\.?\\|SCCS\\|RCS\\|blib\\)$"
+(defcustom cperl-noscan-files-regexp
+  "/\\(\\.\\.?\\|SCCS\\|RCS\\|CVS\\|blib\\)$"
   "*Regexp to match files/dirs to skip when generating TAGS."
   :type 'regexp
   :group 'cperl)
 
 (defcustom cperl-regexp-indent-step nil
   "*Indentation used when beautifying regexps.
-If `nil', the value of `cperl-indent-level' will be used."
+If nil, the value of `cperl-indent-level' will be used."
   :type '(choice integer (const nil))
   :group 'cperl-indentation-details)
 
@@ -1491,19 +1607,19 @@ than 1 and nil will probably not work."
 
 (defcustom cperl-break-one-line-blocks-when-indent t
   "*Non-nil means that one-line if/unless/while/until/for/foreach BLOCKs
-need to be reformated into multiline ones when indenting a region."
+need to be reformatted into multiline ones when indenting a region."
   :type 'boolean
   :group 'cperl-indentation-details)
 
 (defcustom cperl-fix-hanging-brace-when-indent t
   "*Non-nil means that BLOCK-end `}' may be put on a separate line
-when indenting a region. 
+when indenting a region.
 Braces followed by else/elsif/while/until are excepted."
   :type 'boolean
   :group 'cperl-indentation-details)
 
 (defcustom cperl-merge-trailing-else t
-  "*Non-nil means that BLOCK-end `}' followed by else/elsif/continue 
+  "*Non-nil means that BLOCK-end `}' followed by else/elsif/continue
 may be merged to be on the same line when indenting a region."
   :type 'boolean
   :group 'cperl-indentation-details)
@@ -1515,8 +1631,8 @@ One should tune up `cperl-close-paren-offset' as well."
   :type 'boolean
   :group 'cperl-indentation-details)
 
-(defcustom cperl-syntaxify-by-font-lock 
-  (and window-system 
+(defcustom cperl-syntaxify-by-font-lock
+  (and cperl-can-font-lock
        (boundp 'parse-sexp-lookup-properties))
   "*Non-nil means that CPerl uses `font-lock's routines for syntaxification."
   :type '(choice (const message) boolean)
@@ -1524,7 +1640,7 @@ One should tune up `cperl-close-paren-offset' as well."
 
 (defcustom cperl-syntaxify-unwind
   t
-  "*Non-nil means that CPerl unwinds to a start of along construction
+  "*Non-nil means that CPerl unwinds to a start of a long construction
 when syntaxifying a chunk of buffer."
   :type 'boolean
   :group 'cperl-speed)
@@ -1542,17 +1658,17 @@ when syntaxifying a chunk of buffer."
     (font-lock-type-face		nil nil		underline)
     (underline				nil "LightGray"	strikeout))
   "List given as an argument to `ps-extend-face-list' in `cperl-ps-print'."
-  :type '(repeat (cons symbol 
+  :type '(repeat (cons symbol
 		       (cons (choice (const nil) string)
 			     (cons (choice (const nil) string)
 				   (repeat symbol)))))
   :group 'cperl-faces)
 
-(if window-system
+(if cperl-can-font-lock
     (progn
-      (defvar cperl-dark-background 
+      (defvar cperl-dark-background
 	(cperl-choose-color "navy" "os2blue" "darkgreen"))
-      (defvar cperl-dark-foreground 
+      (defvar cperl-dark-foreground
 	(cperl-choose-color "orchid1" "orange"))
 
       (defface cperl-nonoverridable-face
@@ -1560,9 +1676,9 @@ when syntaxifying a chunk of buffer."
 	     (:background "Gray90" :italic t :underline t))
 	    (((class grayscale) (background dark))
 	     (:foreground "Gray80" :italic t :underline t :bold t))
-	    (((class color) (background light)) 
+	    (((class color) (background light))
 	     (:foreground "chartreuse3"))
-	    (((class color) (background dark)) 
+	    (((class color) (background dark))
 	     (:foreground (, cperl-dark-foreground)))
 	    (t (:bold t :underline t))))
 	"Font Lock mode face used to highlight array names."
@@ -1573,9 +1689,9 @@ when syntaxifying a chunk of buffer."
 	     (:background "Gray90" :bold t))
 	    (((class grayscale) (background dark))
 	     (:foreground "Gray80" :bold t))
-	    (((class color) (background light)) 
+	    (((class color) (background light))
 	     (:foreground "Blue" :background "lightyellow2" :bold t))
-	    (((class color) (background dark)) 
+	    (((class color) (background dark))
 	     (:foreground "yellow" :background (, cperl-dark-background) :bold t))
 	    (t (:bold t))))
 	"Font Lock mode face used to highlight array names."
@@ -1586,9 +1702,9 @@ when syntaxifying a chunk of buffer."
 	     (:background "Gray90" :bold t :italic t))
 	    (((class grayscale) (background dark))
 	     (:foreground "Gray80" :bold t :italic t))
-	    (((class color) (background light)) 
+	    (((class color) (background light))
 	     (:foreground "Red" :background "lightyellow2" :bold t :italic t))
-	    (((class color) (background dark)) 
+	    (((class color) (background dark))
 	     (:foreground "Red" :background (, cperl-dark-background) :bold t :italic t))
 	    (t (:bold t :italic t))))
 	"Font Lock mode face used to highlight hash names."
@@ -1599,7 +1715,7 @@ when syntaxifying a chunk of buffer."
 ;;; Short extra-docs.
 
 (defvar cperl-tips 'please-ignore-this-line
-  "Get newest version of this package from
+  "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
@@ -1610,13 +1726,12 @@ For best results apply to an older Emacs the patches from
   ftp://ftp.math.ohio-state.edu/pub/users/ilya/cperl-mode/patches
 \(this upgrades syntax-parsing abilities of RMS Emaxen v19.34 and 
 v20.2 up to the level of RMS Emacs v20.3 - a must for a good Perl
-mode.)  You will not get much from XEmacs; its syntax abilities are
-too primitive.
+mode.)  As of beginning of 2003, XEmacs may provide a similar ability.
 
 Get support packages choose-color.el (or font-lock-extra.el before
 19.30), imenu-go.el from the same place.  \(Look for other files there
 too... ;-).  Get a patch for imenu.el in 19.29.  Note that for 19.30 and
-later you should use choose-color.el *instead* of font-lock-extra.el 
+later you should use choose-color.el *instead* of font-lock-extra.el
 \(and you will not get smart highlighting in C :-().
 
 Note that to enable Compile choices in the menu you need to install
@@ -1625,9 +1740,13 @@ mode-compile.el.
 If your Emacs does not default to `cperl-mode' on Perl files, and you
 want it to: put the following into your .emacs file:
 
-(autoload 'perl-mode \"cperl-mode\" \"alternate mode for editing Perl programs\" t)
+  (autoload 'perl-mode \"cperl-mode\" \"alternate mode for editing Perl programs\" t)
+
+or
+
+  (defalias 'perl-mode 'cperl-mode)
 
-Get perl5-info from 
+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
@@ -1637,7 +1756,7 @@ from Perl menu).  If many files are related, generate TAGS files from
 Tools/Tags submenu in Perl menu.
 
 If some class structure is too complicated, use Tools/Hierarchy-view
-from Perl menu, or hierarchic view of imenu. The second one uses the
+from Perl menu, or hierarchic view of imenu.  The second one uses the
 current buffer only, the first one requires generation of TAGS from
 Perl/Tools/Tags menu beforehand.
 
@@ -1650,16 +1769,26 @@ parsing of Perl even when editing, sometimes it may be lost.  Fix this by
 
   M-x norm RET
 
+or
+
+  \\[normal-mode]
+
 In cases of more severe confusion sometimes it is helpful to do
 
   M-x load-l RET cperl-mode RET
   M-x norm RET
 
+or
+
+  \\[load-library] cperl-mode RET
+  \\[normal-mode]
+
 Before reporting (non-)problems look in the problem section of online
 micro-docs on what I know about CPerl problems.")
 
 (defvar cperl-problems 'please-ignore-this-line
-"Some faces will not be shown on some versions of Emacs unless you
+  "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/
 
@@ -1669,9 +1798,9 @@ yet.
 
 Emacs had a _very_ restricted syntax parsing engine until RMS's Emacs
 20.1.  Most problems below are corrected starting from this version of
-Emacs, and all of them should go with RMS's version 20.3.  (Or apply
-patches to Emacs 19.33/34 - see tips.)  XEmacs is very backward in
-this respect.
+Emacs, and all of them should be fixed in RMS's version 20.3.  (Or apply
+patches to Emacs 19.33/34 - see tips.)  XEmacs was very backward in
+this respect (until 2003).
 
 Note that even with newer Emacsen in some very rare cases the details
 of interaction of `font-lock' and syntaxification may be not cleaned
@@ -1688,13 +1817,13 @@ braces.
 
 This may be confusing, since the regexp s#//#/#\; may be highlighted
 as a comment, but it will be recognized as a regexp by the indentation
-code.  Or the opposite case, when a pod section is highlighted, but
+code.  Or the opposite case, when a POD section is highlighted, but
 may break the indentation of the following code (though indentation
 should work if the balance of delimiters is not broken by POD).
 
 The main trick (to make $ a \"backslash\") makes constructions like
 ${aaa} look like unbalanced braces.  The only trick I can think of is
-to insert it as $ {aaa} (legal in perl5, not in perl4). 
+to insert it as $ {aaa} (legal in perl5, not in perl4).
 
 Similar problems arise in regexps, when /(\\s|$)/ should be rewritten
 as /($|\\s)/.  Note that such a transposition is not always possible.
@@ -1706,7 +1835,7 @@ and on CPAN.
 
 If these bugs cannot be fixed on your machine (say, you have an inferior
 environment and cannot recompile), you may still disable all the fancy stuff
-via `cperl-use-syntax-table-text-property'." )
+via `cperl-use-syntax-table-text-property'.")
 
 (defvar cperl-non-problems 'please-ignore-this-line
 "As you know from `problems' section, Perl syntax is too hard for CPerl on 
@@ -1765,12 +1894,12 @@ receive.  Note that some releases of XEmacs are better than the others
 as far as bugs reports I see are concerned.")
 
 (defvar cperl-praise 'please-ignore-this-line
-  "RMS asked me to list good things about CPerl.  Here they go:
+  "Advantages of CPerl mode.
 
 0) It uses the newest `syntax-table' property ;-);
 
 1) It does 99% of Perl syntax correct (as opposed to 80-90% in Perl
-mode - but the latter number may have improved too in last years) even 
+mode - but the latter number may have improved too in last years) even
 with old Emaxen which do not support `syntax-table' property.
 
 When using `syntax-table' property for syntax assist hints, it should
@@ -1834,7 +1963,7 @@ voice);
 not needed anymore with the support for `syntax-table' property.  Has
 progress indicator for indentation (with `imenu' loaded).
 
-6) Indent-region improves inline-comments as well; also corrects 
+6) Indent-region improves inline-comments as well; also corrects
 whitespace *inside* the conditional/loop constructs.
 
 7) Fill-paragraph correctly handles multi-line comments;
@@ -1842,12 +1971,11 @@ whitespace *inside* the conditional/loop constructs.
 8) Can switch to different indentation styles by one command, and restore
 the settings present before the switch.
 
-9) When doing indentation of control constructs, may correct 
+9) When doing indentation of control constructs, may correct
 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).")
 
 (defvar cperl-speed 'please-ignore-this-line
   "This is an incomplete compendium of what is available in other parts
@@ -1881,7 +2009,7 @@ syntax-parsing routines, and marks them up so that either
        `cperl-pod-here-scan'
     to nil.
 
-B) Speed of editing operations.  
+B) Speed of editing operations.
 
     One can add a (minor) speedup to editing operations by setting
        `cperl-use-syntax-table-text-property'
@@ -1891,40 +2019,39 @@ B) Speed of editing operations.
     wrongly matched parentheses, wrong indentation, etc.
 
     One can unset `cperl-syntaxify-unwind'.  This might speed up editing
-    of, say, long POD sections.
-")
+    of, say, long POD sections.")
 
 (defvar cperl-tips-faces 'please-ignore-this-line
   "CPerl mode uses following faces for highlighting:
 
-  cperl-array-face		Array names
-  cperl-hash-face		Hash names
-  font-lock-comment-face	Comments, PODs and whatever is considered
+  `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
+  `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 
+  `font-lock-function-name-face' Special-cased m// and s//foo/, _ 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-face	Non-overridable keywords, modifiers of RExen
-  font-lock-string-face		Strings, qw() constructs, RExen, POD sections,
+  `font-lock-keyword-face'	Control flow switch constructs, declarators
+  `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
 				as string literals
-  font-lock-type-face		Overridable keywords
-  font-lock-variable-name-face	Variable declarations, indirect array and
+  `font-lock-type-face'		Overridable keywords
+  `font-lock-variable-name-face' Variable declarations, indirect array and
 				hash names, POD headers/item names
-  cperl-invalid-face		Trailing whitespace
+  `cperl-invalid-face'		Trailing whitespace
 
 Note that in several situations the highlighting tries to inform about
 possible confusion, such as different colors for function names in
 declarations depending on what they (do not) override, or special cases
 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 
+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.)")
@@ -1933,8 +2060,6 @@ the faces: please specify bold, italic, underline, shadow and box.)
 
 ;;; Portability stuff:
 
-(defconst cperl-xemacs-p (string-match "XEmacs\\|Lucid" emacs-version))
-
 (defmacro cperl-define-key (emacs-key definition &optional xemacs-key)
   (` (define-key cperl-mode-map
        (, (if xemacs-key
@@ -1945,9 +2070,9 @@ the faces: please specify bold, italic, underline, shadow and box.)
 (defvar cperl-del-back-ch
   (car (append (where-is-internal 'delete-backward-char)
 	       (where-is-internal 'backward-delete-char-untabify)))
-  "Character generated by key bound to delete-backward-char.")
+  "Character generated by key bound to `delete-backward-char'.")
 
-(and (vectorp cperl-del-back-ch) (= (length cperl-del-back-ch) 1) 
+(and (vectorp cperl-del-back-ch) (= (length cperl-del-back-ch) 1)
      (setq cperl-del-back-ch (aref cperl-del-back-ch 0)))
 
 (defun cperl-mark-active () (mark))	; Avoid undefined warning
@@ -1962,9 +2087,9 @@ the faces: please specify bold, italic, underline, shadow and box.)
   (defun cperl-mark-active () mark-active))
 
 (defsubst cperl-enable-font-lock ()
-  (or cperl-xemacs-p window-system))
+  cperl-can-font-lock)
 
-(defun cperl-putback-char (c)	; Emacs 19
+(defun cperl-putback-char (c)		; Emacs 19
   (set 'unread-command-events (list c))) ; Avoid undefined warning
 
 (if (boundp 'unread-command-events)
@@ -1993,14 +2118,14 @@ the faces: please specify bold, italic, underline, shadow and box.)
 		       to cperl-do-not-fontify t)))
 
 (defcustom cperl-mode-hook nil
-  "Hook run by `cperl-mode'."
+  "Hook run by CPerl mode."
   :type 'hook
   :group 'cperl)
 
 (defvar cperl-syntax-state nil)
 (defvar cperl-syntax-done-to nil)
 (defvar cperl-emacs-can-parse (> (length (save-excursion
-					   (parse-partial-sexp 1 1))) 9))
+					   (parse-partial-sexp (point) (point)))) 9))
 
 ;; Make customization possible "in reverse"
 (defsubst cperl-val (symbol &optional default hairy)
@@ -2019,39 +2144,25 @@ the faces: please specify bold, italic, underline, shadow and box.)
 					       '(("miniperl" . perl-mode))))))
 (if (fboundp 'eval-when-compile)
     (eval-when-compile
-      (condition-case nil
-	  (require 'imenu)
-	(error nil))
-      (condition-case nil
-	  (require 'easymenu)
-	(error nil))
-      (condition-case nil
-	  (require 'etags)
-	(error nil))
-      (condition-case nil
-	  (require 'timer)
-	(error nil))
-      (condition-case nil
-	  (require 'man)
-	(error nil))
-      (condition-case nil
-	  (require 'info)
-	(error nil))
+      (mapcar (lambda (p)
+		(condition-case nil
+		    (require p)
+		  (error nil)))
+	      '(imenu easymenu etags timer man info))
       (if (fboundp 'ps-extend-face-list)
 	  (defmacro cperl-ps-extend-face-list (arg)
 	    (` (ps-extend-face-list (, arg))))
 	(defmacro cperl-ps-extend-face-list (arg)
-	  (` (error "This version of Emacs has no `ps-extend-face-list'."))))
+	  (` (error "This version of Emacs has no `ps-extend-face-list'"))))
       ;; Calling `cperl-enable-font-lock' below doesn't compile on XEmacs,
       ;; macros instead of defsubsts don't work on Emacs, so we do the
       ;; expansion manually.  Any other suggestions?
-      (if (or (string-match "XEmacs\\|Lucid" emacs-version)
-	      window-system)
+      (if cperl-can-font-lock
 	  (require 'font-lock))
       (require 'cl)))
 
 (defvar cperl-mode-abbrev-table nil
-  "Abbrev table in use in Cperl-mode buffers.")
+  "Abbrev table in use in CPerl mode buffers.")
 
 (add-hook 'edit-var-mode-alist '(perl-mode (regexp . "^cperl-")))
 
@@ -2111,7 +2222,7 @@ the faces: please specify bold, italic, underline, shadow and box.)
 		      ;;(concat (char-to-string help-char) "v") ; does not work
 		      'cperl-get-help
 		      [(control c) (control h) v]))
-  (if (and cperl-xemacs-p 
+  (if (and cperl-xemacs-p
 	   (<= emacs-minor-version 11) (<= emacs-major-version 19))
       (progn
 	;; substitute-key-definition is usefulness-deenhanced...
@@ -2137,113 +2248,115 @@ the faces: please specify bold, italic, underline, shadow and box.)
 (condition-case nil
     (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]
-	   ["Fill paragraph/comment" cperl-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])
-	   ["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)]
-	    ["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"
+      (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]
+	 ["Fill paragraph/comment" cperl-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])
+	 ["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)]
+	  ["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"
 ;;;	     ["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]
 ;;;	     ["Add tags for Perl files in directory" (cperl-etags t t) t]
-;;;	     ["Create tags for Perl files in (sub)directories" 
+;;;	     ["Create tags for Perl files in (sub)directories"
 ;;;	      (cperl-etags nil 'recursive) t]
 ;;;	     ["Add tags for Perl files in (sub)directories"
-;;;	      (cperl-etags t 'recursive) t]) 
+;;;	      (cperl-etags t 'recursive) t])
 ;;;; cperl-write-tags (&optional file erase recurse dir inbuffer)
-	     ["Create tags for current file" (cperl-write-tags nil t) t]
-	     ["Add tags for current file" (cperl-write-tags) t]
-	     ["Create tags for Perl files in directory" 
-	      (cperl-write-tags nil t nil t) t]
-	     ["Add tags for Perl files in directory" 
-	      (cperl-write-tags nil nil nil t) t]
-	     ["Create tags for Perl files in (sub)directories" 
-	      (cperl-write-tags nil t t t) t]
-	     ["Add tags for Perl files in (sub)directories"
-	      (cperl-write-tags nil nil t t) t]))
-	   ("Perl docs"
-	    ["Define word at point" imenu-go-find-at-position 
-	     (fboundp 'imenu-go-find-at-position)]
-	    ["Help on function" cperl-info-on-command t]
-	    ["Help on function at point" cperl-info-on-current-command t]
-	    ["Help on symbol at point" cperl-get-help t]
-	    ["Perldoc" cperl-perldoc t]
-	    ["Perldoc on word at point" cperl-perldoc-at-point t]
-	    ["View manpage of POD in this file" cperl-pod-to-manpage t]
-	    ["Auto-help on" cperl-lazy-install 
-	     (and (fboundp 'run-with-idle-timer)
-		  (not cperl-lazy-installed))]
-	    ["Auto-help off" (eval '(cperl-lazy-unstall)) 
-	     (and (fboundp 'run-with-idle-timer)
-		  cperl-lazy-installed)])
-	   ("Toggle..."
-	    ["Auto newline" cperl-toggle-auto-newline t]
-	    ["Electric parens" cperl-toggle-electric t]
-	    ["Electric keywords" cperl-toggle-abbrev t]
-	    ["Fix whitespace on indent" cperl-toggle-construct-fix t]
-	    ["Auto fill" auto-fill-mode t]) 
-	   ("Indent styles..."
-	    ["CPerl" (cperl-set-style "CPerl") t]
-	    ["PerlStyle" (cperl-set-style "PerlStyle") t]
-	    ["GNU" (cperl-set-style "GNU") t]
-	    ["C++" (cperl-set-style "C++") t]
-	    ["FSF" (cperl-set-style "FSF") t]
-	    ["BSD" (cperl-set-style "BSD") t]
-	    ["Whitesmith" (cperl-set-style "Whitesmith") t]
-	    ["Current" (cperl-set-style "Current") t]
-	    ["Memorized" (cperl-set-style-back) cperl-old-style])
-	   ("Micro-docs"
-	    ["Tips" (describe-variable 'cperl-tips) t]
-	    ["Problems" (describe-variable 'cperl-problems) t]
-	    ["Non-problems" (describe-variable 'cperl-non-problems) t]
-	    ["Speed" (describe-variable 'cperl-speed) t]
-	    ["Praise" (describe-variable 'cperl-praise) t]
-	    ["Faces" (describe-variable 'cperl-tips-faces) t]
-	    ["CPerl mode" (describe-function 'cperl-mode) t]
-	    ["CPerl version" 
-	     (message "The version of master-file for this CPerl is %s" 
-		      cperl-version) t]))))
+	   ["Create tags for current file" (cperl-write-tags nil t) t]
+	   ["Add tags for current file" (cperl-write-tags) t]
+	   ["Create tags for Perl files in directory"
+	    (cperl-write-tags nil t nil t) t]
+	   ["Add tags for Perl files in directory"
+	    (cperl-write-tags nil nil nil t) t]
+	   ["Create tags for Perl files in (sub)directories"
+	    (cperl-write-tags nil t t t) t]
+	   ["Add tags for Perl files in (sub)directories"
+	    (cperl-write-tags nil nil t t) t]))
+	 ("Perl docs"
+	  ["Define word at point" imenu-go-find-at-position 
+	   (fboundp 'imenu-go-find-at-position)]
+	  ["Help on function" cperl-info-on-command t]
+	  ["Help on function at point" cperl-info-on-current-command t]
+	  ["Help on symbol at point" cperl-get-help t]
+	  ["Perldoc" cperl-perldoc t]
+	  ["Perldoc on word at point" cperl-perldoc-at-point t]
+	  ["View manpage of POD in this file" cperl-build-manpage t]
+	  ["Auto-help on" cperl-lazy-install 
+	   (and (fboundp 'run-with-idle-timer)
+		(not cperl-lazy-installed))]
+	  ["Auto-help off" cperl-lazy-unstall
+	   (and (fboundp 'run-with-idle-timer)
+		cperl-lazy-installed)])
+	 ("Toggle..."
+	  ["Auto newline" cperl-toggle-auto-newline t]
+	  ["Electric parens" cperl-toggle-electric t]
+	  ["Electric keywords" cperl-toggle-abbrev t]
+	  ["Fix whitespace on indent" cperl-toggle-construct-fix t]
+	  ["Auto-help on Perl constructs" cperl-toggle-autohelp t]
+	  ["Auto fill" auto-fill-mode t]) 
+	 ("Indent styles..."
+	  ["CPerl" (cperl-set-style "CPerl") t]
+	  ["PerlStyle" (cperl-set-style "PerlStyle") t]
+	  ["GNU" (cperl-set-style "GNU") t]
+	  ["C++" (cperl-set-style "C++") t]
+	  ["FSF" (cperl-set-style "FSF") t]
+	  ["BSD" (cperl-set-style "BSD") t]
+	  ["Whitesmith" (cperl-set-style "Whitesmith") t]
+	  ["Current" (cperl-set-style "Current") t]
+	  ["Memorized" (cperl-set-style-back) cperl-old-style])
+	 ("Micro-docs"
+	  ["Tips" (describe-variable 'cperl-tips) t]
+	  ["Problems" (describe-variable 'cperl-problems) t]
+	  ["Non-problems" (describe-variable 'cperl-non-problems) t]
+	  ["Speed" (describe-variable 'cperl-speed) t]
+	  ["Praise" (describe-variable 'cperl-praise) t]
+	  ["Faces" (describe-variable 'cperl-tips-faces) t]
+	  ["CPerl mode" (describe-function 'cperl-mode) t]
+	  ["CPerl version" 
+	   (message "The version of master-file for this CPerl is %s" 
+		    cperl-version) t]))))
   (error nil))
 
 (autoload 'c-macro-expand "cmacexp"
@@ -2251,11 +2364,22 @@ the faces: please specify bold, italic, underline, shadow and box.)
 The expansion is entirely correct because it uses the C preprocessor."
   t)
 
+(defvar cperl-imenu--function-name-regexp-perl
+  (concat
+   "^\\("
+	"[ \t]*\\(sub\\|package\\)[ \t\n]+\\([a-zA-Z_0-9:']+\\)[ \t]*\\(([^()]*)[ \t]*\\)?"
+   "\\|"
+	"=head\\([12]\\)[ \t]+\\([^\n]+\\)$"
+   "\\)"))
+
+(defvar cperl-outline-regexp
+  (concat cperl-imenu--function-name-regexp-perl "\\|" "\\`"))
+
 (defvar cperl-mode-syntax-table nil
-  "Syntax table in use in Cperl-mode buffers.")
+  "Syntax table in use in CPerl mode buffers.")
 
 (defvar cperl-string-syntax-table nil
-  "Syntax table in use in Cperl-mode string-like chunks.")
+  "Syntax table in use in CPerl mode string-like chunks.")
 
 (if cperl-mode-syntax-table
     ()
@@ -2281,8 +2405,7 @@ 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) ; (?# comment )
-)
+  (modify-syntax-entry ?# "." cperl-string-syntax-table)) ; (?# comment )
 
 
 
@@ -2298,7 +2421,13 @@ The expansion is entirely correct because it uses the C preprocessor."
 (defvar perl-font-lock-keywords-1)
 (defvar perl-font-lock-keywords-2)
 (defvar outline-level)
-(defvar cperl-outline-regexp)
+(if (fboundp 'defvaralias)
+    (let ((f 'defvaralias)) ; Some functions deduce stuff from the mode name...
+      (funcall f 'cperl-font-lock-keywords   'perl-font-lock-keywords)
+      (funcall f 'cperl-font-lock-keywords-1 'perl-font-lock-keywords-1)
+      (funcall f 'cperl-font-lock-keywords-2 'perl-font-lock-keywords-2)))
+
+(defvar cperl-use-major-mode 'perl-mode)
 
 ;;;###autoload
 (defun cperl-mode ()
@@ -2313,7 +2442,7 @@ sometimes <>.  When the user types the first, she gets the second as
 well, with optional special formatting done on {}.  (Disabled by
 default.)  You can always quote (with \\[quoted-insert]) the left
 \"paren\" to avoid the expansion.  The processing of < is special,
-since most the time you mean \"less\".  Cperl mode tries to guess
+since most the time you mean \"less\".  CPerl mode tries to guess
 whether you want to type pair <>, and inserts is if it
 appropriate.  You can set `cperl-electric-parens-string' to the string that
 contains the parenths from the above list you want to be electrical.
@@ -2323,7 +2452,7 @@ look for active mark and \"embrace\" a region if possible.'
 
 CPerl mode provides expansion of the Perl control constructs:
 
-   if, else, elsif, unless, while, until, continue, do, 
+   if, else, elsif, unless, while, until, continue, do,
    for, foreach, formy and foreachmy.
 
 and POD directives (Disabled by default, see `cperl-electric-keywords'.)
@@ -2336,7 +2465,7 @@ following \"if\" the following appears in the buffer: if () { or if ()
 type some boolean expression within the parens.  Having done that,
 typing \\[cperl-linefeed] places you - appropriately indented - on a
 new line between the braces (if you typed \\[cperl-linefeed] in a POD
-directive line, then appropriate number of new lines is inserted).  
+directive line, then appropriate number of new lines is inserted).
 
 If CPerl decides that you want to insert \"English\" style construct like
 
@@ -2355,8 +2484,8 @@ you type it inside the inline block of control construct, like
 
 and you are on a boundary of a statement inside braces, it will
 transform the construct into a multiline and will place you into an
-appropriately indented blank line.  If you need a usual 
-`newline-and-indent' behaviour, it is on \\[newline-and-indent], 
+appropriately indented blank line.  If you need a usual
+`newline-and-indent' behaviour, it is on \\[newline-and-indent],
 see documentation on `cperl-electric-linefeed'.
 
 Use \\[cperl-invert-if-unless] to change a construction of the form
@@ -2387,7 +2516,7 @@ If your site has perl5 documentation in info format, you can use commands
 \\[cperl-info-on-current-command] and \\[cperl-info-on-command] to access it.
 These keys run commands `cperl-info-on-current-command' and
 `cperl-info-on-command', which one is which is controlled by variable
-`cperl-info-on-command-no-prompt' and `cperl-clobber-lisp-bindings' 
+`cperl-info-on-command-no-prompt' and `cperl-clobber-lisp-bindings'
 \(in turn affected by `cperl-hairy').
 
 Even if you have no info-format documentation, short one-liner-style
@@ -2405,7 +2534,7 @@ beginning of the region at the start of construction, and make region
 span the needed amount of lines.
 
 Variables `cperl-pod-here-scan', `cperl-pod-here-fontify',
-`cperl-pod-face', `cperl-pod-head-face' control processing of pod and
+`cperl-pod-face', `cperl-pod-head-face' control processing of POD and
 here-docs sections.  With capable Emaxen results of scan are used
 for indentation too, otherwise they are used for highlighting only.
 
@@ -2419,8 +2548,8 @@ Variables controlling indentation style:
     Non-nil means automatically newline before and after braces,
     and after colons and semicolons, inserted in Perl code.  The following
     \\[cperl-electric-backspace] will remove the inserted whitespace.
-    Insertion after colons requires both this variable and 
-    `cperl-auto-newline-after-colon' set. 
+    Insertion after colons requires both this variable and
+    `cperl-auto-newline-after-colon' set.
  `cperl-auto-newline-after-colon'
     Non-nil means automatically newline even after colons.
     Subject to `cperl-auto-newline' setting.
@@ -2456,7 +2585,7 @@ corresponding variables.  Use \\[cperl-set-style] to do this.  Use
 \(both available from menu).
 
 If `cperl-indent-level' is 0, the statement after opening brace in
-column 0 is indented on 
+column 0 is indented on
 `cperl-brace-offset'+`cperl-continued-statement-offset'.
 
 Turning on CPerl mode calls the hooks in the variable `cperl-mode-hook'
@@ -2480,7 +2609,7 @@ or as help on variables `cperl-tips', `cperl-problems',
 	(cperl-define-key "\C-hf" 'cperl-info-on-current-command [(control h) f])
 	(cperl-define-key "\C-c\C-hf" 'cperl-info-on-command
 			  [(control c) (control h) f])))
-  (setq major-mode 'perl-mode)
+  (setq major-mode cperl-use-major-mode)
   (setq mode-name "CPerl")
   (if (not cperl-mode-abbrev-table)
       (let ((prev-a-c abbrevs-changed))
@@ -2533,7 +2662,7 @@ 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]+\\([^ \t\n{(;]+\\)[ \t]*")
+  (setq defun-prompt-regexp "^[ \t]*sub[ \t]+\\([^ \t\n{(;]+\\)\\([ \t]*([^()]*)[ \t]*\\)?[ \t]*")
   (make-local-variable 'comment-indent-function)
   (setq comment-indent-function 'cperl-comment-indent)
   (make-local-variable 'parse-sexp-ignore-comments)
@@ -2543,7 +2672,7 @@ or as help on variables `cperl-tips', `cperl-problems',
   ;;(setq auto-fill-function 'cperl-do-auto-fill) ; Need to switch on and off!
   (make-local-variable 'imenu-create-index-function)
   (setq imenu-create-index-function
-	(function imenu-example--create-perl-index))
+	(function cperl-imenu--create-perl-index))
   (make-local-variable 'imenu-sort-function)
   (setq imenu-sort-function nil)
   (make-local-variable 'vc-header-alist)
@@ -2564,37 +2693,40 @@ or as help on variables `cperl-tips', `cperl-problems',
   (make-local-variable 'cperl-syntax-state)
   (if cperl-use-syntax-table-text-property
       (progn
-	(make-variable-buffer-local 'parse-sexp-lookup-properties)
+	(make-local-variable 'parse-sexp-lookup-properties)
 	;; Do not introduce variable if not needed, we check it!
 	(set 'parse-sexp-lookup-properties t)
 	;; Fix broken font-lock:
 	(or (boundp 'font-lock-unfontify-region-function)
 	    (set 'font-lock-unfontify-region-function
-		  'font-lock-default-unfontify-region))
-	(make-variable-buffer-local '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)
-	(make-variable-buffer-local 'cperl-syntax-done-to)
+	(make-local-variable 'cperl-syntax-done-to)
 	;; Another bug: unless font-lock-syntactic-keywords, font-lock
 	;;  ignores syntax-table text-property.  (t) is a hack
 	;;  to make font-lock think that font-lock-syntactic-keywords
 	;;  are defined
-	(make-variable-buffer-local 'font-lock-syntactic-keywords)
-	(setq font-lock-syntactic-keywords 
+	(make-local-variable 'font-lock-syntactic-keywords)
+	(setq font-lock-syntactic-keywords
 	      (if cperl-syntaxify-by-font-lock
 		  '(t (cperl-fontify-syntaxically))
 		'(t)))))
   (make-local-variable 'cperl-old-style)
-  (or (fboundp 'cperl-old-auto-fill-mode)
-      (progn
-	(fset 'cperl-old-auto-fill-mode (symbol-function 'auto-fill-mode))
-	(defun auto-fill-mode (&optional arg)
-	  (interactive "P")
-	  (eval '(cperl-old-auto-fill-mode arg)) ; Avoid a warning
-	  (and auto-fill-function (eq major-mode 'perl-mode)
-	       (setq auto-fill-function 'cperl-do-auto-fill)))))
+  (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 ???
+    (or (fboundp 'cperl-old-auto-fill-mode)
+	(progn
+	  (fset 'cperl-old-auto-fill-mode (symbol-function 'auto-fill-mode))
+	  (defun auto-fill-mode (&optional arg)
+	    (interactive "P")
+	    (eval '(cperl-old-auto-fill-mode arg)) ; Avoid a warning
+	    (and auto-fill-function (memq major-mode '(perl-mode cperl-mode))
+		 (setq auto-fill-function 'cperl-do-auto-fill))))))
   (if (cperl-enable-font-lock)
-      (if (cperl-val 'cperl-font-lock) 
+      (if (cperl-val 'cperl-font-lock)
 	  (progn (or cperl-faces-init (cperl-init-faces))
 		 (font-lock-mode 1))))
   (and (boundp 'msb-menu-cond)
@@ -2604,16 +2736,12 @@ or as help on variables `cperl-tips', `cperl-problems',
       (easy-menu-add cperl-menu))	; A NOP in RMS Emacs.
   (run-hooks 'cperl-mode-hook)
   ;; After hooks since fontification will break this
-  (if cperl-pod-here-scan 
-      (or ;;(and (boundp 'font-lock-mode)
-	  ;;     (eval 'font-lock-mode)	; Avoid warning
-	  ;;     (boundp 'font-lock-hot-pass) ; Newer font-lock
-       cperl-syntaxify-by-font-lock  ;;)
+  (if cperl-pod-here-scan
+      (or cperl-syntaxify-by-font-lock
        (progn (or cperl-faces-init (cperl-init-faces-weak))
 	      (cperl-find-pods-heres)))))
 
 ;; Fix for perldb - make default reasonable
-(defvar gud-perldb-history)
 (defun cperl-db ()
   (interactive)
   (require 'gud)
@@ -2621,14 +2749,13 @@ or as help on variables `cperl-tips', `cperl-problems',
 				(if (consp gud-perldb-history)
 				    (car gud-perldb-history)
 				  (concat "perl " ;;(file-name-nondirectory
-						   ;; I have problems
-						   ;; in OS/2
-						   ;; otherwise
-						   (buffer-file-name)))
+					  ;; I have problems
+					  ;; in OS/2
+					  ;; otherwise
+					  (buffer-file-name)))
 				nil nil
 				'(gud-perldb-history . 1))))
 
-(defvar msb-menu-cond)
 (defun cperl-msb-fix ()
   ;; Adds perl files to msb menu, supposes that msb is already loaded
   (setq cperl-msb-fixed t)
@@ -2638,7 +2765,7 @@ or as help on variables `cperl-tips', `cperl-problems',
 	 (handle (1- (nth 1 last))))
     (setcdr precdr (list
 		    (list
-		     '(eq major-mode 'perl-mode)
+		     '(memq major-mode '(cperl-mode perl-mode))
 		     handle
 		     "Perl Files (%d)")
 		    last))))
@@ -2688,7 +2815,7 @@ or as help on variables `cperl-tips', `cperl-problems',
 ;;;  (let ((c (current-column)) target cnt prevc)
 ;;;    (if (= c comment-column) nil
 ;;;      (setq cnt (skip-chars-backward "[ \t]"))
-;;;      (setq target (max (1+ (setq prevc 
+;;;      (setq target (max (1+ (setq prevc
 ;;;			     (current-column))) ; Else indent at comment column
 ;;;		   comment-column))
 ;;;      (if (= c comment-column) nil
@@ -2730,14 +2857,14 @@ See `comment-region'."
   "Insert character and correct line's indentation.
 If ONLY-BEFORE and `cperl-auto-newline', will insert newline before the
 place (even in empty line), but not after.  If after \")\" and the inserted
-char is \"{\", insert extra newline before only if 
+char is \"{\", insert extra newline before only if
 `cperl-extra-newline-before-brace'."
   (interactive "P")
   (let (insertpos
 	(other-end (if (and cperl-electric-parens-mark
-			    (cperl-mark-active) 
+			    (cperl-mark-active)
 			    (< (mark) (point)))
-		       (mark) 
+		       (mark)
 		     nil)))
     (if (and other-end
 	     (not cperl-brace-recursing)
@@ -2751,14 +2878,16 @@ char is \"{\", insert extra newline before only if
 	    (setq last-command-char ?\{)
 	    (cperl-electric-lbrace arg insertpos))
 	  (forward-char 1))
-      ;: Check whether we close something "usual" with `}'
+      ;; Check whether we close something "usual" with `}'
       (if (and (eq last-command-char ?\})
-	       (not 
+	       (not
 		(condition-case nil
 		    (save-excursion
 		      (up-list (- (prefix-numeric-value arg)))
 		      ;;(cperl-after-block-p (point-min))
-		      (cperl-after-expr-p nil "{;)"))
+		      (or (cperl-after-expr-p nil "{;)")
+			  ;; after sub, else, continue
+			  (cperl-after-block-p nil 'pre)))
 		  (error nil))))
 	  ;; Just insert the guy
 	  (self-insert-command (prefix-numeric-value arg))
@@ -2775,7 +2904,7 @@ char is \"{\", insert extra newline before only if
 			  (save-excursion
 			    (skip-chars-backward " \t")
 			    (eq (preceding-char) ?\))))
-		     (if cperl-auto-newline 
+		     (if cperl-auto-newline
 			 (progn (cperl-indent-line) (newline) t) nil)))
 	    (progn
 	      (self-insert-command (prefix-numeric-value arg))
@@ -2788,7 +2917,7 @@ char is \"{\", insert extra newline before only if
 		    (cperl-indent-line)))
 	      (save-excursion
 		(if insertpos (progn (goto-char insertpos)
-				     (search-forward (make-string 
+				     (search-forward (make-string
 						      1 last-command-char))
 				     (setq insertpos (1- (point)))))
 		(delete-char -1))))
@@ -2801,17 +2930,17 @@ char is \"{\", insert extra newline before only if
 (defun cperl-electric-lbrace (arg &optional end)
   "Insert character, correct line's indentation, correct quoting by space."
   (interactive "P")
-  (let (pos after 
-	    (cperl-brace-recursing t)
-	    (cperl-auto-newline cperl-auto-newline)
-	    (other-end (or end
-			   (if (and cperl-electric-parens-mark
-				    (cperl-mark-active)
-				    (> (mark) (point)))
-			       (save-excursion
-				 (goto-char (mark))
-				 (point-marker)) 
-			     nil))))
+  (let ((cperl-brace-recursing t)
+	(cperl-auto-newline cperl-auto-newline)
+	(other-end (or end
+		       (if (and cperl-electric-parens-mark
+				(cperl-mark-active)
+				(> (mark) (point)))
+			   (save-excursion
+			     (goto-char (mark))
+			     (point-marker))
+			 nil)))
+	pos after)
     (and (cperl-val 'cperl-electric-lbrace-space)
 	 (eq (preceding-char) ?$)
 	 (save-excursion
@@ -2819,7 +2948,7 @@ char is \"{\", insert extra newline before only if
 	   (looking-at "\\(\\$\\$\\)*\\$\\([^\\$]\\|$\\)"))
 	 (insert ?\ ))
     ;; Check whether we are in comment
-    (if (and 
+    (if (and
 	 (save-excursion
 	   (beginning-of-line)
 	   (not (looking-at "[ \t]*#")))
@@ -2829,7 +2958,7 @@ char is \"{\", insert extra newline before only if
     (cperl-electric-brace arg)
     (and (cperl-val 'cperl-electric-parens)
 	 (eq last-command-char ?{)
-	 (memq last-command-char 
+	 (memq last-command-char
 	       (append cperl-electric-parens-string nil))
 	 (or (if other-end (goto-char (marker-position other-end)))
 	     t)
@@ -2838,15 +2967,16 @@ char is \"{\", insert extra newline before only if
 		(goto-char pos)))))
 
 (defun cperl-electric-paren (arg)
-  "Insert a matching pair of parentheses."
+  "Insert an opening parenthesis or a matching pair of parentheses.
+See `cperl-electric-parens'."
   (interactive "P")
   (let ((beg (save-excursion (beginning-of-line) (point)))
 	(other-end (if (and cperl-electric-parens-mark
-			    (cperl-mark-active) 
+			    (cperl-mark-active)
 			    (> (mark) (point)))
-			   (save-excursion
-			     (goto-char (mark))
-			     (point-marker)) 
+		       (save-excursion
+			 (goto-char (mark))
+			 (point-marker))
 		     nil)))
     (if (and (cperl-val 'cperl-electric-parens)
 	     (memq last-command-char
@@ -2862,7 +2992,7 @@ char is \"{\", insert extra newline before only if
 	(progn
 	  (self-insert-command (prefix-numeric-value arg))
 	  (if other-end (goto-char (marker-position other-end)))
-	  (insert (make-string 
+	  (insert (make-string
 		   (prefix-numeric-value arg)
 		   (cdr (assoc last-command-char '((?{ .?})
 						   (?[ . ?])
@@ -2873,16 +3003,17 @@ char is \"{\", insert extra newline before only if
 
 (defun cperl-electric-rparen (arg)
   "Insert a matching pair of parentheses if marking is active.
-If not, or if we are not at the end of marking range, would self-insert."
+If not, or if we are not at the end of marking range, would self-insert.
+Affected by `cperl-electric-parens'."
   (interactive "P")
   (let ((beg (save-excursion (beginning-of-line) (point)))
 	(other-end (if (and cperl-electric-parens-mark
 			    (cperl-val 'cperl-electric-parens)
 			    (memq last-command-char
 				  (append cperl-electric-parens-string nil))
-			    (cperl-mark-active) 
+			    (cperl-mark-active)
 			    (< (mark) (point)))
-		       (mark) 
+		       (mark)
 		     nil))
 	p)
     (if (and other-end
@@ -2898,9 +3029,9 @@ If not, or if we are not at the end of marking range, would self-insert."
 	  (insert (make-string
 		   (prefix-numeric-value arg)
 		   (cdr (assoc last-command-char '((?\} . ?\{)
-						  (?\] . ?\[)
-						  (?\) . ?\()
-						  (?\> . ?\<))))))
+						   (?\] . ?\[)
+						   (?\) . ?\()
+						   (?\> . ?\<))))))
 	  (goto-char (1+ p)))
       (self-insert-command (prefix-numeric-value arg)))))
 
@@ -2908,7 +3039,7 @@ If not, or if we are not at the end of marking range, would self-insert."
   "Insert a construction appropriate after a keyword.
 Help message may be switched off by setting `cperl-message-electric-keyword'
 to nil."
-  (let ((beg (save-excursion (beginning-of-line) (point))) 
+  (let ((beg (save-excursion (beginning-of-line) (point)))
 	(dollar (and (eq last-command-char ?$)
 		     (eq this-command 'self-insert-command)))
 	(delete (and (memq last-command-char '(?\ ?\n ?\t ?\f))
@@ -2921,8 +3052,8 @@ to nil."
 		 (setq do (looking-at "do\\>")))
 	     (error nil))
 	   (cperl-after-expr-p nil "{;:"))
-	 (save-excursion 
-	   (not 
+	 (save-excursion
+	   (not
 	    (re-search-backward
 	     "[#\"'`]\\|\\<q\\(\\|[wqxr]\\)\\>"
 	     beg t)))
@@ -2933,14 +3064,16 @@ to nil."
 				   (not (eq (get-text-property (point)
 							       'syntax-type)
 					    'pod))))))
+	 (save-excursion (forward-sexp -1) 
+			 (not (memq (following-char) (append "$@%&*" nil))))
 	 (progn
 	   (and (eq (preceding-char) ?y)
 		(progn			; "foreachmy"
 		  (forward-char -2)
 		  (insert " ")
 		  (forward-char 2)
-		  (setq my t dollar t 
-			delete 
+		  (setq my t dollar t
+			delete
 			(memq this-command '(self-insert-command newline)))))
 	   (and dollar (insert " $"))
 	   (cperl-indent-line)
@@ -2955,15 +3088,18 @@ to nil."
  	     (insert "\n}")
 	     (and do (insert " while ();")))
  	    (t
- 	     (insert (if do " {\n} while ();" " () {\n}")))
- 	    )
+ 	     (insert (if do " {\n} while ();" " () {\n}"))))
 	   (or (looking-at "[ \t]\\|$") (insert " "))
 	   (cperl-indent-line)
 	   (if dollar (progn (search-backward "$")
-			     (if my 
+			     (if my
 				 (forward-char 1)
 			       (delete-char 1)))
-	     (search-backward ")"))
+	     (search-backward ")")
+	     (if (eq last-command-char ?\()
+		 (progn			; Avoid "if (())"
+		   (delete-backward-char 1)
+		   (delete-backward-char -1))))
 	   (if delete
 	       (cperl-putback-char cperl-del-back-ch))
 	   (if cperl-message-electric-keyword
@@ -2986,7 +3122,7 @@ to nil."
 	head1 notlast name p really-delete over)
     (and (save-excursion
 	   (forward-word -1)
-	   (and 
+	   (and
 	    (eq (preceding-char) ?=)
 	    (progn
 	      (setq head1 (looking-at "head1\\>[ \t]*$"))
@@ -2994,12 +3130,12 @@ to nil."
 			      (not (looking-at "over[ \t]*\n\n\n*=item\\>"))))
 	      (forward-char -1)
 	      (bolp))
-	    (or 
+	    (or
 	     (get-text-property (point) 'in-pod)
 	     (cperl-after-expr-p nil "{;:")
 	     (and (re-search-backward
-		   ;; "\\(\\`\n?\\|\n\n\\)=\\sw+" 
-		   "\\(\\`\n?\\|^\n\\)=\\sw+" 
+		   ;; "\\(\\`\n?\\|\n\n\\)=\\sw+"
+		   "\\(\\`\n?\\|^\n\\)=\\sw+"
 		   (point-min) t)
 		  (not (or
 			(looking-at "=cut")
@@ -3014,18 +3150,18 @@ to nil."
 		 (insert "\n\n=cut")
 		 (cperl-ensure-newlines 2)
 		 (forward-word -2)
-		 (if (and head1 
-			  (not 
+		 (if (and head1
+			  (not
 			   (save-excursion
 			     (forward-char -1)
 			     (re-search-backward "\\(\\`\n?\\|\n\n\\)=head1\\>"
-						nil t)))) ; Only one
-		     (progn 
+						 nil t)))) ; Only one
+		     (progn
 		       (forward-word 1)
 		       (setq name (file-name-sans-extension
 				   (file-name-nondirectory (buffer-file-name)))
 			     p (point))
-		       (insert " NAME\n\n" name 
+		       (insert " NAME\n\n" name
 			       " - \n\n=head1 SYNOPSIS\n\n\n\n"
 			       "=head1 DESCRIPTION")
 		       (cperl-ensure-newlines 4)
@@ -3055,8 +3191,8 @@ to nil."
     (and (save-excursion
 	   (backward-sexp 1)
 	   (cperl-after-expr-p nil "{;:"))
-	 (save-excursion 
-	   (not 
+	 (save-excursion
+	   (not
 	    (re-search-backward
 	     "[#\"'`]\\|\\<q\\(\\|[wqxr]\\)\\>"
 	     beg t)))
@@ -3076,8 +3212,7 @@ to nil."
  	     (cperl-indent-line)
  	     (insert "\n\n}"))
  	    (t
- 	     (insert " {\n\n}"))
- 	    )
+ 	     (insert " {\n\n}")))
 	   (or (looking-at "[ \t]\\|$") (insert " "))
 	   (cperl-indent-line)
 	   (forward-line -1)
@@ -3095,9 +3230,9 @@ If in POD, insert appropriate lines."
 	(end (save-excursion (end-of-line) (point)))
 	(pos (point)) start over cut res)
     (if (and				; Check if we need to split:
-					; i.e., on a boundary and inside "{...}" 
+					; i.e., on a boundary and inside "{...}"
 	 (save-excursion (cperl-to-comment-or-eol)
-	   (>= (point) pos))		; Not in a comment
+			 (>= (point) pos)) ; Not in a comment
 	 (or (save-excursion
 	       (skip-chars-backward " \t" beg)
 	       (forward-char -1)
@@ -3106,7 +3241,7 @@ If in POD, insert appropriate lines."
 	     (re-search-forward "\\=[ \t]*;" end t)) ; Before spaces + ;
 	 (save-excursion
 	   (and
-	    (eq (car (parse-partial-sexp pos end -1)) -1) 
+	    (eq (car (parse-partial-sexp pos end -1)) -1)
 					; Leave the level of parens
 	    (looking-at "[,; \t]*\\($\\|#\\)") ; Comma to allow anon subr
 					; Are at end
@@ -3134,7 +3269,7 @@ If in POD, insert appropriate lines."
 	  (cperl-indent-line)
 	  (beginning-of-line)
 	  (or (looking-at "[ \t]*}[,; \t]*$") ; If there is a statement
-					    ; after, move it to separate line
+					; after, move it to separate line
 	      (progn
 		(end-of-line)
 		(search-backward "}" beg)
@@ -3144,7 +3279,7 @@ If in POD, insert appropriate lines."
 		(insert "\n")
 		(cperl-indent-line)
 		(forward-line -1)))
-	  (forward-line -1)		; We are on the line before target 
+	  (forward-line -1)		; We are on the line before target
 	  (end-of-line)
 	  (newline-and-indent))
       (end-of-line)			; else - no splitting
@@ -3153,7 +3288,7 @@ If in POD, insert appropriate lines."
 	     (save-excursion
 	       (skip-chars-backward " \t")
 	       (eq (preceding-char) ?\)))) ; Probably if () {} group
-					   ; with an extra newline.
+					; with an extra newline.
 	(forward-line 2)
 	(cperl-indent-line))
        ((save-excursion			; In POD header
@@ -3161,7 +3296,7 @@ If in POD, insert appropriate lines."
 	  ;; (re-search-backward "\\(\\`\n?\\|\n\n\\)=head1\\b")
 	  ;; We are after \n now, so look for the rest
 	  (if (looking-at "\\(\\`\n?\\|\n\\)=\\sw+")
-	      (progn 
+	      (progn
 		(setq cut (looking-at "\\(\\`\n?\\|\n\\)=cut\\>"))
 		(setq over (looking-at "\\(\\`\n?\\|\n\\)=over\\>"))
 		t)))
@@ -3205,11 +3340,12 @@ If in POD, insert appropriate lines."
 (defun cperl-electric-terminator (arg)
   "Insert character and correct line's indentation."
   (interactive "P")
-  (let (insertpos (end (point)) 
-		  (auto (and cperl-auto-newline
-			     (or (not (eq last-command-char ?:))
-				 cperl-auto-newline-after-colon))))
-    (if (and ;;(not arg) 
+  (let ((end (point))
+	(auto (and cperl-auto-newline
+		   (or (not (eq last-command-char ?:))
+		       cperl-auto-newline-after-colon)))
+	insertpos)
+    (if (and ;;(not arg)
 	     (eolp)
 	     (not (save-excursion
 		    (beginning-of-line)
@@ -3252,16 +3388,16 @@ If in POD, insert appropriate lines."
       (self-insert-command (prefix-numeric-value arg)))))
 
 (defun cperl-electric-backspace (arg)
-  "Backspace-untabify, or remove the whitespace around the point inserted 
-by an electric key."
+  "Backspace, or remove the whitespace around the point inserted by an electric
+key.  Will untabivy if `cperl-electric-backspace-untabify' is non-nil."
   (interactive "p")
-  (if (and cperl-auto-newline 
-	   (memq last-command '(cperl-electric-semi 
+  (if (and cperl-auto-newline
+	   (memq last-command '(cperl-electric-semi
 				cperl-electric-terminator
 				cperl-electric-lbrace))
 	   (memq (preceding-char) '(?\  ?\t ?\n)))
       (let (p)
-	(if (eq last-command 'cperl-electric-lbrace) 
+	(if (eq last-command 'cperl-electric-lbrace)
 	    (skip-chars-forward " \t\n"))
 	(setq p (point))
 	(skip-chars-backward " \t\n")
@@ -3269,7 +3405,7 @@ by an electric key."
     (and (eq last-command 'cperl-electric-else)
 	 ;; We are removing the whitespace *inside* cperl-electric-else
 	 (setq this-command 'cperl-electric-else-really))
-    (if (and cperl-auto-newline 
+    (if (and cperl-auto-newline
 	     (eq last-command 'cperl-electric-else-really)
 	     (memq (preceding-char) '(?\  ?\t ?\n)))
 	(let (p)
@@ -3277,7 +3413,9 @@ by an electric key."
 	  (setq p (point))
 	  (skip-chars-backward " \t\n")
 	  (delete-region (point) p))
-      (backward-delete-char-untabify arg))))
+      (if cperl-electric-backspace-untabify
+	  (backward-delete-char-untabify arg)
+	(delete-backward-char arg)))))
 
 (defun cperl-inside-parens-p ()
   (condition-case ()
@@ -3291,7 +3429,7 @@ by an electric key."
 
 (defun cperl-indent-command (&optional whole-exp)
   "Indent current line as Perl code, or in some cases insert a tab character.
-If `cperl-tab-always-indent' is non-nil (the default), always indent current 
+If `cperl-tab-always-indent' is non-nil (the default), always indent current
 line.  Otherwise, indent the current line only if point is at the left margin
 or in the line's indentation; otherwise insert a tab.
 
@@ -3327,9 +3465,9 @@ The relative indentation among the lines of the expression are preserved."
 (defun cperl-indent-line (&optional parse-data)
   "Indent current line as Perl code.
 Return the amount the indentation changed by."
-  (let (indent i beg shift-amt
-	(case-fold-search nil)
-	(pos (- (point-max) (point))))
+  (let ((case-fold-search nil)
+	(pos (- (point-max) (point)))
+	indent i beg shift-amt)
     (setq indent (cperl-calculate-indent parse-data)
 	  i indent)
     (beginning-of-line)
@@ -3379,7 +3517,7 @@ Return the amount the indentation changed by."
 (defun cperl-get-state (&optional parse-start start-state)
   ;; returns list (START STATE DEPTH PRESTART),
   ;; START is a good place to start parsing, or equal to
-  ;; PARSE-START if preset, 
+  ;; PARSE-START if preset,
   ;; STATE is what is returned by `parse-partial-sexp'.
   ;; DEPTH is true is we are immediately after end of block
   ;; which contains START.
@@ -3407,7 +3545,7 @@ 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 ";" !
+(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))
@@ -3425,7 +3563,7 @@ Return the amount the indentation changed by."
 		   (and (memq (char-syntax (preceding-char)) '(?w ?_))
 			(progn
 			  (backward-sexp)
-			  (looking-at 
+			  (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)))
@@ -3436,7 +3574,8 @@ 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.."
+and closing parentheses and brackets."
+  (cperl-update-syntaxification (point) (point))
   (save-excursion
     (if (or
 	 (and (memq (get-text-property (point) 'syntax-type)
@@ -3444,125 +3583,126 @@ and closing parentheses and brackets.."
 	      (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!"))
+	      (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
-	  (cperl-backward-to-noncomment nil)
-	  (setq p (max (point-min) (1- (point)))
-		prop (get-text-property p 'syntax-type)
-		look-prop (or (nth 1 (assoc prop cperl-look-for-prop))
-			      'syntax-type))
-	  (if (memq prop '(pod here-doc format here-doc-delim))
+      (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
+	    (cperl-backward-to-noncomment nil)
+	    (setq p (max (point-min) (1- (point)))
+		  prop (get-text-property p 'syntax-type)
+		  look-prop (or (nth 1 (assoc prop cperl-look-for-prop))
+				'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)))
+		  (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
-		(goto-char (or (previous-single-property-change p look-prop) 
-			       (point-min)))
-		(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]*:")))) 
-			(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)))
+		(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:
@@ -3584,153 +3724,159 @@ and closing parentheses and brackets.."
 ;;;		   (skip-chars-forward " \t"))
 ;;;	       (+ (current-column)	; Correct indentation of trailing ?\}
 ;;;		  (if (eq char-after ?\}) (+ cperl-indent-level
-;;;					     cperl-close-paren-offset) 
+;;;					     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))))
-		   ;; 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_$]*:[^:]"))
-			;; Skip over comments and labels following openbrace.
-			(cond ((= (following-char) ?\#)
-			       (forward-line 1))
-			      ;; 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
+		(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
-		       (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)
-				(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))))))))))))))
+		       (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)
+				  (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)
@@ -3766,7 +3912,7 @@ Not finished, not used."
 	    ((nth 4 state)		; In comment
 	     (setq res (cons '(comment) res)))
 	    ((null containing-sexp)
-	     ;; Line is at top level.  
+	     ;; 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.
@@ -3778,7 +3924,7 @@ Not finished, not used."
 	       (setq res (cons (list 'toplevel start) res)))
 	      ((eq (preceding-char) ?\) )
 	       (setq res (cons (list 'toplevel-after-parenth start) res)))
-	      (t 
+	      (t
 	       (setq res (cons (list 'toplevel-continued start) res)))))
 	    ((/= (char-after containing-sexp) ?{)
 	     ;; line is expression, not statement:
@@ -3792,9 +3938,9 @@ Not finished, not used."
 				     (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)))
+	       ;; 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))
@@ -3815,7 +3961,7 @@ Not finished, not used."
 			(save-excursion (cperl-after-label)))
 	       (if (eq (preceding-char) ?\,)
 		   ;; Will go to beginning of line, essentially
-		     ;; Will ignore embedded sexpr XXXX.
+		   ;; Will ignore embedded sexpr XXXX.
 		   (cperl-backward-to-start-of-continued-exp containing-sexp))
 	       (beginning-of-line)
 	       (cperl-backward-to-noncomment containing-sexp))
@@ -3848,12 +3994,12 @@ Not finished, not used."
 			     (save-excursion (end-of-line)
 					     (setq colon-line-end (point)))
 			     (search-forward ":"))))
-		    ;; Now at the point, after label, or at start 
+		    ;; Now at the point, after label, or at start
 		    ;; of first statement in the block.
 		    (and (< (point) start-point)
-			 (if (> colon-line-end (point)) 
+			 (if (> colon-line-end (point))
 			     ;; Before statement after label
-			     (if (> (current-indentation) 
+			     (if (> (current-indentation)
 				    cperl-min-label-indent)
 				 (list (list 'label-in-block (point)))
 			       ;; Do not believe: `max' is involved
@@ -3912,46 +4058,45 @@ the current line is to be regarded as part of a block comment."
 
 
 (defun cperl-to-comment-or-eol ()
-  "Goes to position before comment on the current line, or to end of line.
+  "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))))
-      (beginning-of-line)
-      (if (or 
-	   (eq (get-text-property (point) 'syntax-type) 'pod)
-	   (re-search-forward "\\=[ \t]*\\(#\\|$\\)" lim t))
-	  (if (eq (preceding-char) ?\#) (progn (backward-char 1) t))
-	;; Else
-	(while (not stop-in)
-	  (setq state (parse-partial-sexp (point) lim nil nil nil t))
+    (beginning-of-line)
+    (if (or
+	 (eq (get-text-property (point) 'syntax-type) 'pod)
+	 (re-search-forward "\\=[ \t]*\\(#\\|$\\)" lim t))
+	(if (eq (preceding-char) ?\#) (progn (backward-char 1) t))
+      ;; Else
+      (while (not stop-in)
+	(setq state (parse-partial-sexp (point) lim nil nil nil t))
 					; stop at comment
-	  ;; If fails (beginning-of-line inside sexp), then contains not-comment
-	  (if (nth 4 state)		; After `#';
+	;; If fails (beginning-of-line inside sexp), then contains not-comment
+	(if (nth 4 state)		; After `#';
 					; (nth 2 state) can be
 					; beginning of m,s,qq and so
 					; on
-	      (if (nth 2 state)
-		  (progn
-		    (setq cpoint (point))
-		    (goto-char (nth 2 state))
-		    (cond
-		     ((looking-at "\\(s\\|tr\\)\\>")
-		      (or (re-search-forward
-			   "\\=\\w+[ \t]*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*"
-			   lim 'move)
-			  (setq stop-in t)))
-		     ((looking-at "\\(m\\|q\\([qxwr]\\)?\\)\\>")
-		      (or (re-search-forward
-			   "\\=\\w+[ \t]*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*#"
-			   lim 'move)
-			  (setq stop-in t)))
-		     (t			; It was fair comment
-		      (setq stop-in t)	; Finish
-		      (goto-char (1- cpoint)))))
-		(setq stop-in t)	; Finish
-		(forward-char -1))
-	    (setq stop-in t))		; Finish
-	  )
-	(nth 4 state))))
+	    (if (nth 2 state)
+		(progn
+		  (setq cpoint (point))
+		  (goto-char (nth 2 state))
+		  (cond
+		   ((looking-at "\\(s\\|tr\\)\\>")
+		    (or (re-search-forward
+			 "\\=\\w+[ \t]*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*"
+			 lim 'move)
+			(setq stop-in t)))
+		   ((looking-at "\\(m\\|q\\([qxwr]\\)?\\)\\>")
+		    (or (re-search-forward
+			 "\\=\\w+[ \t]*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*#"
+			 lim 'move)
+			(setq stop-in t)))
+		   (t			; It was fair comment
+		    (setq stop-in t)	; Finish
+		    (goto-char (1- cpoint)))))
+	      (setq stop-in t)		; Finish
+	      (forward-char -1))
+	  (setq stop-in t)))		; Finish 
+      (nth 4 state))))
 
 (defsubst cperl-1- (p)
   (max (point-min) (1- p)))
@@ -3973,7 +4118,7 @@ Returns true if comment is found."
       (put-text-property (1- (point)) (point) 'syntax-table cperl-st-punct))))
 
 (defun cperl-commentify (bb e string &optional noface)
-  (if cperl-use-syntax-table-text-property 
+  (if cperl-use-syntax-table-text-property
       (if (eq noface 'n)		; Only immediate
 	  nil
 	;; We suppose that e is _after_ the end of construction, as after eol.
@@ -3984,7 +4129,7 @@ Returns true if comment is found."
 	  (cperl-modify-syntax-type bb string)
 	  (cperl-modify-syntax-type (1- e) string))
 	(if (and (eq string cperl-st-sfence) (> (- e 2) bb))
-	    (put-text-property (1+ bb) (1- e) 
+	    (put-text-property (1+ bb) (1- e)
 			       'syntax-table cperl-string-syntax-table))
 	(cperl-protect-defun-start bb e))
     ;; Fontify
@@ -4005,7 +4150,7 @@ Returns true if comment is found."
   (let (b starter ender st i i2 go-forward reset-st)
     (skip-chars-forward " \t")
     ;; ender means matching-char matcher.
-    (setq b (point) 
+    (setq b (point)
 	  starter (if (eobp) 0 (char-after b))
 	  ender (cdr (assoc starter cperl-starters)))
     ;; What if starter == ?\\  ????
@@ -4071,7 +4216,7 @@ Returns true if comment is found."
 			  (setq i2 (point))))
 		  (forward-char -1))
 		(modify-syntax-entry starter (if (eq starter ?\\) "\\" ".") st)
-		(if ender (modify-syntax-entry ender "." 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
 					      argument starter ender)
@@ -4101,25 +4246,26 @@ Returns true if comment is found."
 (defvar font-lock-string-face)
 ;;(defvar font-lock-reference-face)
 (defvar font-lock-constant-face)
-(defsubst cperl-postpone-fontification (b e type val &optional now) 
+(defsubst cperl-postpone-fontification (b e type val &optional now)
   ;; Do after syntactic fontification?
   (if cperl-syntaxify-by-font-lock
       (or now (put-text-property b e 'cperl-postpone (cons type val)))
-      (put-text-property b e type val)))
+    (put-text-property b e type val)))
 
 ;;; Here is how the global structures (those which cannot be
 ;;; recognized locally) are marked:
-;;	a) PODs: 
+;;	a) PODs:
 ;;		Start-to-end is marked `in-pod' ==> t
 ;;		Each non-literal part is marked `syntax-type' ==> `pod'
 ;;		Each literal part is marked `syntax-type' ==> `in-pod'
-;;	b) HEREs: 
+;;	b) HEREs:
 ;;		Start-to-end is marked `here-doc-group' ==> t
 ;;		The body is marked `syntax-type' ==> `here-doc'
 ;;		The delimiter is marked `syntax-type' ==> `here-doc-delim'
-;;	c) FORMATs: 
-;;		After-initial-line--to-end is marked `syntax-type' ==> `format'
-;;	d) 'Q'uoted string: 
+;;	c) FORMATs:
+;;		First line (to =) marked `first-format-line' ==> t
+;;		After-this--to-end is marked `syntax-type' ==> `format'
+;;	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'
 
@@ -4157,136 +4303,137 @@ Returns true if comment is found."
 
 (defun cperl-find-pods-heres (&optional min max non-inter end ignore-max)
   "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', 
+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)
 		cperl-syntax-state nil
 		cperl-syntax-done-to min))
   (or max (setq max (point-max)))
-  (let* (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
-	      (cperl-pod-here-fontify (eval cperl-pod-here-fontify)) go tmpend 
-	      (case-fold-search nil) (inhibit-read-only t) (buffer-undo-list t)
-	      (modified (buffer-modified-p))
-	      (after-change-functions nil)
-	      (use-syntax-state (and cperl-syntax-state
-				     (>= min (car cperl-syntax-state))))
-	      (state-point (if use-syntax-state
-			       (car cperl-syntax-state)
-			     (point-min)))
-	      (state (if use-syntax-state
-			 (cdr cperl-syntax-state)))
-	      ;; (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...
-	      (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)
-					 font-lock-constant-face
-				       'font-lock-constant-face))
-	      (font-lock-function-name-face 
-	       (if (boundp 'font-lock-function-name-face)
-		   font-lock-function-name-face
-		 'font-lock-function-name-face))
-	      (font-lock-comment-face 
-	       (if (boundp 'font-lock-comment-face)
-		   font-lock-comment-face
-		 'font-lock-comment-face))
-	      (cperl-nonoverridable-face 
-	       (if (boundp 'cperl-nonoverridable-face)
-		   cperl-nonoverridable-face
-		 'cperl-nonoverridable-face))
-	      (stop-point (if ignore-max 
-			      (point-max)
-			    max))
-	      (search
+  (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
+	 (case-fold-search nil) (inhibit-read-only t) (buffer-undo-list t)
+	 (modified (buffer-modified-p))
+	 (after-change-functions nil)
+	 (use-syntax-state (and cperl-syntax-state
+				(>= min (car cperl-syntax-state))))
+	 (state-point (if use-syntax-state
+			  (car cperl-syntax-state)
+			(point-min)))
+	 (state (if use-syntax-state
+		    (cdr cperl-syntax-state)))
+	 ;; (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...
+	 (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)
+				      font-lock-constant-face
+				    'font-lock-constant-face))
+	 (font-lock-function-name-face
+	  (if (boundp 'font-lock-function-name-face)
+	      font-lock-function-name-face
+	    'font-lock-function-name-face))
+	 (font-lock-comment-face
+	  (if (boundp 'font-lock-comment-face)
+	      font-lock-comment-face
+	    'font-lock-comment-face))
+	 (cperl-nonoverridable-face
+	  (if (boundp 'cperl-nonoverridable-face)
+	      cperl-nonoverridable-face
+	    'cperl-nonoverridable-face))
+	 (stop-point (if ignore-max
+			 (point-max)
+		       max))
+	 (search
+	  (concat
+	   "\\(\\`\n?\\|^\n\\)="
+	   "\\|"
+	   ;; One extra () before this:
+	   "<<"
+	   "\\("			; 1 + 1
+	   ;; First variant "BLAH" or just ``.
+	   "[ \t]*"			; Yes, whitespace is allowed!
+	   "\\([\"'`]\\)"		; 2 + 1 = 3
+	   "\\([^\"'`\n]*\\)"		; 3 + 1
+	   "\\3"
+	   "\\|"
+	   ;; Second variant: Identifier or \ID (same as 'ID') or empty
+	   "\\\\?\\(\\([a-zA-Z_][a-zA-Z_0-9]*\\)?\\)" ; 4 + 1, 5 + 1
+	   ;; Do not have <<= or << 30 or <<30 or << $blah.
+	   ;; "\\([^= \t0-9$@%&]\\|[ \t]+[^ \t\n0-9$@%&]\\)" ; 6 + 1
+	   "\\(\\)"		; To preserve count of pars :-( 6 + 1
+	   "\\)"
+	   "\\|"
+	   ;; 1+6 extra () before this:
+	   "^[ \t]*\\(format\\)[ \t]*\\([a-zA-Z0-9_]+\\)?[ \t]*=[ \t]*$"
+	   (if cperl-use-syntax-table-text-property
 	       (concat
-		"\\(\\`\n?\\|^\n\\)=" 
 		"\\|"
-		;; One extra () before this:
-		"<<" 
-		  "\\("			; 1 + 1
-		  ;; First variant "BLAH" or just ``.
-		     "[ \t]*"		; Yes, whitespace is allowed!
-		     "\\([\"'`]\\)"	; 2 + 1 = 3
-		     "\\([^\"'`\n]*\\)"	; 3 + 1
-		     "\\3"
-		  "\\|"
-		  ;; Second variant: Identifier or \ID or empty
-		    "\\\\?\\(\\([a-zA-Z_][a-zA-Z_0-9]*\\)?\\)" ; 4 + 1, 5 + 1
-		    ;; Do not have <<= or << 30 or <<30 or << $blah.
-		    ;; "\\([^= \t0-9$@%&]\\|[ \t]+[^ \t\n0-9$@%&]\\)" ; 6 + 1
-		    "\\(\\)"		; To preserve count of pars :-( 6 + 1
-		  "\\)"
+		;; 1+6+2=9 extra () before this:
+		"\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>"
+		"\\|"
+		;; 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+2=13 extra () before this:
+		"\\$\\(['{]\\)"
+		"\\|"
+		;; 1+6+2+1+1+2+1=14 extra () before this:
+		"\\(\\<sub[ \t\n\f]+\\|[&*$@%]\\)[a-zA-Z0-9_]*'"
+		;; 1+6+2+1+1+2+1+1=15 extra () before this:
+		"\\|"
+		"__\\(END\\|DATA\\)__"
+		;; 1+6+2+1+1+2+1+1+1=16 extra () before this:
 		"\\|"
-		;; 1+6 extra () before this:
-		"^[ \t]*\\(format\\)[ \t]*\\([a-zA-Z0-9_]+\\)?[ \t]*=[ \t]*$"
-		(if cperl-use-syntax-table-text-property
-		    (concat
-		     "\\|"
-		     ;; 1+6+2=9 extra () before this:
-		     "\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>"
-		     "\\|"
-		     ;; 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+2=13 extra () before this:
-		     "\\$\\(['{]\\)"
-		     "\\|"
-		     ;; 1+6+2+1+1+2+1=14 extra () before this:
-		     "\\(\\<sub[ \t\n\f]+\\|[&*$@%]\\)[a-zA-Z0-9_]*'"
-		     ;; 1+6+2+1+1+2+1+1=15 extra () before this:
-		     "\\|"
-		     "__\\(END\\|DATA\\)__"
-		     ;; 1+6+2+1+1+2+1+1+1=16 extra () before this:
-		     "\\|"
-		     "\\\\\\(['`\"]\\)"
-		     )
-		  ""))))
+		"\\\\\\(['`\"($]\\)")
+	     ""))))
     (unwind-protect
 	(progn
 	  (save-excursion
 	    (or non-inter
 		(message "Scanning for \"hard\" Perl constructions..."))
 	    (and cperl-pod-here-fontify
-		;; We had evals here, do not know why...
-		(setq face cperl-pod-face
-		      head-face cperl-pod-head-face
-		      here-face cperl-here-face))
-	    (remove-text-properties min max 
+		 ;; We had evals here, do not know why...
+		 (setq face cperl-pod-face
+		       head-face cperl-pod-head-face
+		       here-face cperl-here-face))
+	    (remove-text-properties min max
 				    '(syntax-type t in-pod t syntax-table t
 						  cperl-postpone t
 						  syntax-subtype t
 						  rear-nonsticky t
+						  here-doc-group t
+						  first-format-line t
 						  indentable t))
 	    ;; Need to remove face as well...
 	    (goto-char min)
 	    (and (eq system-type 'emx)
 		 (looking-at "extproc[ \t]") ; Analogue of #!
-		 (cperl-commentify min 
+		 (cperl-commentify min
 				   (save-excursion (end-of-line) (point))
 				   nil))
 	    (while (and
 		    (< (point) max)
 		    (re-search-forward search max t))
 	      (setq tmpend nil)		; Valid for most cases
-	      (cond 
+	      (cond
 	       ((match-beginning 1)	; POD section
-		;;  "\\(\\`\n?\\|^\n\\)=" 
+		;;  "\\(\\`\n?\\|^\n\\)="
 		(if (looking-at "cut\\>")
 		    (if ignore-max
 			nil		; Doing a chunk only
 		      (message "=cut is not preceded by a POD section")
 		      (or (car err-l) (setcar err-l (point))))
 		  (beginning-of-line)
-		
-		  (setq b (point) 
+
+		  (setq b (point)
 			bb b
 			tb (match-beginning 0)
 			b1 nil)		; error condition
@@ -4304,11 +4451,13 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 		  (setq e (point))
 		  (and (> e max)
 		       (progn
-			 (remove-text-properties 
+			 (remove-text-properties
 			  max e '(syntax-type t in-pod t syntax-table t
 					      cperl-postpone t
 					      syntax-subtype t
+					      here-doc-group t
 					      rear-nonsticky t
+					      first-format-line t
 					      indentable t))
 			 (setq tmpend tb)))
 		  (put-text-property b e 'in-pod t)
@@ -4320,22 +4469,22 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 		    (put-text-property (cperl-1- b) (point) 'syntax-type 'pod)
 		    (cperl-put-do-not-fontify b (point) t)
 		    ;; mark the non-literal parts as PODs
-		    (if cperl-pod-here-fontify 
+		    (if cperl-pod-here-fontify
 			(cperl-postpone-fontification b (point) 'face face t))
 		    (re-search-forward "\n\n[^ \t\f\n]" e 'toend)
 		    (beginning-of-line)
 		    (setq b (point)))
 		  (put-text-property (cperl-1- (point)) e 'syntax-type 'pod)
 		  (cperl-put-do-not-fontify (point) e t)
-		  (if cperl-pod-here-fontify 
-		      (progn 
+		  (if cperl-pod-here-fontify
+		      (progn
 			;; mark the non-literal parts as PODs
 			(cperl-postpone-fontification (point) e 'face face t)
 			(goto-char bb)
-			(if (looking-at 
+			(if (looking-at
 			     "=[a-zA-Z0-9_]+\\>[ \t]*\\(\\(\n?[^\n]\\)+\\)$")
 			    ;; mark the headers
-			    (cperl-postpone-fontification 
+			    (cperl-postpone-fontification
 			     (match-beginning 1) (match-end 1)
 			     'face head-face))
 			(while (re-search-forward
@@ -4343,19 +4492,20 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 				"^\n=[a-zA-Z0-9_]+\\>[ \t]*\\(\\(\n?[^\n]\\)+\\)$"
 				e 'toend)
 			  ;; mark the headers
-			  (cperl-postpone-fontification 
+			  (cperl-postpone-fontification
 			   (match-beginning 1) (match-end 1)
 			   'face head-face))))
 		  (cperl-commentify bb e nil)
 		  (goto-char e)
 		  (or (eq e (point-max))
-		      (forward-char -1)))) ; Prepare for immediate pod start.
+		      (forward-char -1)))) ; Prepare for immediate POD start.
 	       ;; Here document
 	       ;; We do only one here-per-line
                ;; ;; One extra () before this:
-	       ;;"<<" 
+	       ;;"<<"
 	       ;;  "\\("			; 1 + 1
 	       ;;  ;; First variant "BLAH" or just ``.
+	       ;;     "[ \t]*"			; Yes, whitespace is allowed!
 	       ;;     "\\([\"'`]\\)"	; 2 + 1
 	       ;;     "\\([^\"'`\n]*\\)"	; 3 + 1
 	       ;;     "\\3"
@@ -4373,7 +4523,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 		      state-point b
 		      tb (match-beginning 0)
 		      i (or (nth 3 state) (nth 4 state)))
-		(if i 
+		(if i
 		    (setq c t)
 		  (setq c (and
 			   (match-beginning 5)
@@ -4389,7 +4539,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 			  e1 (match-end 4))) ; 3 + 1
 		  (setq tag (buffer-substring b1 e1)
 			qtag (regexp-quote tag))
-		  (cond (cperl-pod-here-fontify 
+		  (cond (cperl-pod-here-fontify
 			 ;; Highlight the starting delimiter
 			 (cperl-postpone-fontification b1 e1 'face font-lock-constant-face)
 			 (cperl-put-do-not-fontify b1 e1 t)))
@@ -4397,30 +4547,34 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 		  (setq b (point))
 		  ;; We do not search to max, since we may be called from
 		  ;; some hook of fontification, and max is random
-		  (cond ((re-search-forward (concat "^" qtag "$") 
-					    stop-point 'toend)
-			 (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-put-do-not-fontify b (match-end 0) t)
-			       ;; Highlight the HERE-DOC
-			       (cperl-postpone-fontification b (match-beginning 0) 
-						  'face here-face)))
-			 (setq e1 (cperl-1+ (match-end 0)))
-			 (put-text-property b (match-beginning 0) 
-					    '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)
-			 (cperl-commentify b e1 nil)
-			 (cperl-put-do-not-fontify b (match-end 0) t)
-			 (if (> e1 max)
-			     (setq tmpend tb)))
-			(t (message "End of here-document `%s' not found." tag)
-			   (or (car err-l) (setcar err-l b))))))
+		  (or (and (re-search-forward (concat "^" qtag "$")
+					      stop-point 'toend)
+			   (eq (following-char) ?\n))
+		    (progn		; Pretend we matched at the end
+		      (goto-char (point-max))
+		      (re-search-forward "\\'")
+		      (message "End of here-document `%s' not found." tag)
+		      (or (car err-l) (setcar err-l b))))
+		  (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-put-do-not-fontify b (match-end 0) t)
+			;; Highlight the HERE-DOC
+			(cperl-postpone-fontification b (match-beginning 0)
+						      'face here-face)))
+		  (setq e1 (cperl-1+ (match-end 0)))
+		  (put-text-property b (match-beginning 0)
+				     '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)
+		  (cperl-commentify b e1 nil)
+		  (cperl-put-do-not-fontify b (match-end 0) t)
+		  (if (> e1 max)
+		      (setq tmpend tb))))
 	       ;; format
 	       ((match-beginning 8)
 		;; 1+6=7 extra () before this:
@@ -4432,13 +4586,17 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 			     "")
 		      tb (match-beginning 0))
 		(setq argument nil)
-		(if cperl-pod-here-fontify 
+		(put-text-property (save-excursion
+				     (beginning-of-line)
+				     (point))
+				   b 'first-format-line 't)
+		(if cperl-pod-here-fontify
 		    (while (and (eq (forward-line) 0)
 				(not (looking-at "^[.;]$")))
 		      (cond
 		       ((looking-at "^#")) ; Skip comments
 		       ((and argument	; Skip argument multi-lines
-			     (looking-at "^[ \t]*{")) 
+			     (looking-at "^[ \t]*{"))
 			(forward-sexp 1)
 			(setq argument nil))
 		       (argument	; Skip argument lines
@@ -4448,19 +4606,19 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 			(setq argument (looking-at "^[^\n]*[@^]"))
 			(end-of-line)
 			;; Highlight the format line
-			(cperl-postpone-fontification b1 (point) 
-					   'face font-lock-string-face)
+			(cperl-postpone-fontification b1 (point)
+						      'face font-lock-string-face)
 			(cperl-commentify b1 (point) nil)
 			(cperl-put-do-not-fontify b1 (point) t))))
 		  ;; We do not search to max, since we may be called from
 		  ;; some hook of fontification, and max is random
 		  (re-search-forward "^[.;]$" stop-point 'toend))
 		(beginning-of-line)
-		(if (looking-at "^\\.$")	; ";" is not supported yet
+		(if (looking-at "^\\.$") ; ";" is not supported yet
 		    (progn
 		      ;; Highlight the ending delimiter
 		      (cperl-postpone-fontification (point) (+ (point) 2)
-					 'face font-lock-string-face)
+						    'face font-lock-string-face)
 		      (cperl-commentify (point) (+ (point) 2) nil)
 		      (cperl-put-do-not-fontify (point) (+ (point) 2) t))
 		  (message "End of format `%s' not found." name)
@@ -4484,18 +4642,26 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 		      bb (char-after (1- (match-beginning b1)))	; tmp holder
 		      ;; bb == "Not a stringy"
 		      bb (if (eq b1 10) ; user variables/whatever
-			     (or
-			      (memq bb '(?\$ ?\@ ?\% ?\* ?\#)) ; $#y
-			      (and (eq bb ?-) (eq c ?s)) ; -s file test
-			      (and (eq bb ?\&)
-				   (not (eq (char-after  ; &&m/blah/
-					     (- (match-beginning b1) 2))
-					    ?\&))))
+			     (and (memq bb (append "$@%*#_:-&>" nil)) ; $#y)
+				  (cond ((eq bb ?-) (eq c ?s)) ; -s file test
+					((eq bb ?\:) ; $opt::s
+					 (eq (char-after
+					      (- (match-beginning b1) 2))
+					     ?\:))
+					((eq bb ?\>) ; $foo->s
+					 (eq (char-after
+					      (- (match-beginning b1) 2))
+					     ?\-))
+					((eq bb ?\&)
+					 (not (eq (char-after	; &&m/blah/
+						   (- (match-beginning b1) 2))
+						  ?\&)))
+					(t t)))
 			   ;; <file> or <$file>
 			   (and (eq c ?\<)
 				;; Do not stringify <FH>, <$fh> :
 				(save-match-data
-				  (looking-at 
+				  (looking-at
 				   "\\$?\\([_a-zA-Z:][_a-zA-Z0-9:]*\\)?>"))))
 		      tb (match-beginning 0))
 		(goto-char (match-beginning b1))
@@ -4503,9 +4669,10 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 		(or bb
 		    (if (eq b1 11)	; bare /blah/ or ?blah? or <foo>
 			(setq argument ""
+			      b1 nil
 			      bb	; Not a regexp?
 			      (progn
-				(not 
+				(not
 				 ;; What is below: regexp-p?
 				 (and
 				  (or (memq (preceding-char)
@@ -4526,31 +4693,73 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 					       (and
 						(not (memq (preceding-char)
 							   '(?$ ?@ ?& ?%)))
-						(looking-at 
-						"\\(while\\|if\\|unless\\|until\\|and\\|or\\|not\\|xor\\|split\\|grep\\|map\\|print\\)\\>")))))
+						(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 
+					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
-		      (if (and (eq (preceding-char) ?>)
-			       (eq (char-after (- (point) 2)) ?-))
+		      ;; Check for $a -> y
+		      (setq b1 (preceding-char)
+			    go (point))
+		      (if (and (eq b1 ?>)
+			       (eq (char-after (- go 2)) ?-))
 			  ;; Not a regexp
 			  (setq bb t))))
-		(or bb (setq state (parse-partial-sexp 
+		(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)
-		(if (or bb (nth 3 state) (nth 4 state))
+		(or bb
+		    (progn
+		      (if (looking-at "[ \t\n\f]+\\(#[^\n]*\n[ \t\n\f]*\\)+")
+			  (goto-char (match-end 0))
+			(skip-chars-forward " \t\n\f"))
+		      (cond ((and (eq (following-char) ?\})
+				  (eq b1 ?\{))
+			     ;; Check for $a[23]->{ s }, @{s} and *{s::foo}
+			     (goto-char (1- go))
+			     (skip-chars-backward " \t\n\f")
+			     (if (memq (preceding-char) (append "$@%&*" nil))
+				 (setq bb t) ; @{y}
+			       (condition-case nil
+				   (forward-sexp -1)
+				 (error nil)))
+			     (if (or bb
+				     (looking-at ; $foo -> {s}
+				      "[$@]\\$*\\([a-zA-Z0-9_:]+\\|[^{]\\)\\([ \t\n]*->\\)?[ \t\n]*{")
+				     (and ; $foo[12] -> {s}
+				      (memq (following-char) '(?\{ ?\[))
+				      (progn
+					(forward-sexp 1)
+					(looking-at "\\([ \t\n]*->\\)?[ \t\n]*{"))))
+				 (setq bb t)
+			       (goto-char b)))
+			    ((and (eq (following-char) ?=)
+				  (eq (char-after (1+ (point))) ?\>))
+			     ;; Check for { foo => 1, s => 2 }
+			     ;; Apparently s=> is never a substitution...
+			     (setq bb t))
+			    ((and (eq (following-char) ?:)
+				  (eq b1 ?\{) ; Check for $ { s::bar }
+				  (looking-at "::[a-zA-Z0-9_:]*[ \t\n\f]*}")
+				  (progn 
+				    (goto-char (1- go))
+				    (skip-chars-backward " \t\n\f")
+				    (memq (preceding-char)
+					  (append "$@%&*" nil))))
+			     (setq bb t)))))
+		(if bb
 		    (goto-char i)
 		  ;; Skip whitespace and comments...
 		  (if (looking-at "[ \t\n\f]+\\(#[^\n]*\n[ \t\n\f]*\\)+")
@@ -4571,13 +4780,13 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 					    t st-l err-l argument)
 			;; Note that if `go', then it is considered as 1-arg
 			b1 (nth 1 i)	; start of the second part
-			tag (nth 2 i)	; ender-char, true if second part 
+			tag (nth 2 i)	; ender-char, true if second part
 					; is with matching chars []
 			go (nth 4 i)	; There is a 1-char part after the end
 			i (car i)	; intermediate point
-			e1 (point)	; end 
+			e1 (point)	; end
 			;; Before end of the second part if non-matching: ///
-			tail (if (and i (not tag)) 
+			tail (if (and i (not tag))
 				 (1- e1))
 			e (if i i e1)	; end of the first part
 			qtag nil	; need to preserve backslashitis
@@ -4628,15 +4837,15 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 		      (progn
 			(forward-word 1) ; skip modifiers s///s
 			(if tail (cperl-commentify tail (point) t))
-			(cperl-postpone-fontification 
+			(cperl-postpone-fontification
 			 e1 (point) 'face 'cperl-nonoverridable-face)))
 		  ;; Check whether it is m// which means "previous match"
 		  ;; and highlight differently
-		  (setq is-REx 
+		  (setq is-REx
 			(and (string-match "^\\([sm]?\\|qr\\)$" argument)
 			     (or (not (= (length argument) 0))
 				 (not (eq c ?\<)))))
-		  (if (and is-REx 
+		  (if (and is-REx
 			   (eq e (+ 2 b))
 			   ;; split // *is* using zero-pattern
 			   (save-excursion
@@ -4646,7 +4855,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 				   (forward-sexp -1)
 				   (not (looking-at "split\\>")))
 			       (error t))))
-		      (cperl-postpone-fontification 
+		      (cperl-postpone-fontification
 		       b e 'face font-lock-function-name-face)
 		    (if (or i2		; Has 2 args
 			    (and cperl-fontify-m-as-s
@@ -4655,9 +4864,9 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 				  (and (eq 0 (length argument))
 				       (not (eq ?\< (char-after b)))))))
 			(progn
-			  (cperl-postpone-fontification 
+			  (cperl-postpone-fontification
 			   b (cperl-1+ b) 'face font-lock-constant-face)
-			  (cperl-postpone-fontification 
+			  (cperl-postpone-fontification
 			   (1- e) e 'face font-lock-constant-face)))
 		    (if (and is-REx cperl-regexp-scan)
 			;; Process RExen better
@@ -4669,10 +4878,10 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 				    (if is-x-REx
 					(if (eq (char-after b) ?\#)
 					    "\\((\\?\\\\#\\)\\|\\(\\\\#\\)"
-					    "\\((\\?#\\)\\|\\(#\\)")
-					(if (eq (char-after b) ?\#)
-					    "\\((\\?\\\\#\\)"
-					  "\\((\\?#\\)"))
+					  "\\((\\?#\\)\\|\\(#\\)")
+				      (if (eq (char-after b) ?\#)
+					  "\\((\\?\\\\#\\)"
+					"\\((\\?#\\)"))
 				    (1- e) 'to-end))
 			    (goto-char (match-beginning 0))
 			    (setq REx-comment-start (point)
@@ -4686,7 +4895,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 				(progn (setq was-comment nil)
 				       (forward-char 1))
 			      (if (match-beginning 2)
-				  (progn 
+				  (progn
 				    (beginning-of-line 2)
 				    (if (> (point) e)
 					(goto-char (1- e))))
@@ -4702,18 +4911,18 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 				  (setq REx-comment-end (point))
 				  (cperl-commentify
 				   REx-comment-start REx-comment-end nil)
-				  (cperl-postpone-fontification 
+				  (cperl-postpone-fontification
 				   REx-comment-start REx-comment-end
 				   'face font-lock-comment-face))))))
 		    (if (and is-REx is-x-REx)
-			(put-text-property (1+ b) (1- e) 
+			(put-text-property (1+ b) (1- e)
 					   'syntax-subtype 'x-REx)))
 		  (if i2
 		      (progn
-			(cperl-postpone-fontification 
+			(cperl-postpone-fontification
 			 (1- e1) e1 'face font-lock-constant-face)
 			(if (assoc (char-after b) cperl-starters)
-			    (cperl-postpone-fontification 
+			    (cperl-postpone-fontification
 			     b1 (1+ b1) 'face font-lock-constant-face))))
 		  (if (> (point) max)
 		      (setq tmpend tb))))
@@ -4722,7 +4931,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 		(if (memq (char-after (1- b))
 			  '(?\$ ?\@ ?\% ?\& ?\*))
 		    nil
-		  (setq state (parse-partial-sexp 
+		  (setq state (parse-partial-sexp
 			       state-point b nil nil state)
 			state-point b)
 		  (if (or (nth 3 state) (nth 4 state))
@@ -4735,7 +4944,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 	       ((and (match-beginning 14)
 		     (eq (preceding-char) ?\')) ; $'
 		(setq b (1- (point))
-		      state (parse-partial-sexp 
+		      state (parse-partial-sexp
 			     state-point (1- b) nil nil state)
 		      state-point (1- b))
 		(if (nth 3 state)	; in string
@@ -4751,7 +4960,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 	       ((match-beginning 15)	; old $abc'efg syntax
 		(setq bb (match-end 0)
 		      b (match-beginning 0)
-		      state (parse-partial-sexp 
+		      state (parse-partial-sexp
 			     state-point b nil nil state)
 		      state-point b)
 		(if (nth 3 state)	; in string
@@ -4763,7 +4972,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 	       ((match-beginning 16)	; __END__, __DATA__
 		(setq bb (match-end 0)
 		      b (match-beginning 0)
-		      state (parse-partial-sexp 
+		      state (parse-partial-sexp
 			     state-point b nil nil state)
 		      state-point b)
 		(if (or (nth 3 state) (nth 4 state))
@@ -4772,13 +4981,14 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 		  (cperl-commentify b bb nil)
 		  (setq end t))
 		(goto-char bb))
-	       ((match-beginning 17)	; "\\\\\\(['`\"]\\)"
+	       ((match-beginning 17)	; "\\\\\\(['`\"($]\\)"
+		;; Trailing backslash ==> non-quoting outside string/comment
 		(setq bb (match-end 0)
 		      b (match-beginning 0))
 		(goto-char b)
 		(skip-chars-backward "\\\\")
 		;;;(setq i2 (= (% (skip-chars-backward "\\\\") 2) -1))
-		(setq state (parse-partial-sexp 
+		(setq state (parse-partial-sexp
 			     state-point b nil nil state)
 		      state-point b)
 		(if (or (nth 3 state) (nth 4 state) )
@@ -4788,7 +4998,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 	       (t (error "Error in regexp of the sniffer")))
 	      (if (> (point) stop-point)
 		  (progn
-		    (if end 
+		    (if end
 			(message "Garbage after __END__/__DATA__ ignored")
 		      (message "Unbalanced syntax found while scanning")
 		      (or (car err-l) (setcar err-l b)))
@@ -4814,27 +5024,29 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
       (if (memq (setq pr (get-text-property (point) 'syntax-type))
 		'(pod here-doc here-doc-delim))
 	  (cperl-unwind-to-safe nil)
-	(if (or (looking-at "^[ \t]*\\(#\\|$\\)")
-		(progn (cperl-to-comment-or-eol) (bolp)))
-	    nil				; Only comment, skip
-	  ;; Else
-	  (skip-chars-backward " \t")
-	  (if (< p (point)) (goto-char p))
-	  (setq stop t))))))
+      (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)))))))
 
-(defun cperl-after-block-p (lim)
+(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 }.
   (save-excursion
     (condition-case nil
 	(progn
-	  (forward-sexp -1)
+	  (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 {}
 		  (save-excursion
 		    (forward-sexp -1)
-		    (or (looking-at "\\(else\\|grep\\|map\\|BEGIN\\|END\\|CHECK\\|INIT\\)\\>")
+		    (or (looking-at "\\(else\\|continue\\|grep\\|map\\|BEGIN\\|END\\|CHECK\\|INIT\\)\\>")
 			;; sub f {}
 			(progn
 			  (cperl-backward-to-noncomment lim)
@@ -4846,20 +5058,33 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
       (error nil))))
 
 (defun cperl-after-expr-p (&optional lim chars test)
-  "Returns true if the position is good for start of expression.
+  "Return true if the position is good for start of expression.
 TEST is the expression to evaluate at the found position.  If absent,
 CHARS is a string that contains good characters to have before us (however,
 `}' is treated \"smartly\" if it is not in the list)."
-  (let (stop p 
-	     (lim (or lim (point-min))))
+  (let ((lim (or lim (point-min)))
+	stop p pr)
+    (cperl-update-syntaxification (point) (point))
     (save-excursion
       (while (and (not stop) (> (point) lim))
 	(skip-chars-backward " \t\n\f" lim)
 	(setq p (point))
 	(beginning-of-line)
+	;;(memq (setq pr (get-text-property (point) 'syntax-type))
+	;;      '(pod here-doc here-doc-delim))
+	(if (get-text-property (point) 'here-doc-group)
+	    (progn
+	      (goto-char
+	       (previous-single-property-change (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))
+	      (beginning-of-line 0)))
 	(if (looking-at "^[ \t]*\\(#\\|$\\)") nil ; Only comment, skip
 	  ;; Else: last iteration, or a label
-	  (cperl-to-comment-or-eol) 
+	  (cperl-to-comment-or-eol)	; Will not move past "." after a format
 	  (skip-chars-backward " \t")
 	  (if (< p (point)) (goto-char p))
 	  (setq p (point))
@@ -4878,7 +5103,10 @@ CHARS is a string that contains good characters to have before us (however,
 	    (if test (eval test)
 	      (or (memq (preceding-char) (append (or chars "{;") nil))
 		  (and (eq (preceding-char) ?\})
-		       (cperl-after-block-p lim)))))))))
+		       (cperl-after-block-p lim))
+		  (and (eq (following-char) ?.)	; in format: see comment above
+		       (eq (get-text-property (point) 'syntax-type)
+			   'format)))))))))
 
 (defun cperl-backward-to-start-of-continued-exp (lim)
   (if (memq (preceding-char) (append ")]}\"'`" nil))
@@ -4890,7 +5118,7 @@ CHARS is a string that contains good characters to have before us (however,
 
 (defun cperl-after-block-and-statement-beg (lim)
   ;; We assume that we are after ?\}
-  (and 
+  (and
    (cperl-after-block-p lim)
    (save-excursion
      (forward-sexp -1)
@@ -4900,7 +5128,7 @@ CHARS is a string that contains good characters to have before us (however,
 	 (not (= (char-syntax (preceding-char)) ?w))
 	 (progn
 	   (forward-sexp -1)
-	   (not 
+	   (not
 	    (looking-at
 	     "\\(map\\|grep\\|printf?\\|system\\|exec\\|tr\\|s\\)\\>")))))))
 
@@ -4914,7 +5142,7 @@ CHARS is a string that contains good characters to have before us (however,
 Will not indent comment if it starts at `comment-indent' or looks like
 continuation of the comment on the previous line.
 
-If `cperl-indent-region-fix-constructs', will improve spacing on 
+If `cperl-indent-region-fix-constructs', will improve spacing on
 conditional/loop constructs."
   (interactive)
   (save-excursion
@@ -4947,178 +5175,178 @@ Returns some position at the last line."
   (interactive)
   (or end
       (setq end (point-max)))
-  (let (p pp ml have-brace ret
-	  (ee (save-excursion (end-of-line) (point)))
-	  (cperl-indent-region-fix-constructs
-	   (or cperl-indent-region-fix-constructs 1)))
+  (let ((ee (save-excursion (end-of-line) (point)))
+	(cperl-indent-region-fix-constructs
+	 (or cperl-indent-region-fix-constructs 1))
+	p pp ml have-brace ret)
     (save-excursion
       (beginning-of-line)
       (setq ret (point))
-      ;;  }? continue 
+      ;;  }? continue
       ;;  blah; }
-      (if (not 
+      (if (not
 	   (or (looking-at "[ \t]*\\(els\\(e\\|if\\)\\|continue\\|if\\|while\\|for\\(each\\)?\\|until\\)")
 	       (setq have-brace (save-excursion (search-forward "}" ee t)))))
 	  nil				; Do not need to do anything
-      ;; 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))
-	    (insert (make-string cperl-indent-region-fix-constructs ?\ ))
-	    (beginning-of-line)))
-      ;; Looking at:
-      ;; }     else
-      (if (looking-at "[ \t]*}\\(\t*\\|[ \t][ \t]+\\)\\<\\(els\\(e\\|if\\)\\|continue\\)\\>")
-	  (progn
-	    (search-forward "}")
-	    (delete-horizontal-space)
-	    (insert (make-string cperl-indent-region-fix-constructs ?\ ))
-	    (beginning-of-line)))
-      ;; Looking at:
-      ;; else   {
-      (if (looking-at 
-	   "[ \t]*}?[ \t]*\\<\\(\\els\\(e\\|if\\)\\|continue\\|unless\\|if\\|while\\|for\\(each\\)?\\|until\\)\\>\\(\t*\\|[ \t][ \t]+\\)[^ \t\n#]")
-	  (progn
-	    (forward-word 1)
-	    (delete-horizontal-space)
-	    (insert (make-string cperl-indent-region-fix-constructs ?\ ))
-	    (beginning-of-line)))
-      ;; Looking at:
-      ;; foreach my    $var
-      (if (looking-at 
-	   "[ \t]*\\<for\\(each\\)?[ \t]+\\(my\\|local\\|our\\)\\(\t*\\|[ \t][ \t]+\\)[^ \t\n]")
-	  (progn
-	    (forward-word 2)
-	    (delete-horizontal-space)
-	    (insert (make-string cperl-indent-region-fix-constructs ?\ ))
-	    (beginning-of-line)))
-      ;; Looking at:
-      ;; foreach my $var     (
-      (if (looking-at 
+	;; 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))
+	      (insert (make-string cperl-indent-region-fix-constructs ?\ ))
+	      (beginning-of-line)))
+	;; Looking at:
+	;; }     else
+	(if (looking-at "[ \t]*}\\(\t*\\|[ \t][ \t]+\\)\\<\\(els\\(e\\|if\\)\\|continue\\)\\>")
+	    (progn
+	      (search-forward "}")
+	      (delete-horizontal-space)
+	      (insert (make-string cperl-indent-region-fix-constructs ?\ ))
+	      (beginning-of-line)))
+	;; Looking at:
+	;; else   {
+	(if (looking-at
+	     "[ \t]*}?[ \t]*\\<\\(\\els\\(e\\|if\\)\\|continue\\|unless\\|if\\|while\\|for\\(each\\)?\\|until\\)\\>\\(\t*\\|[ \t][ \t]+\\)[^ \t\n#]")
+	    (progn
+	      (forward-word 1)
+	      (delete-horizontal-space)
+	      (insert (make-string cperl-indent-region-fix-constructs ?\ ))
+	      (beginning-of-line)))
+	;; Looking at:
+	;; foreach my    $var
+	(if (looking-at
+	     "[ \t]*\\<for\\(each\\)?[ \t]+\\(my\\|local\\|our\\)\\(\t*\\|[ \t][ \t]+\\)[^ \t\n]")
+	    (progn
+	      (forward-word 2)
+	      (delete-horizontal-space)
+	      (insert (make-string cperl-indent-region-fix-constructs ?\ ))
+	      (beginning-of-line)))
+	;; Looking at:
+	;; foreach my $var     (
+	(if (looking-at
 	     "[ \t]*\\<for\\(each\\)?[ \t]+\\(my\\|local\\|our\\)[ \t]*\\$[_a-zA-Z0-9]+\\(\t*\\|[ \t][ \t]+\\)[^ \t\n#]")
-	  (progn
-	    (forward-word 3)
-	    (delete-horizontal-space)
-	    (insert
-	     (make-string cperl-indent-region-fix-constructs ?\ ))
-	    (beginning-of-line)))
-      ;; Looking at:
-      ;; } foreach my $var ()    {
-      (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))
-	    (re-search-forward "[({]")
-	    (forward-char -1)
-	    (setq p (point))
-	    (if (eq (following-char) ?\( )
-		(progn
-		  (forward-sexp 1)
-		  (setq pp (point)))
-	      ;; after `else' or nothing
-	      (if ml	; after `else'
-		  (skip-chars-backward " \t\n")
-		(beginning-of-line))
-	      (setq pp nil))
-	    ;; Now after the sexp before the brace
-	    ;; 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))
-		     (looking-at "[ \t\n]*{"))
-		(progn
-		  (cond 
-		   ((bolp)		; Were before `{', no if/else/etc
-		    nil)
-		   ((looking-at "\\(\t*\\| [ \t]+\\){")
-		    (delete-horizontal-space)
-		    (if (if ml 
-			    cperl-extra-newline-before-brace-multiline
-			  cperl-extra-newline-before-brace)
-			(progn
-			  (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)))))
+	    (progn
+	      (forward-sexp 3)
+	      (delete-horizontal-space)
+	      (insert
+	       (make-string cperl-indent-region-fix-constructs ?\ ))
+	      (beginning-of-line)))
+	;; Looking at:
+	;; } foreach my $var ()    {
+	(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))
+	      (re-search-forward "[({]")
+	      (forward-char -1)
+	      (setq p (point))
+	      (if (eq (following-char) ?\( )
+		  (progn
+		    (forward-sexp 1)
+		    (setq pp (point)))
+		;; after `else' or nothing
+		(if ml			; after `else'
+		    (skip-chars-backward " \t\n")
+		  (beginning-of-line))
+		(setq pp nil))
+	      ;; Now after the sexp before the brace
+	      ;; 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))
+		       (looking-at "[ \t\n]*{"))
+		  (progn
+		    (cond
+		     ((bolp)		; Were before `{', no if/else/etc
+		      nil)
+		     ((looking-at "\\(\t*\\| [ \t]+\\){")
+		      (delete-horizontal-space)
+		      (if (if ml
+			      cperl-extra-newline-before-brace-multiline
+			    cperl-extra-newline-before-brace)
+			  (progn
+			    (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)))))
+			(insert
+			 (make-string cperl-indent-region-fix-constructs ?\ ))))
+		     ((and (looking-at "[ \t]*\n")
+			   (not (if ml
+				    cperl-extra-newline-before-brace-multiline
+				  cperl-extra-newline-before-brace)))
+		      (setq pp (point))
+		      (skip-chars-forward " \t\n")
+		      (delete-region pp (point))
 		      (insert
 		       (make-string cperl-indent-region-fix-constructs ?\ ))))
-		   ((and (looking-at "[ \t]*\n")
-			 (not (if ml 
-				  cperl-extra-newline-before-brace-multiline
-				cperl-extra-newline-before-brace)))
-		    (setq pp (point))
-		    (skip-chars-forward " \t\n")
-		    (delete-region pp (point))
-		    (insert
-		     (make-string cperl-indent-region-fix-constructs ?\ ))))
-		  ;; Now we are before `{'
-		  (if (looking-at "[ \t\n]*{[ \t]*[^ \t\n#]")
-		      (progn
-			(skip-chars-forward " \t\n")
-			(setq pp (point))
-			(forward-sexp 1)
-			(setq p (point))
-			(goto-char pp)
-			(setq ml (search-forward "\n" p t))
-			(if (or cperl-break-one-line-blocks-when-indent ml)
-			    ;; not good: multi-line BLOCK
-			    (progn
-			      (goto-char (1+ pp))
-			      (delete-horizontal-space)
-			      (insert "\n")
-			      (setq ret (point))
-			      (if (cperl-indent-line parse-data)
-				  (setq ret (cperl-fix-line-spacing end parse-data)))))))))))
-      (beginning-of-line)
-      (setq p (point) pp (save-excursion (end-of-line) (point))) ; May be different from ee.
-      ;; Now check whether there is a hanging `}'
-      ;; Looking at:
-      ;; } blah
-      (if (and 
-	   cperl-fix-hanging-brace-when-indent
-	   have-brace
-	   (not (looking-at "[ \t]*}[ \t]*\\(\\<\\(els\\(if\\|e\\)\\|continue\\|while\\|until\\)\\>\\|$\\|#\\)"))
-	   (condition-case nil
-	       (progn
-		 (up-list 1)
-		 (if (and (<= (point) pp) 
-			  (eq (preceding-char) ?\} )
-			  (cperl-after-block-and-statement-beg (point-min))) 
-		     t
-		   (goto-char p)
-		   nil))
-	     (error nil)))
-	  (progn
-	    (forward-char -1)
-	    (skip-chars-backward " \t")
-	    (if (bolp)
-		;; `}' was the first thing on the line, insert NL *after* it.
-		(progn
-		  (cperl-indent-line parse-data)
-		  (search-forward "}")
-		  (delete-horizontal-space)
-		  (insert "\n"))
-	      (delete-horizontal-space)
-	      (or (eq (preceding-char) ?\;)
-		  (bolp)
-		  (and (eq (preceding-char) ?\} )
-		       (cperl-after-block-p (point-min)))
-		  (insert ";"))
-	      (insert "\n")
-	      (setq ret (point)))
-	    (if (cperl-indent-line parse-data)
-		(setq ret (cperl-fix-line-spacing end parse-data)))
-	    (beginning-of-line)))))
+		    ;; Now we are before `{'
+		    (if (looking-at "[ \t\n]*{[ \t]*[^ \t\n#]")
+			(progn
+			  (skip-chars-forward " \t\n")
+			  (setq pp (point))
+			  (forward-sexp 1)
+			  (setq p (point))
+			  (goto-char pp)
+			  (setq ml (search-forward "\n" p t))
+			  (if (or cperl-break-one-line-blocks-when-indent ml)
+			      ;; not good: multi-line BLOCK
+			      (progn
+				(goto-char (1+ pp))
+				(delete-horizontal-space)
+				(insert "\n")
+				(setq ret (point))
+				(if (cperl-indent-line parse-data)
+				    (setq ret (cperl-fix-line-spacing end parse-data)))))))))))
+	(beginning-of-line)
+	(setq p (point) pp (save-excursion (end-of-line) (point))) ; May be different from ee.
+	;; Now check whether there is a hanging `}'
+	;; Looking at:
+	;; } blah
+	(if (and
+	     cperl-fix-hanging-brace-when-indent
+	     have-brace
+	     (not (looking-at "[ \t]*}[ \t]*\\(\\<\\(els\\(if\\|e\\)\\|continue\\|while\\|until\\)\\>\\|$\\|#\\)"))
+	     (condition-case nil
+		 (progn
+		   (up-list 1)
+		   (if (and (<= (point) pp)
+			    (eq (preceding-char) ?\} )
+			    (cperl-after-block-and-statement-beg (point-min)))
+		       t
+		     (goto-char p)
+		     nil))
+	       (error nil)))
+	    (progn
+	      (forward-char -1)
+	      (skip-chars-backward " \t")
+	      (if (bolp)
+		  ;; `}' was the first thing on the line, insert NL *after* it.
+		  (progn
+		    (cperl-indent-line parse-data)
+		    (search-forward "}")
+		    (delete-horizontal-space)
+		    (insert "\n"))
+		(delete-horizontal-space)
+		(or (eq (preceding-char) ?\;)
+		    (bolp)
+		    (and (eq (preceding-char) ?\} )
+			 (cperl-after-block-p (point-min)))
+		    (insert ";"))
+		(insert "\n")
+		(setq ret (point)))
+	      (if (cperl-indent-line parse-data)
+		  (setq ret (cperl-fix-line-spacing end parse-data)))
+	      (beginning-of-line)))))
     ret))
 
 (defvar cperl-update-start)		; Do not need to make them local
@@ -5129,23 +5357,23 @@ Returns some position at the last line."
 
 (defun cperl-indent-region (start end)
   "Simple variant of indentation of region in CPerl mode.
-Should be slow.  Will not indent comment if it starts at `comment-indent' 
+Should be slow.  Will not indent comment if it starts at `comment-indent'
 or looks like continuation of the comment on the previous line.
-Indents all the lines whose first character is between START and END 
-inclusive.  
+Indents all the lines whose first character is between START and END
+inclusive.
 
-If `cperl-indent-region-fix-constructs', will improve spacing on 
+If `cperl-indent-region-fix-constructs', will improve spacing on
 conditional/loop constructs."
   (interactive "r")
   (cperl-update-syntaxification end end)
   (save-excursion
     (let (cperl-update-start cperl-update-end (h-a-c after-change-functions))
-      (let (st comm old-comm-indent new-comm-indent p pp i empty
-	       (indent-info (if cperl-emacs-can-parse
-				(list nil nil nil) ; Cannot use '(), since will modify
-			      nil))
-	       after-change-functions	; Speed it up!
-	       (pm 0) (imenu-scanning-message "Indenting... (%3d%%)"))
+      (let ((indent-info (if cperl-emacs-can-parse
+			     (list nil nil nil)	; Cannot use '(), since will modify
+			   nil))
+	    (pm 0) (imenu-scanning-message "Indenting... (%3d%%)")
+	    after-change-functions	; Speed it up!
+	    st comm old-comm-indent new-comm-indent p pp i empty)
 	(if h-a-c (add-hook 'after-change-functions 'cperl-delay-update-hook))
 	(goto-char start)
 	(setq old-comm-indent (and (cperl-to-comment-or-eol)
@@ -5158,13 +5386,13 @@ conditional/loop constructs."
 	    (message "Indenting... For feedback load `imenu'..."))
 	(while (and (<= (point) end) (not (eobp))) ; bol to check start
 	  (and (fboundp 'imenu-progress-message)
-	       (imenu-progress-message 
+	       (imenu-progress-message
 		pm (/ (* 100 (- (point) start)) (- end start -1))))
 	  (setq st (point))
 	  (if (or
 	       (setq empty (looking-at "[ \t]*\n"))
 	       (and (setq comm (looking-at "[ \t]*#"))
-		    (or (eq (current-indentation) (or old-comm-indent 
+		    (or (eq (current-indentation) (or old-comm-indent
 						      comment-column))
 			(setq old-comm-indent nil))))
 	      (if (and old-comm-indent
@@ -5175,19 +5403,19 @@ conditional/loop constructs."
 				cperl-st-cfence)))
 		  (let ((comment-column new-comm-indent))
 		    (indent-for-comment)))
-	    (progn 
+	    (progn
 	      (setq i (cperl-indent-line indent-info))
 	      (or comm
 		  (not i)
 		  (progn
 		    (if cperl-indent-region-fix-constructs
 			(goto-char (cperl-fix-line-spacing end indent-info)))
-		    (if (setq old-comm-indent 
+		    (if (setq old-comm-indent
 			      (and (cperl-to-comment-or-eol)
-				   (not (memq (get-text-property (point) 
+				   (not (memq (get-text-property (point)
 								 'syntax-type)
 					      '(pod here-doc)))
-				   (not (eq (get-text-property (point) 
+				   (not (eq (get-text-property (point)
 							       'syntax-table)
 					    cperl-st-cfence))
 				   (current-column)))
@@ -5200,16 +5428,15 @@ conditional/loop constructs."
 	    (imenu-progress-message pm 100)
 	  (message nil)))
       ;; Now run the update hooks
-      (if after-change-functions
-	  (save-excursion
-	    (if cperl-update-end
-		(progn
-		  (goto-char cperl-update-end)
-		  (insert " ")
-		  (delete-char -1)
-		  (goto-char cperl-update-start)
-		  (insert " ")
-		  (delete-char -1))))))))
+      (and after-change-functions
+	   cperl-update-end
+	   (save-excursion
+	     (goto-char cperl-update-end)
+	     (insert " ")
+	     (delete-char -1)
+	     (goto-char cperl-update-start)
+	     (insert " ")
+	     (delete-char -1))))))
 
 ;; Stolen from lisp-mode with a lot of improvements
 
@@ -5219,8 +5446,7 @@ If any of the current line is a comment, fill the comment or the
 block of it that point is in, preserving the comment's initial
 indentation and initial hashes.  Behaves usually outside of comment."
   (interactive "P")
-  (let (
-	;; Non-nil if the current line contains a comment.
+  (let (;; Non-nil if the current line contains a comment.
 	has-comment
 
 	;; If has-comment, the appropriate fill-prefix for the comment.
@@ -5245,18 +5471,18 @@ indentation and initial hashes.  Behaves usually outside of comment."
        ((cperl-to-comment-or-eol)
 	(setq has-comment t)
 	(looking-at "#+[ \t]*")
-	(setq start (point) c (current-column) 
+	(setq start (point) c (current-column)
 	      comment-fill-prefix
 	      (concat (make-string (current-column) ?\ )
 		      (buffer-substring (match-beginning 0) (match-end 0)))
-	      spaces (progn (skip-chars-backward " \t") 
+	      spaces (progn (skip-chars-backward " \t")
 			    (buffer-substring (point) start))
-	      dc (- c (current-column)) len (- start (point)) 
+	      dc (- c (current-column)) len (- start (point))
 	      start (point-marker))
 	(delete-char len)
 	(insert (make-string dc ?-)))))
     (if (not has-comment)
-	(fill-paragraph justify)	; Do the usual thing outside of comment
+	(fill-paragraph justify)       ; Do the usual thing outside of comment
       ;; Narrow to include only the comment, and then fill the region.
       (save-restriction
 	(narrow-to-region
@@ -5278,7 +5504,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
 	(goto-char (point-min))
 	(while (progn (forward-line 1) (< (point) (point-max)))
 	  (skip-chars-forward " \t")
-	  (and (looking-at "#+") 
+	  (and (looking-at "#+")
 	       (delete-char (- (match-end 0) (match-beginning 0)))))
 
 	;; Lines with only hashes on them can be paragraph boundaries.
@@ -5287,10 +5513,10 @@ indentation and initial hashes.  Behaves usually outside of comment."
 	      (fill-prefix comment-fill-prefix))
 	  (fill-paragraph justify)))
       (if (and start)
-	  (progn 
+	  (progn
 	    (goto-char start)
 	    (if (> dc 0)
-	      (progn (delete-char dc) (insert spaces)))
+		(progn (delete-char dc) (insert spaces)))
 	    (if (or (= (current-column) c) iteration) nil
 	      (setq comment-column c)
 	      (indent-for-comment)
@@ -5303,30 +5529,22 @@ indentation and initial hashes.  Behaves usually outside of comment."
 	   (end-of-line)
 	   (current-column))
 	 fill-column)
-  (let ((c (save-excursion (beginning-of-line)
-			   (cperl-to-comment-or-eol) (point)))
-	(s (memq (following-char) '(?\ ?\t))) marker)
-    (if (>= c (point)) nil
-      (setq marker (point-marker))
-      (cperl-fill-paragraph)
-      (goto-char marker)
-      ;; Is not enough, sometimes marker is a start of line
-      (if (bolp) (progn (re-search-forward "#+[ \t]*") 
-			(goto-char (match-end 0))))
-      ;; Following space could have gone:
-      (if (or (not s) (memq (following-char) '(?\ ?\t))) nil
-	(insert " ")
-	(backward-char 1))
-      ;; Previous space could have gone:
-      (or (memq (preceding-char) '(?\ ?\t)) (insert " "))))))
-
-(defvar imenu-example--function-name-regexp-perl
-  (concat 
-   "^\\("
-       "[ \t]*\\(sub\\|package\\)[ \t\n]+\\([a-zA-Z_0-9:']+\\)[ \t]*\\(([^()]*)[ \t]*\\)?"
-     "\\|"
-       "=head\\([12]\\)[ \t]+\\([^\n]+\\)$"
-   "\\)"))
+      (let ((c (save-excursion (beginning-of-line)
+			       (cperl-to-comment-or-eol) (point)))
+	    (s (memq (following-char) '(?\ ?\t))) marker)
+	(if (>= c (point)) nil
+	  (setq marker (point-marker))
+	  (cperl-fill-paragraph)
+	  (goto-char marker)
+	  ;; Is not enough, sometimes marker is a start of line
+	  (if (bolp) (progn (re-search-forward "#+[ \t]*")
+			    (goto-char (match-end 0))))
+	  ;; Following space could have gone:
+	  (if (or (not s) (memq (following-char) '(?\ ?\t))) nil
+	    (insert " ")
+	    (backward-char 1))
+	  ;; Previous space could have gone:
+	  (or (memq (preceding-char) '(?\ ?\t)) (insert " "))))))
 
 (defun cperl-imenu-addback (lst &optional isback name)
   ;; We suppose that the lst is a DAG, unless the first element only
@@ -5334,24 +5552,23 @@ indentation and initial hashes.  Behaves usually outside of comment."
   ;; applied twice without ISBACK set.
   (cond ((not cperl-imenu-addback) lst)
 	(t
-	 (or name 
+	 (or name
 	     (setq name "+++BACK+++"))
-	 (mapcar (function (lambda (elt)
-			     (if (and (listp elt) (listp (cdr elt)))
-				 (progn
-				   ;; In the other order it goes up
-				   ;; one level only ;-(
-				   (setcdr elt (cons (cons name lst)
-						     (cdr elt)))
-				   (cperl-imenu-addback (cdr elt) t name)
-				   ))))
+	 (mapcar (lambda (elt)
+		   (if (and (listp elt) (listp (cdr elt)))
+		       (progn
+			 ;; In the other order it goes up
+			 ;; one level only ;-(
+			 (setcdr elt (cons (cons name lst)
+					   (cdr elt)))
+			 (cperl-imenu-addback (cdr elt) t name))))
 		 (if isback (cdr lst) lst))
 	 lst)))
 
-(defun imenu-example--create-perl-index (&optional regexp)
+(defun cperl-imenu--create-perl-index (&optional regexp)
   (require 'cl)
   (require 'imenu)			; May be called from TAGS creator
-  (let ((index-alist '()) (index-pack-alist '()) (index-pod-alist '()) 
+  (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
@@ -5364,7 +5581,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
     ;; Search for the function
     (progn ;;save-match-data
       (while (re-search-forward
-	      (or regexp imenu-example--function-name-regexp-perl)
+	      (or regexp cperl-imenu--function-name-regexp-perl)
 	      nil t)
 	(or noninteractive
 	    (imenu-progress-message prev-pos))
@@ -5373,7 +5590,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
 	   (match-beginning 2)		; package or sub
 	   (eq (char-after (match-beginning 2)) ?p) ; package
 	   (not (save-match-data
-		  (looking-at "[ \t\n]*;"))))  ; Plain text word 'package'
+		  (looking-at "[ \t\n]*;")))) ; Plain text word 'package'
 	  nil)
 	 ((and
 	   (match-beginning 2)		; package or sub
@@ -5383,8 +5600,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
 	   (null (get-text-property (match-beginning 1) 'in-pod)))
 	  (save-excursion
 	    (goto-char (match-beginning 2))
-	    (setq fchar (following-char))
-	    )
+	    (setq fchar (following-char)))
 	  ;; (if (looking-at "([^()]*)[ \t\n\f]*")
 	  ;;    (goto-char (match-end 0)))	; Messes what follows
 	  (setq char (following-char)	; ?\; for "sub foo () ;"
@@ -5400,9 +5616,9 @@ indentation and initial hashes.  Behaves usually outside of comment."
 		    name (progn
 			   (set-text-properties 0 (length name) nil name)
 			   name)
-		    package (concat name "::") 
+		    package (concat name "::")
 		    name (concat "package " name)
-		    end-range 
+		    end-range
 		    (save-excursion
 		      (parse-partial-sexp (point) (point-max) -1) (point))
 		    ends-ranges (cons end-range ends-ranges)
@@ -5414,20 +5630,20 @@ indentation and initial hashes.  Behaves usually outside of comment."
 		  marker (make-marker))
 	    (set-text-properties 0 (length name) nil name)
 	    (set-marker marker (match-end 3))
-	    (if (eq fchar ?p) 
+	    (if (eq fchar ?p)
 		(setq name (concat "package " name))
 	      (cond ((string-match "[:']" name)
 		     (setq meth t))
 		    ((> p end-range) nil)
-		    (t 
+		    (t
 		     (setq name (concat package name) meth t))))
 	    (setq index (cons name marker))
-	    (if (eq fchar ?p) 
+	    (if (eq fchar ?p)
 		(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
+	 ((match-beginning 5)		; POD section
 	  ;; (beginning-of-line)
 	  (setq index (imenu-example--name-and-position)
 		name (buffer-substring (match-beginning 6) (match-end 6)))
@@ -5440,10 +5656,10 @@ indentation and initial hashes.  Behaves usually outside of comment."
 	  (push index1 index-unsorted-alist)))))
     (or noninteractive
 	(imenu-progress-message prev-pos 100))
-    (setq index-alist 
+    (setq index-alist
 	  (if (default-value 'imenu-sort-function)
 	      (sort index-alist (default-value 'imenu-sort-function))
-	      (nreverse index-alist)))
+	    (nreverse index-alist)))
     (and index-pod-alist
 	 (push (cons "+POD headers+..."
 		     (nreverse index-pod-alist))
@@ -5460,22 +5676,22 @@ indentation and initial hashes.  Behaves usually outside of comment."
 	     (setq elt (car lst) lst (cdr lst))
 	     (cond ((string-match "\\(::\\|'\\)[_a-zA-Z0-9]+$" (car elt))
 		    (setq pack (substring (car elt) 0 (match-beginning 0)))
-		    (if (setq group (assoc pack hier-list)) 
+		    (if (setq group (assoc pack hier-list))
 			(if (listp (cdr group))
 			    ;; Have some functions already
-			    (setcdr group 
-				    (cons (cons (substring 
+			    (setcdr group
+				    (cons (cons (substring
 						 (car elt)
 						 (+ 2 (match-beginning 0)))
 						(cdr elt))
 					  (cdr group)))
-			  (setcdr group (list (cons (substring 
+			  (setcdr group (list (cons (substring
 						     (car elt)
 						     (+ 2 (match-beginning 0)))
 						    (cdr elt)))))
-		      (setq hier-list 
-			    (cons (cons pack 
-					(list (cons (substring 
+		      (setq hier-list
+			    (cons (cons pack
+					(list (cons (substring
 						     (car elt)
 						     (+ 2 (match-beginning 0)))
 						    (cdr elt))))
@@ -5487,7 +5703,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
 	 (push (cons "+Packages+..."
 		     (nreverse index-pack-alist))
 	       index-alist))
-    (and (or index-pack-alist index-pod-alist 
+    (and (or index-pack-alist index-pod-alist
 	     (default-value 'imenu-sort-function))
 	 index-unsorted-alist
 	 (push (cons "+Unsorted List+..."
@@ -5496,9 +5712,6 @@ indentation and initial hashes.  Behaves usually outside of comment."
     (cperl-imenu-addback index-alist)))
 
 
-(defvar cperl-outline-regexp
-  (concat imenu-example--function-name-regexp-perl "\\|" "\\`"))
-
 ;; Suggested by Mark A. Hershberger
 (defun cperl-outline-level ()
   (looking-at outline-regexp)
@@ -5514,7 +5727,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
 	(t 3)))				; should not happen
 
 
-(defvar cperl-compilation-error-regexp-alist 
+(defvar cperl-compilation-error-regexp-alist
   ;; This look like a paranoiac regexp: could anybody find a better one? (which WORK).
   '(("^[^\n]* \\(file\\|at\\) \\([^ \t\n]+\\) [^\n]*line \\([0-9]+\\)[\\., \n]"
      2 3))
@@ -5522,9 +5735,9 @@ indentation and initial hashes.  Behaves usually outside of comment."
 
 (if (fboundp 'eval-after-load)
     (eval-after-load
-     "mode-compile"
-     '(setq perl-compilation-error-regexp-alist
-	   cperl-compilation-error-regexp-alist)))
+	"mode-compile"
+      '(setq perl-compilation-error-regexp-alist
+	     cperl-compilation-error-regexp-alist)))
 
 
 (defun cperl-windowed-init ()
@@ -5535,15 +5748,13 @@ indentation and initial hashes.  Behaves usually outside of comment."
     (add-hook 'font-lock-mode-hook
 	      (function
 	       (lambda ()
-		 (if (or
-		      (eq major-mode 'perl-mode)
-		      (eq major-mode 'cperl-mode))
+		 (if (memq major-mode '(perl-mode cperl-mode))
 		     (progn
 		       (or cperl-faces-init (cperl-init-faces)))))))
     (if (fboundp 'eval-after-load)
 	(eval-after-load
-	 "ps-print"
-	 '(or cperl-faces-init (cperl-init-faces))))))
+	    "ps-print"
+	  '(or cperl-faces-init (cperl-init-faces))))))
 
 (defun cperl-load-font-lock-keywords ()
   (or cperl-faces-init (cperl-init-faces))
@@ -5584,7 +5795,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
 	(let (t-font-lock-keywords t-font-lock-keywords-1 font-lock-anchored)
 	  (if (fboundp 'font-lock-fontify-anchored-keywords)
 	      (setq font-lock-anchored t))
-	  (setq 
+	  (setq
 	   t-font-lock-keywords
 	   (list
 	    (list "[ \t]+$" 0 cperl-invalid-face t)
@@ -5637,7 +5848,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
 	      ;; "telldir" "time" "times" "truncate" "uc" "ucfirst"
 	      ;; "umask" "unlink" "unpack" "utime" "values" "vec"
 	      ;; "wait" "waitpid" "wantarray" "warn" "write" "x" "xor"
-	      "a\\(bs\\|ccept\\|tan2\\|larm\\|nd\\)\\|" 
+	      "a\\(bs\\|ccept\\|tan2\\|larm\\|nd\\)\\|"
 	      "b\\(in\\(d\\|mode\\)\\|less\\)\\|"
 	      "c\\(h\\(r\\(\\|oot\\)\\|dir\\|mod\\|own\\)\\|aller\\|rypt\\|"
 	      "lose\\(\\|dir\\)\\|mp\\|o\\(s\\|n\\(tinue\\|nect\\)\\)\\)\\|"
@@ -5708,7 +5919,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
 	    '("^[ \t]*format[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t]*=[ \t]*$"
 	      1 font-lock-function-name-face)
 	    (cond ((featurep 'font-lock-extra)
-		   '("\\([]}\\\\%@>*&]\\|\\$[a-zA-Z0-9_:]*\\)[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" 
+		   '("\\([]}\\\\%@>*&]\\|\\$[a-zA-Z0-9_:]*\\)[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}"
 		     (2 font-lock-string-face t)
 		     (0 '(restart 2 t)))) ; To highlight $a{bc}{ef}
 		  (font-lock-anchored
@@ -5721,8 +5932,8 @@ indentation and initial hashes.  Behaves usually outside of comment."
 		       2 font-lock-string-face t)))
 	    '("[\[ \t{,(]\\(-?[a-zA-Z0-9_:]+\\)[ \t]*=>" 1
 	      font-lock-string-face t)
-	    '("^[ \t]*\\([a-zA-Z0-9_]+[ \t]*:\\)[ \t]*\\($\\|{\\|\\<\\(until\\|while\\|for\\(each\\)?\\|do\\)\\>\\)" 1 
-	      font-lock-constant-face) ; labels
+	    '("^[ \t]*\\([a-zA-Z0-9_]+[ \t]*:\\)[ \t]*\\($\\|{\\|\\<\\(until\\|while\\|for\\(each\\)?\\|do\\)\\>\\)" 1
+	      font-lock-constant-face)	; labels
 	    '("\\<\\(continue\\|next\\|last\\|redo\\|goto\\)\\>[ \t]+\\([a-zA-Z0-9_:]+\\)" ; labels as targets
 	      2 font-lock-constant-face)
 	    ;; Uncomment to get perl-mode-like vars
@@ -5735,7 +5946,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
 		     (4 '(another 4 nil
 				  ("\\=[ \t]*,[ \t]*\\([$@%*][a-zA-Z0-9_:]+\\)\\([ \t]*,\\)?"
 				   (1 font-lock-variable-name-face)
-				   (2 '(restart 2 nil) nil t))) 
+				   (2 '(restart 2 nil) nil t)))
 			nil t)))	; local variables, multiple
 		  (font-lock-anchored
 		   '("^[ \t{}]*\\(my\\|local\\|our\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)"
@@ -5747,10 +5958,10 @@ indentation and initial hashes.  Behaves usually outside of comment."
 		       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)))
-	  (setq 
+	  (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 cperl-xemacs-p)	; not yet as of XEmacs 19.12
 		'(
 		  ("\\(\\([@%]\\|\$#\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)" 1
 		   (if (eq (char-after (match-beginning 2)) ?%)
@@ -5759,7 +5970,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
 		   t)			; arrays and hashes
 		  ("\\(\\([$@]+\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)[ \t]*\\([[{]\\)"
 		   1
-		   (if (= (- (match-end 2) (match-beginning 2)) 1) 
+		   (if (= (- (match-end 2) (match-beginning 2)) 1)
 		       (if (eq (char-after (match-beginning 3)) ?{)
 			   cperl-hash-face
 			 cperl-array-face) ; arrays and hashes
@@ -5767,7 +5978,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
 		   t)
 		  ;;("\\([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_]\\)\\|\\(/\\)\\)" 
+		  ;;("\\(\\<\\([msy]\\|tr\\)[ \t]*\\([^ \t\na-zA-Z0-9_]\\)\\|\\(/\\)\\)"
 		  ;;(3 font-lock-function-name-face t t)
 		  ;;(4
 		  ;; (if (cperl-slash-is-regexp)
@@ -5790,86 +6001,83 @@ indentation and initial hashes.  Behaves usually outside of comment."
 	(if (fboundp 'ps-print-buffer) (cperl-ps-print-init))
 	(if (or (featurep 'choose-color) (featurep 'font-lock-extra))
 	    (eval			; Avoid a warning
-	    '(font-lock-require-faces
-	     (list
-	      ;; Color-light    Color-dark      Gray-light      Gray-dark Mono
-	      (list 'font-lock-comment-face
-		    ["Firebrick"	"OrangeRed" 	"DimGray"	"Gray80"]
-		    nil
-		    [nil		nil		t		t	t]
-		    [nil		nil		t		t	t]
-		    nil)
-	      (list 'font-lock-string-face
-		    ["RosyBrown"	"LightSalmon" 	"Gray50"	"LightGray"]
-		    nil
-		    nil
-		    [nil		nil		t		t	t]
-		    nil)
-	      (list 'font-lock-function-name-face
-		    (vector
-		     "Blue"		"LightSkyBlue"	"Gray50"	"LightGray"
-		     (cdr (assq 'background-color ; if mono
-				(frame-parameters))))
-		    (vector
-		     nil		nil		nil		nil
-		     (cdr (assq 'foreground-color ; if mono
-				(frame-parameters))))
-		    [nil		nil		t		t	t]
-		    nil
-		    nil)
-	      (list 'font-lock-variable-name-face
-		    ["DarkGoldenrod"	"LightGoldenrod" "DimGray"	"Gray90"]
-		    nil
-		    [nil		nil		t		t	t]
-		    [nil		nil		t		t	t]
-		    nil)
-	      (list 'font-lock-type-face
-		    ["DarkOliveGreen"	"PaleGreen" 	"DimGray"	"Gray80"]
-		    nil
-		    [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-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-face
-		    ["blue"		"yellow" 	nil		"Gray80"]
-		    ["lightyellow2"	("navy" "os2blue" "darkgreen")
-		     "gray90"]
-		    t
-		    nil
-		    nil)
-	      (list 'cperl-hash-face
-		    ["red"		"red"	 	nil		"Gray80"]
-		    ["lightyellow2"	("navy" "os2blue" "darkgreen")
-		     "gray90"]
-		    t
-		    t
-		    nil))))
+	     '(font-lock-require-faces
+	       (list
+		;; Color-light    Color-dark      Gray-light      Gray-dark Mono
+		(list 'font-lock-comment-face
+		      ["Firebrick"	"OrangeRed" 	"DimGray"	"Gray80"]
+		      nil
+		      [nil		nil		t		t	t]
+		      [nil		nil		t		t	t]
+		      nil)
+		(list 'font-lock-string-face
+		      ["RosyBrown"	"LightSalmon" 	"Gray50"	"LightGray"]
+		      nil
+		      nil
+		      [nil		nil		t		t	t]
+		      nil)
+		(list 'font-lock-function-name-face
+		      (vector
+		       "Blue"		"LightSkyBlue"	"Gray50"	"LightGray"
+		       (cdr (assq 'background-color ; if mono
+				  (frame-parameters))))
+		      (vector
+		       nil		nil		nil		nil
+		       (cdr (assq 'foreground-color ; if mono
+				  (frame-parameters))))
+		      [nil		nil		t		t	t]
+		      nil
+		      nil)
+		(list 'font-lock-variable-name-face
+		      ["DarkGoldenrod"	"LightGoldenrod" "DimGray"	"Gray90"]
+		      nil
+		      [nil		nil		t		t	t]
+		      [nil		nil		t		t	t]
+		      nil)
+		(list 'font-lock-type-face
+		      ["DarkOliveGreen"	"PaleGreen" 	"DimGray"	"Gray80"]
+		      nil
+		      [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-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-face
+		      ["blue"		"yellow" 	nil		"Gray80"]
+		      ["lightyellow2"	("navy" "os2blue" "darkgreen")
+		       "gray90"]
+		      t
+		      nil
+		      nil)
+		(list 'cperl-hash-face
+		      ["red"		"red"	 	nil		"Gray80"]
+		      ["lightyellow2"	("navy" "os2blue" "darkgreen")
+		       "gray90"]
+		      t
+		      t
+		      nil))))
 	  ;; Do it the dull way, without choose-color
 	  (defvar cperl-guessed-background nil
 	    "Display characteristics as guessed by cperl.")
-;;	  (or (fboundp 'x-color-defined-p)
-;;	      (defalias 'x-color-defined-p 
-;;		(cond ((fboundp 'color-defined-p) 'color-defined-p)
-;;		      ;; XEmacs >= 19.12
-;;		      ((fboundp 'valid-color-name-p) 'valid-color-name-p)
-;;		      ;; XEmacs 19.11
-;;		      (t 'x-valid-color-name-p))))
-	  (cperl-force-face font-lock-constant-face 
+	  ;;	  (or (fboundp 'x-color-defined-p)
+	  ;;	      (defalias 'x-color-defined-p 
+	  ;;		(cond ((fboundp 'color-defined-p) 'color-defined-p)
+	  ;;		      ;; XEmacs >= 19.12
+	  ;;		      ((fboundp 'valid-color-name-p) 'valid-color-name-p)
+	  ;;		      ;; XEmacs 19.11
+	  ;;		      (t 'x-valid-color-name-p))))
+	  (cperl-force-face font-lock-constant-face
 			    "Face for constant and label names")
 	  (cperl-force-face font-lock-variable-name-face
 			    "Face for variable names")
@@ -5909,18 +6117,18 @@ 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-face)) 
-	       (cperl-is-face 'font-lock-emphasized-face)) 
+	       (not (cperl-is-face 'cperl-array-face))
+	       (cperl-is-face 'font-lock-emphasized-face))
 	      (copy-face 'font-lock-emphasized-face 'cperl-array-face))
 	  (if (and
-	       (not (cperl-is-face 'cperl-hash-face)) 
-	       (cperl-is-face 'font-lock-other-emphasized-face)) 
-	      (copy-face 'font-lock-other-emphasized-face 
+	       (not (cperl-is-face 'cperl-hash-face))
+	       (cperl-is-face 'font-lock-other-emphasized-face))
+	      (copy-face 'font-lock-other-emphasized-face
 			 'cperl-hash-face))
 	  (if (and
-	       (not (cperl-is-face 'cperl-nonoverridable-face)) 
-	       (cperl-is-face 'font-lock-other-type-face)) 
-	      (copy-face 'font-lock-other-type-face 
+	       (not (cperl-is-face 'cperl-nonoverridable-face))
+	       (cperl-is-face 'font-lock-other-type-face))
+	      (copy-face 'font-lock-other-type-face
 			 'cperl-nonoverridable-face))
 	  ;;(or (boundp 'cperl-hash-face)
 	  ;;    (defconst cperl-hash-face
@@ -5934,10 +6142,8 @@ indentation and initial hashes.  Behaves usually outside of comment."
 	  (let ((background
 		 (if (boundp 'font-lock-background-mode)
 		     font-lock-background-mode
-		   'light)) 
-		(face-list (and (fboundp 'face-list) (face-list)))
-		;; cperl-is-face
-		)
+		   'light))
+		(face-list (and (fboundp 'face-list) (face-list))))
 ;;;;	    (fset 'cperl-is-face
 ;;;;		  (cond ((fboundp 'find-face)
 ;;;;			 (symbol-function 'find-face))
@@ -5951,10 +6157,9 @@ indentation and initial hashes.  Behaves usually outside of comment."
 		  'gray
 		background)
 	      "Background as guessed by CPerl mode")
-	    (if (and 
-		 (not (cperl-is-face 'font-lock-constant-face)) 
-		 (cperl-is-face 'font-lock-reference-face)) 
-	      (copy-face 'font-lock-reference-face 'font-lock-constant-face))
+	    (and (not (cperl-is-face 'font-lock-constant-face))
+		 (cperl-is-face 'font-lock-reference-face)
+		 (copy-face 'font-lock-reference-face 'font-lock-constant-face))
 	    (if (cperl-is-face 'font-lock-type-face) nil
 	      (copy-face 'default 'font-lock-type-face)
 	      (cond
@@ -6030,10 +6235,10 @@ indentation and initial hashes.  Behaves usually outside of comment."
   "Initialization of `ps-print' components for faces used in CPerl."
   (eval-after-load "ps-print"
     '(setq ps-bold-faces
-	   ;; 			font-lock-variable-name-face 
+	   ;; 			font-lock-variable-name-face
 	   ;;			font-lock-constant-face
 	   (append '(cperl-array-face
-		     cperl-hash-face) 
+		     cperl-hash-face)
 		   ps-bold-faces)
 	   ps-italic-faces
 	   ;;			font-lock-constant-face
@@ -6057,8 +6262,8 @@ to the file FILE.  If FILE is nil, prompts for a file name.
 
 Style of printout regulated by the variable `cperl-ps-print-face-properties'."
   (interactive)
-  (or file 
-      (setq file (read-from-minibuffer 
+  (or file
+      (setq file (read-from-minibuffer
 		  "Print to file (if empty - to printer): "
 		  (concat (buffer-file-name) ".ps")
 		  nil nil 'file-name-history)))
@@ -6079,17 +6284,17 @@ Style of printout regulated by the variable `cperl-ps-print-face-properties'."
 ;;;   (setq ps-bold-faces
 ;;; 	(append '(font-lock-emphasized-face
 ;;; 		  cperl-array-face
-;;; 		  font-lock-keyword-face 
-;;; 		  font-lock-variable-name-face 
-;;; 		  font-lock-constant-face 
-;;; 		  font-lock-reference-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-face) 
+;;; 		  cperl-hash-face)
 ;;; 		ps-bold-faces))
 ;;;   (setq ps-italic-faces
 ;;; 	(append '(cperl-nonoverridable-face
-;;; 		  font-lock-constant-face 
-;;; 		  font-lock-reference-face 
+;;; 		  font-lock-constant-face
+;;; 		  font-lock-reference-face
 ;;; 		  font-lock-other-emphasized-face
 ;;; 		  cperl-hash-face)
 ;;; 		ps-italic-faces))
@@ -6106,13 +6311,13 @@ Style of printout regulated by the variable `cperl-ps-print-face-properties'."
 (if (cperl-enable-font-lock) (cperl-windowed-init))
 
 (defconst cperl-styles-entries
-  '(cperl-indent-level cperl-brace-offset cperl-continued-brace-offset     
-    cperl-label-offset cperl-extra-newline-before-brace 
+  '(cperl-indent-level cperl-brace-offset cperl-continued-brace-offset
+    cperl-label-offset cperl-extra-newline-before-brace
     cperl-merge-trailing-else
     cperl-continued-statement-offset))
 
 (defconst cperl-style-alist
-  '(("CPerl" ; =GNU without extra-newline-before-brace
+  '(("CPerl"			     ; =GNU without extra-newline-before-brace
      (cperl-indent-level               .  2)
      (cperl-brace-offset               .  0)
      (cperl-continued-brace-offset     .  0)
@@ -6120,7 +6325,7 @@ Style of printout regulated by the variable `cperl-ps-print-face-properties'."
      (cperl-extra-newline-before-brace .  nil)
      (cperl-merge-trailing-else	       .  t)
      (cperl-continued-statement-offset .  2))
-    ("PerlStyle" ; CPerl with 4 as indent
+    ("PerlStyle"			; CPerl with 4 as indent
      (cperl-indent-level               .  4)
      (cperl-brace-offset               .  0)
      (cperl-continued-brace-offset     .  0)
@@ -6171,9 +6376,9 @@ Style of printout regulated by the variable `cperl-ps-print-face-properties'."
 Should be used via `cperl-set-style' or via Perl menu.")
 
 (defun cperl-set-style (style)
-  "Set CPerl-mode variables to use one of several different indentation styles.
+  "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 
+The list of styles is in `cperl-style-alist', available styles
 are GNU, K&R, BSD, C++ and Whitesmith.
 
 The current value of style is memorized (unless there is a memorized
@@ -6181,7 +6386,7 @@ 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."
-  (interactive 
+  (interactive
    (let ((list (mapcar (function (lambda (elt) (list (car elt)))) 
 		       cperl-style-alist)))
      (list (completing-read "Enter style: " list nil 'insist))))
@@ -6202,7 +6407,7 @@ side-effect of memorizing only."
   (or cperl-old-style (error "The style was not changed"))
   (let (setting)
     (while cperl-old-style
-      (setq setting (car cperl-old-style) 
+      (setq setting (car cperl-old-style)
 	    cperl-old-style (cdr cperl-old-style))
       (set (car setting) (cdr setting)))))
 
@@ -6235,12 +6440,12 @@ side-effect of memorizing only."
 	       (set-buffer "*info-perl-tmp*")
 	       (rename-buffer "*info*")
 	       (set-buffer bname)))
-	(make-variable-buffer-local 'window-min-height)
+	(make-local-variable 'window-min-height)
 	(setq window-min-height 2)
 	(current-buffer)))))
 
 (defun cperl-word-at-point (&optional p)
-  ;; Returns the word at point or at P.
+  "Return the word at point or at P."
   (save-excursion
     (if p (goto-char p))
     (or (cperl-word-at-point-hard)
@@ -6254,18 +6459,18 @@ side-effect of memorizing only."
 		       'find-tag-default))))))
 
 (defun cperl-info-on-command (command)
-  "Shows documentation for Perl command in other window.
+  "Show documentation for Perl command COMMAND in other window.
 If perl-info buffer is shown in some frame, uses this frame.
 Customized by setting variables `cperl-shrink-wrap-info-frame',
 `cperl-max-help-size'."
-  (interactive 
+  (interactive
    (let* ((default (cperl-word-at-point))
-	  (read (read-string 
-		     (format "Find doc for Perl function (default %s): " 
-			     default))))
-     (list (if (equal read "") 
-		   default 
-		 read))))
+	  (read (read-string
+		 (format "Find doc for Perl function (default %s): "
+			 default))))
+     (list (if (equal read "")
+	       default
+	     read))))
 
   (let ((buffer (current-buffer))
 	(cmd-desc (concat "^" (regexp-quote command) "[^a-zA-Z_0-9]")) ; "tr///"
@@ -6279,7 +6484,7 @@ Customized by setting variables `cperl-shrink-wrap-info-frame',
 	  fr1 (window-frame iniwin))
     (set-buffer buf)
     (beginning-of-buffer)
-    (or isvar 
+    (or isvar
 	(progn (re-search-forward "^-X[ \t\n]")
 	       (forward-line -1)))
     (if (re-search-forward cmd-desc nil t)
@@ -6288,7 +6493,7 @@ Customized by setting variables `cperl-shrink-wrap-info-frame',
 	  (if (re-search-backward "^[ \t\n\f]")
 	      (forward-line 1))
 	  (beginning-of-line)
-	  ;; Get some of 
+	  ;; Get some of
 	  (setq pos (point)
 		buf-list (list buf "*info-perl-var*" "*info-perl*"))
 	  (while (and (not win) buf-list)
@@ -6307,25 +6512,24 @@ Customized by setting variables `cperl-shrink-wrap-info-frame',
 	  (setq iniheight (window-height)
 		frheight (frame-height)
 		not-loner (< iniheight (1- frheight))) ; Are not alone
-	  (cond ((if not-loner cperl-max-help-size 
+	  (cond ((if not-loner cperl-max-help-size
 		   cperl-shrink-wrap-info-frame)
-		 (setq height 
-		       (+ 2 
-			  (count-lines 
-			   pos 
+		 (setq height
+		       (+ 2
+			  (count-lines
+			   pos
 			   (save-excursion
 			     (if (re-search-forward
 				  "^[ \t][^\n]*\n+\\([^ \t\n\f]\\|\\'\\)" nil t)
 				 (match-beginning 0) (point-max)))))
-		       max-height 
+		       max-height
 		       (if not-loner
 			   (/ (* (- frheight 3) cperl-max-help-size) 100)
 			 (setq char-height (frame-char-height))
 			 ;; Non-functioning under OS/2:
 			 (if (eq char-height 1) (setq char-height 18))
 			 ;; Title, menubar, + 2 for slack
-			 (- (/ (x-display-pixel-height) char-height) 4)
-			 ))
+			 (- (/ (x-display-pixel-height) char-height) 4)))
 		 (if (> height max-height) (setq height max-height))
 		 ;;(message "was %s doing %s" iniheight height)
 		 (if not-loner
@@ -6337,7 +6541,7 @@ Customized by setting variables `cperl-shrink-wrap-info-frame',
     (select-window iniwin)))
 
 (defun cperl-info-on-current-command ()
-  "Shows documentation for Perl command at point in other window."
+  "Show documentation for Perl command at point in other window."
   (interactive)
   (cperl-info-on-command (cperl-word-at-point)))
 
@@ -6347,7 +6551,7 @@ Customized by setting variables `cperl-shrink-wrap-info-frame',
      "^\n\\([-a-zA-Z_]+\\)[ \t\n]")
     (forward-line 1)))
 
-(defun cperl-imenu-info-imenu-name ()  
+(defun cperl-imenu-info-imenu-name ()
   (buffer-substring
    (match-beginning 1) (match-end 1)))
 
@@ -6355,12 +6559,12 @@ Customized by setting variables `cperl-shrink-wrap-info-frame',
   (interactive)
   (let* ((buffer (current-buffer))
 	 imenu-create-index-function
-	 imenu-prev-index-position-function 
-	 imenu-extract-index-name-function 
+	 imenu-prev-index-position-function
+	 imenu-extract-index-name-function
 	 (index-item (save-restriction
 		       (save-window-excursion
 			 (set-buffer (cperl-info-buffer nil))
-			 (setq imenu-create-index-function 
+			 (setq imenu-create-index-function
 			       'imenu-default-create-index-function
 			       imenu-prev-index-position-function
 			       'cperl-imenu-info-imenu-search
@@ -6387,7 +6591,7 @@ partially contained in the region are lined up at the same column.
 
 MINSHIFT is the minimal amount of space to insert before the construction.
 STEP is the tabwidth to position constructions.
-If STEP is `nil', `cperl-lineup-step' will be used 
+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")
@@ -6405,8 +6609,8 @@ Will not move the position at the start to the left."
       (if (looking-at "[a-zA-Z0-9_]")
 	  (if (looking-at "\\<[a-zA-Z0-9_]+\\>")
 	      (setq search
-		    (concat "\\<" 
-			    (regexp-quote 
+		    (concat "\\<"
+			    (regexp-quote
 			     (buffer-substring (match-beginning 0)
 					       (match-end 0))) "\\>"))
 	    (error "Cannot line up in a middle of the word"))
@@ -6417,7 +6621,7 @@ Will not move the position at the start to the left."
       (or minshift (setq minshift 1))
       (while (progn
 	       (beginning-of-line 2)
-	       (and (< (point) end) 
+	       (and (< (point) end)
 		    (re-search-forward search end t)
 		    (goto-char (match-beginning 0))))
 	(setq tcol (current-column) seen t)
@@ -6427,14 +6631,14 @@ Will not move the position at the start to the left."
       (goto-char beg)
       (setq col (+ col minshift))
       (if (/= (% col step) 0) (setq step (* step (1+ (/ col step)))))
-      (while 
+      (while
 	  (progn
 	    (setq e (point))
 	    (skip-chars-backward " \t")
 	    (delete-region (point) e)
-	    (indent-to-column col); (make-string (- col (current-column)) ?\ ))
-	    (beginning-of-line 2) 
-	    (and (< (point) end) 
+	    (indent-to-column col) ;(make-string (- col (current-column)) ?\ ))
+	    (beginning-of-line 2)
+	    (and (< (point) end)
 		 (re-search-forward search end t)
 		 (goto-char (match-beginning 0)))))))) ; No body
 
@@ -6451,18 +6655,18 @@ in subdirectories too."
     (cond
      ((eq all 'recursive)
       ;;(error "Not implemented: recursive")
-      (setq args (append (list "-e" 
+      (setq args (append (list "-e"
 			       "sub wanted {push @ARGV, $File::Find::name if /\\.[pP][Llm]$/}
 				use File::Find;
 				find(\\&wanted, '.');
-				exec @ARGV;" 
+				exec @ARGV;"
 			       cmd) args)
 	    cmd "perl"))
-     (all 
+     (all
       ;;(error "Not implemented: all")
-      (setq args (append (list "-e" 
+      (setq args (append (list "-e"
 			       "push @ARGV, <*.PL *.pl *.pm>;
-				exec @ARGV;" 
+				exec @ARGV;"
 			       cmd) args)
 	    cmd "perl"))
      (t
@@ -6475,14 +6679,14 @@ in subdirectories too."
   "Toggle the state of `cperl-auto-newline'."
   (interactive)
   (setq cperl-auto-newline (not cperl-auto-newline))
-  (message "Newlines will %sbe auto-inserted now." 
+  (message "Newlines will %sbe auto-inserted now."
 	   (if cperl-auto-newline "" "not ")))
 
 (defun cperl-toggle-abbrev ()
   "Toggle the state of automatic keyword expansion in CPerl mode."
   (interactive)
   (abbrev-mode (if abbrev-mode 0 1))
-  (message "Perl control structure will %sbe auto-inserted now." 
+  (message "Perl control structure will %sbe auto-inserted now."
 	   (if abbrev-mode "" "not ")))
 
 
@@ -6490,30 +6694,30 @@ in subdirectories too."
   "Toggle the state of parentheses doubling in CPerl mode."
   (interactive)
   (setq cperl-electric-parens (if (cperl-val 'cperl-electric-parens) 'null t))
-  (message "Parentheses will %sbe auto-doubled now." 
+  (message "Parentheses will %sbe auto-doubled now."
 	   (if (cperl-val 'cperl-electric-parens) "" "not ")))
 
 (defun cperl-toggle-autohelp ()
-  "Toggle the state of automatic help message in CPerl mode.
-See `cperl-lazy-help-time' too."
+  "Toggle the state of Auto-Help on Perl constructs (put in the message area).
+Delay of auto-help controlled by `cperl-lazy-help-time'."
   (interactive)
   (if (fboundp 'run-with-idle-timer)
       (progn
 	(if cperl-lazy-installed
-	    (eval '(cperl-lazy-unstall))
+	    (cperl-lazy-unstall)
 	  (cperl-lazy-install))
-	(message "Perl help messages will %sbe automatically shown now." 
+	(message "Perl help messages will %sbe automatically shown now."
 		 (if cperl-lazy-installed "" "not ")))
     (message "Cannot automatically show Perl help messages - run-with-idle-timer missing.")))
 
 (defun cperl-toggle-construct-fix ()
   "Toggle whether `indent-region'/`indent-sexp' fix whitespace too."
   (interactive)
-  (setq cperl-indent-region-fix-constructs 
+  (setq cperl-indent-region-fix-constructs
 	(if cperl-indent-region-fix-constructs
 	    nil
 	  1))
-  (message "indent-region/indent-sexp will %sbe automatically fix whitespace." 
+  (message "indent-region/indent-sexp will %sbe automatically fix whitespace."
 	   (if cperl-indent-region-fix-constructs "" "not ")))
 
 ;;;; Tags file creation.
@@ -6527,14 +6731,14 @@ See `cperl-lazy-help-time' too."
   (auto-fill-mode 0)
   (if cperl-use-syntax-table-text-property-for-tags
       (progn
-	(make-variable-buffer-local 'parse-sexp-lookup-properties)
+	(make-local-variable 'parse-sexp-lookup-properties)
 	;; Do not introduce variable if not needed, we check it!
 	(set 'parse-sexp-lookup-properties t))))
 
 (defun cperl-xsub-scan ()
   (require 'cl)
   (require 'imenu)
-  (let ((index-alist '()) 
+  (let ((index-alist '())
 	(prev-pos 0) index index1 name package prefix)
     (goto-char (point-min))
     (if noninteractive
@@ -6548,7 +6752,7 @@ See `cperl-lazy-help-time' too."
 	(or noninteractive
 	    (imenu-progress-message prev-pos))
 	(cond
-	 ((match-beginning 2)	; SECTION
+	 ((match-beginning 2)		; SECTION
 	  (setq package (buffer-substring (match-beginning 2) (match-end 2)))
 	  (goto-char (match-beginning 0))
 	  (skip-chars-forward " \t")
@@ -6581,11 +6785,11 @@ See `cperl-lazy-help-time' too."
 (defvar cperl-unreadable-ok nil)
 
 (defun cperl-find-tags (ifile xs topdir)
-  (let (ind (b (get-buffer cperl-tmp-buffer)) lst elt pos ret rel
-	    (cperl-pod-here-fontify nil) f file)
+  (let ((b (get-buffer cperl-tmp-buffer)) ind lst elt pos ret rel
+	(cperl-pod-here-fontify nil) f file)
     (save-excursion
       (if b (set-buffer b)
-	  (cperl-setup-tmp-buf))
+	(cperl-setup-tmp-buf))
       (erase-buffer)
       (condition-case err
 	  (setq file (car (insert-file-contents ifile)))
@@ -6594,80 +6798,80 @@ See `cperl-lazy-help-time' too."
 		      (format "File %s unreadable.  Continue? " ifile))
 		     (setq cperl-unreadable-ok t)
 		   (error "Aborting: unreadable file %s" ifile)))))
-      (if (not file) 
+      (if (not file)
 	  (message "Unreadable file %s" ifile)
-      (message "Scanning file %s ..." file)
-      (if (and cperl-use-syntax-table-text-property-for-tags
-	       (not xs))
-	  (condition-case err		; after __END__ may have garbage
-	      (cperl-find-pods-heres nil nil noninteractive)
-	    (error (message "While scanning for syntax: %s" err))))
-      (if xs
-	  (setq lst (cperl-xsub-scan))
-	(setq ind (imenu-example--create-perl-index))
-	(setq lst (cdr (assoc "+Unsorted List+..." ind))))
-      (setq lst 
-	    (mapcar 
-	     (function 
-	      (lambda (elt)
-		(cond ((string-match "^[_a-zA-Z]" (car elt))
-		       (goto-char (cdr elt))
-		       (beginning-of-line) ; pos should be of the start of the line
-		       (list (car elt) 
-			     (point) 
-			     (1+ (count-lines 1 (point))) ; 1+ since at beg-o-l
-			     (buffer-substring (progn
-						 (goto-char (cdr elt))
-						 ;; After name now...
-						 (or (eolp) (forward-char 1))
-						 (point))
-					       (progn
-						 (beginning-of-line)
-						 (point))))))))
-		    lst))
-      (erase-buffer)
-      (while lst
-	(setq elt (car lst) lst (cdr lst))
-	(if elt
-	    (progn
-	      (insert (elt elt 3) 
-		      127
-		      (if (string-match "^package " (car elt))
-			  (substring (car elt) 8)
-			(car elt) )
-		      1
-		      (number-to-string (elt elt 2)) ; Line
-		      ","
-		      (number-to-string (1- (elt elt 1))) ; Char pos 0-based
-		      "\n")
-	      (if (and (string-match "^[_a-zA-Z]+::" (car elt))
-		       (string-match "^sub[ \t]+\\([_a-zA-Z]+\\)[^:_a-zA-Z]"
-				     (elt elt 3)))
-		  ;; Need to insert the name without package as well
-		  (setq lst (cons (cons (substring (elt elt 3) 
-						   (match-beginning 1)
-						   (match-end 1))
-					(cdr elt))
-				  lst))))))
-      (setq pos (point))
-      (goto-char 1)
-      (setq rel file)
-      ;; On case-preserving filesystems (EMX on OS/2) case might be encoded in properties
-      (set-text-properties 0 (length rel) nil rel)
-      (and (equal topdir (substring rel 0 (length topdir)))
-	   (setq rel (substring file (length topdir))))
-      (insert "\f\n" rel "," (number-to-string (1- pos)) "\n")
-      (setq ret (buffer-substring 1 (point-max)))
-      (erase-buffer)
-      (or noninteractive
-	  (message "Scanning file %s finished" file))
-      ret))))
+	(message "Scanning file %s ..." file)
+	(if (and cperl-use-syntax-table-text-property-for-tags
+		 (not xs))
+	    (condition-case err		; after __END__ may have garbage
+		(cperl-find-pods-heres nil nil noninteractive)
+	      (error (message "While scanning for syntax: %s" err))))
+	(if xs
+	    (setq lst (cperl-xsub-scan))
+	  (setq ind (cperl-imenu--create-perl-index))
+	  (setq lst (cdr (assoc "+Unsorted List+..." ind))))
+	(setq lst
+	      (mapcar
+	       (function
+		(lambda (elt)
+		  (cond ((string-match "^[_a-zA-Z]" (car elt))
+			 (goto-char (cdr elt))
+			 (beginning-of-line) ; pos should be of the start of the line
+			 (list (car elt)
+			       (point)
+			       (1+ (count-lines 1 (point))) ; 1+ since at beg-o-l
+			       (buffer-substring (progn
+						   (goto-char (cdr elt))
+						   ;; After name now...
+						   (or (eolp) (forward-char 1))
+						   (point))
+						 (progn
+						   (beginning-of-line)
+						   (point))))))))
+	       lst))
+	(erase-buffer)
+	(while lst
+	  (setq elt (car lst) lst (cdr lst))
+	  (if elt
+	      (progn
+		(insert (elt elt 3)
+			127
+			(if (string-match "^package " (car elt))
+			    (substring (car elt) 8)
+			  (car elt) )
+			1
+			(number-to-string (elt elt 2)) ; Line
+			","
+			(number-to-string (1- (elt elt 1))) ; Char pos 0-based
+			"\n")
+		(if (and (string-match "^[_a-zA-Z]+::" (car elt))
+			 (string-match "^sub[ \t]+\\([_a-zA-Z]+\\)[^:_a-zA-Z]"
+				       (elt elt 3)))
+		    ;; Need to insert the name without package as well
+		    (setq lst (cons (cons (substring (elt elt 3) 
+						     (match-beginning 1)
+						     (match-end 1))
+					  (cdr elt))
+				    lst))))))
+	(setq pos (point))
+	(goto-char 1)
+	(setq rel file)
+	;; On case-preserving filesystems (EMX on OS/2) case might be encoded in properties
+	(set-text-properties 0 (length rel) nil rel)
+	(and (equal topdir (substring rel 0 (length topdir)))
+	     (setq rel (substring file (length topdir))))
+	(insert "\f\n" rel "," (number-to-string (1- pos)) "\n")
+	(setq ret (buffer-substring 1 (point-max)))
+	(erase-buffer)
+	(or noninteractive
+	    (message "Scanning file %s finished" file))
+	ret))))
 
 (defun cperl-add-tags-recurse-noxs ()
   "Add to TAGS data for Perl and XSUB 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
 "
   (cperl-write-tags nil nil t t nil t))
 
@@ -6675,7 +6879,7 @@ Use as
   "Add to TAGS file data for 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
 "
   (cperl-write-tags nil nil t t))
 
@@ -6696,7 +6900,7 @@ Use as
 	    ((file-exists-p tags-file-name)
 	     (if cperl-xemacs-p
 		 (visit-tags-table-buffer)
-	      (visit-tags-table-buffer tags-file-name)))
+	       (visit-tags-table-buffer tags-file-name)))
 	    (t (set-buffer (find-file-noselect tags-file-name))))
       (cond
        (dir
@@ -6704,61 +6908,61 @@ Use as
 	      (erase
 	       (erase-buffer)
 	       (setq erase 'ignore)))
-	(let ((files 
+	(let ((files
 	       (condition-case err
-		   (directory-files file t 
+		   (directory-files file t
 				    (if recurse nil cperl-scan-files-regexp)
 				    t)
 		 (error
 		  (if cperl-unreadable-ok nil
 		    (if (y-or-n-p
 			 (format "Directory %s unreadable.  Continue? " file))
-			(setq cperl-unreadable-ok t 
-			      tm nil) ; Return empty list
+			(setq cperl-unreadable-ok t
+			      tm nil)	; Return empty list
 		      (error "Aborting: unreadable directory %s" file)))))))
-	  (mapcar (function (lambda (file)
-			      (cond
-			       ((string-match cperl-noscan-files-regexp file)
-				nil)
-			       ((not (file-directory-p file))
-				(if (string-match cperl-scan-files-regexp file)
-				    (cperl-write-tags file erase recurse nil t noxs topdir)))
-			       ((not recurse) nil)
-			       (t (cperl-write-tags file erase recurse t t noxs topdir)))))
-		  files))
-	)
+	  (mapcar (function 
+		   (lambda (file)
+		     (cond
+		      ((string-match cperl-noscan-files-regexp file)
+		       nil)
+		      ((not (file-directory-p file))
+		       (if (string-match cperl-scan-files-regexp file)
+			   (cperl-write-tags file erase recurse nil t noxs topdir)))
+		      ((not recurse) nil)
+		      (t (cperl-write-tags file erase recurse t t noxs topdir)))))
+		  files)))
        (t
 	(setq xs (string-match "\\.xs$" file))
 	(if (not (and xs noxs))
 	    (progn
 	      (cond ((eq erase 'ignore) (goto-char (point-max)))
-		  (erase (erase-buffer))
-		  (t
-		   (goto-char 1)
-		   (setq rel file)
-		   ;; On case-preserving filesystems (EMX on OS/2) case might be encoded in properties
-		   (set-text-properties 0 (length rel) nil rel)
-		   (and (equal topdir (substring rel 0 (length topdir)))
-			(setq rel (substring file (length topdir))))
-		   (if (search-forward (concat "\f\n" rel ",") nil t)
-		       (progn
-			 (search-backward "\f\n")
-			 (delete-region (point)
-					(save-excursion
-					  (forward-char 1)
-					  (if (search-forward "\f\n" 
-							      nil 'toend)
-					      (- (point) 2)
-					    (point-max)))))
-		     (goto-char (point-max)))))
+		    (erase (erase-buffer))
+		    (t
+		     (goto-char 1)
+		     (setq rel file)
+		     ;; On case-preserving filesystems (EMX on OS/2) case might be encoded in properties
+		     (set-text-properties 0 (length rel) nil rel)
+		     (and (equal topdir (substring rel 0 (length topdir)))
+			  (setq rel (substring file (length topdir))))
+		     (if (search-forward (concat "\f\n" rel ",") nil t)
+			 (progn
+			   (search-backward "\f\n")
+			   (delete-region (point)
+					  (save-excursion
+					    (forward-char 1)
+					    (if (search-forward "\f\n"
+								nil 'toend)
+						(- (point) 2)
+					      (point-max)))))
+		       (goto-char (point-max)))))
 	      (insert (cperl-find-tags file xs topdir))))))
-      (if inbuffer nil		; Delegate to the caller
-	(save-buffer 0)		; No backup
+      (if inbuffer nil			; Delegate to the caller
+	(save-buffer 0)			; No backup
 	(if (fboundp 'initialize-new-tags-table) ; Do we need something special in XEmacs?
 	    (initialize-new-tags-table))))))
 
 (defvar cperl-tags-hier-regexp-list
-  (concat 
+  (concat
    "^\\("
       "\\(package\\)\\>"
      "\\|"
@@ -6770,14 +6974,14 @@ Use as
    "\\)"))
 
 (defvar cperl-hierarchy '(() ())
-  "Global hierarchy of classes")
+  "Global hierarchy of classes.")
 
 (defun cperl-tags-hier-fill ()
   ;; Suppose we are in a tag table cooked by cperl.
   (goto-char 1)
   (let (type pack name pos line chunk ord cons1 file str info fileind)
     (while (re-search-forward cperl-tags-hier-regexp-list nil t)
-      (setq pos (match-beginning 0) 
+      (setq pos (match-beginning 0)
 	    pack (match-beginning 2))
       (beginning-of-line)
       (if (looking-at (concat
@@ -6807,7 +7011,7 @@ Use as
 				    (cdr cons1)))
 	      ;; First occurrence of the name, start alist
 	      (setq cons1 (cons name (list (cons fileind (vector file info)))))
-	      (if pack 
+	      (if pack
 		  (setcar (cdr cperl-hierarchy)
 			  (cons cons1 (nth 1 cperl-hierarchy)))
 		(setcar cperl-hierarchy
@@ -6823,11 +7027,11 @@ One may build such TAGS files from CPerl mode menu."
   (require 'etags)
   (require 'imenu)
   (if (or update (null (nth 2 cperl-hierarchy)))
-      (let (pack name cons1 to l1 l2 l3 l4 b
-		 (remover (function (lambda (elt) ; (name (file1...) (file2..))
-				      (or (nthcdr 2 elt)
-					  ;; Only in one file
-					  (setcdr elt (cdr (nth 1 elt))))))))
+      (let ((remover (function (lambda (elt) ; (name (file1...) (file2..))
+				 (or (nthcdr 2 elt)
+				     ;; Only in one file
+				     (setcdr elt (cdr (nth 1 elt)))))))
+	    pack name cons1 to l1 l2 l3 l4 b)
 	;; (setq cperl-hierarchy '(() () ())) ; Would write into '() later!
 	(setq cperl-hierarchy (list l1 l2 l3))
 	(if cperl-xemacs-p		; Not checked
@@ -6862,14 +7066,17 @@ One may build such TAGS files from CPerl mode menu."
       (error "No items found"))
   (setq update
 ;;;	(imenu-choose-buffer-index "Packages: " (nth 2 cperl-hierarchy))
-	(if window-system
+	(if (if (boundp 'display-popup-menus-p)
+		(let ((f 'display-popup-menus-p))
+		  (funcall f))
+	      window-system)
 	    (x-popup-menu t (nth 2 cperl-hierarchy))
 	  (require 'tmm)
 	  (tmm-prompt (nth 2 cperl-hierarchy))))
   (if (and update (listp update))
       (progn (while (cdr update) (setq update (cdr update)))
 	     (setq update (car update)))) ; Get the last from the list
-  (if (vectorp update) 
+  (if (vectorp update)
       (progn
 	(find-file (elt update 0))
 	(cperl-etags-goto-tag-location (elt update 1))))
@@ -6877,7 +7084,7 @@ One may build such TAGS files from CPerl mode menu."
 
 (defun cperl-tags-treeify (to level)
   ;; cadr of `to' is read-write.  On start it is a cons
-  (let* ((regexp (concat "^\\(" (mapconcat 
+  (let* ((regexp (concat "^\\(" (mapconcat
 				 'identity
 				 (make-list level "[_a-zA-Z0-9]+")
 				 "::")
@@ -6941,16 +7148,15 @@ One may build such TAGS files from CPerl mode menu."
 					       (cdr elt)) 
 					 (cdr to)))))
 	    (if (default-value 'imenu-sort-function)
-		(nreverse 
+		(nreverse
 		 (sort root-packages (default-value 'imenu-sort-function)))
-	      root-packages))
-    ))
+	      root-packages))))
 
 ;;;(x-popup-menu t
-;;;   '(keymap "Name1" 
+;;;   '(keymap "Name1"
 ;;;	    ("Ret1" "aa")
-;;;	    ("Head1" "ab"  
-;;;	     keymap "Name2" 
+;;;	    ("Head1" "ab"
+;;;	     keymap "Name2"
 ;;;	     ("Tail1" "x") ("Tail2" "y"))))
 
 (defun cperl-list-fold (list name limit)
@@ -6958,7 +7164,7 @@ One may build such TAGS files from CPerl mode menu."
     (if (<= (length list) limit) list
       (setq list1 nil list2 nil)
       (while list
-	(setq num (1+ num) 
+	(setq num (1+ num)
 	      elt1 (car list)
 	      list (cdr list))
 	(if (<= num imenu-max-items)
@@ -6974,9 +7180,9 @@ One may build such TAGS files from CPerl mode menu."
 
 (defun cperl-menu-to-keymap (menu &optional name)
   (let (list)
-    (cons 'keymap 
-	  (mapcar 
-	   (function 
+    (cons 'keymap
+	  (mapcar
+	   (function
 	    (lambda (elt)
 	      (cond ((listp (cdr elt))
 		     (setq list (cperl-list-fold
@@ -6991,14 +7197,14 @@ One may build such TAGS files from CPerl mode menu."
 
 (defvar cperl-bad-style-regexp
   (mapconcat 'identity
-   '("[^-\n\t <>=+!.&|(*/'`\"#^][-=+<>!|&^]" ; char sign
-     "[-<>=+^&|]+[^- \t\n=+<>~]"	; sign+ char
-     )
-   "\\|")
+	     '("[^-\n\t <>=+!.&|(*/'`\"#^][-=+<>!|&^]" ; char sign
+	       "[-<>=+^&|]+[^- \t\n=+<>~]") ; sign+ char 
+	     "\\|")
   "Finds places such that insertion of a whitespace may help a lot.")
 
-(defvar cperl-not-bad-style-regexp 
-  (mapconcat 'identity
+(defvar cperl-not-bad-style-regexp
+  (mapconcat 
+   'identity
    '("[^-\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)
@@ -7017,7 +7223,7 @@ One may build such TAGS files from CPerl mode menu."
      "||"
      "&&"
      "[CBIXSLFZ]<\\(\\sw\\|\\s \\|\\s_\\|[\n]\\)*>" ; C<code like text>
-     "-[a-zA-Z_0-9]+[ \t]*=>"			; -option => value
+     "-[a-zA-Z_0-9]+[ \t]*=>"		; -option => value
      ;; Unaddressed trouble spots: = -abc, f(56, -abc) --- specialcased below
      ;;"[*/+-|&<.]+="
      )
@@ -7036,16 +7242,16 @@ Currently it is tuned to C and Perl syntax."
     (setq last-nonmenu-event 13)	; To disable popup
     (beginning-of-buffer)
     (map-y-or-n-p "Insert space here? "
-		  (function (lambda (arg) (insert " ")))
+		  (lambda (arg) (insert " "))
 		  'cperl-next-bad-style
-		  '("location" "locations" "insert a space into") 
+		  '("location" "locations" "insert a space into")
 		  '((?\C-r (lambda (arg)
 			     (let ((buffer-quit-function
 				    'exit-recursive-edit))
 			       (message "Exit with Esc Esc")
 			       (recursive-edit)
 			       t))	; Consider acted upon
-			   "edit, exit with Esc Esc") 
+			   "edit, exit with Esc Esc")
 		    (?e (lambda (arg)
 			  (let ((buffer-quit-function
 				 'exit-recursive-edit))
@@ -7070,7 +7276,7 @@ Currently it is tuned to C and Perl syntax."
 	   (and (eq (following-char) ?\-)
 		(save-excursion
 		  (skip-chars-backward " \t\n")
-		  (memq (preceding-char) '(?\= ?\> ?\< ?\, ?\(, ?\[, ?\{))))
+		  (memq (preceding-char) '(?\= ?\> ?\< ?\, ?\( ?\[ ?\{))))
 	   ;; Now check for syntax type
 	   (save-match-data
 	     (setq found (point))
@@ -7083,27 +7289,26 @@ Currently it is tuned to C and Perl syntax."
 	      found-bad found)))
     (not not-found)))
 
+
 ;;; Getting help
-(defvar cperl-have-help-regexp 
+(defvar cperl-have-help-regexp
   ;;(concat "\\("
   (mapconcat
    'identity
-   '("[$@%*&][0-9a-zA-Z_:]+\\([ \t]*[[{]\\)?"		; Usual variable
+   '("[$@%*&][0-9a-zA-Z_:]+\\([ \t]*[[{]\\)?" ; Usual variable
      "[$@]\\^[a-zA-Z]"			; Special variable
      "[$@][^ \n\t]"			; Special variable
      "-[a-zA-Z]"			; File test
      "\\\\[a-zA-Z0]"			; Special chars
-     "^=[a-z][a-zA-Z0-9_]*"		; Pod sections
+     "^=[a-z][a-zA-Z0-9_]*"		; POD sections
      "[-!&*+,-./<=>?\\\\^|~]+"		; Operator
      "[a-zA-Z_0-9:]+"			; symbol or number
      "x="
-     "#!"
-     )
+     "#!")
    ;;"\\)\\|\\("
-   "\\|"
-   )
-	  ;;"\\)"
-	  ;;)
+   "\\|")
+  ;;"\\)"
+  ;;)
   "Matches places in the buffer we can find help for.")
 
 (defvar cperl-message-on-help-error t)
@@ -7113,7 +7318,7 @@ Currently it is tuned to C and Perl syntax."
   ;; Does not save-excursion
   ;; Get to the something meaningful
   (or (eobp) (eolp) (forward-char 1))
-  (re-search-backward "[-a-zA-Z0-9_:!&*+,-./<=>?\\\\^|~$%@]" 
+  (re-search-backward "[-a-zA-Z0-9_:!&*+,-./<=>?\\\\^|~$%@]"
 		      (save-excursion (beginning-of-line) (point))
 		      'to-beg)
   ;;  (cond
@@ -7124,7 +7329,7 @@ Currently it is tuned to C and Perl syntax."
   (cond
    ((looking-at "[a-zA-Z0-9_:]")	; symbol
     (skip-chars-backward "a-zA-Z0-9_:")
-    (cond 
+    (cond
      ((and (eq (preceding-char) ?^)	; $^I
 	   (eq (char-after (- (point) 2)) ?\$))
       (forward-char -2))
@@ -7178,7 +7383,7 @@ than a line.  Your contribution to update/shorten it is appreciated."
 		nil
 	      (cperl-describe-perl-symbol word))
 	  (if cperl-message-on-help-error
-	      (message "Nothing found for %s..." 
+	      (message "Nothing found for %s..."
 		       (buffer-substring (point) (min (+ 5 (point)) (point-max))))))))))
 
 ;;; Stolen from perl-descr.el by Johan Vromans:
@@ -7191,25 +7396,25 @@ than a line.  Your contribution to update/shorten it is appreciated."
   (let ((enable-recursive-minibuffers t)
 	args-file regexp)
     (cond
-	((string-match "^[&*][a-zA-Z_]" val)
-	 (setq val (concat (substring val 0 1) "NAME")))
-	((string-match "^[$@]\\([a-zA-Z_:0-9]+\\)[ \t]*\\[" val)
-	 (setq val (concat "@" (substring val 1 (match-end 1)))))
-	((string-match "^[$@]\\([a-zA-Z_:0-9]+\\)[ \t]*{" val)
-	 (setq val (concat "%" (substring val 1 (match-end 1)))))
-	((and (string= val "x") (string-match "^x=" val))
-	 (setq val "x="))
-	((string-match "^\\$[\C-a-\C-z]" val)
-	 (setq val (concat "$^" (char-to-string (+ ?A -1 (aref val 1))))))
-        ((string-match "^CORE::" val)
-	 (setq val "CORE::"))
-        ((string-match "^SUPER::" val)
-	 (setq val "SUPER::"))
-	((and (string= "<" val) (string-match "^<\\$?[a-zA-Z0-9_:]+>" val))
-	 (setq val "<NAME>")))
-    (setq regexp (concat "^" 
+     ((string-match "^[&*][a-zA-Z_]" val)
+      (setq val (concat (substring val 0 1) "NAME")))
+     ((string-match "^[$@]\\([a-zA-Z_:0-9]+\\)[ \t]*\\[" val)
+      (setq val (concat "@" (substring val 1 (match-end 1)))))
+     ((string-match "^[$@]\\([a-zA-Z_:0-9]+\\)[ \t]*{" val)
+      (setq val (concat "%" (substring val 1 (match-end 1)))))
+     ((and (string= val "x") (string-match "^x=" val))
+      (setq val "x="))
+     ((string-match "^\\$[\C-a-\C-z]" val)
+      (setq val (concat "$^" (char-to-string (+ ?A -1 (aref val 1))))))
+     ((string-match "^CORE::" val)
+      (setq val "CORE::"))
+     ((string-match "^SUPER::" val)
+      (setq val "SUPER::"))
+     ((and (string= "<" val) (string-match "^<\\$?[a-zA-Z0-9_:]+>" val))
+      (setq val "<NAME>")))
+    (setq regexp (concat "^"
 			 "\\([^a-zA-Z0-9_:]+[ \t]+\\)?"
-			 (regexp-quote val) 
+			 (regexp-quote val)
 			 "\\([ \t([/]\\|$\\)"))
 
     ;; get the buffer with the documentation text
@@ -7218,7 +7423,7 @@ than a line.  Your contribution to update/shorten it is appreciated."
     ;; lookup in the doc
     (goto-char (point-min))
     (let ((case-fold-search nil))
-      (list 
+      (list
        (if (re-search-forward regexp (point-max) t)
 	   (save-excursion
 	     (beginning-of-line 1)
@@ -7228,15 +7433,16 @@ than a line.  Your contribution to update/shorten it is appreciated."
 	 (if cperl-message-on-help-error
 	     (message "No definition for %s" val)))))))
 
-(defvar cperl-short-docs "Ignore my value"
+(defvar cperl-short-docs 'please-ignore-this-line
   ;; Perl4 version was written by Johan Vromans (jvromans@squirrel.nl)
   "# based on '@(#)@ perl-descr.el 1.9 - describe-perl-symbol' [Perl 5]
-! ...	Logical negation.	
+...	Range (list context); flip/flop [no flop when flip] (scalar context).
+! ...	Logical negation.
 ... != ...	Numeric inequality.
 ... !~ ...	Search pattern, substitution, or translation (negated).
 $!	In numeric context: errno.  In a string context: error string.
 $\"	The separator which joins elements of arrays interpolated in strings.
-$#	The output format for printed numbers.  Initial value is %.15g or close.
+$#	The output format for printed numbers.  Default is %.15g or close.
 $$	Process number of this script.  Changes in the fork()ed child process.
 $%	The current page number of the currently selected output channel.
 
@@ -7263,7 +7469,7 @@ $,	The output field separator for the print operator.
 $-	The number of lines left on the page.
 $.	The current input line number of the last filehandle that was read.
 $/	The input record separator, newline by default.
-$0	Name of the file containing the perl script being executed.  May be set.
+$0	Name of the file containing the current perl script (read/write).
 $:     String may be broken after these characters to fill ^-lines in a format.
 $;	Subscript separator for multi-dim array emulation.  Default \"\\034\".
 $<	The real uid of this process.
@@ -7290,7 +7496,7 @@ $^T	The time the script was started.  Used by -A/-M/-C file tests.
 $^W	True if warnings are requested (perl -w flag).
 $^X	The name under which perl was invoked (argv[0] in C-speech).
 $_	The default input and pattern-searching space.
-$|	Auto-flush after write/print on current output channel?  Default 0. 
+$|	Auto-flush after write/print on current output channel?  Default 0.
 $~	The name of the current report format.
 ... % ...	Modulo division.
 ... %= ...	Modulo division assignment.
@@ -7340,12 +7546,12 @@ $~	The name of the current report format.
 -x	File is executable by effective uid.
 -z	File has zero size.
 .	Concatenate strings.
-..	Alternation, also range operator.
+..	Range (list context); flip/flop (scalar context) operator.
 .=	Concatenate assignment strings
 ... / ...	Division.	/PATTERN/ioxsmg	Pattern match
 ... /= ...	Division assignment.
 /PATTERN/ioxsmg	Pattern match.
-... < ...	Numeric less than.	<pattern>	Glob.	See <NAME>, <> as well.
+... < ...    Numeric less than.	<pattern>	Glob.	See <NAME>, <> as well.
 <NAME>	Reads line from filehandle NAME (a bareword or dollar-bareword).
 <pattern>	Glob (Unless pattern is bareword/dollar-bareword - see <NAME>).
 <>	Reads line from union of files in @ARGV (= command line) and STDIN.
@@ -7363,7 +7569,7 @@ $~	The name of the current report format.
 ?PATTERN?	One-time pattern match.
 @ARGV	Command line arguments (not including the command name - see $0).
 @INC	List of places to look for perl scripts during do/include/use.
-@_	Parameter array for subroutines.  Also used by split unless in list context.
+@_    Parameter array for subroutines; result of split() unless in list context.
 \\  Creates reference to what follows, like \$var, or quotes non-\w in strings.
 \\0	Octal char, e.g. \\033.
 \\E	Case modification terminator.  See \\Q, \\L, and \\U.
@@ -7614,7 +7820,7 @@ chomp [LIST]	Strips $/ off LIST/$_.  Returns count.  Special if $/ eq ''!
 chr		Converts a number to char with the same ordinal.
 else		Part of if/unless {BLOCK} elsif {BLOCK} else {BLOCK}.
 elsif		Part of if/unless {BLOCK} elsif {BLOCK} else {BLOCK}.
-exists	$HASH{KEY}	True if the key exists.
+exists $HASH{KEY}	True if the key exists.
 format [NAME] =	 Start of output format.  Ended by a single dot (.) on a line.
 formline PICTURE, LIST	Backdoor into \"format\" processing.
 glob EXPR	Synonym of <EXPR>.
@@ -7692,7 +7898,7 @@ prototype \&SUB	Returns prototype of the function given a reference.
     (goto-char e)
     (beginning-of-line)
     (if (re-search-forward "[^ \t]" e t)
-	(progn				; Something before the ending delimiter
+	(progn			       ; Something before the ending delimiter
 	  (goto-char e)
 	  (delete-horizontal-space)
 	  (insert "\n")
@@ -7709,7 +7915,7 @@ prototype \&SUB	Returns prototype of the function given a reference.
       (indent-to-column c1)
       (while (and
 	      inline
-	      (looking-at 
+	      (looking-at
 	       (concat "\\([a-zA-Z0-9]+[^*+{?]\\)" ; 1 word
 		       "\\|"		; Embedded variable
 		       "\\$\\([a-zA-Z0-9_]+\\([[{]\\)?\\|[^\n \t)|]\\)" ; 2 3
@@ -7722,8 +7928,7 @@ prototype \&SUB	Returns prototype of the function given a reference.
 		       "\\|"		; Grouping
 		       "\\((\\(\\?\\)?\\)" ; 7 8
 		       "\\|"		; |
-		       "\\(|\\)"	; 9
-		       )))
+		       "\\(|\\)")))	; 9
 	(goto-char (match-end 0))
 	(setq spaces t)
 	(cond ((match-beginning 1)	; Alphanum word + junk
@@ -7770,7 +7975,7 @@ prototype \&SUB	Returns prototype of the function given a reference.
 	       (set-marker m1 (point))
 	       (if (= level 1)
 		   (if (progn		; indent rigidly if multiline
-			 ;; In fact does not make a lot of sense, since 
+			 ;; In fact does not make a lot of sense, since
 			 ;; the starting position can be already lost due
 			 ;; to insertion of "\n" and " "
 			 (goto-char tmp)
@@ -7833,20 +8038,19 @@ prototype \&SUB	Returns prototype of the function given a reference.
 	    (not spaces)
 	    (insert " "))
 	(skip-chars-forward " \t"))
-	(or (looking-at "[#\n]")
-	    (error "unknown code \"%s\" in a regexp"
-		   (buffer-substring (point) (1+ (point)))))
-	(and inline (end-of-line 2)))
+      (or (looking-at "[#\n]")
+	  (error "Unknown code `%s' in a regexp"
+		 (buffer-substring (point) (1+ (point)))))
+      (and inline (end-of-line 2)))
     ;; Special-case the last line of group
     (if (and (>= (point) (marker-position e))
 	     (/= (current-indentation) c))
 	(progn
-	 (beginning-of-line)
-	 (setq s (point))
-	 (skip-chars-forward " \t")
-	 (delete-region s (point))
-	 (indent-to-column c)))
-  ))
+	  (beginning-of-line)
+	  (setq s (point))
+	  (skip-chars-forward " \t")
+	  (delete-region s (point))
+	  (indent-to-column c)))))
 
 (defun cperl-make-regexp-x ()
   ;; Returns position of the start
@@ -7859,7 +8063,7 @@ prototype \&SUB	Returns prototype of the function given a reference.
 	nil				; good already
       (if (looking-at "\\([smy]\\|qr\\)\\s|")
 	  (forward-char 1)
-	(re-search-backward "\\s|")))		; Assume it is scanned already.
+	(re-search-backward "\\s|")))	; Assume it is scanned already.
     ;;(forward-char 1)
     (let ((b (point)) (e (make-marker)) have-x delim (c (current-column))
 	  (sub-p (eq (preceding-char) ?s)) s)
@@ -7869,7 +8073,7 @@ prototype \&SUB	Returns prototype of the function given a reference.
       (if (and sub-p (eq delim (char-after (- (point) 2))))
 	  (error "Possible s/blah// - do not know how to deal with"))
       (if sub-p (forward-sexp 1))
-      (if (looking-at "\\sw*x") 
+      (if (looking-at "\\sw*x")
 	  (setq have-x t)
 	(insert "x"))
       ;; Protect fragile " ", "#"
@@ -7882,12 +8086,10 @@ prototype \&SUB	Returns prototype of the function given a reference.
       b)))
 
 (defun cperl-beautify-regexp (&optional deep)
-  "do it.  (Experimental, may change semantics, recheck the result.)
+  "Do it.  (Experimental, may change semantics, recheck the result.)
 We suppose that the regexp is scanned already."
   (interactive "P")
-  (if deep
-      (prefix-numeric-value deep)
-    (setq deep -1))
+  (setq deep (if deep (prefix-numeric-value deep) -1))
   (save-excursion
     (goto-char (cperl-make-regexp-x))
     (let ((b (point)) (e (make-marker)))
@@ -7916,23 +8118,23 @@ We suppose that the regexp is scanned already."
 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)
-      (forward-sexp 1)
-      (set-marker e (1- (point)))
-      (goto-char b)
-      (while (re-search-forward "\\(#\\)\\|\n" e 'to-end)
-	(cond 
-	 ((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))
-	 (t
-	  (delete-char -1)
-	  (just-one-space))))))
+  (cperl-regext-to-level-start)
+  (let ((b (point)) (e (make-marker)) s c)
+    (forward-sexp 1)
+    (set-marker e (1- (point)))
+    (goto-char b)
+    (while (re-search-forward "\\(#\\)\\|\n" e 'to-end)
+      (cond
+       ((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))
+       (t
+	(delete-char -1)
+	(just-one-space))))))
 
 (defun cperl-contract-levels ()
   "Find an enclosing group in regexp and contract all the kids.
@@ -7949,7 +8151,7 @@ We suppose that the regexp is scanned already."
       (set-marker e (1- (point)))
       (goto-char (1+ b))
       (while (re-search-forward "\\(\\\\\\\\\\)\\|(" e t)
-	(cond 
+	(cond
 	 ((match-beginning 1)		; Skip
 	  nil)
 	 (t				; Group
@@ -7960,9 +8162,7 @@ We suppose that the regexp is scanned already."
 \(Experimental, may change semantics, recheck the result.)
 We suppose that the regexp is scanned already."
   (interactive "P")
-  (if deep
-      (prefix-numeric-value deep)
-    (setq deep -1))
+  (setq deep (if deep (prefix-numeric-value deep) -1))
   (save-excursion
     (cperl-regext-to-level-start)
     (let ((b (point)) (e (make-marker)))
@@ -7974,7 +8174,7 @@ We suppose that the regexp is scanned already."
   "Change `if (A) {B}' into `B if A;' etc if possible."
   (interactive)
   (or (looking-at "\\<")
-	(forward-sexp -1))
+      (forward-sexp -1))
   (if (looking-at "\\<\\(if\\|unless\\|while\\|until\\|for\\|foreach\\)\\>")
       (let ((pos1 (point))
 	    pos2 pos3 pos4 pos5 s1 s2 state p pos45
@@ -8014,7 +8214,7 @@ We suppose that the regexp is scanned already."
 		      (setq p (match-beginning 0)
 			    s1 (buffer-substring p (match-end 0))
 			    state (parse-partial-sexp pos4 p))
-		      (or (nth 3 state) 
+		      (or (nth 3 state)
 			  (nth 4 state)
 			  (nth 5 state)
 			  (error "`%s' inside `%s' BLOCK" s1 s0))
@@ -8054,7 +8254,7 @@ We suppose that the regexp is scanned already."
 		    (cperl-indent-line))
 		(error "`%s' (EXPR) not with an {BLOCK}" s0)))
 	  (error "`%s' not with an (EXPR)" s0)))
-    (error "Not at `if', `unless', `while', `unless', `for' or `foreach'")))
+    (error "Not at `if', `unless', `while', `until', `for' or `foreach'")))
 
 ;;; By Anthony Foiani <afoiani@uswest.com>
 ;;; Getting help on modules in C-h f ?
@@ -8074,15 +8274,22 @@ We suppose that the regexp is scanned already."
                    (error "No perldoc args given")
                  default-entry)
              input))))
-  (let* ((is-func (and 
+  (require 'man)
+  (let* ((case-fold-search nil)
+	 (is-func (and
 		   (string-match "^[a-z]+$" word)
 		   (string-match (concat "^" word "\\>")
 				 (documentation-property
 				  'cperl-short-docs
 				  'variable-documentation))))
 	 (manual-program (if is-func "perldoc -f" "perldoc")))
-    (require 'man)
-    (Man-getpage-in-background word)))
+    (cond
+     (cperl-xemacs-p
+      (let ((Manual-program "perldoc")
+	    (Manual-switches (if is-func (list "-f"))))
+	(manual-entry word)))
+     (t
+      (Man-getpage-in-background word)))))
 
 (defun cperl-perldoc-at-point ()
   "Run a `perldoc' on the word around point."
@@ -8112,6 +8319,19 @@ We suppose that the regexp is scanned already."
                         (format (cperl-pod2man-build-command) pod2man-args))
          'Man-bgproc-sentinel)))))
 
+;;; Updated version by him too
+(defun cperl-build-manpage ()
+  "Create a virtual manpage in Emacs from the POD in the file."
+  (interactive)
+  (require 'man)
+  (cond
+   (cperl-xemacs-p
+    (let ((Manual-program "perldoc"))
+      (manual-entry buffer-file-name)))
+   (t
+    (let* ((manual-program "perldoc"))
+      (Man-getpage-in-background buffer-file-name)))))
+
 (defun cperl-pod2man-build-command ()
   "Builds the entire background manpage and cleaning command."
   (let ((command (concat pod2man-program " %s 2>/dev/null"))
@@ -8130,6 +8350,7 @@ We suppose that the regexp is scanned already."
     command))
 
 (defun cperl-lazy-install ())		; Avoid a warning
+(defun cperl-lazy-unstall ())		; Avoid a warning
 
 (if (fboundp 'run-with-idle-timer)
     (progn
@@ -8140,19 +8361,23 @@ We suppose that the regexp is scanned already."
 	"Non-nil means that the lazy-help handlers are installed now.")
 
       (defun cperl-lazy-install ()
+	"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)
 	(if (and (cperl-val 'cperl-lazy-help-time)
 		 (not cperl-lazy-installed))
 	    (progn
 	      (add-hook 'post-command-hook 'cperl-lazy-hook)
-	      (run-with-idle-timer 
-	       (cperl-val 'cperl-lazy-help-time 1000000 5) 
-	       t 
+	      (run-with-idle-timer
+	       (cperl-val 'cperl-lazy-help-time 1000000 5)
+	       t
 	       'cperl-get-help-defer)
 	      (setq cperl-lazy-installed t))))
 
       (defun cperl-lazy-unstall ()
+	"Switches off Auto-Help on Perl constructs (put in the message area).
+Delay of auto-help controlled by `cperl-lazy-help-time'."
 	(interactive)
 	(remove-hook 'post-command-hook 'cperl-lazy-hook)
 	(cancel-function-timers 'cperl-get-help-defer)
@@ -8162,7 +8387,7 @@ We suppose that the regexp is scanned already."
 	(setq cperl-help-shown nil))
 
       (defun cperl-get-help-defer ()
-	(if (not (eq major-mode 'perl-mode)) nil
+	(if (not (memq major-mode '(perl-mode cperl-mode))) nil
 	  (let ((cperl-message-on-help-error nil) (cperl-help-from-timer t))
 	    (cperl-get-help)
 	    (setq cperl-help-shown t))))
@@ -8184,8 +8409,9 @@ We suppose that the regexp is scanned already."
 (defun cperl-fontify-syntaxically (end)
   ;; Some vars for debugging only
   ;; (message "Syntaxifying...")
-  (let (start (dbg (point)) (iend end) 
-	(istate (car cperl-syntax-state)))
+  (let ((dbg (point)) (iend end)
+	(istate (car cperl-syntax-state))
+	start)
     (and cperl-syntaxify-unwind
 	 (setq end (cperl-unwind-to-safe t end)))
     (setq start (point))
@@ -8202,10 +8428,10 @@ We suppose that the regexp is scanned already."
 	 (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 
-		 istate (car cperl-syntax-state))) ; For debugging 
+	(message "Syntaxified %s..%s from %s to %s(%s), state %s-->%s"
+		 dbg iend
+		 start end cperl-syntax-done-to
+		 istate (car cperl-syntax-state))) ; For debugging
     nil))				; Do not iterate
 
 (defun cperl-fontify-update (end)
@@ -8215,7 +8441,7 @@ We suppose that the regexp is scanned already."
       (setq 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
+  nil)					; Do not iterate
 
 (defun cperl-update-syntaxification (from to)
   (if (and cperl-use-syntax-table-text-property
@@ -8227,8 +8453,8 @@ We suppose that the regexp is scanned already."
 	  (goto-char from)
 	  (cperl-fontify-syntaxically to)))))
 
-(defvar cperl-version 
-  (let ((v  "$Revision: 4.32 $"))
+(defvar cperl-version
+  (let ((v  "$Revision: 5.0 $"))
     (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.")