Merged from emacs@sv.gnu.org

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

11 files changed, 3857 insertions, 1912 deletions

diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 1b62774a72d..b70fe58b543 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -85,6 +85,12 @@ This includes those for cfservd as well as cfagent."))
     ;; File, acl &c in group:   { token ... }
     ("{[ \t]*\\([^ \t\n]+\\)" 1 font-lock-constant-face)))
 
+(defconst cfengine-font-lock-syntactic-keywords
+  ;; In the main syntax-table, backslash is marked as a punctuation, because
+  ;; of its use in DOS-style directory separators.  Here we try to recognize
+  ;; the cases where backslash is used as an escape inside strings.
+  '(("\\(\\(?:\\\\\\)+\\)\"" . "\\")))
+
 (defvar cfengine-imenu-expression
   `((nil ,(concat "^[ \t]*" (eval-when-compile
                               (regexp-opt cfengine-actions t))
@@ -218,7 +224,7 @@ to the action header."
   ;; variable substitution:
   (modify-syntax-entry ?$ "." cfengine-mode-syntax-table)
   ;; Doze path separators:
-  (modify-syntax-entry ?\\ "_" cfengine-mode-syntax-table)
+  (modify-syntax-entry ?\\ "." cfengine-mode-syntax-table)
   ;; Otherwise, syntax defaults seem OK to give reasonable word
   ;; movement.
 
@@ -237,7 +243,9 @@ to the action header."
   ;; functions in evaluated classes to string syntax, and then obey
   ;; syntax properties.
   (setq font-lock-defaults
-        '(cfengine-font-lock-keywords nil nil nil beginning-of-line))
+        '(cfengine-font-lock-keywords nil nil nil beginning-of-line
+          (font-lock-syntactic-keywords
+           . cfengine-font-lock-syntactic-keywords)))
   (setq imenu-generic-expression cfengine-imenu-expression)
   (set (make-local-variable 'beginning-of-defun-function)
        #'cfengine-beginning-of-defun)
@@ -249,5 +257,5 @@ to the action header."
 
 (provide 'cfengine)
 
-;;; arch-tag: 6b931be2-1505-4124-afa6-9675971e26d4
+;; arch-tag: 6b931be2-1505-4124-afa6-9675971e26d4
 ;;; cfengine.el ends here
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index e8c09113d39..7d9ce41229c 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -218,10 +218,6 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
      nil 1 nil 2 0
      (2 (compilation-face '(3))))
 
-    (gcc-include
-     "^\\(?:In file included\\|                \\) from \
-\\(.+\\):\\([0-9]+\\)\\(?:\\(:\\)\\|\\(,\\)\\)?" 1 2 nil (3 . 4))
-
     (gnu
      ;; I have no idea what this first line is supposed to match, but it
      ;; makes things ambiguous with output such as "foo:344:50:blabla" since
@@ -233,7 +229,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
      ;; the last line tries to rule out message where the info after the
      ;; line number starts with "SS".  --Stef
      "^\\(?:[[:alpha:]][-[:alnum:].]+: ?\\)?\
-\\([0-9]*[^0-9\n].*?\\): ?\
+\\([0-9]*[^0-9\n]\\(?:[^\n ]\\| [^-\n]\\)*?\\): ?\
 \\([0-9]+\\)\\(?:\\([.:]\\)\\([0-9]+\\)\\)?\
 \\(?:-\\([0-9]+\\)?\\(?:\\3\\([0-9]+\\)\\)?\\)?:\
 \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\
@@ -241,6 +237,12 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
 \[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)"
      1 (2 . 5) (4 . 6) (7 . 8))
 
+    ;; The `gnu' style above can incorrectly match gcc's "In file
+    ;; included from" message, so we process that first. -- cyd
+    (gcc-include
+     "^\\(?:In file included\\|                \\) from \
+\\(.+\\):\\([0-9]+\\)\\(?:\\(:\\)\\|\\(,\\)\\)?" 1 2 nil (3 . 4))
+
     (lcc
      "^\\(?:E\\|\\(W\\)\\), \\([^(\n]+\\)(\\([0-9]+\\),[ \t]*\\([0-9]+\\)"
      2 3 4 (1))
@@ -623,7 +625,7 @@ Faces `compilation-error-face', `compilation-warning-face',
                    (cons (match-string-no-properties idx) dir))
       mouse-face highlight
       keymap compilation-button-map
-      help-echo "mouse-2: visit current directory")))
+      help-echo "mouse-2: visit this directory")))
 
 ;; Data type `reverse-ordered-alist' retriever.  This function retrieves the
 ;; KEY element from the ALIST, creating it in the right position if not already
@@ -1066,7 +1068,8 @@ Returns the compilation buffer created."
                               (window-width))))
               ;; Set the EMACS variable, but
               ;; don't override users' setting of $EMACS.
-              (unless (getenv "EMACS") '("EMACS=t"))
+              (unless (getenv "EMACS")
+                (list (concat "EMACS=" invocation-directory invocation-name)))
               (copy-sequence process-environment))))
         (set (make-local-variable 'compilation-arguments)
              (list command mode name-function highlight-regexp))
@@ -1781,17 +1784,31 @@ and overlay is highlighted between MK and END-MK."
                                 (current-buffer)))
               (move-overlay compilation-highlight-overlay
                             (point) end (current-buffer)))
-            (if (numberp next-error-highlight)
-                (setq next-error-highlight-timer
-                      (run-at-time next-error-highlight nil 'delete-overlay
-                                   compilation-highlight-overlay)))
-            (if (not (or (eq next-error-highlight t)
-                         (numberp next-error-highlight)))
-                (delete-overlay compilation-highlight-overlay))))))
+            (if (or (eq next-error-highlight t)
+                    (numberp next-error-highlight))
+                ;; We want highlighting: delete overlay on next input.
+                (add-hook 'pre-command-hook
+                          'compilation-goto-locus-delete-o)
+              ;; We don't want highlighting: delete overlay now.
+              (delete-overlay compilation-highlight-overlay))
+            ;; We want highlighting for a limited time:
+            ;; set up a timer to delete it.
+            (when (numberp next-error-highlight)
+              (setq next-error-highlight-timer
+                    (run-at-time next-error-highlight nil
+                                 'compilation-goto-locus-delete-o)))))))
     (when (and (eq next-error-highlight 'fringe-arrow))
+      ;; We want a fringe arrow (instead of highlighting).
       (setq next-error-overlay-arrow-position
             (copy-marker (line-beginning-position))))))
 
+(defun compilation-goto-locus-delete-o ()
+  (delete-overlay compilation-highlight-overlay)
+  ;; Get rid of timer and hook that would try to do this again.
+  (if (timerp next-error-highlight-timer)
+      (cancel-timer next-error-highlight-timer))
+  (remove-hook 'pre-command-hook
+               'compilation-goto-locus-delete-o))
 
 (defun compilation-find-file (marker filename directory &rest formats)
   "Find a buffer for file FILENAME.
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index ad44753f352..3264e0e72f6 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -5,7 +5,7 @@
 ;;     Free Software Foundation, Inc.
 
 ;; Author: Ilya Zakharevich and Bob Olson
-;; Maintainer: Ilya Zakharevich <cperl@ilyaz.org>
+;; Maintainer: Ilya Zakharevich <ilyaz@cpan.org>
 ;; Keywords: languages, Perl
 
 ;; This file is part of GNU Emacs.
@@ -25,7 +25,7 @@
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 
-;;; Corrections made by Ilya Zakharevich cperl@ilyaz.org
+;;; Corrections made by Ilya Zakharevich ilyaz@cpan.org
 
 ;;; Commentary:
 
@@ -67,67 +67,89 @@
 ;; likewise with m, tr, y, q, qX instead of s
 
 ;;; Code:
-
+
 (defvar vc-rcs-header)
 (defvar vc-sccs-header)
 
-;; Some macros are needed for `defcustom'
 (eval-when-compile
-  (condition-case nil
-      (require 'man)
-    (error nil))
-  (defconst cperl-xemacs-p (string-match "XEmacs\\|Lucid" emacs-version))
-  (defvar cperl-can-font-lock
-    (or cperl-xemacs-p
-        (and (boundp 'emacs-major-version)
-                (or window-system
-                    (> emacs-major-version 20)))))
-  (if cperl-can-font-lock
-      (require 'font-lock))
-  (defvar msb-menu-cond)
-  (defvar gud-perldb-history)
-  (defvar font-lock-background-mode)    ; not in Emacs
-  (defvar font-lock-display-type)       ; ditto
-  (defmacro cperl-is-face (arg)         ; Takes quoted arg
-    (cond ((fboundp 'find-face)
-           `(find-face ,arg))
-          (;;(and (fboundp 'face-list)
-           ;;   (face-list))
-           (fboundp 'face-list)
-           `(member ,arg (and (fboundp 'face-list)
-                              (face-list))))
-          (t
-           `(boundp ,arg))))
-  (defmacro cperl-make-face (arg descr) ; Takes unquoted arg
-    (cond ((fboundp 'make-face)
-           `(make-face (quote ,arg)))
-          (t
-           `(defvar ,arg (quote ,arg) ,descr))))
-  (defmacro cperl-force-face (arg descr) ; Takes unquoted arg
-    `(progn
-       (or (cperl-is-face (quote ,arg))
-           (cperl-make-face ,arg ,descr))
-       (or (boundp (quote ,arg))        ; We use unquoted variants too
-           (defvar ,arg (quote ,arg) ,descr))))
-  (if cperl-xemacs-p
-      (defmacro cperl-etags-snarf-tag (file line)
-        `(progn
-           (beginning-of-line 2)
-           (list ,file ,line)))
-    (defmacro cperl-etags-snarf-tag (file line)
-      `(etags-snarf-tag)))
-  (if cperl-xemacs-p
-      (defmacro cperl-etags-goto-tag-location (elt)
-        ;;(progn
-        ;; (switch-to-buffer (get-file-buffer (elt (, elt) 0)))
-        ;; (set-buffer (get-file-buffer (elt (, elt) 0)))
-        ;; Probably will not work due to some save-excursion???
-        ;; Or save-file-position?
-        ;; (message "Did I get to line %s?" (elt (, elt) 1))
-        `(goto-line (string-to-number (elt ,elt 1))))
-    ;;)
-    (defmacro cperl-etags-goto-tag-location (elt)
-      `(etags-goto-tag-location ,elt))))
+      (condition-case nil
+          (require 'custom)
+        (error nil))
+      (condition-case nil
+          (require 'man)
+        (error nil))
+      (defconst cperl-xemacs-p (string-match "XEmacs\\|Lucid" emacs-version))
+      (defvar cperl-can-font-lock
+        (or cperl-xemacs-p
+            (and (boundp 'emacs-major-version)
+                 (or window-system
+                     (> emacs-major-version 20)))))
+      (if cperl-can-font-lock
+          (require 'font-lock))
+      (defvar msb-menu-cond)
+      (defvar gud-perldb-history)
+      (defvar font-lock-background-mode) ; not in Emacs
+      (defvar font-lock-display-type)   ; ditto
+      (defvar paren-backwards-message)  ; Not in newer XEmacs?
+      (or (fboundp 'defgroup)
+          (defmacro defgroup (name val doc &rest arr)
+            nil))
+      (or (fboundp 'custom-declare-variable)
+          (defmacro defcustom (name val doc &rest arr)
+            (` (defvar (, name) (, val) (, doc)))))
+      (or (and (fboundp 'custom-declare-variable)
+               (string< "19.31" emacs-version)) ;  Checked with 19.30: defface does not work
+          (defmacro defface (&rest arr)
+            nil))
+      ;; Avoid warning (tmp definitions)
+      (or (fboundp 'x-color-defined-p)
+          (defmacro x-color-defined-p (col)
+            (cond ((fboundp 'color-defined-p) (` (color-defined-p (, col))))
+                  ;; XEmacs >= 19.12
+                  ((fboundp 'valid-color-name-p) (` (valid-color-name-p (, col))))
+                  ;; XEmacs 19.11
+                  ((fboundp 'x-valid-color-name-p) (` (x-valid-color-name-p (, col))))
+                  (t '(error "Cannot implement color-defined-p")))))
+      (defmacro cperl-is-face (arg)     ; Takes quoted arg
+        (cond ((fboundp 'find-face)
+               (` (find-face (, arg))))
+              (;;(and (fboundp 'face-list)
+               ;;       (face-list))
+               (fboundp 'face-list)
+               (` (member (, arg) (and (fboundp 'face-list)
+                                       (face-list)))))
+              (t
+               (` (boundp (, arg))))))
+      (defmacro cperl-make-face (arg descr) ; Takes unquoted arg
+        (cond ((fboundp 'make-face)
+               (` (make-face (quote (, arg)))))
+              (t
+               (` (defvar (, arg) (quote (, arg)) (, descr))))))
+      (defmacro cperl-force-face (arg descr) ; Takes unquoted arg
+        (` (progn
+             (or (cperl-is-face (quote (, arg)))
+                 (cperl-make-face (, arg) (, descr)))
+             (or (boundp (quote (, arg))) ; We use unquoted variants too
+                 (defvar (, arg) (quote (, arg)) (, descr))))))
+      (if cperl-xemacs-p
+          (defmacro cperl-etags-snarf-tag (file line)
+            (` (progn
+                 (beginning-of-line 2)
+                 (list (, file) (, line)))))
+        (defmacro cperl-etags-snarf-tag (file line)
+          (` (etags-snarf-tag))))
+      (if cperl-xemacs-p
+          (defmacro cperl-etags-goto-tag-location (elt)
+            (`;;(progn
+             ;; (switch-to-buffer (get-file-buffer (elt (, elt) 0)))
+             ;; (set-buffer (get-file-buffer (elt (, elt) 0)))
+             ;; Probably will not work due to some save-excursion???
+             ;; Or save-file-position?
+             ;; (message "Did I get to line %s?" (elt (, elt) 1))
+             (goto-line (string-to-int (elt (, elt) 1)))))
+        ;;)
+        (defmacro cperl-etags-goto-tag-location (elt)
+          (` (etags-goto-tag-location (, elt))))))
 
 (defconst cperl-xemacs-p (string-match "XEmacs\\|Lucid" emacs-version))
 
@@ -251,6 +273,12 @@ This is in addition to cperl-continued-statement-offset."
   :type 'integer
   :group 'cperl-indentation-details)
 
+(defcustom cperl-indent-wrt-brace t
+  "*Non-nil means indent statements in if/etc block relative brace, not if/etc.
+Versions 5.2 ... 5.20 behaved as if this were `nil'."
+  :type 'boolean
+  :group 'cperl-indentation-details)
+
 (defcustom cperl-auto-newline nil
   "*Non-nil means automatically newline before and after braces,
 and after colons and semicolons, inserted in CPerl code.  The following
@@ -347,20 +375,26 @@ Affects: `cperl-font-lock', `cperl-electric-lbrace-space',
   :type 'integer
   :group 'cperl-indentation-details)
 
-(defvar cperl-vc-header-alist nil)
-(make-obsolete-variable
- 'cperl-vc-header-alist
- "use cperl-vc-rcs-header or cperl-vc-sccs-header instead.")
+(defcustom cperl-indent-comment-at-column-0 nil
+  "*Non-nil means that comment started at column 0 should be indentable."
+  :type 'boolean
+  :group 'cperl-indentation-details)
 
 (defcustom cperl-vc-sccs-header '("($sccs) = ('%W\%' =~ /(\\d+(\\.\\d+)+)/) ;")
   "*Special version of `vc-sccs-header' that is used in CPerl mode buffers."
   :type '(repeat string)
   :group 'cperl)
 
-(defcustom cperl-vc-rcs-header '("($rcs) = (' $Id\$ ' =~ /(\\d+(\\.\\d+)+)/) ;")
+(defcustom cperl-vc-rcs-header '("($rcs) = (' $Id\$ ' =~ /(\\d+(\\.\\d+)+)/);")
   "*Special version of `vc-rcs-header' that is used in CPerl mode buffers."
   :type '(repeat string)
-  :group 'cperl)
+     :group 'cperl)
+
+;; This became obsolete...
+(defvar cperl-vc-header-alist nil)
+(make-obsolete-variable
+ 'cperl-vc-header-alist
+ "use cperl-vc-rcs-header or cperl-vc-sccs-header instead.")
 
 (defcustom cperl-clobber-mode-lists
   (not
@@ -408,8 +442,15 @@ Font for POD headers."
   :type 'face
   :group 'cperl-faces)
 
-(defcustom cperl-invalid-face 'underline
-  "*Face for highlighting trailing whitespace."
+;;; Some double-evaluation happened with font-locks...  Needed with 21.2...
+(defvar cperl-singly-quote-face cperl-xemacs-p)
+
+(defcustom cperl-invalid-face           ; Does not customize with '' on XEmacs
+  (if cperl-singly-quote-face
+      'underline ''underline) ; On older Emacsen was evaluated by `font-lock'
+  (if cperl-singly-quote-face
+      "*This face is used for highlighting trailing whitespace."
+    "*Face for highlighting trailing whitespace.")
   :type 'face
   :version "21.1"
   :group 'cperl-faces)
@@ -441,7 +482,14 @@ You can always make lookup from menu or using \\[cperl-find-pods-heres]."
 
 (defcustom cperl-regexp-scan t
   "*Not-nil means make marking of regular expression more thorough.
-Effective only with `cperl-pod-here-scan'.  Not implemented yet."
+Effective only with `cperl-pod-here-scan'."
+  :type 'boolean
+  :group 'cperl-speed)
+
+(defcustom cperl-hook-after-change t
+  "*Not-nil means install hook to know which regions of buffer are changed.
+May significantly speed up delayed fontification.  Changes take effect
+after reload."
   :type 'boolean
   :group 'cperl-speed)
 
@@ -564,17 +612,25 @@ when syntaxifying a chunk of buffer."
   :type 'boolean
   :group 'cperl-speed)
 
+(defcustom cperl-syntaxify-for-menu
+  t
+  "*Non-nil means that CPerl syntaxifies up to the point before showing menu.
+This way enabling/disabling of menu items is more correct."
+  :type 'boolean
+  :group 'cperl-speed)
+
 (defcustom cperl-ps-print-face-properties
   '((font-lock-keyword-face             nil nil         bold shadow)
     (font-lock-variable-name-face       nil nil         bold)
     (font-lock-function-name-face       nil nil         bold italic box)
     (font-lock-constant-face            nil "LightGray" bold)
-    (cperl-array                        nil "LightGray" bold underline)
-    (cperl-hash                         nil "LightGray" bold italic underline)
+    (cperl-array-face                   nil "LightGray" bold underline)
+    (cperl-hash-face                            nil "LightGray" bold italic underline)
     (font-lock-comment-face             nil "LightGray" italic)
     (font-lock-string-face              nil nil         italic underline)
-    (cperl-nonoverridable               nil nil         italic underline)
+    (cperl-nonoverridable-face          nil nil         italic underline)
     (font-lock-type-face                nil nil         underline)
+    (font-lock-warning-face             nil "LightGray" bold italic box)
     (underline                          nil "LightGray" strikeout))
   "List given as an argument to `ps-extend-face-list' in `cperl-ps-print'."
   :type '(repeat (cons symbol
@@ -588,7 +644,7 @@ when syntaxifying a chunk of buffer."
 (defvar cperl-dark-foreground
   (cperl-choose-color "orchid1" "orange"))
 
-(defface cperl-nonoverridable
+(defface cperl-nonoverridable-face
   `((((class grayscale) (background light))
      (:background "Gray90" :slant italic :underline t))
     (((class grayscale) (background dark))
@@ -600,10 +656,8 @@ when syntaxifying a chunk of buffer."
     (t (:weight bold :underline t)))
   "Font Lock mode face used non-overridable keywords and modifiers of regexps."
   :group 'cperl-faces)
-;; backward-compatibility alias
-(put 'cperl-nonoverridable-face 'face-alias 'cperl-nonoverridable)
 
-(defface cperl-array
+(defface cperl-array-face
   `((((class grayscale) (background light))
      (:background "Gray90" :weight bold))
     (((class grayscale) (background dark))
@@ -615,10 +669,8 @@ when syntaxifying a chunk of buffer."
     (t (:weight bold)))
   "Font Lock mode face used to highlight array names."
   :group 'cperl-faces)
-;; backward-compatibility alias
-(put 'cperl-array-face 'face-alias 'cperl-array)
 
-(defface cperl-hash
+(defface cperl-hash-face
   `((((class grayscale) (background light))
      (:background "Gray90" :weight bold :slant italic))
     (((class grayscale) (background dark))
@@ -630,8 +682,6 @@ when syntaxifying a chunk of buffer."
     (t (:weight bold :slant italic)))
   "Font Lock mode face used to highlight hash names."
   :group 'cperl-faces)
-;; backward-compatibility alias
-(put 'cperl-hash-face 'face-alias 'cperl-hash)
 
 
 
@@ -639,9 +689,7 @@ when syntaxifying a chunk of buffer."
 
 (defvar cperl-tips 'please-ignore-this-line
   "Get maybe newer version of this package from
-  ftp://ftp.math.ohio-state.edu/pub/users/ilya/emacs
-and/or
-  ftp://ftp.math.ohio-state.edu/pub/users/ilya/perl
+  http://ilyaz.org/software/emacs
 Subdirectory `cperl-mode' may contain yet newer development releases and/or
 patches to related files.
 
@@ -666,9 +714,9 @@ want it to: put the following into your .emacs file:
   (defalias 'perl-mode 'cperl-mode)
 
 Get perl5-info from
-  $CPAN/doc/manual/info/perl-info.tar.gz
-older version was on
-  http://www.metronet.com:70/9/perlinfo/perl5/manual/perl5-info.tar.gz
+  $CPAN/doc/manual/info/perl5-old/perl5-info.tar.gz
+Also, one can generate a newer documentation running `pod2texi' converter
+  $CPAN/doc/manual/info/perl5/pod2texi-0.1.tar.gz
 
 If you use imenu-go, run imenu on perl5-info buffer (you can do it
 from Perl menu).  If many files are related, generate TAGS files from
@@ -700,11 +748,18 @@ micro-docs on what I know about CPerl problems.")
   "Description of problems in CPerl mode.
 Some faces will not be shown on some versions of Emacs unless you
 install choose-color.el, available from
-   ftp://ftp.math.ohio-state.edu/pub/users/ilya/emacs/
+  http://ilyaz.org/software/emacs
 
 `fill-paragraph' on a comment may leave the point behind the
-paragraph.  Parsing of lines with several <<EOF is not implemented
-yet.
+paragraph.  It also triggers a bug in some versions of Emacs (CPerl tries
+to detect it and bulk out).
+
+See documentation of a variable `cperl-problems-old-emaxen' for the
+problems which disappear if you upgrade Emacs to a reasonably new
+version (20.3 for Emacs, and those of 2004 for XEmacs).")
+
+(defvar cperl-problems-old-emaxen 'please-ignore-this-line
+  "Description of problems in CPerl mode specific for older Emacs versions.
 
 Emacs had a _very_ restricted syntax parsing engine until version
 20.1.  Most problems below are corrected starting from this version of
@@ -812,6 +867,13 @@ voice);
         o) Highlights trailing whitespace;
         p) Is able to manipulate Perl Regular Expressions to ease
            conversion to a more readable form.
+        q) Can ispell POD sections and HERE-DOCs.
+        r) Understands comments and character classes inside regular
+           expressions; can find matching () and [] in a regular expression.
+        s) Allows indentation of //x-style regular expressions;
+        t) Highlights different symbols in regular expressions according
+           to their function; much less problems with backslashitis;
+        u) Allows to find regular expressions which contain interpolated parts.
 
 5) The indentation engine was very smart, but most of tricks may be
 not needed anymore with the support for `syntax-table' property.  Has
@@ -829,7 +891,10 @@ the settings present before the switch.
 line-breaks/spacing between elements of the construct.
 
 10) Uses a linear-time algorith for indentation of regions (on Emaxen with
-capable syntax engines).")
+capable syntax engines).
+
+11) Syntax-highlight, indentation, sexp-recognition inside regular expressions.
+")
 
 (defvar cperl-speed 'please-ignore-this-line
   "This is an incomplete compendium of what is available in other parts
@@ -878,19 +943,19 @@ B) Speed of editing operations.
 (defvar cperl-tips-faces 'please-ignore-this-line
   "CPerl mode uses following faces for highlighting:
 
-  `cperl-array'                 Array names
-  `cperl-hash'                  Hash names
+  `cperl-array-face'                    Array names
+  `cperl-hash-face'                     Hash names
   `font-lock-comment-face'      Comments, PODs and whatever is considered
                                 syntaxically to be not code
   `font-lock-constant-face'     HERE-doc delimiters, labels, delimiters of
                                 2-arg operators s/y/tr/ or of RExen,
-  `font-lock-function-name-face' Special-cased m// and s//foo/, _ as
-                                a target of a file tests, file tests,
+  `font-lock-warning-face'      Special-cased m// and s//foo/,
+  `font-lock-function-name-face' _ as a target of a file tests, file tests,
                                 subroutine names at the moment of definition
                                 (except those conflicting with Perl operators),
                                 package names (when recognized), format names
   `font-lock-keyword-face'      Control flow switch constructs, declarators
-  `cperl-nonoverridable'        Non-overridable keywords, modifiers of RExen
+  `cperl-nonoverridable-face'   Non-overridable keywords, modifiers of RExen
   `font-lock-string-face'       Strings, qw() constructs, RExen, POD sections,
                                 literal parts and the terminator of formats
                                 and whatever is syntaxically considered
@@ -908,7 +973,25 @@ m// and s/// which do not do what one would expect them to do.
 Help with best setup of these faces for printout requested (for each of
 the faces: please specify bold, italic, underline, shadow and box.)
 
-\(Not finished.)")
+In regular expressions (except character classes):
+  `font-lock-string-face'       \"Normal\" stuff and non-0-length constructs
+  `font-lock-constant-face':    Delimiters
+  `font-lock-warning-face'      Special-cased m// and s//foo/,
+                                Mismatched closing delimiters, parens
+                                we couldn't match, misplaced quantifiers,
+                                unrecognized escape sequences
+  `cperl-nonoverridable-face'   Modifiers, as gism in m/REx/gism
+  `font-lock-type-face'         POSIX classes inside charclasses,
+                                escape sequences with arguments (\x \23 \p \N)
+                                and others match-a-char escape sequences
+  `font-lock-keyword-face'      Capturing parens, and |
+  `font-lock-function-name-face' Special symbols: $ ^ . [ ] [^ ] (?{ }) (??{ })
+  `font-lock-builtin-face'      \"Remaining\" 0-length constructs, executable
+                                parts of a REx, not-capturing parens
+  `font-lock-variable-name-face' Interpolated constructs, embedded code
+  `font-lock-comment-face'      Embedded comments
+
+")
 
 
 
@@ -985,6 +1068,25 @@ the faces: please specify bold, italic, underline, shadow and box.)
    (cperl-hairy (or hairy t))
    (t (symbol-value symbol))))
 
+
+(defun cperl-make-indent (column &optional minimum keep)
+  "Makes indent of the current line the requested amount.
+Unless KEEP, removes the old indentation.  Works around a bug in ancient
+versions of Emacs."
+  (let ((prop (get-text-property (point) 'syntax-type)))
+    (or keep
+        (delete-horizontal-space))
+    (indent-to column minimum)
+    ;; In old versions (e.g., 19.33) `indent-to' would not inherit properties
+    (and prop
+         (> (current-column) 0)
+         (save-excursion
+           (beginning-of-line)
+           (or (get-text-property (point) 'syntax-type)
+               (and (looking-at "\\=[ \t]")
+                      (put-text-property (point) (match-end 0)
+                                         'syntax-type prop)))))))
+
 ;;; Probably it is too late to set these guys already, but it can help later:
 
 ;;;(and cperl-clobber-mode-lists
@@ -1035,7 +1137,16 @@ the faces: please specify bold, italic, underline, shadow and box.)
   (cperl-define-key "\C-c\C-w" 'cperl-toggle-construct-fix)
   (cperl-define-key "\C-c\C-f" 'auto-fill-mode)
   (cperl-define-key "\C-c\C-e" 'cperl-toggle-electric)
+  (cperl-define-key "\C-c\C-b" 'cperl-find-bad-style)
+  (cperl-define-key "\C-c\C-p" 'cperl-pod-spell)
+  (cperl-define-key "\C-c\C-d" 'cperl-here-doc-spell)
+  (cperl-define-key "\C-c\C-n" 'cperl-narrow-to-here-doc)
+  (cperl-define-key "\C-c\C-v" 'cperl-next-interpolated-REx)
+  (cperl-define-key "\C-c\C-x" 'cperl-next-interpolated-REx-0)
+  (cperl-define-key "\C-c\C-y" 'cperl-next-interpolated-REx-1)
   (cperl-define-key "\C-c\C-ha" 'cperl-toggle-autohelp)
+  (cperl-define-key "\C-c\C-hp" 'cperl-perldoc)
+  (cperl-define-key "\C-c\C-hP" 'cperl-perldoc-at-point)
   (cperl-define-key "\e\C-q" 'cperl-indent-exp) ; Usually not bound
   (cperl-define-key [?\C-\M-\|] 'cperl-lineup
                     [(control meta |)])
@@ -1074,9 +1185,13 @@ the faces: please specify bold, italic, underline, shadow and box.)
            (<= emacs-minor-version 11) (<= emacs-major-version 19))
       (progn
         ;; substitute-key-definition is usefulness-deenhanced...
-        (cperl-define-key "\M-q" 'cperl-fill-paragraph)
+        ;;;;;(cperl-define-key "\M-q" 'cperl-fill-paragraph)
         (cperl-define-key "\e;" 'cperl-indent-for-comment)
         (cperl-define-key "\e\C-\\" 'cperl-indent-region))
+    (or (boundp 'fill-paragraph-function)
+        (substitute-key-definition
+         'fill-paragraph 'cperl-fill-paragraph
+         cperl-mode-map global-map))
     (substitute-key-definition
      'indent-sexp 'cperl-indent-exp
      cperl-mode-map global-map)
@@ -1094,52 +1209,101 @@ the faces: please specify bold, italic, underline, shadow and box.)
     (progn
       (require 'easymenu)
       (easy-menu-define
-        cperl-menu cperl-mode-map "Menu for CPerl mode"
-        '("Perl"
-          ["Beginning of function" beginning-of-defun t]
-          ["End of function" end-of-defun t]
-          ["Mark function" mark-defun t]
-          ["Indent expression" cperl-indent-exp t]
+       cperl-menu cperl-mode-map "Menu for CPerl mode"
+       '("Perl"
+         ["Beginning of function" beginning-of-defun t]
+         ["End of function" end-of-defun t]
+         ["Mark function" mark-defun t]
+         ["Indent expression" cperl-indent-exp t]
           ["Fill paragraph/comment" fill-paragraph t]
+         "----"
+         ["Line up a construction" cperl-lineup (cperl-use-region-p)]
+         ["Invert if/unless/while etc" cperl-invert-if-unless t]
+         ("Regexp"
+          ["Beautify" cperl-beautify-regexp
+           cperl-use-syntax-table-text-property]
+          ["Beautify one level deep" (cperl-beautify-regexp 1)
+           cperl-use-syntax-table-text-property]
+          ["Beautify a group" cperl-beautify-level
+           cperl-use-syntax-table-text-property]
+          ["Beautify a group one level deep" (cperl-beautify-level 1)
+           cperl-use-syntax-table-text-property]
+          ["Contract a group" cperl-contract-level
+           cperl-use-syntax-table-text-property]
+          ["Contract groups" cperl-contract-levels
+           cperl-use-syntax-table-text-property]
           "----"
-          ["Line up a construction" cperl-lineup (cperl-use-region-p)]
-          ["Invert if/unless/while etc" cperl-invert-if-unless t]
-          ("Regexp"
-           ["Beautify" cperl-beautify-regexp
-            cperl-use-syntax-table-text-property]
-           ["Beautify one level deep" (cperl-beautify-regexp 1)
-            cperl-use-syntax-table-text-property]
-           ["Beautify a group" cperl-beautify-level
-            cperl-use-syntax-table-text-property]
-           ["Beautify a group one level deep" (cperl-beautify-level 1)
-            cperl-use-syntax-table-text-property]
-           ["Contract a group" cperl-contract-level
-            cperl-use-syntax-table-text-property]
-           ["Contract groups" cperl-contract-levels
-            cperl-use-syntax-table-text-property])
-          ["Refresh \"hard\" constructions" cperl-find-pods-heres t]
+          ["Find next interpolated" cperl-next-interpolated-REx 
+           (next-single-property-change (point-min) 'REx-interpolated)]
+          ["Find next interpolated (no //o)"
+           cperl-next-interpolated-REx-0
+           (or (text-property-any (point-min) (point-max) 'REx-interpolated t)
+               (text-property-any (point-min) (point-max) 'REx-interpolated 1))]
+          ["Find next interpolated (neither //o nor whole-REx)"
+           cperl-next-interpolated-REx-1
+           (text-property-any (point-min) (point-max) 'REx-interpolated t)])
+         ["Insert spaces if needed to fix style" cperl-find-bad-style t]
+         ["Refresh \"hard\" constructions" cperl-find-pods-heres t]
+         "----"
+         ["Indent region" cperl-indent-region (cperl-use-region-p)]
+         ["Comment region" cperl-comment-region (cperl-use-region-p)]
+         ["Uncomment region" cperl-uncomment-region (cperl-use-region-p)]
+         "----"
+         ["Run" mode-compile (fboundp 'mode-compile)]
+         ["Kill" mode-compile-kill (and (fboundp 'mode-compile-kill)
+                                        (get-buffer "*compilation*"))]
+         ["Next error" next-error (get-buffer "*compilation*")]
+         ["Check syntax" cperl-check-syntax (fboundp 'mode-compile)]
+         "----"
+         ["Debugger" cperl-db t]
+         "----"
+         ("Tools"
+          ["Imenu" imenu (fboundp 'imenu)]
+          ["Imenu on Perl Info" cperl-imenu-on-info (featurep 'imenu)]
           "----"
-          ["Indent region" cperl-indent-region (cperl-use-region-p)]
-          ["Comment region" cperl-comment-region (cperl-use-region-p)]
-          ["Uncomment region" cperl-uncomment-region (cperl-use-region-p)]
+          ["Ispell PODs" cperl-pod-spell
+           ;; Better not to update syntaxification here:
+           ;; debugging syntaxificatio can be broken by this???
+           (or
+            (get-text-property (point-min) 'in-pod)
+            (< (progn
+                 (and cperl-syntaxify-for-menu
+                      (cperl-update-syntaxification (point-max) (point-max)))
+                 (next-single-property-change (point-min) 'in-pod nil (point-max)))
+               (point-max)))]
+          ["Ispell HERE-DOCs" cperl-here-doc-spell
+           (< (progn
+                (and cperl-syntaxify-for-menu
+                     (cperl-update-syntaxification (point-max) (point-max)))
+                (next-single-property-change (point-min) 'here-doc-group nil (point-max)))
+              (point-max))]
+          ["Narrow to this HERE-DOC" cperl-narrow-to-here-doc
+           (eq 'here-doc  (progn
+                (and cperl-syntaxify-for-menu
+                     (cperl-update-syntaxification (point) (point)))
+                (get-text-property (point) 'syntax-type)))]
+          ["Select this HERE-DOC or POD section"
+           cperl-select-this-pod-or-here-doc
+           (memq (progn
+                   (and cperl-syntaxify-for-menu
+                        (cperl-update-syntaxification (point) (point)))
+                   (get-text-property (point) 'syntax-type))
+                 '(here-doc pod))]
           "----"
-          ["Run" mode-compile (fboundp 'mode-compile)]
-          ["Kill" mode-compile-kill (and (fboundp 'mode-compile-kill)
-                                         (get-buffer "*compilation*"))]
-          ["Next error" next-error (get-buffer "*compilation*")]
-          ["Check syntax" cperl-check-syntax (fboundp 'mode-compile)]
+          ["CPerl pretty print (exprmntl)" cperl-ps-print
+           (fboundp 'ps-extend-face-list)]
           "----"
-          ["Debugger" cperl-db t]
+          ["Syntaxify region" cperl-find-pods-heres-region
+           (cperl-use-region-p)]
+          ["Profile syntaxification" cperl-time-fontification t]
+          ["Debug errors in delayed fontification" cperl-emulate-lazy-lock t]
+          ["Debug unwind for syntactic scan" cperl-toggle-set-debug-unwind t]
+          ["Debug backtrace on syntactic scan (BEWARE!!!)"
+           (cperl-toggle-set-debug-unwind nil t) t]
           "----"
-          ("Tools"
-           ["Imenu" imenu (fboundp 'imenu)]
-           ["Insert spaces if needed" cperl-find-bad-style t]
-           ["Class Hierarchy from TAGS" cperl-tags-hier-init t]
-           ;;["Update classes" (cperl-tags-hier-init t) tags-table-list]
-           ["CPerl pretty print (exprmntl)" cperl-ps-print
-            (fboundp 'ps-extend-face-list)]
-           ["Imenu on info" cperl-imenu-on-info (featurep 'imenu)]
-           ("Tags"
+          ["Class Hierarchy from TAGS" cperl-tags-hier-init t]
+          ;;["Update classes" (cperl-tags-hier-init t) tags-table-list]
+          ("Tags"
 ;;;          ["Create tags for current file" cperl-etags t]
 ;;;          ["Add tags for current file" (cperl-etags t) t]
 ;;;          ["Create tags for Perl files in directory" (cperl-etags nil t) t]
@@ -1186,10 +1350,10 @@ the faces: please specify bold, italic, underline, shadow and box.)
           ["PerlStyle" (cperl-set-style "PerlStyle") t]
           ["GNU" (cperl-set-style "GNU") t]
           ["C++" (cperl-set-style "C++") t]
-          ["FSF" (cperl-set-style "FSF") t]
+          ["K&R" (cperl-set-style "K&R") t]
           ["BSD" (cperl-set-style "BSD") t]
           ["Whitesmith" (cperl-set-style "Whitesmith") t]
-          ["Current" (cperl-set-style "Current") t]
+          ["Memorize Current" (cperl-set-style "Current") t]
           ["Memorized" (cperl-set-style-back) cperl-old-style])
          ("Micro-docs"
           ["Tips" (describe-variable 'cperl-tips) t]
@@ -1208,12 +1372,73 @@ the faces: please specify bold, italic, underline, shadow and box.)
 The expansion is entirely correct because it uses the C preprocessor."
   t)
 
+;;; These two must be unwound, otherwise take exponential time
+(defconst cperl-maybe-white-and-comment-rex "[ \t\n]*\\(#[^\n]*\n[ \t\n]*\\)*"
+"Regular expression to match optional whitespace with interpspersed comments.
+Should contain exactly one group.")
+
+;;; This one is tricky to unwind; still very inefficient...
+(defconst cperl-white-and-comment-rex "\\([ \t\n]\\|#[^\n]*\n\\)+"
+"Regular expression to match whitespace with interpspersed comments.
+Should contain exactly one group.")
+
+
+;;; Is incorporated in `cperl-imenu--function-name-regexp-perl'
+;;; `cperl-outline-regexp', `defun-prompt-regexp'.
+;;; Details of groups in this may be used in several functions; see comments
+;;; near mentioned above variable(s)...
+;;; sub($$):lvalue{}  sub:lvalue{} Both allowed...
+(defsubst cperl-after-sub-regexp (named attr) ; 9 groups without attr...
+  "Match the text after `sub' in a subroutine declaration.
+If NAMED is nil, allows anonymous subroutines.  Matches up to the first \":\"
+of attributes (if present), or end of the name or prototype (whatever is
+the last)."
+  (concat                               ; Assume n groups before this...
+   "\\("                                ; n+1=name-group
+     cperl-white-and-comment-rex        ; n+2=pre-name
+     "\\(::[a-zA-Z_0-9:']+\\|[a-zA-Z_'][a-zA-Z_0-9:']*\\)" ; n+3=name
+   "\\)"                                ; END n+1=name-group
+   (if named "" "?")
+   "\\("                                ; n+4=proto-group
+     cperl-maybe-white-and-comment-rex  ; n+5=pre-proto
+     "\\(([^()]*)\\)"                   ; n+6=prototype
+   "\\)?"                               ; END n+4=proto-group
+   "\\("                                ; n+7=attr-group
+     cperl-maybe-white-and-comment-rex  ; n+8=pre-attr
+     "\\("                              ; n+9=start-attr
+        ":"
+        (if attr (concat
+                  "\\("
+                     cperl-maybe-white-and-comment-rex ; whitespace-comments
+                     "\\(\\sw\\|_\\)+"  ; attr-name
+                     ;; attr-arg (1 level of internal parens allowed!)
+                     "\\((\\(\\\\.\\|[^\\\\()]\\|([^\\\\()]*)\\)*)\\)?"
+                     "\\("              ; optional : (XXX allows trailing???)
+                        cperl-maybe-white-and-comment-rex ; whitespace-comments
+                     ":\\)?"
+                  "\\)+")
+          "[^:]")
+     "\\)"
+   "\\)?"                               ; END n+6=proto-group
+   ))
+
+;;; Details of groups in this are used in `cperl-imenu--create-perl-index'
+;;;  and `cperl-outline-level'.
+;;;; Was: 2=sub|package; now 2=package-group, 5=package-name 8=sub-name (+3)
 (defvar cperl-imenu--function-name-regexp-perl
   (concat
-   "^\\("
-       "[ \t]*\\(sub\\|package\\)[ \t\n]+\\([a-zA-Z_0-9:']+\\)[ \t]*\\(([^()]*)[ \t]*\\)?"
-     "\\|"
-       "=head\\([12]\\)[ \t]+\\([^\n]+\\)$"
+   "^\\("                               ; 1 = all
+       "\\([ \t]*package"               ; 2 = package-group
+          "\\("                         ; 3 = package-name-group
+            cperl-white-and-comment-rex ; 4 = pre-package-name
+               "\\([a-zA-Z_0-9:']+\\)\\)?\\)" ; 5 = package-name
+       "\\|"
+          "[ \t]*sub"
+          (cperl-after-sub-regexp 'named nil) ; 8=name 11=proto 14=attr-start
+          cperl-maybe-white-and-comment-rex     ; 15=pre-block
+   "\\|"
+     "=head\\([1-4]\\)[ \t]+"           ; 16=level
+     "\\([^\n]+\\)$"                    ; 17=text
    "\\)"))
 
 (defvar cperl-outline-regexp
@@ -1225,6 +1450,12 @@ The expansion is entirely correct because it uses the C preprocessor."
 (defvar cperl-string-syntax-table nil
   "Syntax table in use in CPerl mode string-like chunks.")
 
+(defsubst cperl-1- (p)
+  (max (point-min) (1- p)))
+
+(defsubst cperl-1+ (p)
+  (min (point-max) (1+ p)))
+
 (if cperl-mode-syntax-table
     ()
   (setq cperl-mode-syntax-table (make-syntax-table))
@@ -1249,6 +1480,8 @@ The expansion is entirely correct because it uses the C preprocessor."
   (modify-syntax-entry ?| "." cperl-mode-syntax-table)
   (setq cperl-string-syntax-table (copy-syntax-table cperl-mode-syntax-table))
   (modify-syntax-entry ?$ "." cperl-string-syntax-table)
+  (modify-syntax-entry ?\{ "." cperl-string-syntax-table)
+  (modify-syntax-entry ?\} "." cperl-string-syntax-table)
   (modify-syntax-entry ?# "." cperl-string-syntax-table)) ; (?# comment )
 
 
@@ -1257,6 +1490,10 @@ The expansion is entirely correct because it uses the C preprocessor."
 ;; Fix for msb.el
 (defvar cperl-msb-fixed nil)
 (defvar cperl-use-major-mode 'cperl-mode)
+(defvar cperl-font-lock-multiline-start nil)
+(defvar cperl-font-lock-multiline nil)
+(defvar cperl-compilation-error-regexp-alist nil)
+(defvar cperl-font-locking nil)
 
 ;;;###autoload
 (defun cperl-mode ()
@@ -1402,16 +1639,24 @@ Variables controlling indentation style:
  `cperl-min-label-indent'
     Minimal indentation for line that is a label.
 
-Settings for K&R and BSD indentation styles are
-  `cperl-indent-level'                5    8
-  `cperl-continued-statement-offset'  5    8
-  `cperl-brace-offset'               -5   -8
-  `cperl-label-offset'               -5   -8
+Settings for classic indent-styles: K&R BSD=C++ GNU PerlStyle=Whitesmith
+  `cperl-indent-level'                5   4       2   4
+  `cperl-brace-offset'                0   0       0   0
+  `cperl-continued-brace-offset'     -5  -4       0   0
+  `cperl-label-offset'               -5  -4      -2  -4
+  `cperl-continued-statement-offset'  5   4       2   4
 
 CPerl knows several indentation styles, and may bulk set the
 corresponding variables.  Use \\[cperl-set-style] to do this.  Use
 \\[cperl-set-style-back] to restore the memorized preexisting values
-\(both available from menu).
+\(both available from menu).  See examples in `cperl-style-examples'.
+
+Part of the indentation style is how different parts of if/elsif/else
+statements are broken into lines; in CPerl, this is reflected on how
+templates for these constructs are created (controlled by
+`cperl-extra-newline-before-brace'), and how reflow-logic should treat \"continuation\" blocks of else/elsif/continue, controlled by the same variable,
+and by `cperl-extra-newline-before-brace-multiline',
+`cperl-merge-trailing-else', `cperl-indent-region-fix-constructs'.
 
 If `cperl-indent-level' is 0, the statement after opening brace in
 column 0 is indented on
@@ -1465,8 +1710,12 @@ or as help on variables `cperl-tips', `cperl-problems',
                 ("head2" "head2" cperl-electric-pod 0)))
         (setq abbrevs-changed prev-a-c)))
   (setq local-abbrev-table cperl-mode-abbrev-table)
-  (abbrev-mode (if (cperl-val 'cperl-electric-keywords) 1 0))
+  (if (cperl-val 'cperl-electric-keywords)
+      (abbrev-mode 1))
   (set-syntax-table cperl-mode-syntax-table)
+  ;; Until Emacs is multi-threaded, we do not actually need it local:
+  (make-local-variable 'cperl-font-lock-multiline-start)
+  (make-local-variable 'cperl-font-locking)
   (make-local-variable 'outline-regexp)
   ;; (setq outline-regexp imenu-example--function-name-regexp-perl)
   (setq outline-regexp cperl-outline-regexp)
@@ -1478,7 +1727,10 @@ or as help on variables `cperl-tips', `cperl-problems',
   (setq paragraph-separate paragraph-start)
   (make-local-variable 'paragraph-ignore-fill-prefix)
   (setq paragraph-ignore-fill-prefix t)
-  (set (make-local-variable 'fill-paragraph-function) 'cperl-fill-paragraph)
+  (if cperl-xemacs-p
+    (progn
+      (make-local-variable 'paren-backwards-message)
+      (set 'paren-backwards-message t)))
   (make-local-variable 'indent-line-function)
   (setq indent-line-function 'cperl-indent-line)
   (make-local-variable 'require-final-newline)
@@ -1492,9 +1744,22 @@ or as help on variables `cperl-tips', `cperl-problems',
   (make-local-variable 'comment-start-skip)
   (setq comment-start-skip "#+ *")
   (make-local-variable 'defun-prompt-regexp)
-  (setq defun-prompt-regexp "^[ \t]*sub[ \t\n]+\\([^ \t\n{(;]+\\)\\([ \t\n]*([^()]*)[ \t\n]*\\)?[ \t\n]*")
+;;;       "[ \t]*sub"
+;;;       (cperl-after-sub-regexp 'named nil) ; 8=name 11=proto 14=attr-start
+;;;       cperl-maybe-white-and-comment-rex     ; 15=pre-block
+  (setq defun-prompt-regexp
+        (concat "^[ \t]*\\(sub"
+                (cperl-after-sub-regexp 'named 'attr-groups)
+                "\\|"                   ; per toke.c
+                "\\(BEGIN\\|CHECK\\|INIT\\|END\\|AUTOLOAD\\|DESTROY\\)"
+                "\\)"
+                cperl-maybe-white-and-comment-rex))
   (make-local-variable 'comment-indent-function)
   (setq comment-indent-function 'cperl-comment-indent)
+  (and (boundp 'fill-paragraph-function)
+      (progn
+        (make-local-variable 'fill-paragraph-function)
+        (set 'fill-paragraph-function 'cperl-fill-paragraph)))
   (make-local-variable 'parse-sexp-ignore-comments)
   (setq parse-sexp-ignore-comments t)
   (make-local-variable 'indent-region-function)
@@ -1509,21 +1774,40 @@ or as help on variables `cperl-tips', `cperl-problems',
   (set 'vc-rcs-header cperl-vc-rcs-header)
   (make-local-variable 'vc-sccs-header)
   (set 'vc-sccs-header cperl-vc-sccs-header)
+  ;; This one is obsolete...
+  (make-local-variable 'vc-header-alist)
+  (set 'vc-header-alist (or cperl-vc-header-alist ; Avoid warning
+                            (` ((SCCS (, (car cperl-vc-sccs-header)))
+                                     (RCS (, (car cperl-vc-rcs-header)))))))
+  (cond ((boundp 'compilation-error-regexp-alist-alist);; xemacs 20.x
+         (make-local-variable 'compilation-error-regexp-alist-alist)
+         (set 'compilation-error-regexp-alist-alist
+              (cons (cons 'cperl cperl-compilation-error-regexp-alist)
+                    (symbol-value 'compilation-error-regexp-alist-alist)))
+         (if (fboundp 'compilation-build-compilation-error-regexp-alist)
+             (let ((f 'compilation-build-compilation-error-regexp-alist))
+               (funcall f))
+           (push 'cperl compilation-error-regexp-alist)))
+        ((boundp 'compilation-error-regexp-alist);; xmeacs 19.x
+         (make-local-variable 'compilation-error-regexp-alist)
+         (set 'compilation-error-regexp-alist
+               (cons cperl-compilation-error-regexp-alist
+                     (symbol-value 'compilation-error-regexp-alist)))))
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults
         (cond
          ((string< emacs-version "19.30")
-          '(cperl-font-lock-keywords-2))
+          '(cperl-font-lock-keywords-2 nil nil ((?_ . "w"))))
          ((string< emacs-version "19.33") ; Which one to use?
           '((cperl-font-lock-keywords
              cperl-font-lock-keywords-1
-             cperl-font-lock-keywords-2)))
+             cperl-font-lock-keywords-2) nil nil ((?_ . "w"))))
          (t
           '((cperl-load-font-lock-keywords
              cperl-load-font-lock-keywords-1
-             cperl-load-font-lock-keywords-2)
-            nil nil ((?_ . "w"))))))
+             cperl-load-font-lock-keywords-2) nil nil ((?_ . "w"))))))
   (make-local-variable 'cperl-syntax-state)
+  (setq cperl-syntax-state nil)         ; reset syntaxification cache
   (if cperl-use-syntax-table-text-property
       (progn
         (make-local-variable 'parse-sexp-lookup-properties)
@@ -1533,10 +1817,12 @@ or as help on variables `cperl-tips', `cperl-problems',
         (or (boundp 'font-lock-unfontify-region-function)
             (set 'font-lock-unfontify-region-function
                  'font-lock-default-unfontify-region))
-        (make-local-variable 'font-lock-unfontify-region-function)
-        (set 'font-lock-unfontify-region-function ; not present with old Emacs
-              'cperl-font-lock-unfontify-region-function)
+        (unless cperl-xemacs-p          ; Our: just a plug for wrong font-lock
+          (make-local-variable 'font-lock-unfontify-region-function)
+          (set 'font-lock-unfontify-region-function ; not present with old Emacs
+               'cperl-font-lock-unfontify-region-function))
         (make-local-variable 'cperl-syntax-done-to)
+        (setq cperl-syntax-done-to nil) ; reset syntaxification cache
         (make-local-variable 'font-lock-syntactic-keywords)
         (setq font-lock-syntactic-keywords
               (if cperl-syntaxify-by-font-lock
@@ -1546,10 +1832,20 @@ or as help on variables `cperl-tips', `cperl-problems',
                 ;;  to make font-lock think that font-lock-syntactic-keywords
                 ;;  are defined.
                 '(t)))))
+  (if (boundp 'font-lock-multiline)     ; Newer font-lock; use its facilities
+      (progn
+        (setq cperl-font-lock-multiline t) ; Not localized...
+        (set 'font-lock-multiline t)) ; not present with old Emacs; auto-local
+    (make-local-variable 'font-lock-fontify-region-function)
+    (set 'font-lock-fontify-region-function ; not present with old Emacs
+         'cperl-font-lock-fontify-region-function))
+  (make-local-variable 'font-lock-fontify-region-function)
+  (set 'font-lock-fontify-region-function ; not present with old Emacs
+       'cperl-font-lock-fontify-region-function)
   (make-local-variable 'cperl-old-style)
   (if (boundp 'normal-auto-fill-function) ; 19.33 and later
       (set (make-local-variable 'normal-auto-fill-function)
-           'cperl-do-auto-fill)       ; RMS has it as #'cperl-do-auto-fill ???
+           'cperl-do-auto-fill)
     (or (fboundp 'cperl-old-auto-fill-mode)
         (progn
           (fset 'cperl-old-auto-fill-mode (symbol-function 'auto-fill-mode))
@@ -1562,12 +1858,18 @@ or as help on variables `cperl-tips', `cperl-problems',
       (if (cperl-val 'cperl-font-lock)
           (progn (or cperl-faces-init (cperl-init-faces))
                  (font-lock-mode 1))))
+  (set (make-local-variable 'facemenu-add-face-function)
+       'cperl-facemenu-add-face-function) ; XXXX What this guy is for???
   (and (boundp 'msb-menu-cond)
        (not cperl-msb-fixed)
        (cperl-msb-fix))
   (if (featurep 'easymenu)
       (easy-menu-add cperl-menu))       ; A NOP in Emacs.
   (run-mode-hooks 'cperl-mode-hook)
+  (if cperl-hook-after-change
+      (progn
+        (make-local-hook 'after-change-functions)
+        (add-hook 'after-change-functions 'cperl-after-change-function nil t)))
   ;; After hooks since fontification will break this
   (if cperl-pod-here-scan
       (or cperl-syntaxify-by-font-lock
@@ -1616,31 +1918,37 @@ or as help on variables `cperl-tips', `cperl-problems',
 (defvar cperl-st-ket '(5 . ?\<))
 
 
-(defun cperl-comment-indent ()
+(defun cperl-comment-indent ()          ; called at point at supposed comment
   (let ((p (point)) (c (current-column)) was phony)
-    (if (looking-at "^#") 0             ; Existing comment at bol stays there.
+    (if (and (not cperl-indent-comment-at-column-0)
+             (looking-at "^#"))
+        0       ; Existing comment at bol stays there.
       ;; Wrong comment found
       (save-excursion
         (setq was (cperl-to-comment-or-eol)
               phony (eq (get-text-property (point) 'syntax-table)
                         cperl-st-cfence))
         (if phony
-            (progn
+            (progn                      ; Too naive???
               (re-search-forward "#\\|$") ; Hmm, what about embedded #?
               (if (eq (preceding-char) ?\#)
                   (forward-char -1))
               (setq was nil)))
-        (if (= (point) p)
+        (if (= (point) p)               ; Our caller found a correct place
             (progn
               (skip-chars-backward " \t")
-              (max (1+ (current-column)) ; Else indent at comment column
-                   comment-column))
+              (setq was (current-column))
+              (if (eq was 0)
+                  comment-column
+                (max (1+ was) ; Else indent at comment column
+                     comment-column)))
+          ;; No, the caller found a random place; we need to edit ourselves
           (if was nil
             (insert comment-start)
             (backward-char (length comment-start)))
           (setq cperl-wrong-comment t)
-          (indent-to comment-column 1)  ; Indent minimum 1
-          c)))))                        ; except leave at least one space.
+          (cperl-make-indent comment-column 1) ; Indent min 1
+          c)))))
 
 ;;;(defun cperl-comment-indent-fallback ()
 ;;;  "Is called if the standard comment-search procedure fails.
@@ -1666,7 +1974,7 @@ or as help on variables `cperl-tips', `cperl-problems',
   (interactive)
   (let (cperl-wrong-comment)
     (indent-for-comment)
-    (if cperl-wrong-comment
+    (if cperl-wrong-comment             ; set by `cperl-comment-indent'
         (progn (cperl-to-comment-or-eol)
                (forward-char (length comment-start))))))
 
@@ -1966,15 +2274,10 @@ to nil."
             (or
              (get-text-property (point) 'in-pod)
              (cperl-after-expr-p nil "{;:")
-             (and (re-search-backward
-                   ;; "\\(\\`\n?\\|\n\n\\)=\\sw+"
-                   "\\(\\`\n?\\|^\n\\)=\\sw+"
-                   (point-min) t)
-                  (not (or
-                        (looking-at "=cut")
-                        (and cperl-use-syntax-table-text-property
-                             (not (eq (get-text-property (point) 'syntax-type)
-                                      'pod)))))))))
+             (and (re-search-backward "\\(\\`\n?\\|^\n\\)=\\sw+" (point-min) t)
+                  (not (looking-at "\n*=cut"))
+                  (or (not cperl-use-syntax-table-text-property)
+                      (eq (get-text-property (point) 'syntax-type) 'pod))))))
          (progn
            (save-excursion
              (setq notlast (re-search-forward "^\n=" nil t)))
@@ -2252,7 +2555,7 @@ key.  Will untabify if `cperl-electric-backspace-untabify' is non-nil."
 
 (put 'cperl-electric-backspace 'delete-selection 'supersede)
 
-(defun cperl-inside-parens-p ()
+(defun cperl-inside-parens-p ()         ;; NOT USED????
   (condition-case ()
       (save-excursion
         (save-restriction
@@ -2332,8 +2635,9 @@ Return the amount the indentation changed by."
             (zerop shift-amt))
         (if (> (- (point-max) pos) (point))
             (goto-char (- (point-max) pos)))
-      (delete-region beg (point))
-      (indent-to indent)
+      ;;;(delete-region beg (point))
+      ;;;(indent-to indent)
+      (cperl-make-indent indent)
       ;; If initial point was within line's indentation,
       ;; position after the indentation.  Else stay at same point in text.
       (if (> (- (point-max) pos) (point))
@@ -2380,63 +2684,55 @@ Return the amount the indentation changed by."
       (or state (setq state (parse-partial-sexp start start-point -1 nil start-state)))
       (list start state depth prestart))))
 
-(defun cperl-block-p ()            ; Do not C-M-q !  One string contains ";" !
-  ;; Positions is before ?\{.  Checks whether it starts a block.
-  ;; No save-excursion!
-  (cperl-backward-to-noncomment (point-min))
-  (or (memq (preceding-char) (append ";){}$@&%\C-@" nil)) ; Or label!  \C-@ at bobp
-                                        ; Label may be mixed up with `$blah :'
-      (save-excursion (cperl-after-label))
-      (and (memq (char-syntax (preceding-char)) '(?w ?_))
-           (progn
-             (backward-sexp)
-             ;; Need take into account `bless', `return', `tr',...
-             (or (and (looking-at "[a-zA-Z0-9_:]+[ \t\n\f]*[{#]") ; Method call syntax
-                      (not (looking-at "\\(bless\\|return\\|q[wqrx]?\\|tr\\|[smy]\\)\\>")))
-                 (progn
-                   (skip-chars-backward " \t\n\f")
-                   (and (memq (char-syntax (preceding-char)) '(?w ?_))
-                        (progn
-                          (backward-sexp)
-                          (looking-at
-                           "sub[ \t]+[a-zA-Z0-9_:]+[ \t\n\f]*\\(([^()]*)[ \t\n\f]*\\)?[#{]")))))))))
-
 (defvar cperl-look-for-prop '((pod in-pod) (here-doc-delim here-doc-group)))
 
-(defun cperl-calculate-indent (&optional parse-data) ; was parse-start
-  "Return appropriate indentation for current line as Perl code.
-In usual case returns an integer: the column to indent to.
-Returns nil if line starts inside a string, t if in a comment.
-
-Will not correct the indentation for labels, but will correct it for braces
-and closing parentheses and brackets."
+(defun cperl-beginning-of-property (p prop &optional lim)
+  "Given that P has a property PROP, find where the property starts.
+Will not look before LIM."
+  ;;; XXXX What to do at point-max???
+  (or (previous-single-property-change (cperl-1+ p) prop lim)
+      (point-min))
+;;;  (cond ((eq p (point-min))
+;;;      p)
+;;;     ((and lim (<= p lim))
+;;;      p)
+;;;     ((not (get-text-property (1- p) prop))
+;;;      p)
+;;;     (t (or (previous-single-property-change p look-prop lim)
+;;;            (point-min))))
+  )
+
+(defun cperl-sniff-for-indent (&optional parse-data) ; was parse-start
+  ;; Old workhorse for calculation of indentation; the major problem
+  ;; is that it mixes the sniffer logic to understand what the current line
+  ;; MEANS with the logic to actually calculate where to indent it.
+  ;; The latter part should be eventually moved to `cperl-calculate-indent';
+  ;; actually, this is mostly done now...
   (cperl-update-syntaxification (point) (point))
-  (save-excursion
-    (if (or
-         (and (memq (get-text-property (point) 'syntax-type)
-                    '(pod here-doc here-doc-delim format))
-              (not (get-text-property (point) 'indentable)))
-         ;; before start of POD - whitespace found since do not have 'pod!
-         (and (looking-at "[ \t]*\n=")
-              (error "Spaces before POD section!"))
-         (and (not cperl-indent-left-aligned-comments)
-              (looking-at "^#")))
-        nil
-      (beginning-of-line)
-      (let ((indent-point (point))
-            (char-after (save-excursion
-                          (skip-chars-forward " \t")
-                          (following-char)))
-            (in-pod (get-text-property (point) 'in-pod))
-            (pre-indent-point (point))
-            p prop look-prop is-block delim)
-        (cond
-         (in-pod
-          ;; In the verbatim part, probably code example.  What to do???
-          )
-         (t
-          (save-excursion
-            ;; Not in POD
+  (let ((res (get-text-property (point) 'syntax-type)))
+    (save-excursion
+      (cond
+       ((and (memq res '(pod here-doc here-doc-delim format))
+             (not (get-text-property (point) 'indentable)))
+        (vector res))
+       ;; before start of POD - whitespace found since do not have 'pod!
+       ((looking-at "[ \t]*\n=")
+        (error "Spaces before POD section!"))
+       ((and (not cperl-indent-left-aligned-comments)
+             (looking-at "^#"))
+        [comment-special:at-beginning-of-line])
+       ((get-text-property (point) 'in-pod)
+        [in-pod])
+       (t
+        (beginning-of-line)
+        (let* ((indent-point (point))
+               (char-after-pos (save-excursion
+                                 (skip-chars-forward " \t")
+                                 (point)))
+               (char-after (char-after char-after-pos))
+               (pre-indent-point (point))
+               p prop look-prop is-block delim)
+          (save-excursion               ; Know we are not in POD, find appropriate pos before
             (cperl-backward-to-noncomment nil)
             (setq p (max (point-min) (1- (point)))
                   prop (get-text-property p 'syntax-type)
@@ -2444,437 +2740,597 @@ and closing parentheses and brackets."
                                 'syntax-type))
             (if (memq prop '(pod here-doc format here-doc-delim))
                 (progn
-                  (goto-char (or (previous-single-property-change p look-prop)
-                                 (point-min)))
+                  (goto-char (cperl-beginning-of-property p look-prop))
                   (beginning-of-line)
-                  (setq pre-indent-point (point)))))))
-        (goto-char pre-indent-point)
-        (let* ((case-fold-search nil)
-               (s-s (cperl-get-state (car parse-data) (nth 1 parse-data)))
-               (start (or (nth 2 parse-data)
-                          (nth 0 s-s)))
-               (state (nth 1 s-s))
-               (containing-sexp (car (cdr state)))
-               old-indent)
-          (if (and
-               ;;containing-sexp                ;; We are buggy at toplevel :-(
-               parse-data)
-              (progn
-                (setcar parse-data pre-indent-point)
-                (setcar (cdr parse-data) state)
-                (or (nth 2 parse-data)
-                    (setcar (cddr parse-data) start))
-                ;; Before this point: end of statement
-                (setq old-indent (nth 3 parse-data))))
-          (cond ((get-text-property (point) 'indentable)
-                 ;; indent to just after the surrounding open,
-                 ;; skip blanks if we do not close the expression.
-                 (goto-char (1+ (previous-single-property-change (point) 'indentable)))
-                 (or (memq char-after (append ")]}" nil))
-                     (looking-at "[ \t]*\\(#\\|$\\)")
-                     (skip-chars-forward " \t"))
-                 (current-column))
-                ((or (nth 3 state) (nth 4 state))
-                 ;; return nil or t if should not change this line
-                 (nth 4 state))
-                ;; XXXX Do we need to special-case this?
-                ((null containing-sexp)
-                 ;; Line is at top level.  May be data or function definition,
-                 ;; or may be function argument declaration.
-                 ;; Indent like the previous top level line
-                 ;; unless that ends in a closeparen without semicolon,
-                 ;; in which case this line is the first argument decl.
-                 (skip-chars-forward " \t")
-                 (+ (save-excursion
-                      (goto-char start)
-                      (- (current-indentation)
-                         (if (nth 2 s-s) cperl-indent-level 0)))
-                    (if (= char-after ?{) cperl-continued-brace-offset 0)
-                    (progn
-                      (cperl-backward-to-noncomment (or old-indent (point-min)))
-                      ;; Look at previous line that's at column 0
-                      ;; to determine whether we are in top-level decls
-                      ;; or function's arg decls.  Set basic-indent accordingly.
-                      ;; Now add a little if this is a continuation line.
-                      (if (or (bobp)
-                              (eq (point) old-indent) ; old-indent was at comment
-                              (eq (preceding-char) ?\;)
-                              ;;  Had ?\) too
-                              (and (eq (preceding-char) ?\})
-                                   (cperl-after-block-and-statement-beg
-                                    (point-min))) ; Was start - too close
-                              (memq char-after (append ")]}" nil))
-                              (and (eq (preceding-char) ?\:) ; label
-                                   (progn
-                                     (forward-sexp -1)
-                                     (skip-chars-backward " \t")
-                                     (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*[ \t]*:")))
-                              (get-text-property (point) 'first-format-line))
-                          (progn
-                            (if (and parse-data
-                                     (not (eq char-after ?\C-j)))
-                                (setcdr (cddr parse-data)
-                                        (list pre-indent-point)))
-                            0)
-                        cperl-continued-statement-offset))))
-                ((not
-                  (or (setq is-block
-                            (and (setq delim (= (char-after containing-sexp) ?{))
-                                 (save-excursion ; Is it a hash?
-                                   (goto-char containing-sexp)
-                                   (cperl-block-p))))
-                      cperl-indent-parens-as-block))
-                 ;; group is an expression, not a block:
-                 ;; indent to just after the surrounding open parens,
-                 ;; skip blanks if we do not close the expression.
-                 (goto-char (1+ containing-sexp))
-                 (or (memq char-after
-                           (append (if delim "}" ")]}") nil))
-                     (looking-at "[ \t]*\\(#\\|$\\)")
-                     (skip-chars-forward " \t"))
-                 (+ (current-column)
-                    (if (and delim
-                             (eq char-after ?\}))
-                        ;; Correct indentation of trailing ?\}
-                        (+ cperl-indent-level cperl-close-paren-offset)
-                      0)))
-;;;           ((and (/= (char-after containing-sexp) ?{)
-;;;                 (not cperl-indent-parens-as-block))
-;;;            ;; line is expression, not statement:
-;;;            ;; indent to just after the surrounding open,
-;;;            ;; skip blanks if we do not close the expression.
-;;;            (goto-char (1+ containing-sexp))
-;;;            (or (memq char-after (append ")]}" nil))
-;;;                (looking-at "[ \t]*\\(#\\|$\\)")
-;;;                (skip-chars-forward " \t"))
-;;;            (current-column))
-;;;           ((progn
-;;;              ;; Containing-expr starts with \{.  Check whether it is a hash.
-;;;              (goto-char containing-sexp)
-;;;              (and (not (cperl-block-p))
-;;;                   (not cperl-indent-parens-as-block)))
-;;;            (goto-char (1+ containing-sexp))
-;;;            (or (eq char-after ?\})
-;;;                (looking-at "[ \t]*\\(#\\|$\\)")
-;;;                (skip-chars-forward " \t"))
-;;;            (+ (current-column)      ; Correct indentation of trailing ?\}
-;;;               (if (eq char-after ?\}) (+ cperl-indent-level
-;;;                                          cperl-close-paren-offset)
-;;;                 0)))
-                (t
-                 ;; Statement level.  Is it a continuation or a new statement?
-                 ;; Find previous non-comment character.
-                 (goto-char pre-indent-point)
-                 (cperl-backward-to-noncomment containing-sexp)
-                 ;; Back up over label lines, since they don't
-                 ;; affect whether our line is a continuation.
-                 ;; (Had \, too)
-                 (while ;;(or (eq (preceding-char) ?\,)
-                     (and (eq (preceding-char) ?:)
-                          (or ;;(eq (char-after (- (point) 2)) ?\') ; ????
-                           (memq (char-syntax (char-after (- (point) 2)))
-                                 '(?w ?_))))
-                   ;;)
-                   (if (eq (preceding-char) ?\,)
-                       ;; Will go to beginning of line, essentially.
-                       ;; Will ignore embedded sexpr XXXX.
-                       (cperl-backward-to-start-of-continued-exp containing-sexp))
-                   (beginning-of-line)
-                   (cperl-backward-to-noncomment containing-sexp))
-                 ;; Now we get the answer.
-                 (if (not (or (eq (1- (point)) containing-sexp)
-                              (memq (preceding-char)
-                                    (append (if is-block " ;{" " ,;{") '(nil)))
-                              (and (eq (preceding-char) ?\})
-                                   (cperl-after-block-and-statement-beg
-                                    containing-sexp))
-                              (get-text-property (point) 'first-format-line)))
-                     ;; This line is continuation of preceding line's statement;
-                     ;; indent  `cperl-continued-statement-offset'  more than the
-                     ;; previous line of the statement.
-                     ;;
-                     ;; There might be a label on this line, just
-                     ;; consider it bad style and ignore it.
-                     (progn
-                       (cperl-backward-to-start-of-continued-exp containing-sexp)
-                       (+ (if (memq char-after (append "}])" nil))
-                              0         ; Closing parenth
-                            cperl-continued-statement-offset)
-                          (if (or is-block
-                                  (not delim)
-                                  (not (eq char-after ?\})))
-                              0
-                            ;; Now it is a hash reference
-                            (+ cperl-indent-level cperl-close-paren-offset))
-                          (if (looking-at "\\w+[ \t]*:")
-                              (if (> (current-indentation) cperl-min-label-indent)
-                                  (- (current-indentation) cperl-label-offset)
-                                ;; Do not move `parse-data', this should
-                                ;; be quick anyway (this comment comes
-                                ;; from different location):
-                                (cperl-calculate-indent))
-                            (current-column))
-                          (if (eq char-after ?\{)
-                              cperl-continued-brace-offset 0)))
-                   ;; This line starts a new statement.
-                   ;; Position following last unclosed open.
-                   (goto-char containing-sexp)
-                   ;; Is line first statement after an open-brace?
-                   (or
-                    ;; If no, find that first statement and indent like
-                    ;; it.  If the first statement begins with label, do
-                    ;; not believe when the indentation of the label is too
-                    ;; small.
-                    (save-excursion
-                      (forward-char 1)
-                      (setq old-indent (current-indentation))
-                      (let ((colon-line-end 0))
-                        (while
-                            (progn (skip-chars-forward " \t\n")
-                                   (looking-at "#\\|[a-zA-Z0-9_$]*:[^:]\\|=[a-zA-Z]"))
-                          ;; Skip over comments and labels following openbrace.
-                          (cond ((= (following-char) ?\#)
-                                 (forward-line 1))
-                                ((= (following-char) ?\=)
-                                 (goto-char
-                                  (or (next-single-property-change (point) 'in-pod)
-                                      (point-max)))) ; do not loop if no syntaxification
-                                ;; label:
-                                (t
-                                 (save-excursion (end-of-line)
-                                                 (setq colon-line-end (point)))
-                                 (search-forward ":"))))
-                        ;; The first following code counts
-                        ;; if it is before the line we want to indent.
-                        (and (< (point) indent-point)
-                             (if (> colon-line-end (point)) ; After label
-                                 (if (> (current-indentation)
-                                        cperl-min-label-indent)
-                                     (- (current-indentation) cperl-label-offset)
-                                   ;; Do not believe: `max' is involved
-                                   (+ old-indent cperl-indent-level))
-                               (current-column)))))
-                    ;; If no previous statement,
-                    ;; indent it relative to line brace is on.
-                    ;; For open brace in column zero, don't let statement
-                    ;; start there too.  If cperl-indent-level is zero,
-                    ;; use cperl-brace-offset + cperl-continued-statement-offset instead.
-                    ;; For open-braces not the first thing in a line,
-                    ;; add in cperl-brace-imaginary-offset.
-
-                    ;; If first thing on a line:  ?????
-                    (+ (if (and (bolp) (zerop cperl-indent-level))
-                           (+ cperl-brace-offset cperl-continued-statement-offset)
-                         cperl-indent-level)
-                       (if (or is-block
-                               (not delim)
-                               (not (eq char-after ?\})))
-                           0
-                         ;; Now it is a hash reference
-                         (+ cperl-indent-level cperl-close-paren-offset))
-                       ;; Move back over whitespace before the openbrace.
-                       ;; If openbrace is not first nonwhite thing on the line,
-                       ;; add the cperl-brace-imaginary-offset.
-                       (progn (skip-chars-backward " \t")
-                              (if (bolp) 0 cperl-brace-imaginary-offset))
-                       ;; If the openbrace is preceded by a parenthesized exp,
-                       ;; move to the beginning of that;
-                       ;; possibly a different line
-                       (progn
-                         (if (eq (preceding-char) ?\))
-                             (forward-sexp -1))
-                         ;; In the case it starts a subroutine, indent with
-                         ;; respect to `sub', not with respect to the
-                         ;; first thing on the line, say in the case of
-                         ;; anonymous sub in a hash.
-                         ;;
-                         (skip-chars-backward " \t")
-                         (if (and (eq (preceding-char) ?b)
+                  (setq pre-indent-point (point)))))
+          (goto-char pre-indent-point)  ; Orig line skipping preceeding pod/etc
+          (let* ((case-fold-search nil)
+                 (s-s (cperl-get-state (car parse-data) (nth 1 parse-data)))
+                 (start (or (nth 2 parse-data) ; last complete sexp terminated
+                            (nth 0 s-s))) ; Good place to start parsing
+                 (state (nth 1 s-s))
+                 (containing-sexp (car (cdr state)))
+                 old-indent)
+            (if (and
+                 ;;containing-sexp              ;; We are buggy at toplevel :-(
+                 parse-data)
+                (progn
+                  (setcar parse-data pre-indent-point)
+                  (setcar (cdr parse-data) state)
+                  (or (nth 2 parse-data)
+                      (setcar (cddr parse-data) start))
+                  ;; Before this point: end of statement
+                  (setq old-indent (nth 3 parse-data))))
+            (cond ((get-text-property (point) 'indentable)
+                   ;; indent to "after" the surrounding open
+                   ;; (same offset as `cperl-beautify-regexp-piece'),
+                   ;; skip blanks if we do not close the expression.
+                   (setq delim          ; We do not close the expression
+                         (get-text-property
+                          (cperl-1+ char-after-pos) 'indentable)
+                         p (1+ (cperl-beginning-of-property
+                                (point) 'indentable))
+                         is-block       ; misused for: preceeding line in REx
+                         (save-excursion ; Find preceeding line
+                           (cperl-backward-to-noncomment p)
+                           (beginning-of-line)
+                           (if (<= (point) p)
+                               (progn   ; get indent from the first line
+                                 (goto-char p)
+                                 (skip-chars-forward " \t")
+                                 (if (memq (char-after (point))
+                                           (append "#\n" nil))
+                                     nil ; Can't use intentation of this line...
+                                   (point)))
+                             (skip-chars-forward " \t")
+                             (point)))
+                         prop (parse-partial-sexp p char-after-pos))
+                   (cond ((not delim)   ; End the REx, ignore is-block
+                          (vector 'indentable 'terminator p is-block))
+                         (is-block      ; Indent w.r.t. preceeding line
+                          (vector 'indentable 'cont-line char-after-pos
+                                  is-block char-after p))
+                         (t             ; No preceeding line...
+                          (vector 'indentable 'first-line p))))
+                  ((get-text-property char-after-pos 'REx-part2)
+                   (vector 'REx-part2 (point)))
+                  ((nth 3 state)
+                   [comment])
+                  ((nth 4 state)
+                   [string])
+                  ;; XXXX Do we need to special-case this?
+                  ((null containing-sexp)
+                   ;; Line is at top level.  May be data or function definition,
+                   ;; or may be function argument declaration.
+                   ;; Indent like the previous top level line
+                   ;; unless that ends in a closeparen without semicolon,
+                   ;; in which case this line is the first argument decl.
+                   (skip-chars-forward " \t")
+                   (cperl-backward-to-noncomment (or old-indent (point-min)))
+                   (setq state
+                         (or (bobp)
+                             (eq (point) old-indent) ; old-indent was at comment
+                             (eq (preceding-char) ?\;)
+                             ;;  Had ?\) too
+                             (and (eq (preceding-char) ?\})
+                                  (cperl-after-block-and-statement-beg
+                                   (point-min))) ; Was start - too close
+                             (memq char-after (append ")]}" nil))
+                             (and (eq (preceding-char) ?\:) ; label
                                   (progn
                                     (forward-sexp -1)
-                                    (looking-at "sub\\>"))
-                                  (setq old-indent
-                                        (nth 1
-                                             (parse-partial-sexp
-                                              (save-excursion (beginning-of-line) (point))
-                                              (point)))))
-                             (progn (goto-char (1+ old-indent))
-                                    (skip-chars-forward " \t")
-                                    (current-column))
-                           ;; Get initial indentation of the line we are on.
-                           ;; If line starts with label, calculate label indentation
-                           (if (save-excursion
-                                 (beginning-of-line)
-                                 (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*:[^:]"))
-                               (if (> (current-indentation) cperl-min-label-indent)
-                                   (- (current-indentation) cperl-label-offset)
-                                 ;; Do not move `parse-data', this should
-                                 ;; be quick anyway:
-                                 (cperl-calculate-indent))
-                             (current-indentation))))))))))))))
-
-;; (defvar cperl-indent-alist
-;;   '((string nil)
-;;     (comment nil)
-;;     (toplevel 0)
-;;     (toplevel-after-parenth 2)
-;;     (toplevel-continued 2)
-;;     (expression 1))
-;;   "Alist of indentation rules for CPerl mode.
-;; The values mean:
-;;   nil: do not indent;
-;;   number: add this amount of indentation.
-
-;; Not finished, not used.")
-
-;; (defun cperl-where-am-i (&optional parse-start start-state)
-;;   ;; Unfinished
-;;   "Return a list of lists ((TYPE POS)...) of good points before the point.
-;; ;; POS may be nil if it is hard to find, say, when TYPE is `string' or `comment'.
-
-;; ;; Not finished, not used."
-;;   (save-excursion
-;;     (let* ((start-point (point))
-;;         (s-s (cperl-get-state))
-;;         (start (nth 0 s-s))
-;;         (state (nth 1 s-s))
-;;         (prestart (nth 3 s-s))
-;;         (containing-sexp (car (cdr state)))
-;;         (case-fold-search nil)
-;;         (res (list (list 'parse-start start) (list 'parse-prestart prestart))))
-;;       (cond ((nth 3 state)           ; In string
-;;           (setq res (cons (list 'string nil (nth 3 state)) res))) ; What started string
-;;          ((nth 4 state)              ; In comment
-;;           (setq res (cons '(comment) res)))
-;;          ((null containing-sexp)
-;;           ;; Line is at top level.
-;;           ;; Indent like the previous top level line
-;;           ;; unless that ends in a closeparen without semicolon,
-;;           ;; in which case this line is the first argument decl.
-;;           (cperl-backward-to-noncomment (or parse-start (point-min)))
-;;           ;;(skip-chars-backward " \t\f\n")
-;;           (cond
-;;            ((or (bobp)
-;;                 (memq (preceding-char) (append ";}" nil)))
-;;             (setq res (cons (list 'toplevel start) res)))
-;;            ((eq (preceding-char) ?\) )
-;;             (setq res (cons (list 'toplevel-after-parenth start) res)))
-;;            (t
-;;             (setq res (cons (list 'toplevel-continued start) res)))))
-;;          ((/= (char-after containing-sexp) ?{)
-;;           ;; line is expression, not statement:
-;;           ;; indent to just after the surrounding open.
-;;           ;; skip blanks if we do not close the expression.
-;;           (setq res (cons (list 'expression-blanks
-;;                                 (progn
-;;                                   (goto-char (1+ containing-sexp))
-;;                                   (or (looking-at "[ \t]*\\(#\\|$\\)")
-;;                                       (skip-chars-forward " \t"))
-;;                                   (point)))
-;;                           (cons (list 'expression containing-sexp) res))))
-;;          ((progn
-;;             ;; Containing-expr starts with \{.  Check whether it is a hash.
-;;             (goto-char containing-sexp)
-;;             (not (cperl-block-p)))
-;;           (setq res (cons (list 'expression-blanks
-;;                                 (progn
-;;                                   (goto-char (1+ containing-sexp))
-;;                                   (or (looking-at "[ \t]*\\(#\\|$\\)")
-;;                                       (skip-chars-forward " \t"))
-;;                                   (point)))
-;;                           (cons (list 'expression containing-sexp) res))))
-;;          (t
-;;           ;; Statement level.
-;;           (setq res (cons (list 'in-block containing-sexp) res))
-;;           ;; Is it a continuation or a new statement?
-;;           ;; Find previous non-comment character.
-;;           (cperl-backward-to-noncomment containing-sexp)
-;;           ;; Back up over label lines, since they don't
-;;           ;; affect whether our line is a continuation.
-;;           ;; Back up comma-delimited lines too ?????
-;;           (while (or (eq (preceding-char) ?\,)
-;;                      (save-excursion (cperl-after-label)))
-;;             (if (eq (preceding-char) ?\,)
-;;                 ;; Will go to beginning of line, essentially
-;;                 ;; Will ignore embedded sexpr XXXX.
-;;                 (cperl-backward-to-start-of-continued-exp containing-sexp))
-;;             (beginning-of-line)
-;;             (cperl-backward-to-noncomment containing-sexp))
-;;           ;; Now we get the answer.
-;;           (if (not (memq (preceding-char) (append ";}{" '(nil)))) ; Was ?\,
-;;               ;; This line is continuation of preceding line's statement.
-;;               (list (list 'statement-continued containing-sexp))
-;;             ;; This line starts a new statement.
-;;             ;; Position following last unclosed open.
-;;             (goto-char containing-sexp)
-;;             ;; Is line first statement after an open-brace?
-;;             (or
-;;              ;; If no, find that first statement and indent like
-;;              ;; it.  If the first statement begins with label, do
-;;              ;; not believe when the indentation of the label is too
-;;              ;; small.
-;;              (save-excursion
-;;                (forward-char 1)
-;;                (let ((colon-line-end 0))
-;;                  (while (progn (skip-chars-forward " \t\n" start-point)
-;;                                (and (< (point) start-point)
-;;                                     (looking-at
-;;                                      "#\\|[a-zA-Z_][a-zA-Z0-9_]*:[^:]")))
-;;                    ;; Skip over comments and labels following openbrace.
-;;                    (cond ((= (following-char) ?\#)
-;;                           ;;(forward-line 1)
-;;                           (end-of-line))
-;;                          ;; label:
-;;                          (t
-;;                           (save-excursion (end-of-line)
-;;                                           (setq colon-line-end (point)))
-;;                           (search-forward ":"))))
-;;                  ;; Now at the point, after label, or at start
-;;                  ;; of first statement in the block.
-;;                  (and (< (point) start-point)
-;;                       (if (> colon-line-end (point))
-;;                           ;; Before statement after label
-;;                           (if (> (current-indentation)
-;;                                  cperl-min-label-indent)
-;;                               (list (list 'label-in-block (point)))
-;;                             ;; Do not believe: `max' is involved
-;;                             (list
-;;                              (list 'label-in-block-min-indent (point))))
-;;                         ;; Before statement
-;;                         (list 'statement-in-block (point))))))
-;;              ;; If no previous statement,
-;;              ;; indent it relative to line brace is on.
-;;              ;; For open brace in column zero, don't let statement
-;;              ;; start there too.  If cperl-indent-level is zero,
-;;              ;; use cperl-brace-offset + cperl-continued-statement-offset instead.
-;;              ;; For open-braces not the first thing in a line,
-;;              ;; add in cperl-brace-imaginary-offset.
-
-;;              ;; If first thing on a line:  ?????
-;;              (+ (if (and (bolp) (zerop cperl-indent-level))
-;;                     (+ cperl-brace-offset cperl-continued-statement-offset)
-;;                   cperl-indent-level)
-;;                 ;; Move back over whitespace before the openbrace.
-;;                 ;; If openbrace is not first nonwhite thing on the line,
-;;                 ;; add the cperl-brace-imaginary-offset.
-;;                 (progn (skip-chars-backward " \t")
-;;                        (if (bolp) 0 cperl-brace-imaginary-offset))
-;;                 ;; If the openbrace is preceded by a parenthesized exp,
-;;                 ;; move to the beginning of that;
-;;                 ;; possibly a different line
-;;                 (progn
-;;                   (if (eq (preceding-char) ?\))
-;;                       (forward-sexp -1))
-;;                   ;; Get initial indentation of the line we are on.
-;;                   ;; If line starts with label, calculate label indentation
-;;                   (if (save-excursion
-;;                         (beginning-of-line)
-;;                         (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*:[^:]"))
-;;                       (if (> (current-indentation) cperl-min-label-indent)
-;;                           (- (current-indentation) cperl-label-offset)
-;;                         (cperl-calculate-indent))
-;;                     (current-indentation))))))))
-;;       res)))
+                                    (skip-chars-backward " \t")
+                                    (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*[ \t]*:")))
+                             (get-text-property (point) 'first-format-line)))
+                   
+                   ;; Look at previous line that's at column 0
+                   ;; to determine whether we are in top-level decls
+                   ;; or function's arg decls.  Set basic-indent accordingly.
+                   ;; Now add a little if this is a continuation line.
+                   (and state
+                        parse-data
+                        (not (eq char-after ?\C-j))
+                        (setcdr (cddr parse-data)
+                                (list pre-indent-point)))
+                   (vector 'toplevel start char-after state (nth 2 s-s)))
+                  ((not
+                    (or (setq is-block
+                              (and (setq delim (= (char-after containing-sexp) ?{))
+                                   (save-excursion ; Is it a hash?
+                                     (goto-char containing-sexp)
+                                     (cperl-block-p))))
+                        cperl-indent-parens-as-block))
+                   ;; group is an expression, not a block:
+                   ;; indent to just after the surrounding open parens,
+                   ;; skip blanks if we do not close the expression.
+                   (goto-char (1+ containing-sexp))
+                   (or (memq char-after
+                             (append (if delim "}" ")]}") nil))
+                       (looking-at "[ \t]*\\(#\\|$\\)")
+                       (skip-chars-forward " \t"))
+                   (setq old-indent (point)) ; delim=is-brace
+                   (vector 'in-parens char-after (point) delim containing-sexp))
+                  (t
+                   ;; Statement level.  Is it a continuation or a new statement?
+                   ;; Find previous non-comment character.
+                   (goto-char pre-indent-point) ; Skip one level of POD/etc
+                   (cperl-backward-to-noncomment containing-sexp)
+                   ;; Back up over label lines, since they don't
+                   ;; affect whether our line is a continuation.
+                   ;; (Had \, too)
+                   (while;;(or (eq (preceding-char) ?\,)
+                       (and (eq (preceding-char) ?:)
+                            (or;;(eq (char-after (- (point) 2)) ?\') ; ????
+                             (memq (char-syntax (char-after (- (point) 2)))
+                                   '(?w ?_))))
+                     ;;)
+                     ;; This is always FALSE?
+                     (if (eq (preceding-char) ?\,)
+                         ;; Will go to beginning of line, essentially.
+                         ;; Will ignore embedded sexpr XXXX.
+                         (cperl-backward-to-start-of-continued-exp containing-sexp))
+                     (beginning-of-line)
+                     (cperl-backward-to-noncomment containing-sexp))
+                   ;; Now we get non-label preceeding the indent point
+                   (if (not (or (eq (1- (point)) containing-sexp)
+                                (memq (preceding-char)
+                                      (append (if is-block " ;{" " ,;{") '(nil)))
+                                (and (eq (preceding-char) ?\})
+                                     (cperl-after-block-and-statement-beg
+                                      containing-sexp))
+                                (get-text-property (point) 'first-format-line)))
+                       ;; This line is continuation of preceding line's statement;
+                       ;; indent  `cperl-continued-statement-offset'  more than the
+                       ;; previous line of the statement.
+                       ;;
+                       ;; There might be a label on this line, just
+                       ;; consider it bad style and ignore it.
+                       (progn
+                         (cperl-backward-to-start-of-continued-exp containing-sexp)
+                         (vector 'continuation (point) char-after is-block delim))
+                     ;; This line starts a new statement.
+                     ;; Position following last unclosed open brace
+                     (goto-char containing-sexp)
+                     ;; Is line first statement after an open-brace?
+                     (or
+                      ;; If no, find that first statement and indent like
+                      ;; it.  If the first statement begins with label, do
+                      ;; not believe when the indentation of the label is too
+                      ;; small.
+                      (save-excursion
+                        (forward-char 1)
+                        (let ((colon-line-end 0))
+                          (while
+                              (progn (skip-chars-forward " \t\n")
+                                     (looking-at "#\\|[a-zA-Z0-9_$]*:[^:]\\|=[a-zA-Z]"))
+                            ;; Skip over comments and labels following openbrace.
+                            (cond ((= (following-char) ?\#)
+                                   (forward-line 1))
+                                  ((= (following-char) ?\=)
+                                   (goto-char
+                                    (or (next-single-property-change (point) 'in-pod)
+                                        (point-max)))) ; do not loop if no syntaxification
+                                  ;; label:
+                                  (t
+                                   (save-excursion (end-of-line)
+                                                   (setq colon-line-end (point)))
+                                   (search-forward ":"))))
+                          ;; We are at beginning of code (NOT label or comment)
+                          ;; First, the following code counts
+                          ;; if it is before the line we want to indent.
+                          (and (< (point) indent-point)
+                               (vector 'have-prev-sibling (point) colon-line-end
+                                       containing-sexp))))
+                      (progn
+                        ;; If no previous statement,
+                        ;; indent it relative to line brace is on.
+
+                        ;; For open-braces not the first thing in a line,
+                        ;; add in cperl-brace-imaginary-offset.
+
+                        ;; If first thing on a line:  ?????
+                        ;; Move back over whitespace before the openbrace.
+                        (setq           ; brace first thing on a line
+                         old-indent (progn (skip-chars-backward " \t") (bolp)))
+                        ;; Should we indent w.r.t. earlier than start?
+                        ;; Move to start of control group, possibly on a different line
+                        (or cperl-indent-wrt-brace
+                            (cperl-backward-to-noncomment (point-min)))
+                        ;; If the openbrace is preceded by a parenthesized exp,
+                        ;; move to the beginning of that;
+                        (if (eq (preceding-char) ?\))
+                            (progn
+                              (forward-sexp -1)
+                              (cperl-backward-to-noncomment (point-min))))
+                        ;; In the case it starts a subroutine, indent with
+                        ;; respect to `sub', not with respect to the
+                        ;; first thing on the line, say in the case of
+                        ;; anonymous sub in a hash.
+                        (if (and;; Is it a sub in group starting on this line?
+                             (cond ((get-text-property (point) 'attrib-group)
+                                    (goto-char (cperl-beginning-of-property
+                                                (point) 'attrib-group)))
+                                   ((eq (preceding-char) ?b)
+                                    (forward-sexp -1)
+                                    (looking-at "sub\\>")))
+                             (setq p (nth 1 ; start of innermost containing list
+                                          (parse-partial-sexp
+                                           (save-excursion (beginning-of-line)
+                                                           (point))
+                                           (point)))))
+                            (progn
+                              (goto-char (1+ p)) ; enclosing block on the same line
+                              (skip-chars-forward " \t")
+                              (vector 'code-start-in-block containing-sexp char-after
+                                      (and delim (not is-block)) ; is a HASH
+                                      old-indent ; brace first thing on a line
+                                      t (point) ; have something before...
+                                      )
+                              ;;(current-column)
+                              )
+                          ;; Get initial indentation of the line we are on.
+                          ;; If line starts with label, calculate label indentation
+                          (vector 'code-start-in-block containing-sexp char-after
+                                  (and delim (not is-block)) ; is a HASH
+                                  old-indent ; brace first thing on a line
+                                  nil (point) ; nothing interesting before
+                                  ))))))))))))))
+
+(defvar cperl-indent-rules-alist
+  '((pod nil)                           ; via `syntax-type' property
+    (here-doc nil)                      ; via `syntax-type' property
+    (here-doc-delim nil)                ; via `syntax-type' property
+    (format nil)                        ; via `syntax-type' property
+    (in-pod nil)                        ; via `in-pod' property
+    (comment-special:at-beginning-of-line nil)
+    (string t)
+    (comment nil))
+  "Alist of indentation rules for CPerl mode.
+The values mean:
+  nil: do not indent;
+  number: add this amount of indentation.
+
+Not finished.")
+
+(defun cperl-calculate-indent (&optional parse-data) ; was parse-start
+  "Return appropriate indentation for current line as Perl code.
+In usual case returns an integer: the column to indent to.
+Returns nil if line starts inside a string, t if in a comment.
+
+Will not correct the indentation for labels, but will correct it for braces
+and closing parentheses and brackets."
+  ;; This code is still a broken architecture: in some cases we need to
+  ;; compensate for some modifications which `cperl-indent-line' will add later
+  (save-excursion
+    (let ((i (cperl-sniff-for-indent parse-data)) what p)
+      (cond
+       ;;((or (null i) (eq i t) (numberp i))
+       ;;  i)
+       ((vectorp i)
+        (setq what (assoc (elt i 0) cperl-indent-rules-alist))
+        (cond
+         (what (cadr what))             ; Load from table
+         ;;
+         ;; Indenters for regular expressions with //x and qw()
+         ;;
+         ((eq 'REx-part2 (elt i 0)) ;; [self start] start of /REP in s//REP/x
+          (goto-char (elt i 1))
+          (condition-case nil   ; Use indentation of the 1st part
+              (forward-sexp -1))
+          (current-column))
+         ((eq 'indentable (elt i 0))    ; Indenter for REGEXP qw() etc
+          (cond                ;;; [indentable terminator start-pos is-block]
+           ((eq 'terminator (elt i 1)) ; Lone terminator of "indentable string"
+            (goto-char (elt i 2))       ; After opening parens
+            (1- (current-column)))
+           ((eq 'first-line (elt i 1)); [indentable first-line start-pos]
+            (goto-char (elt i 2))
+            (+ (or cperl-regexp-indent-step cperl-indent-level)
+               -1
+               (current-column)))
+           ((eq 'cont-line (elt i 1)); [indentable cont-line pos prev-pos first-char start-pos]
+            ;; Indent as the level after closing parens
+            (goto-char (elt i 2))       ; indent line
+            (skip-chars-forward " \t)") ; Skip closing parens
+            (setq p (point))
+            (goto-char (elt i 3))       ; previous line
+            (skip-chars-forward " \t)") ; Skip closing parens
+            ;; Number of parens in between:
+            (setq p (nth 0 (parse-partial-sexp (point) p))
+                  what (elt i 4))       ; First char on current line
+            (goto-char (elt i 3))       ; previous line
+            (+ (* p (or cperl-regexp-indent-step cperl-indent-level))
+               (cond ((eq what ?\) )
+                      (- cperl-close-paren-offset)) ; compensate
+                     ((eq what ?\| )
+                      (- (or cperl-regexp-indent-step cperl-indent-level)))
+                     (t 0))
+               (if (eq (following-char) ?\| )
+                   (or cperl-regexp-indent-step cperl-indent-level)
+                 0)
+               (current-column)))
+           (t
+            (error "Unrecognized value of indent: %s" i))))
+         ;;
+         ;; Indenter for stuff at toplevel
+         ;;
+         ((eq 'toplevel (elt i 0)) ;; [toplevel start char-after state immed-after-block]
+          (+ (save-excursion            ; To beg-of-defun, or end of last sexp
+               (goto-char (elt i 1))    ; start = Good place to start parsing
+               (- (current-indentation) ; 
+                  (if (elt i 4) cperl-indent-level 0))) ; immed-after-block
+             (if (eq (elt i 2) ?{) cperl-continued-brace-offset 0) ; char-after
+             ;; Look at previous line that's at column 0
+             ;; to determine whether we are in top-level decls
+             ;; or function's arg decls.  Set basic-indent accordingly.
+             ;; Now add a little if this is a continuation line.
+             (if (elt i 3)              ; state (XXX What is the semantic???)
+                 0
+               cperl-continued-statement-offset)))
+         ;;
+         ;; Indenter for stuff in "parentheses" (or brackets, braces-as-hash)
+         ;;
+         ((eq 'in-parens (elt i 0))
+          ;; in-parens char-after old-indent-point is-brace containing-sexp
+
+          ;; group is an expression, not a block:
+          ;; indent to just after the surrounding open parens,
+          ;; skip blanks if we do not close the expression.
+          (+ (progn
+               (goto-char (elt i 2))            ; old-indent-point
+               (current-column))
+             (if (and (elt i 3)         ; is-brace
+                      (eq (elt i 1) ?\})) ; char-after
+                 ;; Correct indentation of trailing ?\}
+                 (+ cperl-indent-level cperl-close-paren-offset)
+               0)))
+         ;;
+         ;; Indenter for continuation lines
+         ;;
+         ((eq 'continuation (elt i 0))
+          ;; [continuation statement-start char-after is-block is-brace]
+          (goto-char (elt i 1))         ; statement-start
+          (+ (if (memq (elt i 2) (append "}])" nil)) ; char-after
+                 0                      ; Closing parenth
+               cperl-continued-statement-offset)
+             (if (or (elt i 3)          ; is-block
+                     (not (elt i 4))            ; is-brace
+                     (not (eq (elt i 2) ?\}))) ; char-after
+                 0
+               ;; Now it is a hash reference
+               (+ cperl-indent-level cperl-close-paren-offset))
+             ;; Labels do not take :: ...
+             (if (looking-at "\\(\\w\\|_\\)+[ \t]*:")
+                 (if (> (current-indentation) cperl-min-label-indent)
+                     (- (current-indentation) cperl-label-offset)
+                   ;; Do not move `parse-data', this should
+                   ;; be quick anyway (this comment comes
+                   ;; from different location):
+                   (cperl-calculate-indent))
+               (current-column))
+             (if (eq (elt i 2) ?\{)     ; char-after
+                 cperl-continued-brace-offset 0)))
+         ;;
+         ;; Indenter for lines in a block which are not leading lines
+         ;;
+         ((eq 'have-prev-sibling (elt i 0))
+          ;; [have-prev-sibling sibling-beg colon-line-end block-start]
+          (goto-char (elt i 1))
+          (if (> (elt i 2) (point)) ; colon-line-end; After-label, same line
+              (if (> (current-indentation)
+                     cperl-min-label-indent)
+                  (- (current-indentation) cperl-label-offset)
+                ;; Do not believe: `max' was involved in calculation of indent
+                (+ cperl-indent-level
+                   (save-excursion
+                     (goto-char (elt i 3)) ; block-start
+                     (current-indentation))))
+            (current-column)))
+         ;;
+         ;; Indenter for the first line in a block
+         ;;
+         ((eq 'code-start-in-block (elt i 0))
+          ;;[code-start-in-block before-brace char-after
+          ;; is-a-HASH-ref brace-is-first-thing-on-a-line
+          ;; group-starts-before-start-of-sub start-of-control-group]
+          (goto-char (elt i 1))
+          ;; For open brace in column zero, don't let statement
+          ;; start there too.  If cperl-indent-level=0,
+          ;; use cperl-brace-offset + cperl-continued-statement-offset instead.
+          (+ (if (and (bolp) (zerop cperl-indent-level))
+                 (+ cperl-brace-offset cperl-continued-statement-offset)
+               cperl-indent-level)
+             (if (and (elt i 3) ; is-a-HASH-ref
+                      (eq (elt i 2) ?\})) ; char-after: End of a hash reference
+                 (+ cperl-indent-level cperl-close-paren-offset)
+               0)
+             ;; Unless openbrace is the first nonwhite thing on the line,
+             ;; add the cperl-brace-imaginary-offset.
+             (if (elt i 4) 0            ; brace-is-first-thing-on-a-line
+               cperl-brace-imaginary-offset)
+             (progn
+               (goto-char (elt i 6))    ; start-of-control-group
+               (if (elt i 5)            ; group-starts-before-start-of-sub
+                   (current-column)
+                 ;; Get initial indentation of the line we are on.
+                 ;; If line starts with label, calculate label indentation
+                 (if (save-excursion
+                       (beginning-of-line)
+                       (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*:[^:]"))
+                     (if (> (current-indentation) cperl-min-label-indent)
+                         (- (current-indentation) cperl-label-offset)
+                       ;; Do not move `parse-data', this should
+                       ;; be quick anyway:
+                       (cperl-calculate-indent))
+                   (current-indentation))))))
+         (t
+          (error "Unrecognized value of indent: %s" i))))
+       (t
+        (error "Got strange value of indent: %s" i))))))
+
+(defvar cperl-indent-alist
+  '((string nil)
+    (comment nil)
+    (toplevel 0)
+    (toplevel-after-parenth 2)
+    (toplevel-continued 2)
+    (expression 1))
+  "Alist of indentation rules for CPerl mode.
+The values mean:
+  nil: do not indent;
+  number: add this amount of indentation.
+
+Not finished, not used.")
+
+(defun cperl-where-am-i (&optional parse-start start-state)
+  ;; Unfinished
+  "Return a list of lists ((TYPE POS)...) of good points before the point.
+POS may be nil if it is hard to find, say, when TYPE is `string' or `comment'.
+
+Not finished, not used."
+  (save-excursion
+    (let* ((start-point (point)) unused
+           (s-s (cperl-get-state))
+           (start (nth 0 s-s))
+           (state (nth 1 s-s))
+           (prestart (nth 3 s-s))
+           (containing-sexp (car (cdr state)))
+           (case-fold-search nil)
+           (res (list (list 'parse-start start) (list 'parse-prestart prestart))))
+      (cond ((nth 3 state)              ; In string
+             (setq res (cons (list 'string nil (nth 3 state)) res))) ; What started string
+            ((nth 4 state)              ; In comment
+             (setq res (cons '(comment) res)))
+            ((null containing-sexp)
+             ;; Line is at top level.
+             ;; Indent like the previous top level line
+             ;; unless that ends in a closeparen without semicolon,
+             ;; in which case this line is the first argument decl.
+             (cperl-backward-to-noncomment (or parse-start (point-min)))
+             ;;(skip-chars-backward " \t\f\n")
+             (cond
+              ((or (bobp)
+                   (memq (preceding-char) (append ";}" nil)))
+               (setq res (cons (list 'toplevel start) res)))
+              ((eq (preceding-char) ?\) )
+               (setq res (cons (list 'toplevel-after-parenth start) res)))
+              (t
+               (setq res (cons (list 'toplevel-continued start) res)))))
+            ((/= (char-after containing-sexp) ?{)
+             ;; line is expression, not statement:
+             ;; indent to just after the surrounding open.
+             ;; skip blanks if we do not close the expression.
+             (setq res (cons (list 'expression-blanks
+                                   (progn
+                                     (goto-char (1+ containing-sexp))
+                                     (or (looking-at "[ \t]*\\(#\\|$\\)")
+                                         (skip-chars-forward " \t"))
+                                     (point)))
+                             (cons (list 'expression containing-sexp) res))))
+            ((progn
+               ;; Containing-expr starts with \{.  Check whether it is a hash.
+               (goto-char containing-sexp)
+               (not (cperl-block-p)))
+             (setq res (cons (list 'expression-blanks
+                                   (progn
+                                     (goto-char (1+ containing-sexp))
+                                     (or (looking-at "[ \t]*\\(#\\|$\\)")
+                                         (skip-chars-forward " \t"))
+                                     (point)))
+                             (cons (list 'expression containing-sexp) res))))
+            (t
+             ;; Statement level.
+             (setq res (cons (list 'in-block containing-sexp) res))
+             ;; Is it a continuation or a new statement?
+             ;; Find previous non-comment character.
+             (cperl-backward-to-noncomment containing-sexp)
+             ;; Back up over label lines, since they don't
+             ;; affect whether our line is a continuation.
+             ;; Back up comma-delimited lines too ?????
+             (while (or (eq (preceding-char) ?\,)
+                        (save-excursion (cperl-after-label)))
+               (if (eq (preceding-char) ?\,)
+                   ;; Will go to beginning of line, essentially
+                   ;; Will ignore embedded sexpr XXXX.
+                   (cperl-backward-to-start-of-continued-exp containing-sexp))
+               (beginning-of-line)
+               (cperl-backward-to-noncomment containing-sexp))
+             ;; Now we get the answer.
+             (if (not (memq (preceding-char) (append ";}{" '(nil)))) ; Was ?\,
+                 ;; This line is continuation of preceding line's statement.
+                 (list (list 'statement-continued containing-sexp))
+               ;; This line starts a new statement.
+               ;; Position following last unclosed open.
+               (goto-char containing-sexp)
+               ;; Is line first statement after an open-brace?
+               (or
+                ;; If no, find that first statement and indent like
+                ;; it.  If the first statement begins with label, do
+                ;; not believe when the indentation of the label is too
+                ;; small.
+                (save-excursion
+                  (forward-char 1)
+                  (let ((colon-line-end 0))
+                    (while (progn (skip-chars-forward " \t\n" start-point)
+                                  (and (< (point) start-point)
+                                       (looking-at
+                                        "#\\|[a-zA-Z_][a-zA-Z0-9_]*:[^:]")))
+                      ;; Skip over comments and labels following openbrace.
+                      (cond ((= (following-char) ?\#)
+                             ;;(forward-line 1)
+                             (end-of-line))
+                            ;; label:
+                            (t
+                             (save-excursion (end-of-line)
+                                             (setq colon-line-end (point)))
+                             (search-forward ":"))))
+                    ;; Now at the point, after label, or at start
+                    ;; of first statement in the block.
+                    (and (< (point) start-point)
+                         (if (> colon-line-end (point))
+                             ;; Before statement after label
+                             (if (> (current-indentation)
+                                    cperl-min-label-indent)
+                                 (list (list 'label-in-block (point)))
+                               ;; Do not believe: `max' is involved
+                               (list
+                                (list 'label-in-block-min-indent (point))))
+                           ;; Before statement
+                           (list 'statement-in-block (point))))))
+                ;; If no previous statement,
+                ;; indent it relative to line brace is on.
+                ;; For open brace in column zero, don't let statement
+                ;; start there too.  If cperl-indent-level is zero,
+                ;; use cperl-brace-offset + cperl-continued-statement-offset instead.
+                ;; For open-braces not the first thing in a line,
+                ;; add in cperl-brace-imaginary-offset.
+
+                ;; If first thing on a line:  ?????
+                (setq unused            ; This is not finished...
+                (+ (if (and (bolp) (zerop cperl-indent-level))
+                       (+ cperl-brace-offset cperl-continued-statement-offset)
+                     cperl-indent-level)
+                   ;; Move back over whitespace before the openbrace.
+                   ;; If openbrace is not first nonwhite thing on the line,
+                   ;; add the cperl-brace-imaginary-offset.
+                   (progn (skip-chars-backward " \t")
+                          (if (bolp) 0 cperl-brace-imaginary-offset))
+                   ;; If the openbrace is preceded by a parenthesized exp,
+                   ;; move to the beginning of that;
+                   ;; possibly a different line
+                   (progn
+                     (if (eq (preceding-char) ?\))
+                         (forward-sexp -1))
+                     ;; Get initial indentation of the line we are on.
+                     ;; If line starts with label, calculate label indentation
+                     (if (save-excursion
+                           (beginning-of-line)
+                           (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*:[^:]"))
+                         (if (> (current-indentation) cperl-min-label-indent)
+                             (- (current-indentation) cperl-label-offset)
+                           (cperl-calculate-indent))
+                       (current-indentation)))))))))
+      res)))
 
 (defun cperl-calculate-indent-within-comment ()
   "Return the indentation amount for line, assuming that
@@ -2894,14 +3350,22 @@ the current line is to be regarded as part of a block comment."
 
 (defun cperl-to-comment-or-eol ()
   "Go to position before comment on the current line, or to end of line.
-Returns true if comment is found."
-  (let (state stop-in cpoint (lim (progn (end-of-line) (point))))
+Returns true if comment is found.  In POD will not move the point."
+  ;; If the line is inside other syntax groups (qq-style strings, HERE-docs)
+  ;; then looks for literal # or end-of-line.
+  (let (state stop-in cpoint (lim (progn (end-of-line) (point))) pr e)
+    (or cperl-font-locking
+        (cperl-update-syntaxification lim lim))
     (beginning-of-line)
-    (if (or
-         (eq (get-text-property (point) 'syntax-type) 'pod)
-         (re-search-forward "\\=[ \t]*\\(#\\|$\\)" lim t))
+    (if (setq pr (get-text-property (point) 'syntax-type))
+        (setq e (next-single-property-change (point) 'syntax-type nil (point-max))))
+    (if (or (eq pr 'pod)
+            (if (or (not e) (> e lim))  ; deep inside a group
+                (re-search-forward "\\=[ \t]*\\(#\\|$\\)" lim t)))
         (if (eq (preceding-char) ?\#) (progn (backward-char 1) t))
-      ;; Else
+      ;; Else - need to do it the hard way
+      (and (and e (<= e lim))
+           (goto-char e))
       (while (not stop-in)
         (setq state (parse-partial-sexp (point) lim nil nil nil t))
                                         ; stop at comment
@@ -2933,17 +3397,11 @@ Returns true if comment is found."
           (setq stop-in t)))            ; Finish
       (nth 4 state))))
 
-(defsubst cperl-1- (p)
-  (max (point-min) (1- p)))
-
-(defsubst cperl-1+ (p)
-  (min (point-max) (1+ p)))
-
 (defsubst cperl-modify-syntax-type (at how)
   (if (< at (point-max))
       (progn
         (put-text-property at (1+ at) 'syntax-table how)
-        (put-text-property at (1+ at) 'rear-nonsticky t))))
+        (put-text-property at (1+ at) 'rear-nonsticky '(syntax-table)))))
 
 (defun cperl-protect-defun-start (s e)
   ;; C code looks for "^\\s(" to skip comment backward in "hard" situations
@@ -2978,35 +3436,53 @@ Returns true if comment is found."
                          ( ?\{ . ?\} )
                          ( ?\< . ?\> )))
 
-(defun cperl-forward-re (lim end is-2arg set-st st-l err-l argument
+(defun cperl-cached-syntax-table (st)
+  "Get a syntax table cached in ST, or create and cache into ST a syntax table.
+All the entries of the syntax table are \".\", except for a backslash, which
+is quoting."
+  (if (car-safe st)
+      (car st)
+    (setcar st (make-syntax-table))
+    (setq st (car st))
+    (let ((i 0))
+      (while (< i 256)
+        (modify-syntax-entry i "." st)
+        (setq i (1+ i))))
+    (modify-syntax-entry ?\\ "\\" st)
+    st))
+
+(defun cperl-forward-re (lim end is-2arg st-l err-l argument
                              &optional ostart oend)
-  ;; Works *before* syntax recognition is done
-  ;; May modify syntax-type text property if the situation is too hard
-  (let (b starter ender st i i2 go-forward reset-st)
+"Find the end of a regular expression or a stringish construct (q[] etc).
+The point should be before the starting delimiter.
+
+Goes to LIM if none is found.  If IS-2ARG is non-nil, assumes that it
+is s/// or tr/// like expression.  If END is nil, generates an error
+message if needed.  If SET-ST is non-nil, will use (or generate) a
+cached syntax table in ST-L.  If ERR-L is non-nil, will store the
+error message in its CAR (unless it already contains some error
+message).  ARGUMENT should be the name of the construct (used in error
+messages).  OSTART, OEND may be set in recursive calls when processing
+the second argument of 2ARG construct.
+
+Works *before* syntax recognition is done.  In IS-2ARG situation may
+modify syntax-type text property if the situation is too hard."
+  (let (b starter ender st i i2 go-forward reset-st set-st)
     (skip-chars-forward " \t")
     ;; ender means matching-char matcher.
     (setq b (point)
           starter (if (eobp) 0 (char-after b))
           ender (cdr (assoc starter cperl-starters)))
     ;; What if starter == ?\\  ????
-    (if set-st
-        (if (car st-l)
-            (setq st (car st-l))
-          (setcar st-l (make-syntax-table))
-          (setq i 0 st (car st-l))
-          (while (< i 256)
-            (modify-syntax-entry i "." st)
-            (setq i (1+ i)))
-          (modify-syntax-entry ?\\ "\\" st)))
+    (setq st (cperl-cached-syntax-table st-l))
     (setq set-st t)
     ;; Whether we have an intermediate point
     (setq i nil)
     ;; Prepare the syntax table:
-    (and set-st
-         (if (not ender)                ; m/blah/, s/x//, s/x/y/
-             (modify-syntax-entry starter "$" st)
-           (modify-syntax-entry starter (concat "(" (list ender)) st)
-           (modify-syntax-entry ender  (concat ")" (list starter)) st)))
+    (if (not ender)             ; m/blah/, s/x//, s/x/y/
+        (modify-syntax-entry starter "$" st)
+      (modify-syntax-entry starter (concat "(" (list ender)) st)
+      (modify-syntax-entry ender  (concat ")" (list starter)) st))
     (condition-case bb
         (progn
           ;; We use `$' syntax class to find matching stuff, but $$
@@ -3053,7 +3529,7 @@ Returns true if comment is found."
                 (modify-syntax-entry starter (if (eq starter ?\\) "\\" ".") st)
                 (if ender (modify-syntax-entry ender "." st))
                 (setq set-st nil)
-                (setq ender (cperl-forward-re lim end nil t st-l err-l
+                (setq ender (cperl-forward-re lim end nil st-l err-l
                                               argument starter ender)
                  ender (nth 2 ender)))))
       (error (goto-char lim)
@@ -3078,6 +3554,33 @@ Returns true if comment is found."
     ;; go-forward: has 2 args, and the second part is empty
     (list i i2 ender starter go-forward)))
 
+(defun cperl-forward-group-in-re (&optional st-l)
+  "Find the end of a group in a REx.
+Return the error message (if any).  Does not work if delimiter is `)'.
+Works before syntax recognition is done."
+  ;; Works *before* syntax recognition is done
+  (or st-l (setq st-l (list nil)))      ; Avoid overwriting '()
+  (let (st b reset-st)
+    (condition-case b
+        (progn
+          (setq st (cperl-cached-syntax-table st-l))
+          (modify-syntax-entry ?\( "()" st)
+          (modify-syntax-entry ?\) ")(" st)
+          (setq reset-st (syntax-table))
+          (set-syntax-table st)
+          (forward-sexp 1))
+      (error (message
+              "cperl-forward-group-in-re: error %s" b)))
+    ;; now restore the initial state
+    (if st
+        (progn
+          (modify-syntax-entry ?\( "." st)
+          (modify-syntax-entry ?\) "." st)))
+    (if reset-st
+        (set-syntax-table reset-st))
+    b))
+
+
 (defvar font-lock-string-face)
 ;;(defvar font-lock-reference-face)
 (defvar font-lock-constant-face)
@@ -3103,13 +3606,24 @@ Returns true if comment is found."
 ;;      d) 'Q'uoted string:
 ;;              part between markers inclusive is marked `syntax-type' ==> `string'
 ;;              part between `q' and the first marker is marked `syntax-type' ==> `prestring'
+;;              second part of s///e is marked `syntax-type' ==> `multiline'
+;;      e) Attributes of subroutines: `attrib-group' ==> t
+;;              (or 0 if declaration); up to `{' or ';': `syntax-type' => `sub-decl'.
+;;      f) Multiline my/our declaration lists etc: `syntax-type' => `multiline'
+
+;;; In addition, some parts of RExes may be marked as `REx-interpolated'
+;;; (value: 0 in //o, 1 if "interpolated variable" is whole-REx, t otherwise).
 
 (defun cperl-unwind-to-safe (before &optional end)
   ;; if BEFORE, go to the previous start-of-line on each step of unwinding
   (let ((pos (point)) opos)
-    (setq opos pos)
-    (while (and pos (get-text-property pos 'syntax-type))
-      (setq pos (previous-single-property-change pos 'syntax-type))
+    (while (and pos (progn
+                      (beginning-of-line)
+                      (get-text-property (setq pos (point)) 'syntax-type)))
+      (setq opos pos
+            pos (cperl-beginning-of-property pos 'syntax-type))
+      (if (eq pos (point-min))
+          (setq pos nil))
       (if pos
           (if before
               (progn
@@ -3126,32 +3640,117 @@ Returns true if comment is found."
     (setq pos (point))
     (if end
         ;; Do the same for end, going small steps
-        (progn
+        (save-excursion
           (while (and end (get-text-property end 'syntax-type))
             (setq pos end
-                  end (next-single-property-change end 'syntax-type)))
+                  end (next-single-property-change end 'syntax-type nil (point-max)))
+            (if end (progn (goto-char end)
+                           (or (bolp) (forward-line 1))
+                           (setq end (point)))))
           (or end pos)))))
 
+;;; These are needed for byte-compile (at least with v19)
 (defvar cperl-nonoverridable-face)
+(defvar font-lock-variable-name-face)
 (defvar font-lock-function-name-face)
+(defvar font-lock-keyword-face)
+(defvar font-lock-builtin-face)
+(defvar font-lock-type-face)
 (defvar font-lock-comment-face)
+(defvar font-lock-warning-face)
 
-(defun cperl-find-pods-heres (&optional min max non-inter end ignore-max)
+(defun cperl-find-sub-attrs (&optional st-l b-fname e-fname pos)
+  "Syntaxically mark (and fontify) attributes of a subroutine.
+Should be called with the point before leading colon of an attribute."
+  ;; Works *before* syntax recognition is done
+  (or st-l (setq st-l (list nil)))      ; Avoid overwriting '()
+  (let (st b p reset-st after-first (start (point)) start1 end1)
+    (condition-case b
+        (while (looking-at
+                (concat
+                 "\\("                  ; 1=optional? colon
+                   ":" cperl-maybe-white-and-comment-rex ; 2=whitespace/comment?
+                 "\\)"
+                 (if after-first "?" "")
+                 ;; No space between name and paren allowed...
+                 "\\(\\sw+\\)"          ; 3=name
+                 "\\((\\)?"))           ; 4=optional paren
+          (and (match-beginning 1)
+               (cperl-postpone-fontification
+                (match-beginning 0) (cperl-1+ (match-beginning 0))
+                'face font-lock-constant-face))
+          (setq start1 (match-beginning 3) end1 (match-end 3))
+          (cperl-postpone-fontification start1 end1
+                                        'face font-lock-constant-face)
+          (goto-char end1)              ; end or before `('
+          (if (match-end 4)             ; Have attribute arguments...
+              (progn
+                (if st nil
+                  (setq st (cperl-cached-syntax-table st-l))
+                  (modify-syntax-entry ?\( "()" st)
+                  (modify-syntax-entry ?\) ")(" st))
+                (setq reset-st (syntax-table) p (point))
+                (set-syntax-table st)
+                (forward-sexp 1)
+                (set-syntax-table reset-st)
+                (setq reset-st nil)
+                (cperl-commentify p (point) t))) ; mark as string
+          (forward-comment (buffer-size))
+          (setq after-first t))
+      (error (message
+              "L%d: attribute `%s': %s"
+              (count-lines (point-min) (point))
+              (and start1 end1 (buffer-substring start1 end1)) b)
+             (setq start nil)))
+    (and start
+         (progn
+           (put-text-property start (point)
+                              'attrib-group (if (looking-at "{") t 0))
+           (and pos
+                (< 1 (count-lines (+ 3 pos) (point))) ; end of `sub'
+                ;; Apparently, we do not need `multiline': faces added now
+                (put-text-property (+ 3 pos) (cperl-1+ (point))
+                                   'syntax-type 'sub-decl))
+           (and b-fname                 ; Fontify here: the following condition
+                (cperl-postpone-fontification ; is too hard to determine by
+                 b-fname e-fname 'face ; a REx, so do it here
+                (if (looking-at "{")
+                    font-lock-function-name-face
+                  font-lock-variable-name-face)))))
+    ;; now restore the initial state
+    (if st
+        (progn
+          (modify-syntax-entry ?\( "." st)
+          (modify-syntax-entry ?\) "." st)))
+    (if reset-st
+        (set-syntax-table reset-st))))
+
+(defsubst cperl-look-at-leading-count (is-x-REx e)
+  (if (re-search-forward (concat "\\=" (if is-x-REx "[ \t\n]*" "") "[{?+*]")
+                         (1- e) t)      ; return nil on failure, no moving
+      (if (eq ?\{ (preceding-char)) nil
+        (cperl-postpone-fontification
+         (1- (point)) (point)
+         'face font-lock-warning-face))))
+
+;;; Debugging this may require (setq max-specpdl-size 2000)...
+(defun cperl-find-pods-heres (&optional min max non-inter end ignore-max end-of-here-doc)
   "Scans the buffer for hard-to-parse Perl constructions.
 If `cperl-pod-here-fontify' is not-nil after evaluation, will fontify
 the sections using `cperl-pod-head-face', `cperl-pod-face',
 `cperl-here-face'."
   (interactive)
-  (or min (setq min (point-min)
+ (or min (setq min (point-min)
                 cperl-syntax-state nil
                 cperl-syntax-done-to min))
   (or max (setq max (point-max)))
   (let* ((cperl-pod-here-fontify (eval cperl-pod-here-fontify)) go tmpend
          face head-face here-face b e bb tag qtag b1 e1 argument i c tail tb
-         is-REx is-x-REx REx-comment-start REx-comment-end was-comment i2
+         is-REx is-x-REx REx-subgr-start REx-subgr-end was-subgr i2 hairy-RE
          (case-fold-search nil) (inhibit-read-only t) (buffer-undo-list t)
-         (modified (buffer-modified-p))
+         (modified (buffer-modified-p)) overshoot is-o-REx
          (after-change-functions nil)
+         (cperl-font-locking t)
          (use-syntax-state (and cperl-syntax-state
                                 (>= min (car cperl-syntax-state))))
          (state-point (if use-syntax-state
@@ -3162,33 +3761,62 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
          ;; (st-l '(nil)) (err-l '(nil)) ; Would overwrite - propagates from a function call to a function call!
          (st-l (list nil)) (err-l (list nil))
          ;; Somehow font-lock may be not loaded yet...
+         ;; (e.g., when building TAGS via command-line call)
          (font-lock-string-face (if (boundp 'font-lock-string-face)
                                     font-lock-string-face
                                   'font-lock-string-face))
-         (font-lock-constant-face (if (boundp 'font-lock-constant-face)
+         (my-cperl-delimiters-face (if (boundp 'font-lock-constant-face)
                                       font-lock-constant-face
                                     'font-lock-constant-face))
-         (font-lock-function-name-face
+         (my-cperl-REx-spec-char-face   ; [] ^.$ and wrapper-of ({})
           (if (boundp 'font-lock-function-name-face)
               font-lock-function-name-face
             'font-lock-function-name-face))
+         (font-lock-variable-name-face  ; interpolated vars and ({})-code
+          (if (boundp 'font-lock-variable-name-face)
+              font-lock-variable-name-face
+            'font-lock-variable-name-face))
+         (font-lock-function-name-face  ; used in `cperl-find-sub-attrs'
+          (if (boundp 'font-lock-function-name-face)
+              font-lock-function-name-face
+            'font-lock-function-name-face))
+         (font-lock-constant-face       ; used in `cperl-find-sub-attrs'
+          (if (boundp 'font-lock-constant-face)
+              font-lock-constant-face
+            'font-lock-constant-face))
+         (my-cperl-REx-0length-face ; 0-length, (?:)etc, non-literal \
+          (if (boundp 'font-lock-builtin-face)
+              font-lock-builtin-face
+            'font-lock-builtin-face))
          (font-lock-comment-face
           (if (boundp 'font-lock-comment-face)
               font-lock-comment-face
             'font-lock-comment-face))
-         (cperl-nonoverridable-face
+         (font-lock-warning-face
+          (if (boundp 'font-lock-warning-face)
+              font-lock-warning-face
+            'font-lock-warning-face))
+         (my-cperl-REx-ctl-face         ; (|)
+          (if (boundp 'font-lock-keyword-face)
+              font-lock-keyword-face
+            'font-lock-keyword-face))
+         (my-cperl-REx-modifiers-face   ; //gims
           (if (boundp 'cperl-nonoverridable-face)
               cperl-nonoverridable-face
-            'cperl-nonoverridable))
+            'cperl-nonoverridable-face))
+         (my-cperl-REx-length1-face     ; length=1 escaped chars, POSIX classes
+          (if (boundp 'font-lock-type-face)
+              font-lock-type-face
+            'font-lock-type-face))
          (stop-point (if ignore-max
                          (point-max)
                        max))
          (search
           (concat
-           "\\(\\`\n?\\|^\n\\)="
+           "\\(\\`\n?\\|^\n\\)="        ; POD
            "\\|"
            ;; One extra () before this:
-           "<<"
+           "<<"                         ; HERE-DOC
            "\\("                        ; 1 + 1
            ;; First variant "BLAH" or just ``.
            "[ \t]*"                     ; Yes, whitespace is allowed!
@@ -3204,36 +3832,44 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
            "\\)"
            "\\|"
            ;; 1+6 extra () before this:
-           "^[ \t]*\\(format\\)[ \t]*\\([a-zA-Z0-9_]+\\)?[ \t]*=[ \t]*$"
+           "^[ \t]*\\(format\\)[ \t]*\\([a-zA-Z0-9_]+\\)?[ \t]*=[ \t]*$" ;FRMAT
            (if cperl-use-syntax-table-text-property
                (concat
                 "\\|"
                 ;; 1+6+2=9 extra () before this:
-                "\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>"
+                "\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>" ; QUOTED CONSTRUCT
                 "\\|"
                 ;; 1+6+2+1=10 extra () before this:
                 "\\([?/<]\\)"   ; /blah/ or ?blah? or <file*glob>
                 "\\|"
-                ;; 1+6+2+1+1=11 extra () before this:
-                "\\<sub\\>[ \t]*\\([a-zA-Z_:'0-9]+[ \t]*\\)?\\(([^()]*)\\)"
+                ;; 1+6+2+1+1=11 extra () before this
+                "\\<sub\\>"             ;  sub with proto/attr
+                "\\("
+                   cperl-white-and-comment-rex
+                   "\\(::[a-zA-Z_:'0-9]*\\|[a-zA-Z_'][a-zA-Z_:'0-9]*\\)\\)?" ; name
+                "\\("
+                   cperl-maybe-white-and-comment-rex
+                   "\\(([^()]*)\\|:[^:]\\)\\)" ; prototype or attribute start
                 "\\|"
-                ;; 1+6+2+1+1+2=13 extra () before this:
-                "\\$\\(['{]\\)"
+                ;; 1+6+2+1+1+6=17 extra () before this:
+                "\\$\\(['{]\\)"         ; $' or ${foo}
                 "\\|"
-                ;; 1+6+2+1+1+2+1=14 extra () before this:
+                ;; 1+6+2+1+1+6+1=18 extra () before this (old pack'var syntax;
+                ;; we do not support intervening comments...):
                 "\\(\\<sub[ \t\n\f]+\\|[&*$@%]\\)[a-zA-Z0-9_]*'"
-                ;; 1+6+2+1+1+2+1+1=15 extra () before this:
+                ;; 1+6+2+1+1+6+1+1=19 extra () before this:
                 "\\|"
-                "__\\(END\\|DATA\\)__"
-                ;; 1+6+2+1+1+2+1+1+1=16 extra () before this:
+                "__\\(END\\|DATA\\)__"  ; __END__ or __DATA__
+                ;; 1+6+2+1+1+6+1+1+1=20 extra () before this:
                 "\\|"
-                "\\\\\\(['`\"($]\\)")
+                "\\\\\\(['`\"($]\\)")   ; BACKWACKED something-hairy
              ""))))
     (unwind-protect
         (progn
           (save-excursion
             (or non-inter
                 (message "Scanning for \"hard\" Perl constructions..."))
+            ;;(message "find: %s --> %s" min max)
             (and cperl-pod-here-fontify
                  ;; We had evals here, do not know why...
                  (setq face cperl-pod-face
@@ -3241,16 +3877,22 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                        here-face cperl-here-face))
             (remove-text-properties min max
                                     '(syntax-type t in-pod t syntax-table t
+                                                  attrib-group t
+                                                  REx-interpolated t
                                                   cperl-postpone t
                                                   syntax-subtype t
                                                   rear-nonsticky t
+                                                  front-sticky t
                                                   here-doc-group t
                                                   first-format-line t
+                                                  REx-part2 t
                                                   indentable t))
             ;; Need to remove face as well...
             (goto-char min)
             (and (eq system-type 'emx)
-                 (looking-at "extproc[ \t]") ; Analogue of #!
+                 (eq (point) 1)
+                 (let ((case-fold-search t))
+                   (looking-at "extproc[ \t]")) ; Analogue of #!
                  (cperl-commentify min
                                    (save-excursion (end-of-line) (point))
                                    nil))
@@ -3258,11 +3900,38 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                     (< (point) max)
                     (re-search-forward search max t))
               (setq tmpend nil)         ; Valid for most cases
+              (setq b (match-beginning 0)
+                    state (save-excursion (parse-partial-sexp
+                                           state-point b nil nil state))
+                    state-point b)
               (cond
+               ;; 1+6+2+1+1+6=17 extra () before this:
+               ;;    "\\$\\(['{]\\)"
+               ((match-beginning 18) ; $' or ${foo}
+                (if (eq (preceding-char) ?\') ; $'
+                    (progn
+                      (setq b (1- (point))
+                            state (parse-partial-sexp
+                                   state-point (1- b) nil nil state)
+                            state-point (1- b))
+                      (if (nth 3 state) ; in string
+                          (cperl-modify-syntax-type (1- b) cperl-st-punct))
+                      (goto-char (1+ b)))
+                  ;; else: ${
+                  (setq bb (match-beginning 0))
+                  (cperl-modify-syntax-type bb cperl-st-punct)))
+               ;; No processing in strings/comments beyond this point:
+               ((or (nth 3 state) (nth 4 state))
+                t)                      ; Do nothing in comment/string
                ((match-beginning 1)     ; POD section
                 ;;  "\\(\\`\n?\\|^\n\\)="
-                (if (looking-at "cut\\>")
-                    (if ignore-max
+                (setq b (match-beginning 0)
+                      state (parse-partial-sexp
+                             state-point b nil nil state)
+                      state-point b)
+                (if (or (nth 3 state) (nth 4 state)
+                        (looking-at "cut\\>"))
+                    (if (or (nth 3 state) (nth 4 state) ignore-max)
                         nil             ; Doing a chunk only
                       (message "=cut is not preceded by a POD section")
                       (or (car err-l) (setcar err-l (point))))
@@ -3288,11 +3957,15 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                        (progn
                          (remove-text-properties
                           max e '(syntax-type t in-pod t syntax-table t
+                                              attrib-group t
+                                              REx-interpolated t
                                               cperl-postpone t
                                               syntax-subtype t
                                               here-doc-group t
                                               rear-nonsticky t
+                                              front-sticky t
                                               first-format-line t
+                                              REx-part2 t
                                               indentable t))
                          (setq tmpend tb)))
                   (put-text-property b e 'in-pod t)
@@ -3335,7 +4008,8 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                   (or (eq e (point-max))
                       (forward-char -1)))) ; Prepare for immediate POD start.
                ;; Here document
-               ;; We do only one here-per-line
+               ;; We can do many here-per-line;
+               ;; but multiline quote on the same line as <<HERE confuses us...
                ;; ;; One extra () before this:
                ;;"<<"
                ;;  "\\("                        ; 1 + 1
@@ -3352,21 +4026,42 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                ;;    "\\(\\)"           ; To preserve count of pars :-( 6 + 1
                ;;  "\\)"
                ((match-beginning 2)     ; 1 + 1
-                ;; Abort in comment:
-                (setq b (point))
-                (setq state (parse-partial-sexp state-point b nil nil state)
-                      state-point b
+                (setq b (point)
                       tb (match-beginning 0)
-                      i (or (nth 3 state) (nth 4 state)))
-                (if i
-                    (setq c t)
-                  (setq c (and
-                           (match-beginning 5)
-                           (not (match-beginning 6)) ; Empty
-                           (looking-at
-                            "[ \t]*[=0-9$@%&(]"))))
+                      c (and            ; not HERE-DOC
+                         (match-beginning 5)
+                         (save-match-data
+                           (or (looking-at "[ \t]*(") ; << function_call()
+                               (save-excursion ; 1 << func_name, or $foo << 10
+                                 (condition-case nil
+                                     (progn
+                                       (goto-char tb)
+               ;;; XXX What to do: foo <<bar ???
+               ;;; XXX Need to support print {a} <<B ???
+                                       (forward-sexp -1)
+                                       (save-match-data 
+                                        ; $foo << b; $f .= <<B;
+                                        ; ($f+1) << b; a($f) . <<B;
+                                        ; foo 1, <<B; $x{a} <<b;
+                                         (cond
+                                          ((looking-at "[0-9$({]")
+                                           (forward-sexp 1)
+                                           (and
+                                            (looking-at "[ \t]*<<")
+                                            (condition-case nil
+                                                ;; print $foo <<EOF
+                                                (progn
+                                                  (forward-sexp -2)
+                                                  (not
+                                                   (looking-at "\\(printf?\\|system\\|exec\\|sort\\)\\>")))
+                                                (error t)))))))
+                                   (error nil))) ; func(<<EOF)
+                               (and (not (match-beginning 6)) ; Empty
+                                    (looking-at
+                                     "[ \t]*[=0-9$@%&(]"))))))
                 (if c                   ; Not here-doc
                     nil                 ; Skip it.
+                  (setq c (match-end 2)) ; 1 + 1
                   (if (match-beginning 5) ;4 + 1
                       (setq b1 (match-beginning 5) ; 4 + 1
                             e1 (match-end 5)) ; 4 + 1
@@ -3376,15 +4071,20 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                         qtag (regexp-quote tag))
                   (cond (cperl-pod-here-fontify
                          ;; Highlight the starting delimiter
-                         (cperl-postpone-fontification b1 e1 'face font-lock-constant-face)
+                         (cperl-postpone-fontification 
+                          b1 e1 'face my-cperl-delimiters-face)
                          (cperl-put-do-not-fontify b1 e1 t)))
                   (forward-line)
+                  (setq i (point))
+                  (if end-of-here-doc
+                      (goto-char end-of-here-doc))
                   (setq b (point))
                   ;; We do not search to max, since we may be called from
                   ;; some hook of fontification, and max is random
                   (or (and (re-search-forward (concat "^" qtag "$")
                                               stop-point 'toend)
-                           (eq (following-char) ?\n))
+                           ;;;(eq (following-char) ?\n) ; XXXX WHY???
+                           )
                     (progn              ; Pretend we matched at the end
                       (goto-char (point-max))
                       (re-search-forward "\\'")
@@ -3393,8 +4093,9 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                   (if cperl-pod-here-fontify
                       (progn
                         ;; Highlight the ending delimiter
-                        (cperl-postpone-fontification (match-beginning 0) (match-end 0)
-                                                      'face font-lock-constant-face)
+                        (cperl-postpone-fontification
+                         (match-beginning 0) (match-end 0)
+                         'face my-cperl-delimiters-face)
                         (cperl-put-do-not-fontify b (match-end 0) t)
                         ;; Highlight the HERE-DOC
                         (cperl-postpone-fontification b (match-beginning 0)
@@ -3404,10 +4105,21 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                      'syntax-type 'here-doc)
                   (put-text-property (match-beginning 0) e1
                                      'syntax-type 'here-doc-delim)
-                  (put-text-property b e1
-                                     'here-doc-group t)
+                  (put-text-property b e1 'here-doc-group t)
+                  ;; This makes insertion at the start of HERE-DOC update
+                  ;; the whole construct:
+                  (put-text-property b (cperl-1+ b) 'front-sticky '(syntax-type))
                   (cperl-commentify b e1 nil)
                   (cperl-put-do-not-fontify b (match-end 0) t)
+                  ;; Cache the syntax info...
+                  (setq cperl-syntax-state (cons state-point state))
+                  ;; ... and process the rest of the line...
+                  (setq overshoot
+                        (elt            ; non-inter ignore-max
+                         (cperl-find-pods-heres c i t end t e1) 1))
+                  (if (and overshoot (> overshoot (point)))
+                      (goto-char overshoot)
+                    (setq overshoot e1))
                   (if (> e1 max)
                       (setq tmpend tb))))
                ;; format
@@ -3462,7 +4174,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                 (if (> (point) max)
                     (setq tmpend tb))
                 (put-text-property b (point) 'syntax-type 'format))
-               ;; Regexp:
+               ;; qq-like String or Regexp:
                ((or (match-beginning 10) (match-beginning 11))
                 ;; 1+6+2=9 extra () before this:
                 ;; "\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>"
@@ -3471,10 +4183,10 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                 (setq b1 (if (match-beginning 10) 10 11)
                       argument (buffer-substring
                                 (match-beginning b1) (match-end b1))
-                      b (point)
+                      b (point)         ; end of qq etc
                       i b
                       c (char-after (match-beginning b1))
-                      bb (char-after (1- (match-beginning b1))) ; tmp holder
+                      bb (char-after (1- (match-beginning b1))) ; tmp holder
                       ;; bb == "Not a stringy"
                       bb (if (eq b1 10) ; user variables/whatever
                              (and (memq bb (append "$@%*#_:-&>" nil)) ; $#y)
@@ -3488,7 +4200,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                               (- (match-beginning b1) 2))
                                              ?\-))
                                         ((eq bb ?\&)
-                                         (not (eq (char-after   ; &&m/blah/
+                                         (not (eq (char-after ; &&m/blah/
                                                    (- (match-beginning b1) 2))
                                                   ?\&)))
                                         (t t)))
@@ -3506,41 +4218,40 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                         (setq argument ""
                               b1 nil
                               bb        ; Not a regexp?
-                              (progn
-                                (not
-                                 ;; What is below: regexp-p?
-                                 (and
-                                  (or (memq (preceding-char)
-                                            (append (if (memq c '(?\? ?\<))
-                                                        ;; $a++ ? 1 : 2
-                                                        "~{(=|&*!,;:"
-                                                      "~{(=|&+-*!,;:") nil))
-                                      (and (eq (preceding-char) ?\})
-                                           (cperl-after-block-p (point-min)))
-                                      (and (eq (char-syntax (preceding-char)) ?w)
-                                           (progn
-                                             (forward-sexp -1)
+                              (not
+                               ;; What is below: regexp-p?
+                               (and
+                                (or (memq (preceding-char)
+                                          (append (if (memq c '(?\? ?\<))
+                                                      ;; $a++ ? 1 : 2
+                                                      "~{(=|&*!,;:["
+                                                    "~{(=|&+-*!,;:[") nil))
+                                    (and (eq (preceding-char) ?\})
+                                         (cperl-after-block-p (point-min)))
+                                    (and (eq (char-syntax (preceding-char)) ?w)
+                                         (progn
+                                           (forward-sexp -1)
 ;; After these keywords `/' starts a RE.  One should add all the
 ;; functions/builtins which expect an argument, but ...
-                                             (if (eq (preceding-char) ?-)
-                                                 ;; -d ?foo? is a RE
-                                                 (looking-at "[a-zA-Z]\\>")
-                                               (and
-                                                (not (memq (preceding-char)
-                                                           '(?$ ?@ ?& ?%)))
-                                                (looking-at
-                                                 "\\(while\\|if\\|unless\\|until\\|and\\|or\\|not\\|xor\\|split\\|grep\\|map\\|print\\)\\>")))))
-                                      (and (eq (preceding-char) ?.)
-                                           (eq (char-after (- (point) 2)) ?.))
-                                      (bobp))
-                                  ;;  m|blah| ? foo : bar;
-                                  (not
-                                   (and (eq c ?\?)
-                                        cperl-use-syntax-table-text-property
-                                        (not (bobp))
-                                        (progn
-                                          (forward-char -1)
-                                          (looking-at "\\s|")))))))
+                                           (if (eq (preceding-char) ?-)
+                                               ;; -d ?foo? is a RE
+                                               (looking-at "[a-zA-Z]\\>")
+                                             (and
+                                              (not (memq (preceding-char)
+                                                         '(?$ ?@ ?& ?%)))
+                                              (looking-at
+                                               "\\(while\\|if\\|unless\\|until\\|and\\|or\\|not\\|xor\\|split\\|grep\\|map\\|print\\)\\>")))))
+                                    (and (eq (preceding-char) ?.)
+                                         (eq (char-after (- (point) 2)) ?.))
+                                    (bobp))
+                                ;;  m|blah| ? foo : bar;
+                                (not
+                                 (and (eq c ?\?)
+                                      cperl-use-syntax-table-text-property
+                                      (not (bobp))
+                                      (progn
+                                        (forward-char -1)
+                                        (looking-at "\\s|"))))))
                               b (1- b))
                       ;; s y tr m
                       ;; Check for $a -> y
@@ -3550,13 +4261,9 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                (eq (char-after (- go 2)) ?-))
                           ;; Not a regexp
                           (setq bb t))))
-                (or bb (setq state (parse-partial-sexp
-                                    state-point b nil nil state)
-                             state-point b))
-                (setq bb (or bb (nth 3 state) (nth 4 state)))
-                (goto-char b)
                 (or bb
                     (progn
+                      (goto-char b)
                       (if (looking-at "[ \t\n\f]+\\(#[^\n]*\n[ \t\n\f]*\\)+")
                           (goto-char (match-end 0))
                         (skip-chars-forward " \t\n\f"))
@@ -3593,6 +4300,8 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                     (skip-chars-backward " \t\n\f")
                                     (memq (preceding-char)
                                           (append "$@%&*" nil))))
+                             (setq bb t))
+                            ((eobp)
                              (setq bb t)))))
                 (if bb
                     (goto-char i)
@@ -3605,15 +4314,16 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                   ;; qtag means two-arg matcher, may be reset to
                   ;;   2 or 3 later if some special quoting is needed.
                   ;; e1 means matching-char matcher.
-                  (setq b (point)
+                  (setq b (point)       ; before the first delimiter
                         ;; has 2 args
                         i2 (string-match "^\\([sy]\\|tr\\)$" argument)
                         ;; We do not search to max, since we may be called from
                         ;; some hook of fontification, and max is random
                         i (cperl-forward-re stop-point end
                                             i2
-                                            t st-l err-l argument)
-                        ;; Note that if `go', then it is considered as 1-arg
+                                            st-l err-l argument)
+                        ;; If `go', then it is considered as 1-arg, `b1' is nil
+                        ;; as in s/foo//x; the point is before final "slash"
                         b1 (nth 1 i)    ; start of the second part
                         tag (nth 2 i)   ; ender-char, true if second part
                                         ; is with matching chars []
@@ -3625,13 +4335,18 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                  (1- e1))
                         e (if i i e1)   ; end of the first part
                         qtag nil        ; need to preserve backslashitis
-                        is-x-REx nil)   ; REx has //x modifier
+                        is-x-REx nil is-o-REx nil); REx has //x //o modifiers
+                  ;; If s{} (), then b/b1 are at "{", "(", e1/i after ")", "}"
                   ;; Commenting \\ is dangerous, what about ( ?
                   (and i tail
                        (eq (char-after i) ?\\)
                        (setq qtag t))
-                  (if (looking-at "\\sw*x") ; qr//x
-                      (setq is-x-REx t))
+                  (and (if go (looking-at ".\\sw*x")
+                         (looking-at "\\sw*x")) ; qr//x
+                       (setq is-x-REx t))
+                  (and (if go (looking-at ".\\sw*o")
+                         (looking-at "\\sw*o")) ; //o
+                       (setq is-o-REx t))
                   (if (null i)
                       ;; Considered as 1arg form
                       (progn
@@ -3648,9 +4363,11 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                     (cperl-commentify b i t)
                     (if (looking-at "\\sw*e") ; s///e
                         (progn
+                          ;; Cache the syntax info...
+                          (setq cperl-syntax-state (cons state-point state))
                           (and
                            ;; silent:
-                           (cperl-find-pods-heres b1 (1- (point)) t end)
+                           (car (cperl-find-pods-heres b1 (1- (point)) t end))
                            ;; Error
                            (goto-char (1+ max)))
                           (if (and tag (eq (preceding-char) ?\>))
@@ -3658,6 +4375,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                 (cperl-modify-syntax-type (1- (point)) cperl-st-ket)
                                 (cperl-modify-syntax-type i cperl-st-bra)))
                           (put-text-property b i 'syntax-type 'string)
+                          (put-text-property i (point) 'syntax-type 'multiline)
                           (if is-x-REx
                               (put-text-property b i 'indentable t)))
                       (cperl-commentify b1 (point) t)
@@ -3673,7 +4391,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                         (forward-word 1) ; skip modifiers s///s
                         (if tail (cperl-commentify tail (point) t))
                         (cperl-postpone-fontification
-                         e1 (point) 'face 'cperl-nonoverridable)))
+                         e1 (point) 'face my-cperl-REx-modifiers-face)))
                   ;; Check whether it is m// which means "previous match"
                   ;; and highlight differently
                   (setq is-REx
@@ -3691,7 +4409,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                    (not (looking-at "split\\>")))
                                (error t))))
                       (cperl-postpone-fontification
-                       b e 'face font-lock-function-name-face)
+                       b e 'face font-lock-warning-face)
                     (if (or i2          ; Has 2 args
                             (and cperl-fontify-m-as-s
                                  (or
@@ -3700,135 +4418,417 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                        (not (eq ?\< (char-after b)))))))
                         (progn
                           (cperl-postpone-fontification
-                           b (cperl-1+ b) 'face font-lock-constant-face)
+                           b (cperl-1+ b) 'face my-cperl-delimiters-face)
                           (cperl-postpone-fontification
-                           (1- e) e 'face font-lock-constant-face)))
+                           (1- e) e 'face my-cperl-delimiters-face)))
                     (if (and is-REx cperl-regexp-scan)
-                        ;; Process RExen better
+                        ;; Process RExen: embedded comments, charclasses and ]
+;;;/\3333\xFg\x{FFF}a\ppp\PPP\qqq\C\99f(?{  foo  })(??{  foo  })/;
+;;;/a\.b[^a[:ff:]b]x$ab->$[|$,$ab->[cd]->[ef]|$ab[xy].|^${a,b}{c,d}/;
+;;;/(?<=foo)(?<!bar)(x)(?:$ab|\$\/)$|\\\b\x888\776\[\:$/xxx;
+;;;m?(\?\?{b,a})? + m/(??{aa})(?(?=xx)aa|bb)(?#aac)/;
+;;;m$(^ab[c]\$)$ + m+(^ab[c]\$\+)+ + m](^ab[c\]$|.+)] + m)(^ab[c]$|.+\));
+;;;m^a[\^b]c^ + m.a[^b]\.c.;
                         (save-excursion
                           (goto-char (1+ b))
+                          ;; First 
+                          (cperl-look-at-leading-count is-x-REx e)
+                          (setq hairy-RE
+                                (concat
+                                 (if is-x-REx
+                                     (if (eq (char-after b) ?\#)
+                                         "\\((\\?\\\\#\\)\\|\\(\\\\#\\)"
+                                       "\\((\\?#\\)\\|\\(#\\)")
+                                   ;; keep the same count: add a fake group
+                                   (if (eq (char-after b) ?\#)
+                                       "\\((\\?\\\\#\\)\\(\\)"
+                                     "\\((\\?#\\)\\(\\)"))
+                                 "\\|"
+                                    "\\(\\[\\)" ; 3=[
+                                 "\\|"
+                                    "\\(]\\)" ; 4=]
+                                 "\\|"
+                                 ;; XXXX Will not be able to use it in s)))
+                                 (if (eq (char-after b) ?\) )
+                                     "\\())))\\)" ; Will never match
+                                   (if (eq (char-after b) ?? )
+                                       ;;"\\((\\\\\\?\\(\\\\\\?\\)?{\\)"
+                                       "\\((\\\\\\?\\\\\\?{\\|()\\\\\\?{\\)"
+                                     "\\((\\?\\??{\\)")) ; 5= (??{ (?{
+                                 "\\|"  ; 6= 0-length, 7: name, 8,9:code, 10:group
+                                    "\\(" ;; XXXX 1-char variables, exc. |()\s
+                                       "[$@]"
+                                       "\\("
+                                          "[_a-zA-Z:][_a-zA-Z0-9:]*"
+                                       "\\|"
+                                          "{[^{}]*}" ; only one-level allowed
+                                       "\\|"
+                                          "[^{(|) \t\r\n\f]"
+                                       "\\)"
+                                       "\\(" ;;8,9:code part of array/hash elt
+                                          "\\(" "->" "\\)?"
+                                          "\\[[^][]*\\]"
+                                          "\\|"
+                                          "{[^{}]*}"
+                                       "\\)*"
+                                    ;; XXXX: what if u is delim?
+                                    "\\|"
+                                       "[)^|$.*?+]"
+                                    "\\|"
+                                       "{[0-9]+}"
+                                    "\\|"
+                                       "{[0-9]+,[0-9]*}"
+                                    "\\|"
+                                       "\\\\[luLUEQbBAzZG]"
+                                    "\\|"
+                                       "(" ; Group opener
+                                       "\\(" ; 10 group opener follower
+                                          "\\?\\((\\?\\)" ; 11: in (?(?=C)A|B)
+                                       "\\|"
+                                          "\\?[:=!>?{]" ; "?" something
+                                       "\\|"
+                                          "\\?[-imsx]+[:)]" ; (?i) (?-s:.)
+                                       "\\|"
+                                          "\\?([0-9]+)" ; (?(1)foo|bar)
+                                       "\\|"
+                                          "\\?<[=!]"
+                                       ;;;"\\|"
+                                       ;;;   "\\?"
+                                       "\\)?"
+                                    "\\)"
+                                 "\\|"
+                                    "\\\\\\(.\\)" ; 12=\SYMBOL
+                                 ))
                           (while
-                              (and (< (point) e)
-                                   (re-search-forward
-                                    (if is-x-REx
-                                        (if (eq (char-after b) ?\#)
-                                            "\\((\\?\\\\#\\)\\|\\(\\\\#\\)"
-                                          "\\((\\?#\\)\\|\\(#\\)")
-                                      (if (eq (char-after b) ?\#)
-                                          "\\((\\?\\\\#\\)"
-                                        "\\((\\?#\\)"))
-                                    (1- e) 'to-end))
+                              (and (< (point) (1- e))
+                                   (re-search-forward hairy-RE (1- e) 'to-end))
                             (goto-char (match-beginning 0))
-                            (setq REx-comment-start (point)
-                                  was-comment t)
-                            (if (save-excursion
-                                  (and
-                                   ;; XXX not working if outside delimiter is #
-                                   (eq (preceding-char) ?\\)
-                                   (= (% (skip-chars-backward "$\\\\") 2) -1)))
-                                ;; Not a comment, avoid loop:
-                                (progn (setq was-comment nil)
-                                       (forward-char 1))
-                              (if (match-beginning 2)
+                            (setq REx-subgr-start (point)
+                                  was-subgr (following-char))
+                            (cond
+                             ((match-beginning 6) ; 0-length builtins, groups
+                              (goto-char (match-end 0))
+                              (if (match-beginning 11)
+                                  (goto-char (match-beginning 11)))
+                              (if (>= (point) e)
+                                  (goto-char (1- e)))
+                              (cperl-postpone-fontification
+                               (match-beginning 0) (point)
+                               'face
+                               (cond
+                                ((eq was-subgr ?\) )
+                                 (condition-case nil
+                                     (save-excursion
+                                       (forward-sexp -1)
+                                       (if (> (point) b)
+                                           (if (if (eq (char-after b) ?? )
+                                                   (looking-at "(\\\\\\?")
+                                                 (eq (char-after (1+ (point))) ?\?))
+                                               my-cperl-REx-0length-face
+                                             my-cperl-REx-ctl-face)
+                                         font-lock-warning-face))
+                                   (error font-lock-warning-face)))
+                                ((eq was-subgr ?\| )
+                                 my-cperl-REx-ctl-face)
+                                ((eq was-subgr ?\$ )
+                                 (if (> (point) (1+ REx-subgr-start))
+                                     (progn
+                                       (put-text-property
+                                        (match-beginning 0) (point)
+                                        'REx-interpolated
+                                        (if is-o-REx 0
+                                            (if (and (eq (match-beginning 0)
+                                                         (1+ b))
+                                                     (eq (point)
+                                                         (1- e))) 1 t)))
+                                       font-lock-variable-name-face)
+                                   my-cperl-REx-spec-char-face))
+                                ((memq was-subgr (append "^." nil) )
+                                 my-cperl-REx-spec-char-face)
+                                ((eq was-subgr ?\( )
+                                 (if (not (match-beginning 10))
+                                     my-cperl-REx-ctl-face
+                                   my-cperl-REx-0length-face))
+                                (t my-cperl-REx-0length-face)))
+                              (if (and (memq was-subgr (append "(|" nil))
+                                       (not (string-match "(\\?[-imsx]+)"
+                                                          (match-string 0))))
+                                  (cperl-look-at-leading-count is-x-REx e))
+                              (setq was-subgr nil)) ; We do stuff here
+                             ((match-beginning 12) ; \SYMBOL
+                              (forward-char 2)
+                              (if (>= (point) e)
+                                  (goto-char (1- e))
+                                ;; How many chars to not highlight:
+                                ;; 0-len special-alnums in other branch =>
+                                ;; Generic:  \non-alnum (1), \alnum (1+face)
+                                ;; Is-delim: \non-alnum (1/spec-2) alnum-1 (=what hai)
+                                (setq REx-subgr-start (point)
+                                      qtag (preceding-char))
+                                (cperl-postpone-fontification
+                                 (- (point) 2) (- (point) 1) 'face
+                                 (if (memq qtag
+                                           (append "ghijkmoqvFHIJKMORTVY" nil))
+                                     font-lock-warning-face
+                                   my-cperl-REx-0length-face))
+                                (if (and (eq (char-after b) qtag)
+                                         (memq qtag (append ".])^$|*?+" nil)))
+                                    (progn
+                                      (if (and cperl-use-syntax-table-text-property
+                                               (eq qtag ?\) ))
+                                          (put-text-property
+                                           REx-subgr-start (1- (point))
+                                           'syntax-table cperl-st-punct))
+                                      (cperl-postpone-fontification
+                                       (1- (point)) (point) 'face
+                                        ; \] can't appear below
+                                       (if (memq qtag (append ".]^$" nil))
+                                           'my-cperl-REx-spec-char-face
+                                         (if (memq qtag (append "*?+" nil))
+                                             'my-cperl-REx-0length-face
+                                           'my-cperl-REx-ctl-face))))) ; )|
+                                ;; Test for arguments:
+                                (cond
+                                 ;; This is not pretty: the 5.8.7 logic:
+                                 ;; \0numx  -> octal (up to total 3 dig)
+                                 ;; \DIGIT  -> backref unless \0
+                                 ;; \DIGITs -> backref if legal
+                                 ;;          otherwise up to 3 -> octal
+                                 ;; Do not try to distinguish, we guess
+                                 ((or (and (memq qtag (append "01234567" nil))
+                                           (re-search-forward
+                                            "\\=[01234567]?[01234567]?"
+                                            (1- e) 'to-end))
+                                      (and (memq qtag (append "89" nil))
+                                           (re-search-forward 
+                                            "\\=[0123456789]*" (1- e) 'to-end))
+                                      (and (eq qtag ?x)
+                                           (re-search-forward
+                                            "\\=[0-9a-fA-F][0-9a-fA-F]?\\|\\={[0-9a-fA-F]+}"
+                                            (1- e) 'to-end))
+                                      (and (memq qtag (append "pPN" nil))
+                                           (re-search-forward "\\={[^{}]+}\\|."
+                                            (1- e) 'to-end))
+                                      (eq (char-syntax qtag) ?w))
+                                  (cperl-postpone-fontification
+                                   (1- REx-subgr-start) (point)
+                                   'face my-cperl-REx-length1-face))))
+                              (setq was-subgr nil)) ; We do stuff here
+                             ((match-beginning 3) ; [charclass]
+                              (forward-char 1)
+                              (if (eq (char-after b) ?^ )
+                                  (and (eq (following-char) ?\\ )
+                                       (eq (char-after (cperl-1+ (point)))
+                                           ?^ )
+                                       (forward-char 2))
+                                (and (eq (following-char) ?^ )
+                                     (forward-char 1)))
+                              (setq argument b ; continue?
+                                    tag nil ; list of POSIX classes
+                                    qtag (point))
+                              (if (eq (char-after b) ?\] )
+                                  (and (eq (following-char) ?\\ )
+                                       (eq (char-after (cperl-1+ (point)))
+                                           ?\] )
+                                       (setq qtag (1+ qtag))
+                                       (forward-char 2))
+                                (and (eq (following-char) ?\] )
+                                     (forward-char 1)))
+                              ;; Apparently, I can't put \] into a charclass
+                              ;; in m]]: m][\\\]\]] produces [\\]]
+;;; POSIX?  [:word:] [:^word:] only inside []
+;;;                                    "\\=\\(\\\\.\\|[^][\\\\]\\|\\[:\\^?\sw+:]\\|\\[[^:]\\)*]")
+                              (while 
+                                  (and argument
+                                       (re-search-forward
+                                        (if (eq (char-after b) ?\] )
+                                            "\\=\\(\\\\[^]]\\|[^]\\\\]\\)*\\\\]"
+                                          "\\=\\(\\\\.\\|[^]\\\\]\\)*]")
+                                        (1- e) 'toend))
+                                ;; Is this ] an end of POSIX class?
+                                (if (save-excursion
+                                      (and
+                                       (search-backward "[" argument t)
+                                       (< REx-subgr-start (point))
+                                       (not
+                                        (and ; Should work with delim = \
+                                         (eq (preceding-char) ?\\ )
+                                         (= (% (skip-chars-backward
+                                                "\\\\") 2) 0)))
+                                       (looking-at
+                                        (cond
+                                         ((eq (char-after b) ?\] )
+                                          "\\\\*\\[:\\^?\\sw+:\\\\\\]")
+                                         ((eq (char-after b) ?\: )
+                                          "\\\\*\\[\\\\:\\^?\\sw+\\\\:]")
+                                         ((eq (char-after b) ?^ )
+                                          "\\\\*\\[:\\(\\\\\\^\\)?\\sw+:\]")
+                                         ((eq (char-syntax (char-after b))
+                                              ?w)
+                                          (concat
+                                           "\\\\*\\[:\\(\\\\\\^\\)?\\(\\\\"
+                                           (char-to-string (char-after b))
+                                           "\\|\\sw\\)+:\]"))
+                                         (t "\\\\*\\[:\\^?\\sw*:]")))
+                                       (setq argument (point))))
+                                    (setq tag (cons (cons argument (point))
+                                                    tag)
+                                          argument (point)) ; continue
+                                  (setq argument nil)))
+                              (and argument
+                                   (message "Couldn't find end of charclass in a REx, pos=%s"
+                                            REx-subgr-start))
+                              (if (and cperl-use-syntax-table-text-property
+                                       (> (- (point) 2) REx-subgr-start))
+                                  (put-text-property
+                                   (1+ REx-subgr-start) (1- (point))
+                                   'syntax-table cperl-st-punct))
+                              (cperl-postpone-fontification
+                               REx-subgr-start qtag
+                               'face my-cperl-REx-spec-char-face)
+                              (cperl-postpone-fontification
+                               (1- (point)) (point) 'face
+                               my-cperl-REx-spec-char-face)
+                              (if (eq (char-after b) ?\] )
+                                  (cperl-postpone-fontification
+                                   (- (point) 2) (1- (point))
+                                   'face my-cperl-REx-0length-face))
+                              (while tag
+                                (cperl-postpone-fontification
+                                 (car (car tag)) (cdr (car tag))
+                                 'face my-cperl-REx-length1-face)
+                                (setq tag (cdr tag)))
+                              (setq was-subgr nil)) ; did facing already
+                             ;; Now rare stuff:
+                             ((and (match-beginning 2) ; #-comment
+                                   (/= (match-beginning 2) (match-end 2)))
+                              (beginning-of-line 2)
+                              (if (> (point) e)
+                                  (goto-char (1- e))))
+                             ((match-beginning 4) ; character "]"
+                              (setq was-subgr nil) ; We do stuff here
+                              (goto-char (match-end 0))
+                              (if cperl-use-syntax-table-text-property
+                                  (put-text-property
+                                   (1- (point)) (point)
+                                   'syntax-table cperl-st-punct))
+                              (cperl-postpone-fontification
+                               (1- (point)) (point)
+                               'face font-lock-warning-face))
+                             ((match-beginning 5) ; before (?{}) (??{})
+                              (setq tag (match-end 0))
+                              (if (or (setq qtag
+                                            (cperl-forward-group-in-re st-l))
+                                      (and (>= (point) e)
+                                           (setq qtag "no matching `)' found"))
+                                      (and (not (eq (char-after (- (point) 2))
+                                                    ?\} ))
+                                           (setq qtag "Can't find })")))
                                   (progn
-                                    (beginning-of-line 2)
-                                    (if (> (point) e)
-                                        (goto-char (1- e))))
-                                ;; Works also if the outside delimiters are ().
-                                (or (search-forward ")" (1- e) 'toend)
-                                    (message
-                                     "Couldn't find end of (?#...)-comment in a REx, pos=%s"
-                                     REx-comment-start))))
+                                    (goto-char (1- e))
+                                    (message qtag))
+                                (cperl-postpone-fontification
+                                 (1- tag) (1- (point))
+                                 'face font-lock-variable-name-face)
+                                (cperl-postpone-fontification
+                                 REx-subgr-start (1- tag)
+                                 'face my-cperl-REx-spec-char-face)
+                                (cperl-postpone-fontification
+                                 (1- (point)) (point)
+                                 'face my-cperl-REx-spec-char-face)
+                                (if cperl-use-syntax-table-text-property
+                                    (progn
+                                      (put-text-property
+                                       (- (point) 2) (1- (point))
+                                       'syntax-table cperl-st-cfence)
+                                      (put-text-property
+                                       (+ REx-subgr-start 2)
+                                       (+ REx-subgr-start 3)
+                                       'syntax-table cperl-st-cfence))))
+                              (setq was-subgr nil))
+                             (t         ; (?#)-comment
+                              ;; Inside "(" and "\" arn't special in any way
+                              ;; Works also if the outside delimiters are ().
+                              (or;;(if (eq (char-after b) ?\) )
+                               ;;(re-search-forward
+                               ;; "[^\\\\]\\(\\\\\\\\\\)*\\\\)"
+                               ;; (1- e) 'toend)
+                               (search-forward ")" (1- e) 'toend)
+                               ;;)
+                               (message
+                                "Couldn't find end of (?#...)-comment in a REx, pos=%s"
+                                REx-subgr-start))))
                             (if (>= (point) e)
                                 (goto-char (1- e)))
-                            (if was-comment
-                                (progn
-                                  (setq REx-comment-end (point))
-                                  (cperl-commentify
-                                   REx-comment-start REx-comment-end nil)
-                                  (cperl-postpone-fontification
-                                   REx-comment-start REx-comment-end
-                                   'face font-lock-comment-face))))))
+                            (cond
+                             (was-subgr
+                              (setq REx-subgr-end (point))
+                              (cperl-commentify
+                               REx-subgr-start REx-subgr-end nil)
+                              (cperl-postpone-fontification
+                               REx-subgr-start REx-subgr-end
+                               'face font-lock-comment-face))))))
                     (if (and is-REx is-x-REx)
                         (put-text-property (1+ b) (1- e)
                                            'syntax-subtype 'x-REx)))
                   (if i2
                       (progn
                         (cperl-postpone-fontification
-                         (1- e1) e1 'face font-lock-constant-face)
+                         (1- e1) e1 'face my-cperl-delimiters-face)
                         (if (assoc (char-after b) cperl-starters)
-                            (cperl-postpone-fontification
-                             b1 (1+ b1) 'face font-lock-constant-face))))
+                            (progn
+                              (cperl-postpone-fontification
+                               b1 (1+ b1) 'face my-cperl-delimiters-face)
+                              (put-text-property b1 (1+ b1)
+                                           'REx-part2 t)))))
                   (if (> (point) max)
                       (setq tmpend tb))))
-               ((match-beginning 13)    ; sub with prototypes
-                (setq b (match-beginning 0))
+               ((match-beginning 17)    ; sub with prototype or attribute
+                ;; 1+6+2+1+1=11 extra () before this (sub with proto/attr):
+                ;;"\\<sub\\>\\("                        ;12
+                ;;   cperl-white-and-comment-rex        ;13
+                ;;   "\\([a-zA-Z_:'0-9]+\\)\\)?" ; name ;14
+                ;;"\\(" cperl-maybe-white-and-comment-rex       ;15,16
+                ;;   "\\(([^()]*)\\|:[^:]\\)\\)" ; 17:proto or attribute start
+                (setq b1 (match-beginning 14) e1 (match-end 14))
                 (if (memq (char-after (1- b))
                           '(?\$ ?\@ ?\% ?\& ?\*))
                     nil
-                  (setq state (parse-partial-sexp
-                               state-point b nil nil state)
-                        state-point b)
-                  (if (or (nth 3 state) (nth 4 state))
-                      nil
-                    ;; Mark as string
-                    (cperl-commentify (match-beginning 13) (match-end 13) t))
-                  (goto-char (match-end 0))))
-               ;; 1+6+2+1+1+2=13 extra () before this:
-               ;;    "\\$\\(['{]\\)"
-               ((and (match-beginning 14)
-                     (eq (preceding-char) ?\')) ; $'
-                (setq b (1- (point))
-                      state (parse-partial-sexp
-                             state-point (1- b) nil nil state)
-                      state-point (1- b))
-                (if (nth 3 state)       ; in string
-                    (cperl-modify-syntax-type (1- b) cperl-st-punct))
-                (goto-char (1+ b)))
-               ;; 1+6+2+1+1+2=13 extra () before this:
-               ;;    "\\$\\(['{]\\)"
-               ((match-beginning 14)    ; ${
-                (setq bb (match-beginning 0))
-                (cperl-modify-syntax-type bb cperl-st-punct))
-               ;; 1+6+2+1+1+2+1=14 extra () before this:
+                  (goto-char b)
+                  (if (eq (char-after (match-beginning 17)) ?\( )
+                      (progn
+                        (cperl-commentify ; Prototypes; mark as string
+                         (match-beginning 17) (match-end 17) t)
+                        (goto-char (match-end 0))
+                        ;; Now look for attributes after prototype:
+                        (forward-comment (buffer-size))
+                        (and (looking-at ":[^:]")
+                             (cperl-find-sub-attrs st-l b1 e1 b)))
+                    ;; treat attributes without prototype
+                    (goto-char (match-beginning 17))
+                    (cperl-find-sub-attrs st-l b1 e1 b))))
+               ;; 1+6+2+1+1+6+1=18 extra () before this:
                ;;    "\\(\\<sub[ \t\n\f]+\\|[&*$@%]\\)[a-zA-Z0-9_]*'")
-               ((match-beginning 15)    ; old $abc'efg syntax
-                (setq bb (match-end 0)
-                      b (match-beginning 0)
-                      state (parse-partial-sexp
-                             state-point b nil nil state)
-                      state-point b)
-                (if (nth 3 state)       ; in string
-                    nil
-                  (put-text-property (1- bb) bb 'syntax-table cperl-st-word))
+               ((match-beginning 19)    ; old $abc'efg syntax
+                (setq bb (match-end 0))
+                ;;;(if (nth 3 state) nil        ; in string
+                (put-text-property (1- bb) bb 'syntax-table cperl-st-word)
                 (goto-char bb))
-               ;; 1+6+2+1+1+2+1+1=15 extra () before this:
+               ;; 1+6+2+1+1+6+1+1=19 extra () before this:
                ;; "__\\(END\\|DATA\\)__"
-               ((match-beginning 16)    ; __END__, __DATA__
-                (setq bb (match-end 0)
-                      b (match-beginning 0)
-                      state (parse-partial-sexp
-                             state-point b nil nil state)
-                      state-point b)
-                (if (or (nth 3 state) (nth 4 state))
-                    nil
-                  ;; (put-text-property b (1+ bb) 'syntax-type 'pod) ; Cheat
-                  (cperl-commentify b bb nil)
-                  (setq end t))
-                (goto-char bb))
-               ((match-beginning 17)    ; "\\\\\\(['`\"($]\\)"
-                ;; Trailing backslash ==> non-quoting outside string/comment
-                (setq bb (match-end 0)
-                      b (match-beginning 0))
+               ((match-beginning 20)    ; __END__, __DATA__
+                (setq bb (match-end 0))
+                ;; (put-text-property b (1+ bb) 'syntax-type 'pod) ; Cheat
+                (cperl-commentify b bb nil)
+                (setq end t))
+               ;; "\\\\\\(['`\"($]\\)"
+               ((match-beginning 21)
+                ;; Trailing backslash; make non-quoting outside string/comment
+                (setq bb (match-end 0))
                 (goto-char b)
                 (skip-chars-backward "\\\\")
                 ;;;(setq i2 (= (% (skip-chars-backward "\\\\") 2) -1))
-                (setq state (parse-partial-sexp
-                             state-point b nil nil state)
-                      state-point b)
-                (if (or (nth 3 state) (nth 4 state) )
-                    nil
-                  (cperl-modify-syntax-type b cperl-st-punct))
+                (cperl-modify-syntax-type b cperl-st-punct)
                 (goto-char bb))
                (t (error "Error in regexp of the sniffer")))
               (if (> (point) stop-point)
@@ -3839,7 +4839,10 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                       (or (car err-l) (setcar err-l b)))
                     (goto-char stop-point))))
             (setq cperl-syntax-state (cons state-point state)
-                  cperl-syntax-done-to (or tmpend (max (point) max))))
+                  ;; Do not mark syntax as done past tmpend???
+                  cperl-syntax-done-to (or tmpend (max (point) max)))
+            ;;(message "state-at=%s, done-to=%s" state-point cperl-syntax-done-to)
+            )
           (if (car err-l) (goto-char (car err-l))
             (or non-inter
                 (message "Scanning for \"hard\" Perl constructions... done"))))
@@ -3851,48 +4854,91 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
       ;; cperl-mode-syntax-table.
       ;; (set-syntax-table cperl-mode-syntax-table)
       )
-    (car err-l)))
+    (list (car err-l) overshoot)))
+
+(defun cperl-find-pods-heres-region (min max)
+  (interactive "r")
+  (cperl-find-pods-heres min max))
 
 (defun cperl-backward-to-noncomment (lim)
   ;; Stops at lim or after non-whitespace that is not in comment
+  ;; XXXX Wrongly understands end-of-multiline strings with # as comment
   (let (stop p pr)
-    (while (and (not stop) (> (point) (or lim 1)))
+    (while (and (not stop) (> (point) (or lim (point-min))))
       (skip-chars-backward " \t\n\f" lim)
       (setq p (point))
       (beginning-of-line)
       (if (memq (setq pr (get-text-property (point) 'syntax-type))
                 '(pod here-doc here-doc-delim))
           (cperl-unwind-to-safe nil)
-      (or (looking-at "^[ \t]*\\(#\\|$\\)")
-          (progn (cperl-to-comment-or-eol) (bolp))
-          (progn
-            (skip-chars-backward " \t")
-            (if (< p (point)) (goto-char p))
-            (setq stop t)))))))
+        (or (and (looking-at "^[ \t]*\\(#\\|$\\)")
+                 (not (memq pr '(string prestring))))
+            (progn (cperl-to-comment-or-eol) (bolp))
+            (progn
+              (skip-chars-backward " \t")
+              (if (< p (point)) (goto-char p))
+              (setq stop t)))))))
 
+;; Used only in `cperl-calculate-indent'...
+(defun cperl-block-p ()            ; Do not C-M-q !  One string contains ";" !
+  ;; Positions is before ?\{.  Checks whether it starts a block.
+  ;; No save-excursion!  This is more a distinguisher of a block/hash ref...
+  (cperl-backward-to-noncomment (point-min))
+  (or (memq (preceding-char) (append ";){}$@&%\C-@" nil)) ; Or label!  \C-@ at bobp
+                                        ; Label may be mixed up with `$blah :'
+      (save-excursion (cperl-after-label))
+      (get-text-property (cperl-1- (point)) 'attrib-group)
+      (and (memq (char-syntax (preceding-char)) '(?w ?_))
+           (progn
+             (backward-sexp)
+             ;; sub {BLK}, print {BLK} $data, but NOT `bless', `return', `tr'
+             (or (and (looking-at "[a-zA-Z0-9_:]+[ \t\n\f]*[{#]") ; Method call syntax
+                      (not (looking-at "\\(bless\\|return\\|q[wqrx]?\\|tr\\|[smy]\\)\\>")))
+                 ;; sub bless::foo {}
+                 (progn
+                   (cperl-backward-to-noncomment (point-min))
+                   (and (eq (preceding-char) ?b)
+                        (progn
+                          (forward-sexp -1)
+                          (looking-at "sub[ \t\n\f#]")))))))))
+
+;;; What is the difference of (cperl-after-block-p lim t) and (cperl-block-p)?
+;;; No save-excursion; condition-case ...  In (cperl-block-p) the block
+;;; may be a part of an in-statement construct, such as
+;;;   ${something()}, print {FH} $data.
+;;; Moreover, one takes positive approach (looks for else,grep etc)
+;;; another negative (looks for bless,tr etc)
 (defun cperl-after-block-p (lim &optional pre-block)
-  "Return true if the preceeding } ends a block or a following { starts one.
-Would not look before LIM.  If PRE-BLOCK is nil checks preceeding }.
-otherwise following {."
-  ;; We suppose that the preceding char is }.
+  "Return true if the preceeding } (if PRE-BLOCK, following {) delimits a block.
+Would not look before LIM.  Assumes that LIM is a good place to begin a
+statement.  The kind of block we treat here is one after which a new
+statement would start; thus the block in ${func()} does not count."
   (save-excursion
     (condition-case nil
         (progn
           (or pre-block (forward-sexp -1))
           (cperl-backward-to-noncomment lim)
           (or (eq (point) lim)
-              (eq (preceding-char) ?\) ) ; if () {}    sub f () {}
-              (if (eq (char-syntax (preceding-char)) ?w) ; else {}
+              ;; if () {}   // sub f () {}   // sub f :a(') {}
+              (eq (preceding-char) ?\) )
+              ;; label: {}
+              (save-excursion (cperl-after-label))
+              ;; sub :attr {}
+              (get-text-property (cperl-1- (point)) 'attrib-group)
+              (if (memq (char-syntax (preceding-char)) '(?w ?_)) ; else {}
                   (save-excursion
                     (forward-sexp -1)
-                    (or (looking-at "\\(else\\|continue\\|grep\\|map\\|BEGIN\\|END\\|CHECK\\|INIT\\)\\>")
+                    ;; else {}     but not    else::func {}
+                    (or (and (looking-at "\\(else\\|continue\\|grep\\|map\\|BEGIN\\|END\\|CHECK\\|INIT\\)\\>")
+                             (not (looking-at "\\(\\sw\\|_\\)+::")))
                         ;; sub f {}
                         (progn
                           (cperl-backward-to-noncomment lim)
-                          (and (eq (char-syntax (preceding-char)) ?w)
+                          (and (eq (preceding-char) ?b)
                                (progn
                                  (forward-sexp -1)
-                                 (looking-at "sub\\>"))))))
+                                 (looking-at "sub[ \t\n\f#]"))))))
+                ;; What preceeds is not word...  XXXX Last statement in sub???
                 (cperl-after-expr-p lim))))
       (error nil))))
 
@@ -3914,12 +4960,12 @@ CHARS is a string that contains good characters to have before us (however,
         (if (get-text-property (point) 'here-doc-group)
             (progn
               (goto-char
-               (previous-single-property-change (point) 'here-doc-group))
+               (cperl-beginning-of-property (point) 'here-doc-group))
               (beginning-of-line 0)))
         (if (get-text-property (point) 'in-pod)
             (progn
               (goto-char
-               (previous-single-property-change (point) 'in-pod))
+               (cperl-beginning-of-property (point) 'in-pod))
               (beginning-of-line 0)))
         (if (looking-at "^[ \t]*\\(#\\|$\\)") nil ; Only comment, skip
           ;; Else: last iteration, or a label
@@ -3931,7 +4977,7 @@ CHARS is a string that contains good characters to have before us (however,
                    (progn
                      (forward-char -1)
                      (skip-chars-backward " \t\n\f" lim)
-                     (eq (char-syntax (preceding-char)) ?w)))
+                     (memq (char-syntax (preceding-char)) '(?w ?_))))
               (forward-sexp -1)         ; Possibly label.  Skip it
             (goto-char p)
             (setq stop t))))
@@ -3947,6 +4993,44 @@ CHARS is a string that contains good characters to have before us (however,
                        (eq (get-text-property (point) 'syntax-type)
                            'format)))))))))
 
+(defun cperl-backward-to-start-of-expr (&optional lim)
+  (condition-case nil
+      (progn
+        (while (and (or (not lim)
+                        (> (point) lim))
+                    (not (cperl-after-expr-p lim)))
+          (forward-sexp -1)
+          ;; May be after $, @, $# etc of a variable
+          (skip-chars-backward "$@%#")))
+    (error nil)))
+
+(defun cperl-at-end-of-expr (&optional lim)
+  ;; Since the SEXP approach below is very fragile, do some overengineering
+  (or (looking-at (concat cperl-maybe-white-and-comment-rex "[;}]"))
+      (condition-case nil
+          (save-excursion
+            ;; If nothing interesting after, does as (forward-sexp -1);
+            ;; otherwise fails, or ends at a start of following sexp.
+            ;; XXXX PROBLEMS: if what follows (after ";") @FOO, or ${bar}
+            ;; may be stuck after @ or $; just put some stupid workaround now:
+            (let ((p (point)))
+              (forward-sexp 1)
+              (forward-sexp -1)
+              (while (memq (preceding-char) (append "%&@$*" nil))
+                (forward-char -1))
+              (or (< (point) p)
+                  (cperl-after-expr-p lim))))
+        (error t))))
+
+(defun cperl-forward-to-end-of-expr (&optional lim)
+  (let ((p (point))))
+  (condition-case nil
+      (progn
+        (while (and (< (point) (or lim (point-max)))
+                    (not (cperl-at-end-of-expr)))
+          (forward-sexp 1)))
+    (error nil)))
+
 (defun cperl-backward-to-start-of-continued-exp (lim)
   (if (memq (preceding-char) (append ")]}\"'`" nil))
       (forward-sexp -1))
@@ -3987,18 +5071,51 @@ conditional/loop constructs."
         (beginning-of-line)
         (while (null done)
           (setq top (point))
-          (while (= (nth 0 (parse-partial-sexp (point) tmp-end
-                                               -1)) -1)
+          ;; Plan A: if line has an unfinished paren-group, go to end-of-group
+          (while (= -1 (nth 0 (parse-partial-sexp (point) tmp-end -1)))
             (setq top (point)))         ; Get the outermost parenths in line
           (goto-char top)
           (while (< (point) tmp-end)
             (parse-partial-sexp (point) tmp-end nil t) ; To start-sexp or eol
             (or (eolp) (forward-sexp 1)))
-          (if (> (point) tmp-end)
-              (save-excursion
-                (end-of-line)
-                (setq tmp-end (point)))
-            (setq done t)))
+          (if (> (point) tmp-end)       ; Yes, there an unfinished block
+              nil
+            (if (eq ?\) (preceding-char))
+                (progn ;; Plan B: find by REGEXP block followup this line
+                  (setq top (point))
+                  (condition-case nil
+                      (progn
+                        (forward-sexp -2)
+                        (if (eq (following-char) ?$ ) ; for my $var (list)
+                            (progn
+                              (forward-sexp -1)
+                              (if (looking-at "\\(my\\|local\\|our\\)\\>")
+                                  (forward-sexp -1))))
+                        (if (looking-at
+                             (concat "\\(\\elsif\\|if\\|unless\\|while\\|until"
+                                     "\\|for\\(each\\)?\\>\\(\\("
+                                     cperl-maybe-white-and-comment-rex
+                                     "\\(my\\|local\\|our\\)\\)?"
+                                     cperl-maybe-white-and-comment-rex
+                                     "\\$[_a-zA-Z0-9]+\\)?\\)\\>"))
+                            (progn
+                              (goto-char top)
+                              (forward-sexp 1)
+                              (setq top (point)))))
+                    (error (setq done t)))
+                  (goto-char top))
+              (if (looking-at           ; Try Plan C: continuation block
+                   (concat cperl-maybe-white-and-comment-rex
+                           "\\<\\(else\\|elsif\|continue\\)\\>"))
+                  (progn
+                    (goto-char (match-end 0))
+                    (save-excursion
+                      (end-of-line)
+                      (setq tmp-end (point))))
+                (setq done t))))
+          (save-excursion
+            (end-of-line)
+            (setq tmp-end (point))))
         (goto-char tmp-end)
         (setq tmp-end (point-marker)))
       (if cperl-indent-region-fix-constructs
@@ -4027,16 +5144,26 @@ Returns some position at the last line."
         ;; Looking at:
         ;; }
         ;; else
-        (if (and cperl-merge-trailing-else
-                 (looking-at
-                  "[ \t]*}[ \t]*\n[ \t\n]*\\(els\\(e\\|if\\)\\|continue\\)\\>"))
-            (progn
-              (search-forward "}")
-              (setq p (point))
-              (skip-chars-forward " \t\n")
-              (delete-region p (point))
+        (if cperl-merge-trailing-else
+            (if (looking-at
+                 "[ \t]*}[ \t]*\n[ \t\n]*\\(els\\(e\\|if\\)\\|continue\\)\\>")
+                (progn
+                  (search-forward "}")
+                  (setq p (point))
+                  (skip-chars-forward " \t\n")
+                  (delete-region p (point))
               (insert (make-string cperl-indent-region-fix-constructs ?\s))
-              (beginning-of-line)))
+                  (beginning-of-line)))
+          (if (looking-at "[ \t]*}[ \t]*\\(els\\(e\\|if\\)\\|continue\\)\\>")
+              (save-excursion
+                  (search-forward "}")
+                  (delete-horizontal-space)
+                  (insert "\n")
+                  (setq ret (point))
+                  (if (cperl-indent-line parse-data)
+                      (progn
+                        (cperl-fix-line-spacing end parse-data)
+                        (setq ret (point)))))))
         ;; Looking at:
         ;; }     else
         (if (looking-at "[ \t]*}\\(\t*\\|[ \t][ \t]+\\)\\<\\(els\\(e\\|if\\)\\|continue\\)\\>")
@@ -4073,19 +5200,19 @@ Returns some position at the last line."
               (insert
                (make-string cperl-indent-region-fix-constructs ?\s))
               (beginning-of-line)))
-        ;; Looking at:
-        ;; } foreach my $var ()    {
+        ;; Looking at (with or without "}" at start, ending after "({"):
+        ;; } foreach my $var ()         OR   {
         (if (looking-at
              "[ \t]*\\(}[ \t]*\\)?\\<\\(\\els\\(e\\|if\\)\\|continue\\|if\\|unless\\|while\\|for\\(each\\)?\\(\\([ \t]+\\(my\\|local\\|our\\)\\)?[ \t]*\\$[_a-zA-Z0-9]+\\)?\\|until\\)\\>\\([ \t]*(\\|[ \t\n]*{\\)\\|[ \t]*{")
             (progn
-              (setq ml (match-beginning 8))
+              (setq ml (match-beginning 8)) ; "(" or "{" after control word
               (re-search-forward "[({]")
               (forward-char -1)
               (setq p (point))
               (if (eq (following-char) ?\( )
                   (progn
                     (forward-sexp 1)
-                    (setq pp (point)))
+                    (setq pp (point)))  ; past parenth-group
                 ;; after `else' or nothing
                 (if ml                  ; after `else'
                     (skip-chars-backward " \t\n")
@@ -4095,13 +5222,13 @@ Returns some position at the last line."
               ;; Multiline expr should be special
               (setq ml (and pp (save-excursion (goto-char p)
                                                (search-forward "\n" pp t))))
-              (if (and (or (not pp) (< pp end))
+              (if (and (or (not pp) (< pp end)) ; Do not go too far...
                        (looking-at "[ \t\n]*{"))
                   (progn
                     (cond
                      ((bolp)            ; Were before `{', no if/else/etc
                       nil)
-                     ((looking-at "\\(\t*\\| [ \t]+\\){")
+                     ((looking-at "\\(\t*\\| [ \t]+\\){") ; Not exactly 1 SPACE
                       (delete-horizontal-space)
                       (if (if ml
                               cperl-extra-newline-before-brace-multiline
@@ -4124,7 +5251,17 @@ Returns some position at the last line."
                       (skip-chars-forward " \t\n")
                       (delete-region pp (point))
                       (insert
-                       (make-string cperl-indent-region-fix-constructs ?\s))))
+                       (make-string cperl-indent-region-fix-constructs ?\ )))
+                     ((and (looking-at "[\t ]*{")
+                           (if ml cperl-extra-newline-before-brace-multiline
+                             cperl-extra-newline-before-brace))
+                      (delete-horizontal-space)
+                      (insert "\n")
+                      (setq ret (point))
+                      (if (cperl-indent-line parse-data)
+                          (progn
+                            (cperl-fix-line-spacing end parse-data)
+                            (setq ret (point))))))
                     ;; Now we are before `{'
                     (if (looking-at "[ \t\n]*{[ \t]*[^ \t\n#]")
                         (progn
@@ -4276,7 +5413,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
   ;; (interactive "P") ; Only works when called from fill-paragraph.  -stef
   (let (;; Non-nil if the current line contains a comment.
         has-comment
-
+        fill-paragraph-function         ; do not recurse
         ;; If has-comment, the appropriate fill-prefix for the comment.
         comment-fill-prefix
         ;; Line that contains code and comment (or nil)
@@ -4308,7 +5445,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
               dc (- c (current-column)) len (- start (point))
               start (point-marker))
         (delete-char len)
-        (insert (make-string dc ?-)))))
+        (insert (make-string dc ?-))))) ; Placeholder (to avoid splitting???)
     (if (not has-comment)
         (fill-paragraph justify)       ; Do the usual thing outside of comment
       ;; Narrow to include only the comment, and then fill the region.
@@ -4330,11 +5467,16 @@ indentation and initial hashes.  Behaves usually outside of comment."
            (point)))
         ;; Remove existing hashes
         (save-excursion
-          (goto-char (point-min))
-          (while (progn (forward-line 1) (< (point) (point-max)))
-            (skip-chars-forward " \t")
-            (and (looking-at "#+")
-                 (delete-char (- (match-end 0) (match-beginning 0))))))
+        (goto-char (point-min))
+        (while (progn (forward-line 1) (< (point) (point-max)))
+          (skip-chars-forward " \t")
+          (if (looking-at "#+")
+              (progn
+                (if (and (eq (point) (match-beginning 0))
+                         (not (eq (point) (match-end 0)))) nil
+                    (error
+ "Bug in Emacs: `looking-at' in `narrow-to-region': match-data is garbage"))
+                (delete-char (- (match-end 0) (match-beginning 0)))))))
 
         ;; Lines with only hashes on them can be paragraph boundaries.
         (let ((paragraph-start (concat paragraph-start "\\|^[ \t#]*$"))
@@ -4350,7 +5492,8 @@ indentation and initial hashes.  Behaves usually outside of comment."
               (setq comment-column c)
               (indent-for-comment)
               ;; Repeat once more, flagging as iteration
-              (cperl-fill-paragraph justify t)))))))
+              (cperl-fill-paragraph justify t))))))
+  t)
 
 (defun cperl-do-auto-fill ()
   ;; Break out if the line is short enough
@@ -4401,8 +5544,8 @@ indentation and initial hashes.  Behaves usually outside of comment."
   (let ((index-alist '()) (index-pack-alist '()) (index-pod-alist '())
         (index-unsorted-alist '()) (i-s-f (default-value 'imenu-sort-function))
         (index-meth-alist '()) meth
-        packages ends-ranges p marker
-        (prev-pos 0) char fchar index index1 name (end-range 0) package)
+        packages ends-ranges p marker is-proto
+        (prev-pos 0) is-pack index index1 name (end-range 0) package)
     (goto-char (point-min))
     (cperl-update-syntaxification (point-max) (point-max))
     ;; Search for the function
@@ -4410,72 +5553,81 @@ indentation and initial hashes.  Behaves usually outside of comment."
       (while (re-search-forward
               (or regexp cperl-imenu--function-name-regexp-perl)
               nil t)
+        ;; 2=package-group, 5=package-name 8=sub-name
         (cond
          ((and                          ; Skip some noise if building tags
-           (match-beginning 2)          ; package or sub
-           (eq (char-after (match-beginning 2)) ?p) ; package
+           (match-beginning 5)          ; package name
+           ;;(eq (char-after (match-beginning 2)) ?p) ; package
            (not (save-match-data
                   (looking-at "[ \t\n]*;")))) ; Plain text word 'package'
           nil)
          ((and
-           (match-beginning 2)          ; package or sub
+           (or (match-beginning 2)
+               (match-beginning 8))             ; package or sub
            ;; Skip if quoted (will not skip multi-line ''-strings :-():
            (null (get-text-property (match-beginning 1) 'syntax-table))
            (null (get-text-property (match-beginning 1) 'syntax-type))
            (null (get-text-property (match-beginning 1) 'in-pod)))
-          (save-excursion
-            (goto-char (match-beginning 2))
-            (setq fchar (following-char)))
+          (setq is-pack (match-beginning 2))
           ;; (if (looking-at "([^()]*)[ \t\n\f]*")
           ;;    (goto-char (match-end 0)))      ; Messes what follows
-          (setq char (following-char)   ; ?\; for "sub foo () ;"
-                meth nil
+          (setq meth nil
                 p (point))
           (while (and ends-ranges (>= p (car ends-ranges)))
             ;; delete obsolete entries
             (setq ends-ranges (cdr ends-ranges) packages (cdr packages)))
           (setq package (or (car packages) "")
                 end-range (or (car ends-ranges) 0))
-          (if (eq fchar ?p)
-              (setq name (buffer-substring (match-beginning 3) (match-end 3))
-                    name (progn
-                           (set-text-properties 0 (length name) nil name)
-                           name)
-                    package (concat name "::")
-                    name (concat "package " name)
-                    end-range
-                    (save-excursion
-                      (parse-partial-sexp (point) (point-max) -1) (point))
-                    ends-ranges (cons end-range ends-ranges)
-                    packages (cons package packages)))
-          ;;   )
+          (if is-pack                   ; doing "package"
+              (progn
+                (if (match-beginning 5) ; named package
+                    (setq name (buffer-substring (match-beginning 5)
+                                                 (match-end 5))
+                          name (progn
+                                 (set-text-properties 0 (length name) nil name)
+                                 name)
+                          package (concat name "::")
+                          name (concat "package " name))
+                  ;; Support nameless packages
+                  (setq name "package;" package ""))
+                (setq end-range
+                      (save-excursion
+                        (parse-partial-sexp (point) (point-max) -1) (point))
+                      ends-ranges (cons end-range ends-ranges)
+                      packages (cons package packages)))
+            (setq is-proto
+                  (or (eq (following-char) ?\;)
+                      (eq 0 (get-text-property (point) 'attrib-group)))))
           ;; Skip this function name if it is a prototype declaration.
-          (if (and (eq fchar ?s) (eq char ?\;)) nil
-            (setq name (buffer-substring (match-beginning 3) (match-end 3))
-                  marker (make-marker))
-            (set-text-properties 0 (length name) nil name)
-            (set-marker marker (match-end 3))
-            (if (eq fchar ?p)
-                (setq name (concat "package " name))
-              (cond ((string-match "[:']" name)
-                     (setq meth t))
-                    ((> p end-range) nil)
-                    (t
-                     (setq name (concat package name) meth t))))
+          (if (and is-proto (not is-pack)) nil
+            (or is-pack
+                (setq name
+                      (buffer-substring (match-beginning 8) (match-end 8)))
+                (set-text-properties 0 (length name) nil name))
+            (setq marker (make-marker))
+            (set-marker marker (match-end (if is-pack 2 8)))
+            (cond (is-pack nil)
+                  ((string-match "[:']" name)
+                   (setq meth t))
+                  ((> p end-range) nil)
+                  (t
+                   (setq name (concat package name) meth t)))
             (setq index (cons name marker))
-            (if (eq fchar ?p)
+            (if is-pack
                 (push index index-pack-alist)
               (push index index-alist))
             (if meth (push index index-meth-alist))
             (push index index-unsorted-alist)))
-         ((match-beginning 5)           ; POD section
-          ;; (beginning-of-line)
-          (setq index (imenu-example--name-and-position)
-                name (buffer-substring (match-beginning 6) (match-end 6)))
+         ((match-beginning 16)          ; POD section
+          (setq name (buffer-substring (match-beginning 17) (match-end 17))
+                marker (make-marker))
+          (set-marker marker (match-beginning 17))
           (set-text-properties 0 (length name) nil name)
-          (if (eq (char-after (match-beginning 5)) ?2)
-              (setq name (concat "   " name)))
-          (setcar index name)
+          (setq name (concat (make-string
+                              (* 3 (- (char-after (match-beginning 16)) ?1))
+                              ?\ )
+                             name)
+                index (cons name marker))
           (setq index1 (cons (concat "=" name) (cdr index)))
           (push index index-pod-alist)
           (push index1 index-unsorted-alist)))))
@@ -4539,29 +5691,20 @@ indentation and initial hashes.  Behaves usually outside of comment."
 (defun cperl-outline-level ()
   (looking-at outline-regexp)
   (cond ((not (match-beginning 1)) 0)   ; beginning-of-file
-        ((match-beginning 2)
-         (if (eq (char-after (match-beginning 2)) ?p)
-             0                          ; package
-           1))                          ; sub
-        ((match-beginning 5)
-         (if (eq (char-after (match-beginning 5)) ?1)
-             1                          ; head1
-           2))                          ; head2
-        (t 3)))                         ; should not happen
+;;;; 2=package-group, 5=package-name 8=sub-name 16=head-level
+        ((match-beginning 2) 0)         ; package
+        ((match-beginning 8) 1)         ; sub
+        ((match-beginning 16)
+         (- (char-after (match-beginning 16)) ?0)) ; headN ==> N
+        (t 5)))                         ; should not happen
 
 
 (defvar cperl-compilation-error-regexp-alist
-  ;; This look like a paranoiac regexp: could anybody find a better one? (which WORK).
+  ;; This look like a paranoiac regexp: could anybody find a better one? (which WORKS).
   '(("^[^\n]* \\(file\\|at\\) \\([^ \t\n]+\\) [^\n]*line \\([0-9]+\\)[\\., \n]"
      2 3))
   "Alist that specifies how to match errors in perl output.")
 
-(if (fboundp 'eval-after-load)
-    (eval-after-load
-        "mode-compile"
-      '(setq perl-compilation-error-regexp-alist
-             cperl-compilation-error-regexp-alist)))
-
 
 (defun cperl-windowed-init ()
   "Initialization under windowed version."
@@ -4602,9 +5745,12 @@ indentation and initial hashes.  Behaves usually outside of comment."
   ;; Allow `cperl-find-pods-heres' to run.
   (or (boundp 'font-lock-constant-face)
       (cperl-force-face font-lock-constant-face
-                        "Face for constant and label names")
-      ;;(setq font-lock-constant-face 'font-lock-constant-face)
-      ))
+                        "Face for constant and label names"))
+  (or (boundp 'font-lock-warning-face)
+      (cperl-force-face font-lock-warning-face
+                        "Face for things which should stand out"))
+  ;;(setq font-lock-constant-face 'font-lock-constant-face)
+  )
 
 (defun cperl-init-faces ()
   (condition-case errs
@@ -4627,7 +5773,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
                'identity
                '("if" "until" "while" "elsif" "else" "unless" "for"
                  "foreach" "continue" "exit" "die" "last" "goto" "next"
-                 "redo" "return" "local" "exec" "sub" "do" "dump" "use"
+                 "redo" "return" "local" "exec" "sub" "do" "dump" "use" "our"
                  "require" "package" "eval" "my" "BEGIN" "END" "CHECK" "INIT")
                "\\|")                   ; Flow control
               "\\)\\>") 2)              ; was "\\)[ \n\t;():,\|&]"
@@ -4711,7 +5857,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
               ;; "chop" "defined" "delete" "do" "each" "else" "elsif"
               ;; "eval" "exists" "for" "foreach" "format" "goto"
               ;; "grep" "if" "keys" "last" "local" "map" "my" "next"
-              ;; "no" "package" "pop" "pos" "print" "printf" "push"
+              ;; "no" "our" "package" "pop" "pos" "print" "printf" "push"
               ;; "q" "qq" "qw" "qx" "redo" "return" "scalar" "shift"
               ;; "sort" "splice" "split" "study" "sub" "tie" "tr"
               ;; "undef" "unless" "unshift" "untie" "until" "use"
@@ -4726,15 +5872,38 @@ indentation and initial hashes.  Behaves usually outside of comment."
               "u\\(se\\|n\\(shift\\|ti\\(l\\|e\\)\\|def\\|less\\)\\)\\|"
               "while\\|y\\|__\\(END\\|DATA\\)__" ;__DATA__ added manually
               "\\|[sm]"                 ; Added manually
-              "\\)\\>") 2 'cperl-nonoverridable)
+              "\\)\\>") 2 'cperl-nonoverridable-face)
             ;;          (mapconcat 'identity
             ;;                     '("#endif" "#else" "#ifdef" "#ifndef" "#if"
             ;;                       "#include" "#define" "#undef")
             ;;                     "\\|")
             '("-[rwxoRWXOezsfdlpSbctugkTBMAC]\\>\\([ \t]+_\\>\\)?" 0
               font-lock-function-name-face keep) ; Not very good, triggers at "[a-z]"
-            '("\\<sub[ \t]+\\([^ \t{;()]+\\)[ \t]*\\(([^()]*)[ \t]*\\)?[#{\n]" 1
-              font-lock-function-name-face)
+            ;; This highlights declarations and definitions differenty.
+            ;; We do not try to highlight in the case of attributes:
+            ;; it is already done by `cperl-find-pods-heres'
+            (list (concat "\\<sub"
+                          cperl-white-and-comment-rex ; whitespace/comments
+                          "\\([^ \n\t{;()]+\\)" ; 2=name (assume non-anonymous)
+                          "\\("
+                            cperl-maybe-white-and-comment-rex ;whitespace/comments?
+                            "([^()]*)\\)?" ; prototype
+                          cperl-maybe-white-and-comment-rex ; whitespace/comments?
+                          "[{;]")
+                  2 (if cperl-font-lock-multiline
+                        '(if (eq (char-after (cperl-1- (match-end 0))) ?\{ )
+                             'font-lock-function-name-face
+                           'font-lock-variable-name-face)
+                      ;; need to manually set 'multiline' for older font-locks
+                      '(progn
+                         (if (< 1 (count-lines (match-beginning 0)
+                                               (match-end 0)))
+                             (put-text-property
+                              (+ 3 (match-beginning 0)) (match-end 0)
+                              'syntax-type 'multiline))
+                         (if (eq (char-after (cperl-1- (match-end 0))) ?\{ )
+                             'font-lock-function-name-face
+                           'font-lock-variable-name-face))))
             '("\\<\\(package\\|require\\|use\\|import\\|no\\|bootstrap\\)[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t;]" ; require A if B;
               2 font-lock-function-name-face)
             '("^[ \t]*format[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t]*=[ \t]*$"
@@ -4770,12 +5939,56 @@ indentation and initial hashes.  Behaves usually outside of comment."
                                    (2 '(restart 2 nil) nil t)))
                         nil t)))        ; local variables, multiple
                   (font-lock-anchored
-                   '("^[ \t{}]*\\(my\\|local\\|our\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)"
-                     (3 font-lock-variable-name-face)
-                     ("\\=[ \t]*,[ \t]*\\([$@%*][a-zA-Z0-9_:]+\\)"
-                      nil nil
-                      (1 font-lock-variable-name-face))))
-                  (t '("^[ \t{}]*\\(my\\|local\\our\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)"
+                   ;; 1=my_etc, 2=white? 3=(+white? 4=white? 5=var
+                   (` ((, (concat "\\<\\(my\\|local\\|our\\)"
+                                  cperl-maybe-white-and-comment-rex
+                                  "\\(("
+                                     cperl-maybe-white-and-comment-rex
+                                  "\\)?\\([$@%*]\\([a-zA-Z0-9_:]+\\|[^a-zA-Z0-9_]\\)\\)"))
+                       (5 (, (if cperl-font-lock-multiline
+                                 'font-lock-variable-name-face
+                               '(progn  (setq cperl-font-lock-multiline-start
+                                              (match-beginning 0))
+                                        'font-lock-variable-name-face))))
+                       ((, (concat "\\="
+                                   cperl-maybe-white-and-comment-rex
+                                   ","
+                                   cperl-maybe-white-and-comment-rex
+                                   "\\([$@%*]\\([a-zA-Z0-9_:]+\\|[^a-zA-Z0-9_]\\)\\)"))
+                        ;; Bug in font-lock: limit is used not only to limit 
+                        ;; searches, but to set the "extend window for
+                        ;; facification" property.  Thus we need to minimize.
+                        (, (if cperl-font-lock-multiline
+                             '(if (match-beginning 3)
+                                  (save-excursion
+                                    (goto-char (match-beginning 3))
+                                    (condition-case nil
+                                        (forward-sexp 1)
+                                      (error
+                                       (condition-case nil
+                                           (forward-char 200)
+                                         (error nil)))) ; typeahead
+                                    (1- (point))) ; report limit
+                                (forward-char -2)) ; disable continued expr
+                             '(if (match-beginning 3)
+                                  (point-max) ; No limit for continuation
+                                (forward-char -2)))) ; disable continued expr
+                        (, (if cperl-font-lock-multiline
+                               nil
+                             '(progn    ; Do at end
+                                ;; "my" may be already fontified (POD),
+                                ;; so cperl-font-lock-multiline-start is nil
+                                (if (or (not cperl-font-lock-multiline-start)
+                                        (> 2 (count-lines
+                                              cperl-font-lock-multiline-start
+                                              (point))))
+                                    nil
+                                  (put-text-property
+                                   (1+ cperl-font-lock-multiline-start) (point)
+                                   'syntax-type 'multiline))
+                                (setq cperl-font-lock-multiline-start nil))))
+                        (3 font-lock-variable-name-face)))))
+                  (t '("^[ \t{}]*\\(my\\|local\\|our\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)"
                        3 font-lock-variable-name-face)))
             '("\\<for\\(each\\)?\\([ \t]+\\(my\\|local\\|our\\)\\)?[ \t]*\\(\\$[a-zA-Z_][a-zA-Z_0-9]*\\)[ \t]*("
               4 font-lock-variable-name-face)
@@ -4785,21 +5998,32 @@ indentation and initial hashes.  Behaves usually outside of comment."
           (setq
            t-font-lock-keywords-1
            (and (fboundp 'turn-on-font-lock) ; Check for newer font-lock
-                (not cperl-xemacs-p)    ; not yet as of XEmacs 19.12
+                ;; not yet as of XEmacs 19.12, works with 21.1.11
+                (or
+                 (not cperl-xemacs-p)
+                 (string< "21.1.9" emacs-version)
+                 (and (string< "21.1.10" emacs-version)
+                      (string< emacs-version "21.1.2")))
                 '(
                   ("\\(\\([@%]\\|\$#\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)" 1
                    (if (eq (char-after (match-beginning 2)) ?%)
-                       'cperl-hash
-                     'cperl-array)
+                       'cperl-hash-face
+                     'cperl-array-face)
                    t)                   ; arrays and hashes
                   ("\\(\\([$@]+\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)[ \t]*\\([[{]\\)"
                    1
                    (if (= (- (match-end 2) (match-beginning 2)) 1)
                        (if (eq (char-after (match-beginning 3)) ?{)
-                           'cperl-hash
-                         'cperl-array) ; arrays and hashes
+                           'cperl-hash-face
+                         'cperl-array-face) ; arrays and hashes
                      font-lock-variable-name-face) ; Just to put something
                    t)
+                  ("\\(@\\|\\$#\\)\\(\\$+\\([a-zA-Z_:][a-zA-Z0-9_:]*\\|[^ \t\n]\\)\\)"
+                   (1 cperl-array-face)
+                   (2 font-lock-variable-name-face))
+                  ("\\(%\\)\\(\\$+\\([a-zA-Z_:][a-zA-Z0-9_:]*\\|[^ \t\n]\\)\\)"
+                   (1 cperl-hash-face)
+                   (2 font-lock-variable-name-face))
                   ;;("\\([smy]\\|tr\\)\\([^a-z_A-Z0-9]\\)\\(\\([^\n\\]*||\\)\\)\\2")
                        ;;; Too much noise from \s* @s[ and friends
                   ;;("\\(\\<\\([msy]\\|tr\\)[ \t]*\\([^ \t\na-zA-Z0-9_]\\)\\|\\(/\\)\\)"
@@ -4811,7 +6035,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
           (if cperl-highlight-variables-indiscriminately
               (setq t-font-lock-keywords-1
                     (append t-font-lock-keywords-1
-                            (list '("[$*]{?\\(\\sw+\\)" 1
+                            (list '("\\([$*]{?\\sw+\\)" 1
                                     font-lock-variable-name-face)))))
           (setq cperl-font-lock-keywords-1
                 (if cperl-syntaxify-by-font-lock
@@ -4864,27 +6088,35 @@ indentation and initial hashes.  Behaves usually outside of comment."
                       [nil              nil             t               t       t]
                       nil
                       [nil              nil             t               t       t])
+                (list 'font-lock-warning-face
+                      ["Pink"           "Red"           "Gray50"        "LightGray"]
+                      ["gray20"         "gray90"
+                                                        "gray80"        "gray20"]
+                      [nil              nil             t               t       t]
+                      nil
+                      [nil              nil             t               t       t]
+                      )
                 (list 'font-lock-constant-face
                       ["CadetBlue"      "Aquamarine"    "Gray50"        "LightGray"]
                       nil
                       [nil              nil             t               t       t]
                       nil
                       [nil              nil             t               t       t])
-                (list 'cperl-nonoverridable
+                (list 'cperl-nonoverridable-face
                       ["chartreuse3"    ("orchid1" "orange")
                        nil              "Gray80"]
                       [nil              nil             "gray90"]
                       [nil              nil             nil             t       t]
                       [nil              nil             t               t]
                       [nil              nil             t               t       t])
-                (list 'cperl-array
+                (list 'cperl-array-face
                       ["blue"           "yellow"        nil             "Gray80"]
                       ["lightyellow2"   ("navy" "os2blue" "darkgreen")
                        "gray90"]
                       t
                       nil
                       nil)
-                (list 'cperl-hash
+                (list 'cperl-hash-face
                       ["red"            "red"           nil             "Gray80"]
                       ["lightyellow2"   ("navy" "os2blue" "darkgreen")
                        "gray90"]
@@ -4907,15 +6139,17 @@ indentation and initial hashes.  Behaves usually outside of comment."
                             "Face for variable names")
           (cperl-force-face font-lock-type-face
                             "Face for data types")
-          (cperl-force-face cperl-nonoverridable
+          (cperl-force-face cperl-nonoverridable-face
                             "Face for data types from another group")
+          (cperl-force-face font-lock-warning-face
+                            "Face for things which should stand out")
           (cperl-force-face font-lock-comment-face
                             "Face for comments")
           (cperl-force-face font-lock-function-name-face
                             "Face for function names")
-          (cperl-force-face cperl-hash
+          (cperl-force-face cperl-hash-face
                             "Face for hashes")
-          (cperl-force-face cperl-array
+          (cperl-force-face cperl-array-face
                             "Face for arrays")
           ;;(defvar font-lock-constant-face 'font-lock-constant-face)
           ;;(defvar font-lock-variable-name-face 'font-lock-variable-name-face)
@@ -4925,7 +6159,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
           ;;    "Face to use for data types."))
           ;;(or (boundp 'cperl-nonoverridable-face)
           ;;    (defconst cperl-nonoverridable-face
-          ;;    'cperl-nonoverridable
+          ;;    'cperl-nonoverridable-face
           ;;    "Face to use for data types from another group."))
           ;;(if (not cperl-xemacs-p) nil
           ;;  (or (boundp 'font-lock-comment-face)
@@ -4941,24 +6175,24 @@ indentation and initial hashes.  Behaves usually outside of comment."
           ;;      'font-lock-function-name-face
           ;;      "Face to use for function names.")))
           (if (and
-               (not (cperl-is-face 'cperl-array))
+               (not (cperl-is-face 'cperl-array-face))
                (cperl-is-face 'font-lock-emphasized-face))
-              (copy-face 'font-lock-emphasized-face 'cperl-array))
+              (copy-face 'font-lock-emphasized-face 'cperl-array-face))
           (if (and
-               (not (cperl-is-face 'cperl-hash))
+               (not (cperl-is-face 'cperl-hash-face))
                (cperl-is-face 'font-lock-other-emphasized-face))
-              (copy-face 'font-lock-other-emphasized-face 'cperl-hash))
+              (copy-face 'font-lock-other-emphasized-face 'cperl-hash-face))
           (if (and
-               (not (cperl-is-face 'cperl-nonoverridable))
+               (not (cperl-is-face 'cperl-nonoverridable-face))
                (cperl-is-face 'font-lock-other-type-face))
-              (copy-face 'font-lock-other-type-face 'cperl-nonoverridable))
+              (copy-face 'font-lock-other-type-face 'cperl-nonoverridable-face))
           ;;(or (boundp 'cperl-hash-face)
           ;;    (defconst cperl-hash-face
-          ;;    'cperl-hash
+          ;;    'cperl-hash-face
           ;;    "Face to use for hashes."))
           ;;(or (boundp 'cperl-array-face)
           ;;    (defconst cperl-array-face
-          ;;    'cperl-array
+          ;;    'cperl-array-face
           ;;    "Face to use for arrays."))
           ;; Here we try to guess background
           (let ((background
@@ -4997,17 +6231,17 @@ indentation and initial hashes.  Behaves usually outside of comment."
                                        "pink")))
                (t
                 (set-face-background 'font-lock-type-face "gray90"))))
-            (if (cperl-is-face 'cperl-nonoverridable)
+            (if (cperl-is-face 'cperl-nonoverridable-face)
                 nil
-              (copy-face 'font-lock-type-face 'cperl-nonoverridable)
+              (copy-face 'font-lock-type-face 'cperl-nonoverridable-face)
               (cond
                ((eq background 'light)
-                (set-face-foreground 'cperl-nonoverridable
+                (set-face-foreground 'cperl-nonoverridable-face
                                      (if (x-color-defined-p "chartreuse3")
                                          "chartreuse3"
                                        "chartreuse")))
                ((eq background 'dark)
-                (set-face-foreground 'cperl-nonoverridable
+                (set-face-foreground 'cperl-nonoverridable-face
                                      (if (x-color-defined-p "orchid1")
                                          "orchid1"
                                        "orange")))))
@@ -5059,15 +6293,15 @@ indentation and initial hashes.  Behaves usually outside of comment."
     '(setq ps-bold-faces
            ;;                   font-lock-variable-name-face
            ;;                   font-lock-constant-face
-           (append '(cperl-array cperl-hash)
+           (append '(cperl-array-face cperl-hash-face)
                    ps-bold-faces)
            ps-italic-faces
            ;;                   font-lock-constant-face
-           (append '(cperl-nonoverridable cperl-hash)
+           (append '(cperl-nonoverridable-face cperl-hash-face)
                    ps-italic-faces)
            ps-underlined-faces
            ;;        font-lock-type-face
-           (append '(cperl-array cperl-hash underline cperl-nonoverridable)
+           (append '(cperl-array-face cperl-hash-face underline cperl-nonoverridable-face)
                    ps-underlined-faces))))
 
 (defvar ps-print-face-extension-alist)
@@ -5100,27 +6334,27 @@ Style of printout regulated by the variable `cperl-ps-print-face-properties'."
 ;;;   (defvar ps-italic-faces nil)
 ;;;   (setq ps-bold-faces
 ;;;     (append '(font-lock-emphasized-face
-;;;               cperl-array
+;;;               cperl-array-face
 ;;;               font-lock-keyword-face
 ;;;               font-lock-variable-name-face
 ;;;               font-lock-constant-face
 ;;;               font-lock-reference-face
 ;;;               font-lock-other-emphasized-face
-;;;               cperl-hash)
+;;;               cperl-hash-face)
 ;;;             ps-bold-faces))
 ;;;   (setq ps-italic-faces
-;;;     (append '(cperl-nonoverridable
+;;;     (append '(cperl-nonoverridable-face
 ;;;               font-lock-constant-face
 ;;;               font-lock-reference-face
 ;;;               font-lock-other-emphasized-face
-;;;               cperl-hash)
+;;;               cperl-hash-face)
 ;;;             ps-italic-faces))
 ;;;   (setq ps-underlined-faces
 ;;;     (append '(font-lock-emphasized-face
-;;;               cperl-array
+;;;               cperl-array-face
 ;;;               font-lock-other-emphasized-face
-;;;               cperl-hash
-;;;               cperl-nonoverridable font-lock-type-face)
+;;;               cperl-hash-face
+;;;               cperl-nonoverridable-face font-lock-type-face)
 ;;;             ps-underlined-faces))
 ;;;   (cons 'font-lock-type-face ps-underlined-faces))
 
@@ -5130,79 +6364,211 @@ Style of printout regulated by the variable `cperl-ps-print-face-properties'."
 (defconst cperl-styles-entries
   '(cperl-indent-level cperl-brace-offset cperl-continued-brace-offset
     cperl-label-offset cperl-extra-newline-before-brace
+    cperl-extra-newline-before-brace-multiline
     cperl-merge-trailing-else
     cperl-continued-statement-offset))
 
+(defconst cperl-style-examples
+"##### Numbers etc are: cperl-indent-level cperl-brace-offset
+##### cperl-continued-brace-offset cperl-label-offset
+##### cperl-continued-statement-offset
+##### cperl-merge-trailing-else cperl-extra-newline-before-brace
+
+########### (Do not forget cperl-extra-newline-before-brace-multiline)
+
+### CPerl       (=GNU - extra-newline-before-brace + merge-trailing-else) 2/0/0/-2/2/t/nil
+if (foo) {
+  bar
+    baz;
+ label:
+  {
+    boon;
+  }
+} else {
+  stop;
+}
+
+### PerlStyle   (=CPerl with 4 as indent)               4/0/0/-4/4/t/nil
+if (foo) {
+    bar
+        baz;
+ label:
+    {
+        boon;
+    }
+} else {
+    stop;
+}
+
+### GNU                                                 2/0/0/-2/2/nil/t
+if (foo)
+  {
+    bar
+      baz;
+  label:
+    {
+      boon;
+    }
+  }
+else
+  {
+    stop;
+  }
+
+### C++         (=PerlStyle with braces aligned with control words) 4/0/-4/-4/4/nil/t
+if (foo)
+{
+    bar
+        baz;
+ label:
+    {
+        boon;
+    }
+}
+else
+{
+    stop;
+}
+
+### BSD         (=C++, but will not change preexisting merge-trailing-else
+###              and extra-newline-before-brace )               4/0/-4/-4/4
+if (foo)
+{
+    bar
+        baz;
+ label:
+    {
+        boon;
+    }
+}
+else
+{
+    stop;
+}
+
+### K&R         (=C++ with indent 5 - merge-trailing-else, but will not
+###              change preexisting extra-newline-before-brace) 5/0/-5/-5/5/nil
+if (foo)
+{
+     bar
+          baz;
+ label:
+     {
+          boon;
+     }
+}
+else
+{
+     stop;
+}
+
+### Whitesmith  (=PerlStyle, but will not change preexisting
+###              extra-newline-before-brace and merge-trailing-else) 4/0/0/-4/4
+if (foo)
+    {
+        bar
+            baz;
+    label:
+        {
+            boon;
+        }
+    }
+else
+    {
+        stop;
+    }
+"
+"Examples of if/else with different indent styles (with v4.23).")
+
 (defconst cperl-style-alist
-  '(("CPerl"                         ; =GNU without extra-newline-before-brace
+  '(("CPerl" ;; =GNU - extra-newline-before-brace + cperl-merge-trailing-else
      (cperl-indent-level               .  2)
      (cperl-brace-offset               .  0)
      (cperl-continued-brace-offset     .  0)
      (cperl-label-offset               . -2)
+     (cperl-continued-statement-offset .  2)
      (cperl-extra-newline-before-brace .  nil)
-     (cperl-merge-trailing-else        .  t)
-     (cperl-continued-statement-offset .  2))
+     (cperl-extra-newline-before-brace-multiline .  nil)
+     (cperl-merge-trailing-else        .  t))
+
     ("PerlStyle"                        ; CPerl with 4 as indent
      (cperl-indent-level               .  4)
      (cperl-brace-offset               .  0)
      (cperl-continued-brace-offset     .  0)
      (cperl-label-offset               . -4)
+     (cperl-continued-statement-offset .  4)
      (cperl-extra-newline-before-brace .  nil)
-     (cperl-merge-trailing-else        .  t)
-     (cperl-continued-statement-offset .  4))
+     (cperl-extra-newline-before-brace-multiline .  nil)
+     (cperl-merge-trailing-else        .  t))
+
     ("GNU"
      (cperl-indent-level               .  2)
      (cperl-brace-offset               .  0)
      (cperl-continued-brace-offset     .  0)
      (cperl-label-offset               . -2)
+     (cperl-continued-statement-offset .  2)
      (cperl-extra-newline-before-brace .  t)
-     (cperl-merge-trailing-else        .  nil)
-     (cperl-continued-statement-offset .  2))
+     (cperl-extra-newline-before-brace-multiline .  t)
+     (cperl-merge-trailing-else        .  nil))
+
     ("K&R"
      (cperl-indent-level               .  5)
      (cperl-brace-offset               .  0)
      (cperl-continued-brace-offset     . -5)
      (cperl-label-offset               . -5)
+     (cperl-continued-statement-offset .  5)
      ;;(cperl-extra-newline-before-brace .  nil) ; ???
-     (cperl-merge-trailing-else        .  nil)
-     (cperl-continued-statement-offset .  5))
+     ;;(cperl-extra-newline-before-brace-multiline .  nil)
+     (cperl-merge-trailing-else        .  nil))
+
     ("BSD"
      (cperl-indent-level               .  4)
      (cperl-brace-offset               .  0)
      (cperl-continued-brace-offset     . -4)
      (cperl-label-offset               . -4)
+     (cperl-continued-statement-offset .  4)
      ;;(cperl-extra-newline-before-brace .  nil) ; ???
-     (cperl-continued-statement-offset .  4))
+     ;;(cperl-extra-newline-before-brace-multiline .  nil)
+     ;;(cperl-merge-trailing-else              .  nil) ; ???
+     )
+
     ("C++"
      (cperl-indent-level               .  4)
      (cperl-brace-offset               .  0)
      (cperl-continued-brace-offset     . -4)
      (cperl-label-offset               . -4)
      (cperl-continued-statement-offset .  4)
-     (cperl-merge-trailing-else        .  nil)
-     (cperl-extra-newline-before-brace .  t))
-    ("Current")
+     (cperl-extra-newline-before-brace .  t)
+     (cperl-extra-newline-before-brace-multiline .  t)
+     (cperl-merge-trailing-else        .  nil))
+
     ("Whitesmith"
      (cperl-indent-level               .  4)
      (cperl-brace-offset               .  0)
      (cperl-continued-brace-offset     .  0)
      (cperl-label-offset               . -4)
+     (cperl-continued-statement-offset .  4)
      ;;(cperl-extra-newline-before-brace .  nil) ; ???
-     (cperl-continued-statement-offset .  4)))
-  "(Experimental) list of variables to set to get a particular indentation style.
-Should be used via `cperl-set-style' or via Perl menu.")
+     ;;(cperl-extra-newline-before-brace-multiline .  nil)
+     ;;(cperl-merge-trailing-else              .  nil) ; ???
+     )
+    ("Current"))
+  "List of variables to set to get a particular indentation style.
+Should be used via `cperl-set-style' or via Perl menu.
+
+See examples in `cperl-style-examples'.")
 
 (defun cperl-set-style (style)
   "Set CPerl mode variables to use one of several different indentation styles.
 The arguments are a string representing the desired style.
 The list of styles is in `cperl-style-alist', available styles
-are GNU, K&R, BSD, C++ and Whitesmith.
+are CPerl, PerlStyle, GNU, K&R, BSD, C++ and Whitesmith.
 
 The current value of style is memorized (unless there is a memorized
 data already), may be restored by `cperl-set-style-back'.
 
 Chosing \"Current\" style will not change style, so this may be used for
-side-effect of memorizing only."
+side-effect of memorizing only.  Examples in `cperl-style-examples'."
   (interactive
    (let ((list (mapcar (function (lambda (elt) (list (car elt))))
                        cperl-style-alist)))
@@ -5373,6 +6739,8 @@ Customized by setting variables `cperl-shrink-wrap-info-frame',
    (match-beginning 1) (match-end 1)))
 
 (defun cperl-imenu-on-info ()
+  "Shows imenu for Perl Info Buffer.
+Opens Perl Info buffer if needed."
   (interactive)
   (let* ((buffer (current-buffer))
          imenu-create-index-function
@@ -5412,7 +6780,7 @@ If STEP is nil, `cperl-lineup-step' will be used
 \(or `cperl-indent-level', if `cperl-lineup-step' is nil).
 Will not move the position at the start to the left."
   (interactive "r")
-  (let (search col tcol seen b e)
+  (let (search col tcol seen b)
     (save-excursion
       (goto-char end)
       (end-of-line)
@@ -5450,22 +6818,25 @@ Will not move the position at the start to the left."
       (if (/= (% col step) 0) (setq step (* step (1+ (/ col step)))))
       (while
           (progn
-            (setq e (point))
-            (skip-chars-backward " \t")
-            (delete-region (point) e)
-            (indent-to-column col) ;(make-string (- col (current-column)) ?\s))
+            (cperl-make-indent col)
             (beginning-of-line 2)
             (and (< (point) end)
                  (re-search-forward search end t)
                  (goto-char (match-beginning 0)))))))) ; No body
 
-(defun cperl-etags (&optional add all files)
+(defun cperl-etags (&optional add all files) ;; NOT USED???
   "Run etags with appropriate options for Perl files.
 If optional argument ALL is `recursive', will process Perl files
 in subdirectories too."
   (interactive)
   (let ((cmd "etags")
-        (args '("-l" "none" "-r" "/\\<\\(package\\|sub\\)[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)[ \\t]*\\(([^()]*)[ \t]*\\)?\\([{#]\\|$\\)\\)/\\4/"))
+        (args '("-l" "none" "-r"
+                ;;       1=fullname  2=package?             3=name                       4=proto?             5=attrs? (VERY APPROX!)
+                "/\\<sub[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)\\)[ \\t]*\\(([^()]*)[ \t]*\\)?\\([ \t]*:[^#{;]*\\)?\\([{#]\\|$\\)/\\3/"
+                "-r"
+                "/\\<package[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)\\)[ \\t]*\\([#;]\\|$\\)/\\1/"
+                "-r"
+                "/\\<\\(package\\)[ \\t]*;/\\1;/"))
         res)
     (if add (setq args (cons "-a" args)))
     (or files (setq files (list buffer-file-name)))
@@ -5537,6 +6908,29 @@ Delay of auto-help controlled by `cperl-lazy-help-time'."
   (message "indent-region/indent-sexp will %sbe automatically fix whitespace."
            (if cperl-indent-region-fix-constructs "" "not ")))
 
+(defun cperl-toggle-set-debug-unwind (arg &optional backtrace)
+  "Toggle (or, with numeric argument, set) debugging state of syntaxification.
+Nonpositive numeric argument disables debugging messages.  The message
+summarizes which regions it was decided to rescan for syntactic constructs.
+
+The message looks like this:
+
+  Syxify req=123..138 actual=101..146 done-to: 112=>146 statepos: 73=>117
+
+Numbers are character positions in the buffer.  REQ provides the range to
+rescan requested by `font-lock'.  ACTUAL is the range actually resyntaxified;
+for correct operation it should start and end outside any special syntactic
+construct.  DONE-TO and STATEPOS indicate changes to internal caches maintained
+by CPerl."
+  (interactive "P")
+  (or arg
+      (setq arg (if (eq cperl-syntaxify-by-font-lock 
+                        (if backtrace 'backtrace 'message)) 0 1)))
+  (setq arg (if (> arg 0) (if backtrace 'backtrace 'message) t))
+  (setq cperl-syntaxify-by-font-lock arg)
+  (message "Debugging messages of syntax unwind %sabled."
+           (if (eq arg t) "dis" "en")))
+
 ;;;; Tags file creation.
 
 (defvar cperl-tmp-buffer " *cperl-tmp*")
@@ -5677,13 +7071,22 @@ Delay of auto-help controlled by `cperl-lazy-help-time'."
         ret))))
 
 (defun cperl-add-tags-recurse-noxs ()
-  "Add to TAGS data for Perl and XSUB files in the current directory and kids.
+  "Add to TAGS data for \"pure\" Perl files in the current directory and kids.
 Use as
   emacs -batch -q -no-site-file -l emacs/cperl-mode.el \
-        -f cperl-add-tags-recurse
+        -f cperl-add-tags-recurse-noxs
 "
   (cperl-write-tags nil nil t t nil t))
 
+(defun cperl-add-tags-recurse-noxs-fullpath ()
+  "Add to TAGS data for \"pure\" Perl in the current directory and kids.
+Writes down fullpath, so TAGS is relocatable (but if the build directory
+is relocated, the file TAGS inside it breaks). Use as
+  emacs -batch -q -no-site-file -l emacs/cperl-mode.el \
+        -f cperl-add-tags-recurse-noxs-fullpath
+"
+  (cperl-write-tags nil nil t t nil t ""))
+
 (defun cperl-add-tags-recurse ()
   "Add to TAGS file data for Perl files in the current directory and kids.
 Use as
@@ -5853,9 +7256,9 @@ One may build such TAGS files from CPerl mode menu."
               (cperl-tags-hier-fill))
           (or tags-table-list
               (call-interactively 'visit-tags-table))
-        (mapcar
-         (function
-          (lambda (tagsfile)
+          (mapcar
+           (function
+            (lambda (tagsfile)
               (message "Updating list of classes... %s" tagsfile)
             (set-buffer (get-file-buffer tagsfile))
             (cperl-tags-hier-fill)))
@@ -6017,7 +7420,7 @@ One may build such TAGS files from CPerl mode menu."
    '("[^-\t <>=+]\\(--\\|\\+\\+\\)"     ; var-- var++
      "[a-zA-Z0-9_][|&][a-zA-Z0-9_$]"    ; abc|def abc&def are often used.
      "&[(a-zA-Z0-9_$]"                  ; &subroutine &(var->field)
-     "<\\$?\\sw+\\(\\.\\sw+\\)?>"       ; <IN> <stdin.h>
+     "<\\$?\\sw+\\(\\.\\(\\sw\\|_\\)+\\)?>"     ; <IN> <stdin.h>
      "-[a-zA-Z][ \t]+[_$\"'`a-zA-Z]"    ; -f file, -t STDIN
      "-[0-9]"                           ; -5
      "\\+\\+"                           ; ++var
@@ -6049,8 +7452,7 @@ Currently it is tuned to C and Perl syntax."
   (interactive)
   (let (found-bad (p (point)))
     (setq last-nonmenu-event 13)        ; To disable popup
-    (with-no-warnings  ; It is useful to push the mark here.
-     (beginning-of-buffer))
+    (goto-char (point-min))
     (map-y-or-n-p "Insert space here? "
                   (lambda (arg) (insert " "))
                   'cperl-next-bad-style
@@ -6446,7 +7848,7 @@ endservent
 eof[([FILEHANDLE])]
 ... eq ...      String equality.
 eval(EXPR) or eval { BLOCK }
-exec(LIST)
+exec([TRUENAME] ARGV0, ARGVs)     or     exec(SHELL_COMMAND_LINE)
 exit(EXPR)
 exp(EXPR)
 fcntl(FILEHANDLE,FUNCTION,SCALAR)
@@ -6582,7 +7984,7 @@ substr(EXPR,OFFSET[,LEN])
 symlink(OLDFILE,NEWFILE)
 syscall(LIST)
 sysread(FILEHANDLE,SCALAR,LENGTH[,OFFSET])
-system(LIST)
+system([TRUENAME] ARGV0 [,ARGV])     or     system(SHELL_COMMAND_LINE)
 syswrite(FILEHANDLE,SCALAR,LENGTH[,OFFSET])
 tell[(FILEHANDLE)]
 telldir(DIRHANDLE)
@@ -6683,7 +8085,7 @@ prototype \\&SUB	Returns prototype of the function given a reference.
   ;; b is before the starting delimiter, e before the ending
   ;; e should be a marker, may be changed, but remains "correct".
   ;; EMBED is nil iff we process the whole REx.
-  ;; The REx is guarantied to have //x
+  ;; The REx is guaranteed to have //x
   ;; LEVEL shows how many levels deep to go
   ;; position at enter and at leave is not defined
   (let (s c tmp (m (make-marker)) (m1 (make-marker)) c1 spaces inline code pos)
@@ -6712,7 +8114,7 @@ prototype \\&SUB	Returns prototype of the function given a reference.
           (goto-char e)
           (delete-horizontal-space)
           (insert "\n")
-          (indent-to-column c)
+          (cperl-make-indent c)
           (set-marker e (point))))
     (goto-char b)
     (end-of-line 2)
@@ -6722,7 +8124,7 @@ prototype \\&SUB	Returns prototype of the function given a reference.
             inline t)
       (skip-chars-forward " \t")
       (delete-region s (point))
-      (indent-to-column c1)
+      (cperl-make-indent c1)
       (while (and
               inline
               (looking-at
@@ -6748,6 +8150,16 @@ prototype \\&SUB	Returns prototype of the function given a reference.
                         (eq (preceding-char) ?\{)))
                (forward-char -1)
                (forward-sexp 1))
+              ((and                     ; [], already syntaxified
+                (match-beginning 6)
+                cperl-regexp-scan
+                cperl-use-syntax-table-text-property)
+               (forward-char -1)
+               (forward-sexp 1)
+               (or (eq (preceding-char) ?\])
+                   (error "[]-group not terminated"))
+               (re-search-forward
+                "\\=\\([*+?]\\|{[0-9]+\\(,[0-9]*\\)?}\\)\\??" e t))
               ((match-beginning 6)      ; []
                (setq tmp (point))
                (if (looking-at "\\^?\\]")
@@ -6761,12 +8173,8 @@ prototype \\&SUB	Returns prototype of the function given a reference.
                    (setq pos t)))
                (or (eq (preceding-char) ?\])
                    (error "[]-group not terminated"))
-               (if (eq (following-char) ?\{)
-                   (progn
-                     (forward-sexp 1)
-                     (and (eq (following-char) ??)
-                          (forward-char 1)))
-                 (re-search-forward "\\=\\([*+?]\\??\\)" e t)))
+               (re-search-forward
+                "\\=\\([*+?]\\|{[0-9]+\\(,[0-9]*\\)?}\\)\\??" e t))
               ((match-beginning 7)      ; ()
                (goto-char (match-beginning 0))
                (setq pos (current-column))
@@ -6774,7 +8182,7 @@ prototype \\&SUB	Returns prototype of the function given a reference.
                    (progn
                      (delete-horizontal-space)
                      (insert "\n")
-                     (indent-to-column c1)))
+                     (cperl-make-indent c1)))
                (setq tmp (point))
                (forward-sexp 1)
                ;;              (or (forward-sexp 1)
@@ -6834,7 +8242,7 @@ prototype \\&SUB	Returns prototype of the function given a reference.
                      (insert "\n"))
                  ;; first at line
                  (delete-region (point) tmp))
-               (indent-to-column c)
+               (cperl-make-indent c)
                (forward-char 1)
                (skip-chars-forward " \t")
                (setq spaces nil)
@@ -6857,10 +8265,7 @@ prototype \\&SUB	Returns prototype of the function given a reference.
              (/= (current-indentation) c))
         (progn
           (beginning-of-line)
-          (setq s (point))
-          (skip-chars-forward " \t")
-          (delete-region s (point))
-          (indent-to-column c)))))
+          (cperl-make-indent c)))))
 
 (defun cperl-make-regexp-x ()
   ;; Returns position of the start
@@ -6929,7 +8334,7 @@ We suppose that the regexp is scanned already."
   (interactive)
   ;; (save-excursion            ; Can't, breaks `cperl-contract-levels'
   (cperl-regext-to-level-start)
-  (let ((b (point)) (e (make-marker)) s c)
+  (let ((b (point)) (e (make-marker)) c)
     (forward-sexp 1)
     (set-marker e (1- (point)))
     (goto-char b)
@@ -6938,10 +8343,7 @@ We suppose that the regexp is scanned already."
        ((match-beginning 1)             ; #-comment
         (or c (setq c (current-indentation)))
         (beginning-of-line 2)           ; Skip
-        (setq s (point))
-        (skip-chars-forward " \t")
-        (delete-region s (point))
-        (indent-to-column c))
+        (cperl-make-indent c))
        (t
         (delete-char -1)
         (just-one-space))))))
@@ -6980,96 +8382,197 @@ We suppose that the regexp is scanned already."
       (set-marker e (1- (point)))
       (cperl-beautify-regexp-piece b e nil deep))))
 
+(defun cperl-invert-if-unless-modifiers ()
+  "Change `B if A;' into `if (A) {B}' etc if possible.
+\(Unfinished.)"
+  (interactive)                         ; 
+  (let (A B pre-B post-B pre-if post-if pre-A post-A if-string
+          (w-rex "\\<\\(if\\|unless\\|while\\|until\\|for\\|foreach\\)\\>"))
+    (and (= (char-syntax (preceding-char)) ?w)
+         (forward-sexp -1))
+    (setq pre-if (point))
+    (cperl-backward-to-start-of-expr)
+    (setq pre-B (point))
+    (forward-sexp 1)            ; otherwise forward-to-end-of-expr is NOP
+    (cperl-forward-to-end-of-expr)
+    (setq post-A (point))
+    (goto-char pre-if)
+    (or (looking-at w-rex)
+        ;; Find the position
+        (progn (goto-char post-A)
+               (while (and
+                       (not (looking-at w-rex))
+                       (> (point) pre-B))
+                 (forward-sexp -1))
+               (setq pre-if (point))))
+    (or (looking-at w-rex)
+        (error "Can't find `if', `unless', `while', `until', `for' or `foreach'"))
+    ;; 1 B 2 ... 3 B-com ... 4 if 5 ... if-com 6 ... 7 A 8
+    (setq if-string (buffer-substring (match-beginning 0) (match-end 0)))
+    ;; First, simple part: find code boundaries
+    (forward-sexp 1)
+    (setq post-if (point))
+    (forward-sexp -2)
+    (forward-sexp 1)
+    (setq post-B (point))
+    (cperl-backward-to-start-of-expr)
+    (setq pre-B (point))
+    (setq B (buffer-substring pre-B post-B))
+    (goto-char pre-if)
+    (forward-sexp 2)
+    (forward-sexp -1)
+    ;; May be after $, @, $# etc of a variable
+    (skip-chars-backward "$@%#")
+    (setq pre-A (point))
+    (cperl-forward-to-end-of-expr)
+    (setq post-A (point))
+    (setq A (buffer-substring pre-A post-A))
+    ;; Now modify (from end, to not break the stuff)
+    (skip-chars-forward " \t;")
+    (delete-region pre-A (point))       ; we move to pre-A
+    (insert "\n" B ";\n}")
+    (and (looking-at "[ \t]*#") (cperl-indent-for-comment))
+    (delete-region pre-if post-if)
+    (delete-region pre-B post-B)
+    (goto-char pre-B)
+    (insert if-string " (" A ") {")
+    (setq post-B (point))
+    (if (looking-at "[ \t]+$")
+        (delete-horizontal-space)
+      (if (looking-at "[ \t]*#")
+          (cperl-indent-for-comment)
+        (just-one-space)))
+    (forward-line 1)
+    (if (looking-at "[ \t]*$")
+        (progn                          ; delete line
+          (delete-horizontal-space)
+          (delete-region (point) (1+ (point)))))
+    (cperl-indent-line)
+    (goto-char (1- post-B))
+    (forward-sexp 1)
+    (cperl-indent-line)
+    (goto-char pre-B)))
+
 (defun cperl-invert-if-unless ()
-  "Change `if (A) {B}' into `B if A;' etc if possible."
+  "Change `if (A) {B}' into `B if A;' etc (or visa versa) if possible.
+If the cursor is not on the leading keyword of the BLOCK flavor of
+construct, will assume it is the STATEMENT flavor, so will try to find
+the appropriate statement modifier."
   (interactive)
-  (or (looking-at "\\<")
-      (forward-sexp -1))
+  (and (= (char-syntax (preceding-char)) ?w)
+       (forward-sexp -1))
   (if (looking-at "\\<\\(if\\|unless\\|while\\|until\\|for\\|foreach\\)\\>")
-      (let ((pos1 (point))
-            pos2 pos3 pos4 pos5 s1 s2 state p pos45
-            (s0 (buffer-substring (match-beginning 0) (match-end 0))))
+      (let ((pre-if (point))
+            pre-A post-A pre-B post-B A B state p end-B-code is-block B-comment
+            (if-string (buffer-substring (match-beginning 0) (match-end 0))))
         (forward-sexp 2)
-        (setq pos3 (point))
+        (setq post-A (point))
         (forward-sexp -1)
-        (setq pos2 (point))
-        (if (eq (following-char) ?\( )
+        (setq pre-A (point))
+        (setq is-block (and (eq (following-char) ?\( )
+                            (save-excursion
+                              (condition-case nil
+                                  (progn
+                                    (forward-sexp 2)
+                                    (forward-sexp -1)
+                                    (eq (following-char) ?\{ ))
+                                (error nil)))))
+        (if is-block
             (progn
-              (goto-char pos3)
+              (goto-char post-A)
               (forward-sexp 1)
-              (setq pos5 (point))
+              (setq post-B (point))
               (forward-sexp -1)
-              (setq pos4 (point))
-              ;; XXXX In fact may be `A if (B); {C}' ...
+              (setq pre-B (point))
               (if (and (eq (following-char) ?\{ )
                        (progn
-                         (cperl-backward-to-noncomment pos3)
+                         (cperl-backward-to-noncomment post-A)
                          (eq (preceding-char) ?\) )))
                   (if (condition-case nil
                           (progn
-                            (goto-char pos5)
+                            (goto-char post-B)
                             (forward-sexp 1)
                             (forward-sexp -1)
                             (looking-at "\\<els\\(e\\|if\\)\\>"))
                         (error nil))
                       (error
-                       "`%s' (EXPR) {BLOCK} with `else'/`elsif'" s0)
-                    (goto-char (1- pos5))
-                    (cperl-backward-to-noncomment pos4)
+                       "`%s' (EXPR) {BLOCK} with `else'/`elsif'" if-string)
+                    (goto-char (1- post-B))
+                    (cperl-backward-to-noncomment pre-B)
                     (if (eq (preceding-char) ?\;)
                         (forward-char -1))
-                    (setq pos45 (point))
-                    (goto-char pos4)
-                    (while (re-search-forward "\\<\\(for\\|foreach\\|if\\|unless\\|while\\|until\\)\\>\\|;" pos45 t)
+                    (setq end-B-code (point))
+                    (goto-char pre-B)
+                    (while (re-search-forward "\\<\\(for\\|foreach\\|if\\|unless\\|while\\|until\\)\\>\\|;" end-B-code t)
                       (setq p (match-beginning 0)
-                            s1 (buffer-substring p (match-end 0))
-                            state (parse-partial-sexp pos4 p))
+                            A (buffer-substring p (match-end 0))
+                            state (parse-partial-sexp pre-B p))
                       (or (nth 3 state)
                           (nth 4 state)
                           (nth 5 state)
-                          (error "`%s' inside `%s' BLOCK" s1 s0))
+                          (error "`%s' inside `%s' BLOCK" A if-string))
                       (goto-char (match-end 0)))
                     ;; Finally got it
-                    (goto-char (1+ pos4))
+                    (goto-char (1+ pre-B))
                     (skip-chars-forward " \t\n")
-                    (setq s2 (buffer-substring (point) pos45))
-                    (goto-char pos45)
+                    (setq B (buffer-substring (point) end-B-code))
+                    (goto-char end-B-code)
                     (or (looking-at ";?[ \t\n]*}")
                         (progn
                           (skip-chars-forward "; \t\n")
-                          (setq s2 (concat s2 "\n" (buffer-substring (point) (1- pos5))))))
-                    (and (equal s2 "")
-                         (setq s2 "1"))
-                    (goto-char (1- pos3))
-                    (cperl-backward-to-noncomment pos2)
+                          (setq B-comment
+                                (buffer-substring (point) (1- post-B)))))
+                    (and (equal B "")
+                         (setq B "1"))
+                    (goto-char (1- post-A))
+                    (cperl-backward-to-noncomment pre-A)
                     (or (looking-at "[ \t\n]*)")
-                        (goto-char (1- pos3)))
+                        (goto-char (1- post-A)))
                     (setq p (point))
-                    (goto-char (1+ pos2))
+                    (goto-char (1+ pre-A))
                     (skip-chars-forward " \t\n")
-                    (setq s1 (buffer-substring (point) p))
-                    (delete-region pos4 pos5)
-                    (delete-region pos2 pos3)
-                    (goto-char pos1)
-                    (insert s2 " ")
+                    (setq A (buffer-substring (point) p))
+                    (delete-region pre-B post-B)
+                    (delete-region pre-A post-A)
+                    (goto-char pre-if)
+                    (insert B " ")
+                    (and B-comment (insert B-comment " "))
                     (just-one-space)
                     (forward-word 1)
-                    (setq pos1 (point))
-                    (insert " " s1 ";")
+                    (setq pre-A (point))
+                    (insert " " A ";")
                     (delete-horizontal-space)
+                    (setq post-B (point))
+                    (if (looking-at "#")
+                        (indent-for-comment))
+                    (goto-char post-B)
                     (forward-char -1)
                     (delete-horizontal-space)
-                    (goto-char pos1)
+                    (goto-char pre-A)
                     (just-one-space)
-                    (cperl-indent-line))
-                (error "`%s' (EXPR) not with an {BLOCK}" s0)))
-          (error "`%s' not with an (EXPR)" s0)))
-    (error "Not at `if', `unless', `while', `until', `for' or `foreach'")))
+                    (goto-char pre-if)
+                    (setq pre-A (set-marker (make-marker) pre-A))
+                    (while (<= (point) (marker-position pre-A))
+                      (cperl-indent-line)
+                      (forward-line 1))
+                    (goto-char (marker-position pre-A))
+                    (if B-comment
+                        (progn
+                          (forward-line -1)
+                          (indent-for-comment)
+                          (goto-char (marker-position pre-A)))))
+                (error "`%s' (EXPR) not with an {BLOCK}" if-string)))
+          ;; (error "`%s' not with an (EXPR)" if-string)
+          (forward-sexp -1)
+          (cperl-invert-if-unless-modifiers)))
+    ;;(error "Not at `if', `unless', `while', `until', `for' or `foreach'")
+    (cperl-invert-if-unless-modifiers)))
 
 ;;; By Anthony Foiani <afoiani@uswest.com>
 ;;; Getting help on modules in C-h f ?
 ;;; This is a modified version of `man'.
 ;;; Need to teach it how to lookup functions
+;;;###autoload
 (defun cperl-perldoc (word)
   "Run `perldoc' on WORD."
   (interactive
@@ -7101,6 +8604,7 @@ We suppose that the regexp is scanned already."
      (t
       (Man-getpage-in-background word)))))
 
+;;;###autoload
 (defun cperl-perldoc-at-point ()
   "Run a `perldoc' on the word around point."
   (interactive)
@@ -7145,7 +8649,7 @@ We suppose that the regexp is scanned already."
 (defun cperl-pod2man-build-command ()
   "Builds the entire background manpage and cleaning command."
   (let ((command (concat pod2man-program " %s 2>/dev/null"))
-        (flist Man-filter-list))
+        (flist (and (boundp 'Man-filter-list) Man-filter-list)))
     (while (and flist (car flist))
       (let ((pcom (car (car flist)))
             (pargs (cdr (car flist))))
@@ -7159,6 +8663,205 @@ We suppose that the regexp is scanned already."
         (setq flist (cdr flist))))
     command))
 
+
+(defun cperl-next-interpolated-REx-1 ()
+  "Move point to next REx which has interpolated parts without //o.
+Skips RExes consisting of one interpolated variable.
+
+Note that skipped RExen are not performance hits."
+  (interactive "")
+  (cperl-next-interpolated-REx 1))
+
+(defun cperl-next-interpolated-REx-0 ()
+  "Move point to next REx which has interpolated parts without //o."
+  (interactive "")
+  (cperl-next-interpolated-REx 0))
+
+(defun cperl-next-interpolated-REx (&optional skip beg limit)
+  "Move point to next REx which has interpolated parts.
+SKIP is a list of possible types to skip, BEG and LIMIT are the starting
+point and the limit of search (default to point and end of buffer).
+
+SKIP may be a number, then it behaves as list of numbers up to SKIP; this
+semantic may be used as a numeric argument.
+
+Types are 0 for / $rex /o (interpolated once), 1 for /$rex/ (if $rex is
+a result of qr//, this is not a performance hit), t for the rest."
+  (interactive "P")
+  (if (numberp skip) (setq skip (list 0 skip)))
+  (or beg (setq beg (point)))
+  (or limit (setq limit (point-max)))   ; needed for n-s-p-c
+  (let (pp)
+    (and (eq (get-text-property beg 'syntax-type) 'string)
+         (setq beg (next-single-property-change beg 'syntax-type nil limit)))
+    (cperl-map-pods-heres
+     (function (lambda (s e p)
+                 (if (memq (get-text-property s 'REx-interpolated) skip)
+                     t
+                   (setq pp s)
+                   nil)))       ; nil stops
+     'REx-interpolated beg limit)
+    (if pp (goto-char pp)
+      (message "No more interpolated REx"))))
+
+;;; Initial version contributed by Trey Belew
+(defun cperl-here-doc-spell (&optional beg end)
+  "Spell-check HERE-documents in the Perl buffer.
+If a region is highlighted, restricts to the region."
+  (interactive "")
+  (cperl-pod-spell t beg end))
+
+(defun cperl-pod-spell (&optional do-heres beg end)
+  "Spell-check POD documentation.
+If invoked with prefix argument, will do HERE-DOCs instead.
+If a region is highlighted, restricts to the region."
+  (interactive "P")
+  (save-excursion
+    (let (beg end)
+      (if (cperl-mark-active)
+          (setq beg (min (mark) (point))
+                end (max (mark) (point)))
+        (setq beg (point-min)
+              end (point-max)))
+      (cperl-map-pods-heres (function
+                             (lambda (s e p)
+                               (if do-heres
+                                   (setq e (save-excursion
+                                             (goto-char e)
+                                             (forward-line -1)
+                                             (point))))
+                               (ispell-region s e)
+                               t))
+                            (if do-heres 'here-doc-group 'in-pod)
+                            beg end))))
+
+(defun cperl-map-pods-heres (func &optional prop s end)
+  "Executes a function over regions of pods or here-documents.
+PROP is the text-property to search for; default to `in-pod'.  Stop when
+function returns nil."
+  (let (pos posend has-prop (cont t))
+    (or prop (setq prop 'in-pod))
+    (or s (setq s (point-min)))
+    (or end (setq end (point-max)))
+    (cperl-update-syntaxification end end)
+    (save-excursion
+      (goto-char (setq pos s))
+      (while (and cont (< pos end))
+        (setq has-prop (get-text-property pos prop))
+        (setq posend (next-single-property-change pos prop nil end))
+        (and has-prop
+             (setq cont (funcall func pos posend prop)))
+        (setq pos posend)))))
+
+;;; Based on code by Masatake YAMATO:
+(defun cperl-get-here-doc-region (&optional pos pod)
+  "Return HERE document region around the point.
+Return nil if the point is not in a HERE document region.  If POD is non-nil,
+will return a POD section if point is in a POD section."
+  (or pos (setq pos (point)))
+  (cperl-update-syntaxification pos pos)
+  (if (or (eq 'here-doc  (get-text-property pos 'syntax-type))
+          (and pod
+               (eq 'pod (get-text-property pos 'syntax-type))))
+      (let ((b (cperl-beginning-of-property pos 'syntax-type))
+            (e (next-single-property-change pos 'syntax-type)))
+        (cons b (or e (point-max))))))
+
+(defun cperl-narrow-to-here-doc (&optional pos)
+  "Narrows editing region to the HERE-DOC at POS.
+POS defaults to the point."
+  (interactive "d")
+  (or pos (setq pos (point)))
+  (let ((p (cperl-get-here-doc-region pos)))
+    (or p (error "Not inside a HERE document"))
+    (narrow-to-region (car p) (cdr p))
+    (message
+     "When you are finished with narrow editing, type C-x n w")))
+
+(defun cperl-select-this-pod-or-here-doc (&optional pos)
+  "Select the HERE-DOC (or POD section) at POS.
+POS defaults to the point."
+  (interactive "d")
+  (let ((p (cperl-get-here-doc-region pos t)))
+    (if p
+        (progn
+          (goto-char (car p))
+          (push-mark (cdr p) nil t))    ; Message, activate in transient-mode
+      (message "I do not think POS is in POD or a HERE-doc..."))))
+
+(defun cperl-facemenu-add-face-function (face end)
+  "A callback to process user-initiated font-change requests.
+Translates `bold', `italic', and `bold-italic' requests to insertion of
+corresponding POD directives, and `underline' to C<> POD directive.
+
+Such requests are usually bound to M-o LETTER."
+  (or (get-text-property (point) 'in-pod)
+      (error "Faces can only be set within POD"))
+  (setq facemenu-end-add-face (if (eq face 'bold-italic) ">>" ">"))
+  (cdr (or (assq face '((bold . "B<")
+                        (italic . "I<")
+                        (bold-italic . "B<I<")
+                        (underline . "C<")))
+           (error "Face %s not configured for cperl-mode"
+                  face))))
+
+(defun cperl-time-fontification (&optional l step lim)
+  "Times how long it takes to do incremental fontification in a region.
+L is the line to start at, STEP is the number of lines to skip when
+doing next incremental fontification, LIM is the maximal number of
+incremental fontification to perform.  Messages are accumulated in
+*Messages* buffer.
+
+May be used for pinpointing which construct slows down buffer fontification:
+start with default arguments, then refine the slowdown regions."
+  (interactive "nLine to start at: \nnStep to do incremental fontification: ")
+  (or l (setq l 1))
+  (or step (setq step 500))
+  (or lim (setq lim 40))
+  (let* ((timems (function (lambda ()
+                             (let ((tt (current-time)))
+                               (+ (* 1000 (nth 1 tt)) (/ (nth 2 tt) 1000))))))
+         (tt (funcall timems)) (c 0) delta tot)
+    (goto-line l)
+    (cperl-mode)
+    (setq tot (- (- tt (setq tt (funcall timems)))))
+    (message "cperl-mode at %s: %s" l tot)
+    (while (and (< c lim) (not (eobp)))
+      (forward-line step)
+      (setq l (+ l step))
+      (setq c (1+ c))
+      (cperl-update-syntaxification (point) (point))
+      (setq delta (- (- tt (setq tt (funcall timems)))) tot (+ tot delta))
+      (message "to %s:%6s,%7s" l delta tot))
+    tot))
+
+(defun cperl-emulate-lazy-lock (&optional window-size)
+  "Emulate `lazy-lock' without `condition-case', so `debug-on-error' works.
+Start fontifying the buffer from the start (or end) using the given
+WINDOW-SIZE (units is lines).  Negative WINDOW-SIZE starts at end, and
+goes backwards; default is -50.  This function is not CPerl-specific; it
+may be used to debug problems with delayed incremental fontification."
+  (interactive
+   "nSize of window for incremental fontification, negative goes backwards: ")
+  (or window-size (setq window-size -50))
+  (let ((pos (if (> window-size 0)
+                 (point-min)
+               (point-max)))
+        p)
+    (goto-char pos)
+    (normal-mode)
+    ;; Why needed???  With older font-locks???
+    (set (make-local-variable 'font-lock-cache-position) (make-marker))
+    (while (if (> window-size 0)
+               (< pos (point-max))
+             (> pos (point-min)))
+      (setq p (progn
+                (forward-line window-size)
+                (point)))
+      (font-lock-fontify-region (min p pos) (max p pos))
+      (setq pos p))))
+
+
 (defun cperl-lazy-install ())           ; Avoid a warning
 (defun cperl-lazy-unstall ())           ; Avoid a warning
 
@@ -7174,7 +8877,7 @@ We suppose that the regexp is scanned already."
         "Switches on Auto-Help on Perl constructs (put in the message area).
 Delay of auto-help controlled by `cperl-lazy-help-time'."
         (interactive)
-        (make-variable-buffer-local 'cperl-help-shown)
+        (make-local-variable 'cperl-help-shown)
         (if (and (cperl-val 'cperl-lazy-help-time)
                  (not cperl-lazy-installed))
             (progn
@@ -7207,48 +8910,109 @@ Delay of auto-help controlled by `cperl-lazy-help-time'."
 ;;; Plug for wrong font-lock:
 
 (defun cperl-font-lock-unfontify-region-function (beg end)
-  ;; Simplified now that font-lock-unfontify-region uses save-buffer-state.
-  (let (before-change-functions after-change-functions)
-    (remove-text-properties beg end '(face nil))))
+  (let* ((modified (buffer-modified-p)) (buffer-undo-list t)
+         (inhibit-read-only t) (inhibit-point-motion-hooks t)
+         before-change-functions after-change-functions
+         deactivate-mark buffer-file-name buffer-file-truename)
+    (remove-text-properties beg end '(face nil))
+    (if (and (not modified) (buffer-modified-p))
+      (set-buffer-modified-p nil))))
+
+(defun cperl-font-lock-fontify-region-function (beg end loudly)
+  "Extends the region to safe positions, then calls the default function.
+Newer `font-lock's can do it themselves.
+We unwind only as far as needed for fontification.  Syntaxification may
+do extra unwind via `cperl-unwind-to-safe'."
+  (save-excursion
+    (goto-char beg)
+    (while (and beg
+                (progn
+                  (beginning-of-line)
+                  (eq (get-text-property (setq beg (point)) 'syntax-type)
+                      'multiline)))
+      (if (setq beg (cperl-beginning-of-property beg 'syntax-type))
+          (goto-char beg)))
+    (setq beg (point))
+    (goto-char end)
+    (while (and end
+                (progn
+                  (or (bolp) (condition-case nil
+                                 (forward-line 1)
+                               (error nil)))
+                  (eq (get-text-property (setq end (point)) 'syntax-type)
+                      'multiline)))
+      (setq end (next-single-property-change end 'syntax-type nil (point-max)))
+      (goto-char end))
+    (setq end (point)))
+  (font-lock-default-fontify-region beg end loudly))
 
 (defvar cperl-d-l nil)
 (defun cperl-fontify-syntaxically (end)
   ;; Some vars for debugging only
   ;; (message "Syntaxifying...")
-  (let ((dbg (point)) (iend end)
+  (let ((dbg (point)) (iend end) (idone cperl-syntax-done-to)
         (istate (car cperl-syntax-state))
-        start)
-    (and cperl-syntaxify-unwind
-         (setq end (cperl-unwind-to-safe t end)))
-    (setq start (point))
+        start from-start edebug-backtrace-buffer)
+    (if (eq cperl-syntaxify-by-font-lock 'backtrace)
+        (progn
+          (require 'edebug)
+          (let ((f 'edebug-backtrace))
+            (funcall f))))      ; Avoid compile-time warning
     (or cperl-syntax-done-to
-        (setq cperl-syntax-done-to (point-min)))
-    (if (or (not (boundp 'font-lock-hot-pass))
-            (eval 'font-lock-hot-pass)
-            t)                          ; Not debugged otherwise
-        ;; Need to forget what is after `start'
-        (setq start (min cperl-syntax-done-to start))
-      ;; Fontification without a change
-      (setq start (max cperl-syntax-done-to start)))
+        (setq cperl-syntax-done-to (point-min)
+              from-start t))
+    (setq start (if (and cperl-hook-after-change
+                         (not from-start))
+                    cperl-syntax-done-to ; Fontify without change; ignore start
+                  ;; Need to forget what is after `start'
+                  (min cperl-syntax-done-to (point))))
+    (goto-char start)
+    (beginning-of-line)
+    (setq start (point))
+    (and cperl-syntaxify-unwind
+         (setq end (cperl-unwind-to-safe t end)
+               start (point)))
     (and (> end start)
          (setq cperl-syntax-done-to start) ; In case what follows fails
          (cperl-find-pods-heres start end t nil t))
-    (if (eq cperl-syntaxify-by-font-lock 'message)
-        (message "Syntaxified %s..%s from %s to %s(%s), state %s-->%s"
-                 dbg iend
-                 start end cperl-syntax-done-to
+    (if (memq cperl-syntaxify-by-font-lock '(backtrace message))
+        (message "Syxify req=%s..%s actual=%s..%s done-to: %s=>%s statepos: %s=>%s"
+                 dbg iend start end idone cperl-syntax-done-to
                  istate (car cperl-syntax-state))) ; For debugging
     nil))                               ; Do not iterate
 
 (defun cperl-fontify-update (end)
-  (let ((pos (point)) prop posend)
+  (let ((pos (point-min)) prop posend)
+    (setq end (point-max))
     (while (< pos end)
-      (setq prop (get-text-property pos 'cperl-postpone))
-      (setq posend (next-single-property-change pos 'cperl-postpone nil end))
+      (setq prop (get-text-property pos 'cperl-postpone)
+            posend (next-single-property-change pos 'cperl-postpone nil end))
       (and prop (put-text-property pos posend (car prop) (cdr prop)))
       (setq pos posend)))
   nil)                                  ; Do not iterate
 
+(defun cperl-fontify-update-bad (end)
+  ;; Since fontification happens with different region than syntaxification,
+  ;; do to the end of buffer, not to END;;; likewise, start earlier if needed
+  (let* ((pos (point)) (prop (get-text-property pos 'cperl-postpone)) posend)
+    (if prop
+        (setq pos (or (cperl-beginning-of-property
+                       (cperl-1+ pos) 'cperl-postpone)
+                      (point-min))))
+    (while (< pos end)
+      (setq posend (next-single-property-change pos 'cperl-postpone))
+      (and prop (put-text-property pos posend (car prop) (cdr prop)))
+      (setq pos posend)
+      (setq prop (get-text-property pos 'cperl-postpone))))
+  nil)                                  ; Do not iterate
+
+;; Called when any modification is made to buffer text.
+(defun cperl-after-change-function (beg end old-len)
+  ;; We should have been informed about changes by `font-lock'.  Since it
+  ;; does not inform as which calls are defered, do it ourselves
+  (if cperl-syntax-done-to
+      (setq cperl-syntax-done-to (min cperl-syntax-done-to beg))))
+
 (defun cperl-update-syntaxification (from to)
   (if (and cperl-use-syntax-table-text-property
            cperl-syntaxify-by-font-lock
@@ -7260,7 +9024,7 @@ Delay of auto-help controlled by `cperl-lazy-help-time'."
           (cperl-fontify-syntaxically to)))))
 
 (defvar cperl-version
-  (let ((v  "Revision: 5.0"))
+  (let ((v  "Revision: 5.22"))
     (string-match ":\\s *\\([0-9.]+\\)" v)
     (substring v (match-beginning 1) (match-end 1)))
   "Version of IZ-supported CPerl package this file is based on.")
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index bce4381c614..9f27c8a60f1 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -5,10 +5,10 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2005-09-18 07:27:20 deego>
+;; Time-stamp: <2006/09/26 21:49:46 vinicius>
 ;; Keywords: wp, ebnf, PostScript
-;; Version: 4.2
-;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
+;; Version: 4.3
+;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
 ;; This file is part of GNU Emacs.
 
@@ -27,8 +27,8 @@
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 
-(defconst ebnf-version "4.2"
-  "ebnf2ps.el, v 4.2 <2004/04/04 vinicius>
+(defconst ebnf-version "4.3"
+  "ebnf2ps.el, v 4.3 <2006/09/26 vinicius>
 
 Vinicius's last change version.  When reporting bugs, please also
 report the version of Emacs, if any, that ebnf2ps was running with.
@@ -73,18 +73,18 @@ Please send all bug fixes and enhancements to
 ;; ebnf2ps provides the following commands for generating PostScript syntactic
 ;; chart images of Emacs buffers:
 ;;
-;;      ebnf-print-directory
-;;      ebnf-print-file
-;;      ebnf-print-buffer
-;;      ebnf-print-region
-;;      ebnf-spool-directory
-;;      ebnf-spool-file
-;;      ebnf-spool-buffer
-;;      ebnf-spool-region
-;;      ebnf-eps-directory
-;;      ebnf-eps-file
-;;      ebnf-eps-buffer
-;;      ebnf-eps-region
+;;    ebnf-print-directory
+;;    ebnf-print-file
+;;    ebnf-print-buffer
+;;    ebnf-print-region
+;;    ebnf-spool-directory
+;;    ebnf-spool-file
+;;    ebnf-spool-buffer
+;;    ebnf-spool-region
+;;    ebnf-eps-directory
+;;    ebnf-eps-file
+;;    ebnf-eps-buffer
+;;    ebnf-eps-region
 ;;
 ;; These commands all perform essentially the same function: they generate
 ;; PostScript syntactic chart images suitable for printing on a PostScript
@@ -94,14 +94,14 @@ Please send all bug fixes and enhancements to
 ;; The word "print", "spool" and "eps" in the command name determines when the
 ;; PostScript image is sent to the printer (or file):
 ;;
-;;      print  - The PostScript image is immediately sent to the printer;
+;;    print  - The PostScript image is immediately sent to the printer;
 ;;
-;;      spool  - The PostScript image is saved temporarily in an Emacs buffer.
-;;               Many images may be spooled locally before printing them.  To
-;;               send the spooled images to the printer, use the command
-;;               `ebnf-despool'.
+;;    spool  - The PostScript image is saved temporarily in an Emacs buffer.
+;;             Many images may be spooled locally before printing them.  To
+;;             send the spooled images to the printer, use the command
+;;             `ebnf-despool'.
 ;;
-;;      eps    - The PostScript image is immediately sent to a EPS file.
+;;    eps    - The PostScript image is immediately sent to a EPS file.
 ;;
 ;; The spooling mechanism is the same as used by ps-print and was designed for
 ;; printing lots of small files to save paper that would otherwise be wasted on
@@ -120,22 +120,22 @@ Please send all bug fixes and enhancements to
 ;; The word "directory", "file", "buffer" or "region" in the command name
 ;; determines how much of the buffer is printed:
 ;;
-;;      directory  - Read files in the directory and print them.
+;;    directory  - Read files in the directory and print them.
 ;;
-;;      file       - Read file and print it.
+;;    file       - Read file and print it.
 ;;
-;;      buffer     - Print the entire buffer.
+;;    buffer     - Print the entire buffer.
 ;;
-;;      region     - Print just the current region.
+;;    region     - Print just the current region.
 ;;
 ;; Two ebnf- command examples:
 ;;
-;;      ebnf-print-buffer  - translate and print the entire buffer, and send it
-;;                           immediately to the printer.
+;;    ebnf-print-buffer  - translate and print the entire buffer, and send it
+;;                         immediately to the printer.
 ;;
-;;      ebnf-spool-region  - translate and print just the current region, and
-;;                           spool the image in Emacs to send to the printer
-;;                           later.
+;;    ebnf-spool-region  - translate and print just the current region, and
+;;                         spool the image in Emacs to send to the printer
+;;                         later.
 ;;
 ;; Note that `ebnf-eps-directory', `ebnf-eps-file', `ebnf-eps-buffer' and
 ;; `ebnf-eps-region' never spool the EPS image, so they don't use the ps-print
@@ -148,13 +148,13 @@ Please send all bug fixes and enhancements to
 ;;
 ;; To translate and print your buffer, type
 ;;
-;;        M-x ebnf-print-buffer
+;;    M-x ebnf-print-buffer
 ;;
 ;; or substitute one of the other four ebnf- commands.  The command will
 ;; generate the PostScript image and print or spool it as specified.  By giving
 ;; the command a prefix argument
 ;;
-;;        C-u M-x ebnf-print-buffer
+;;    C-u M-x ebnf-print-buffer
 ;;
 ;; it will save the PostScript image to a file instead of sending it to the
 ;; printer; you will be prompted for the name of the file to save the image to.
@@ -162,7 +162,7 @@ Please send all bug fixes and enhancements to
 ;; you may save the spooled images to a file by giving a prefix argument to
 ;; `ebnf-despool':
 ;;
-;;        C-u M-x ebnf-despool
+;;    C-u M-x ebnf-despool
 ;;
 ;; When invoked this way, `ebnf-despool' will prompt you for the name of the
 ;; file to save to.
@@ -172,9 +172,9 @@ Please send all bug fixes and enhancements to
 ;;
 ;; Any of the `ebnf-' commands can be bound to keys.  Here are some examples:
 ;;
-;;   (global-set-key 'f22 'ebnf-print-buffer) ;f22 is prsc
-;;   (global-set-key '(shift f22) 'ebnf-print-region)
-;;   (global-set-key '(control f22) 'ebnf-despool)
+;;    (global-set-key 'f22 'ebnf-print-buffer) ;f22 is prsc
+;;    (global-set-key '(shift f22) 'ebnf-print-region)
+;;    (global-set-key '(control f22) 'ebnf-despool)
 ;;
 ;;
 ;; Invoking Ebnf2ps in Batch
@@ -523,14 +523,14 @@ Please send all bug fixes and enhancements to
 ;;
 ;; The following table summarizes the results:
 ;;
-;; EPS FILE NAME    NO SORT    ASCENDING SORT    DESCENDING SORT
-;; ebnf--AA.eps     A C        A C               C A
-;; ebnf--BB.eps     C B        B C               C B
-;; ebnf--CC.eps     A C B F    A B C F           F C B A
-;; ebnf--D.eps      D          D                 D
-;; ebnf--E.eps      E          E                 E
-;; ebnf--G.eps      G          G                 G
-;; ebnf--Z.eps      Z          Z                 Z
+;;    EPS FILE NAME    NO SORT    ASCENDING SORT    DESCENDING SORT
+;;    ebnf--AA.eps     A C        A C               C A
+;;    ebnf--BB.eps     C B        B C               C B
+;;    ebnf--CC.eps     A C B F    A B C F           F C B A
+;;    ebnf--D.eps      D          D                 D
+;;    ebnf--E.eps      E          E                 E
+;;    ebnf--G.eps      G          G                 G
+;;    ebnf--Z.eps      Z          Z                 Z
 ;;
 ;; As you can see if EPS actions is not used, each single production is
 ;; generated per EPS file.  To avoid overriding EPS files, use names in ;[ that
@@ -692,6 +692,11 @@ Please send all bug fixes and enhancements to
 ;;
 ;; `ebnf-line-color'                    Specify flow line color.
 ;;
+;; `ebnf-arrow-extra-width'             Specify extra width for arrow shape
+;;                                      drawing.
+;;
+;; `ebnf-arrow-scale'                   Specify the arrow scale.
+;;
 ;; `ebnf-user-arrow'                    Specify a sexp for user arrow shape (a
 ;;                                      PostScript code).
 ;;
@@ -824,6 +829,8 @@ Please send all bug fixes and enhancements to
 ;;    entry             is the vertical position used to know where it should
 ;;                      be drawn the flow line in the current element.
 ;;
+;;    extra             is given by `ebnf-arrow-extra-width'.
+;;
 ;;
 ;;    * SPECIAL, TERMINAL and NON-TERMINAL
 ;;
@@ -835,17 +842,17 @@ Please send all bug fixes and enhancements to
 ;;       :   |   :      :   |   :  } font height / 2           }
 ;;       :   +==============+...:...............................
 ;;       :   :   :      :   :   :
-;;       :   :   :      :   :   :......................
-;;       :   :   :      :   :      } font height      }
-;;       :   :   :      :   :.......                  }
-;;       :   :   :      :          } font height / 2  }
-;;       :   :   :      :...........                  }
-;;       :   :   :                 } text width       } width
-;;       :   :   :..................                  }
-;;       :   :                     } font height / 2  }
-;;       :   :......................                  }
-;;       :                         } font height      }
-;;       :.............................................
+;;       :   :   :      :   :   :.........................
+;;       :   :   :      :   :      } font height          }
+;;       :   :   :      :   :.......                      }
+;;       :   :   :      :          } font height / 2      }
+;;       :   :   :      :...........                      }
+;;       :   :   :                 } text width           } width
+;;       :   :   :..................                      }
+;;       :   :                     } font height / 2      }
+;;       :   :......................                      }
+;;       :                         } font height + extra  }
+;;       :.................................................
 ;;
 ;;
 ;;    * OPTIONAL
@@ -976,21 +983,21 @@ Please send all bug fixes and enhancements to
 ;;       :   |  :  :  :   :   |   :  } font height / 2           }
 ;;       :   +================+...:...............................
 ;;       :   :  :  :  :   :   :   :
-;;       :   :  :  :  :   :   :   :......................
-;;       :   :  :  :  :   :   :      } font height      }
-;;       :   :  :  :  :   :   :.......                  }
-;;       :   :  :  :  :   :          } font height / 2  }
-;;       :   :  :  :  :   :...........                  }
-;;       :   :  :  :  :              } X width          }
-;;       :   :  :  :  :...............                  }
-;;       :   :  :  :                 } font height / 2  } width
-;;       :   :  :  :..................                  }
-;;       :   :  :                    } text width       }
-;;       :   :  :.....................                  }
-;;       :   :                       } font height / 2  }
-;;       :   :........................                  }
-;;       :                           } font height      }
-;;       :...............................................
+;;       :   :  :  :  :   :   :   :..........................
+;;       :   :  :  :  :   :   :      } font height          }
+;;       :   :  :  :  :   :   :.......                      }
+;;       :   :  :  :  :   :          } font height / 2      }
+;;       :   :  :  :  :   :...........                      }
+;;       :   :  :  :  :              } X width              }
+;;       :   :  :  :  :...............                      }
+;;       :   :  :  :                 } font height / 2      } width
+;;       :   :  :  :..................                      }
+;;       :   :  :                    } text width           }
+;;       :   :  :.....................                      }
+;;       :   :                       } font height / 2      }
+;;       :   :........................                      }
+;;       :                           } font height + extra  }
+;;       :...................................................
 ;;
 ;;
 ;;    * EXCEPT
@@ -1003,21 +1010,21 @@ Please send all bug fixes and enhancements to
 ;;       :   |  :   :   :   :   |   :  } font height / 2           }
 ;;       :   +==================+...:...............................
 ;;       :   :  :   :   :   :   :   :
-;;       :   :  :   :   :   :   :   :......................
-;;       :   :  :   :   :   :   :      } font height      }
-;;       :   :  :   :   :   :   :.......                  }
-;;       :   :  :   :   :   :          } font height / 2  }
-;;       :   :  :   :   :   :...........                  }
-;;       :   :  :   :   :              } Y width          }
-;;       :   :  :   :   :...............                  }
-;;       :   :  :   :                  } font height      } width
-;;       :   :  :   :...................                  }
-;;       :   :  :                      } X width          }
-;;       :   :  :.......................                  }
-;;       :   :                         } font height / 2  }
-;;       :   :..........................                  }
-;;       :                             } font height      }
-;;       :.................................................
+;;       :   :  :   :   :   :   :   :..........................
+;;       :   :  :   :   :   :   :      } font height          }
+;;       :   :  :   :   :   :   :.......                      }
+;;       :   :  :   :   :   :          } font height / 2      }
+;;       :   :  :   :   :   :...........                      }
+;;       :   :  :   :   :              } Y width              }
+;;       :   :  :   :   :...............                      }
+;;       :   :  :   :                  } font height          } width
+;;       :   :  :   :...................                      }
+;;       :   :  :                      } X width              }
+;;       :   :  :.......................                      }
+;;       :   :                         } font height / 2      }
+;;       :   :..........................                      }
+;;       :                             } font height + extra  }
+;;       :.....................................................
 ;;
 ;;       NOTE: If Y element is empty, it's draw nothing at Y place.
 ;;
@@ -1089,7 +1096,8 @@ Please send all bug fixes and enhancements to
 ;; ----------------
 ;;
 ;; Thanks to Drew Adams <drew.adams@oracle.com> for suggestions:
-;;    - `ebnf-production-name-p', `ebnf-stop-on-error',
+;;    - `ebnf-arrow-extra-width', `ebnf-arrow-scale',
+;;      `ebnf-production-name-p', `ebnf-stop-on-error',
 ;;      `ebnf-file-suffix-regexp'and `ebnf-special-show-delimiter' variables.
 ;;    - `ebnf-delete-style', `ebnf-eps-file' and `ebnf-eps-directory'
 ;;      commands.
@@ -1911,6 +1919,29 @@ special."
   :group 'ebnf2ps)
 
 
+(defcustom ebnf-arrow-extra-width
+  (if (eq ebnf-arrow-shape 'none)
+      0.0
+    (* (sqrt 5.0) 0.65 ebnf-line-width))
+  "*Specify extra width for arrow shape drawing.
+
+The extra width is used to avoid that the arrowhead and the terminal border
+overlap.  It depens on `ebnf-arrow-shape' and `ebnf-line-width'."
+  :type 'number
+  :version "22"
+  :group 'ebnf-shape)
+
+
+(defcustom ebnf-arrow-scale 1.0
+  "*Specify the arrow scale.
+
+Values lower than 1.0, shrink the arrow.
+Values greater than 1.0, expand the arrow."
+  :type 'number
+  :version "22"
+  :group 'ebnf-shape)
+
+
 (defcustom ebnf-debug-ps nil
   "*Non-nil means to generate PostScript debug procedures.
 
@@ -2859,9 +2890,9 @@ See documentation for `ebnf-terminal-shape', `ebnf-non-terminal-shape' and
 /HeightNT FontHeight FontHeight add def
 
 /T HeightT HeightNT add 0.5 mul def
-/hT T 0.5 mul def
-/hT2 hT 0.5 mul def
-/hT4 hT 0.25 mul def
+/hT   T 0.5  mul def
+/hT2 hT 0.5  mul ArrowScale mul def
+/hT4 hT 0.25 mul ArrowScale mul def
 
 /Er 0.1 def     % Error factor
 
@@ -2947,6 +2978,7 @@ See documentation for `ebnf-terminal-shape', `ebnf-non-terminal-shape' and
  RA-vector ArrowShape get exec
  Gstroke
  moveto
+ ExtraWidth 0 rmoveto
 }def
 
 % rotation DrawArrow
@@ -3245,7 +3277,7 @@ See documentation for `ebnf-terminal-shape', `ebnf-non-terminal-shape' and
 % string width prepare-width |- string
 /prepare-width
 {/width exch def
- dup stringwidth pop space add space add width exch sub 0.5 mul
+ dup stringwidth pop space add space add width exch sub ExtraWidth sub 0.5 mul
  /w exch def
 }def
 
@@ -4877,7 +4909,6 @@ killed after process termination."
          (progn
            ;; adjust creator comment
            (end-of-line)
-           (backward-char)
            (insert " & ebnf2ps v" ebnf-version)
            ;; insert ebnf settings & engine
            (goto-char (point-max))
@@ -5066,6 +5097,10 @@ killed after process termination."
               (format "/ShadowR       %s def\n"
                       (ebnf-boolean ebnf-repeat-shadow))
               ;; miscellaneous
+              (format "/ExtraWidth    %s def\n"
+                      (ebnf-format-float ebnf-arrow-extra-width))
+              (format "/ArrowScale    %s def\n"
+                      (ebnf-format-float ebnf-arrow-scale))
               (format "/DefaultWidth  %s def\n"
                       (ebnf-format-float ebnf-default-width))
               (format "/LineWidth     %s def\n"
@@ -5152,7 +5187,7 @@ killed after process termination."
         (len    (length (ebnf-node-name node))))
     (ebnf-node-entry  node (* height 0.5))
     (ebnf-node-height node height)
-    (ebnf-node-width  node (+ ebnf-basic-width space
+    (ebnf-node-width  node (+ ebnf-basic-width ebnf-arrow-extra-width space
                               (* len font-width)
                               space ebnf-basic-width))))
 
@@ -5173,6 +5208,7 @@ killed after process termination."
                                      ebnf-font-height-S)
                                 ebnf-space-R ebnf-space-R))
     (ebnf-node-width  repeat (+ (ebnf-node-width element)
+                                ebnf-arrow-extra-width
                                 ebnf-space-R ebnf-space-R ebnf-space-R
                                 ebnf-horizontal-space
                                 (* (length times) ebnf-font-width-R)))))
@@ -5194,6 +5230,7 @@ killed after process termination."
                                 ebnf-space-E ebnf-space-E))
     (ebnf-node-width  except (+ (ebnf-node-width factor)
                                 (ebnf-node-width element)
+                                ebnf-arrow-extra-width
                                 ebnf-space-E ebnf-space-E
                                 ebnf-space-E ebnf-space-E
                                 ebnf-font-width-E
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index f45bb2fe524..52360a73970 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -782,7 +782,7 @@ With arg, enter name of variable to be watched in the minibuffer."
 
 (defconst gdb-var-list-children-regexp
  "child={.*?name=\"\\(.*?\\)\",.*?exp=\"\\(.*?\\)\",.*?\
-numchild=\"\\(.*?\\)\",.*?type=\"\\(.*?\\)\".*?}")
+numchild=\"\\(.*?\\)\"\\(}\\|,.*?\\(type=\"\\(.*?\\)\"\\)?.*?}\\)")
 
 (defun gdb-var-list-children-handler (varnum)
   (goto-char (point-min))
@@ -796,7 +796,7 @@ numchild=\"\\(.*?\\)\",.*?type=\"\\(.*?\\)\".*?}")
                 (let ((varchild (list (match-string 1)
                                       (match-string 2)
                                       (match-string 3)
-                                      (match-string 4)
+                                      (match-string 6)
                                       nil nil)))
                   (if (assoc (car varchild) gdb-var-list)
                       (throw 'child-already-watched nil))
@@ -902,20 +902,23 @@ Changed values are highlighted with the face `font-lock-warning-face'."
 TEXT is the text of the button we clicked on, a + or - item.
 TOKEN is data related to this node.
 INDENT is the current indentation depth."
-  (cond ((string-match "+" text)        ;expand this node
-         (if (and
-              (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
-              (string-equal gdb-version "pre-6.4"))
-             (gdb-var-list-children token)
-           (gdb-var-list-children-1 token)))
-        ((string-match "-" text)        ;contract this node
-         (dolist (var gdb-var-list)
-           (if (string-match (concat token "\\.") (car var))
-               (setq gdb-var-list (delq var gdb-var-list))))
-         (speedbar-change-expand-button-char ?+)
-         (speedbar-delete-subblock indent))
-        (t (error "Ooops...  not sure what to do")))
-  (speedbar-center-buffer-smartly))
+  (if (and gud-comint-buffer (buffer-name gud-comint-buffer))
+      (progn
+        (cond ((string-match "+" text)  ;expand this node
+               (if (and (eq (buffer-local-value
+                             'gud-minor-mode gud-comint-buffer) 'gdba)
+                        (string-equal gdb-version "pre-6.4"))
+                   (gdb-var-list-children token)
+                 (gdb-var-list-children-1 token)))
+              ((string-match "-" text)  ;contract this node
+               (dolist (var gdb-var-list)
+                 (if (string-match (concat token "\\.") (car var))
+                     (setq gdb-var-list (delq var gdb-var-list))))
+               (speedbar-change-expand-button-char ?+)
+               (speedbar-delete-subblock indent))
+              (t (error "Ooops...  not sure what to do")))
+        (speedbar-center-buffer-smartly))
+    (message-box "GUD session has been killed")))
 
 (defun gdb-get-target-string ()
   (with-current-buffer gud-comint-buffer
@@ -1132,7 +1135,7 @@ This filter may simply queue input for a later time."
       (if gdb-prompting
           (progn
             (gdb-send-item item)
-        (setq gdb-prompting nil))
+            (setq gdb-prompting nil))
         (push item gdb-input-queue))))
 
 (defun gdb-dequeue-input ()
@@ -3346,7 +3349,8 @@ is set in them."
 
 (defconst gdb-var-list-children-regexp-1
   "child={.*?name=\"\\(.+?\\)\",.*?exp=\"\\(.+?\\)\",.*?\
-numchild=\"\\(.+?\\)\",.*?value=\\(\".*?\"\\),.*?type=\"\\(.+?\\)\".*?}")
+numchild=\"\\(.+?\\)\",.*?value=\\(\".*?\"\\)\
+\\(}\\|,.*?\\(type=\"\\(.+?\\)\"\\)?.*?}\\)")
 
 (defun gdb-var-list-children-handler-1 (varnum)
   (goto-char (point-min))
@@ -3360,7 +3364,7 @@ numchild=\"\\(.+?\\)\",.*?value=\\(\".*?\"\\),.*?type=\"\\(.+?\\)\".*?}")
                 (let ((varchild (list (match-string 1)
                                       (match-string 2)
                                       (match-string 3)
-                                      (match-string 5)
+                                      (match-string 7)
                                       (read (match-string 4))
                                       nil)))
                   (if (assoc (car varchild) gdb-var-list)
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 84b40e8ba80..b42e1b7fdc7 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -456,8 +456,8 @@ required by the caller."
           (while var-list
             (let* (char (depth 0) (start 0) (var (car var-list))
                         (varnum (car var)) (expr (nth 1 var))
-                        (type (nth 3 var)) (value (nth 4 var))
-                        (status (nth 5 var)))
+                        (type (if (nth 3 var) (nth 3 var) " "))
+                        (value (nth 4 var)) (status (nth 5 var)))
               (put-text-property
                0 (length expr) 'face font-lock-variable-name-face expr)
               (put-text-property
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 2f26c90ac21..52cfa602e59 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -75,7 +75,7 @@
 ;; of the documentation is available from the maintainers webpage (see
 ;; SOURCE).
 ;;
-;; 
+;;
 ;; ACKNOWLEDGMENTS
 ;; ===============
 ;;
@@ -125,7 +125,7 @@
 ;;   up inserting the character that expanded the abbrev after moving
 ;;   point backward, e.g., "\cl" expanded with a space becomes
 ;;   "LONG( )" with point before the close paren.  This is solved by
-;;   using a temporary function in `post-command-hook' - not pretty, 
+;;   using a temporary function in `post-command-hook' - not pretty,
 ;;   but it works.
 ;;
 ;;   Tabs and spaces are treated equally as whitespace when filling a
@@ -178,13 +178,13 @@
       nil ;; We've got what we needed
     ;; We have the old or no custom-library, hack around it!
     (defmacro defgroup (&rest args) nil)
-    (defmacro defcustom (var value doc &rest args) 
+    (defmacro defcustom (var value doc &rest args)
       `(defvar ,var ,value ,doc))))
 
 (defgroup idlwave nil
   "Major mode for editing IDL .pro files."
   :tag "IDLWAVE"
-  :link '(url-link :tag "Home Page" 
+  :link '(url-link :tag "Home Page"
                    "http://idlwave.org")
   :link '(emacs-commentary-link :tag "Commentary in idlw-shell.el"
                                 "idlw-shell.el")
@@ -298,8 +298,8 @@ extends to the end of the match for the regular expression."
 
 (defcustom idlwave-auto-fill-split-string t
   "*If non-nil then auto fill will split strings with the IDL `+' operator.
-When the line end falls within a string, string concatenation with the 
-'+' operator will be used to distribute a long string over lines.  
+When the line end falls within a string, string concatenation with the
+'+' operator will be used to distribute a long string over lines.
 If nil and a string is split then a terminal beep and warning are issued.
 
 This variable is ignored when `idlwave-fill-comment-line-only' is
@@ -418,7 +418,7 @@ t         All available
                (const :tag "When saving a buffer" save-buffer)
                (const :tag "After a buffer was killed" kill-buffer)
                (const :tag "After a buffer was compiled successfully, update shell info" compile-buffer))))
-               
+
 (defcustom idlwave-rinfo-max-source-lines 5
   "*Maximum number of source files displayed in the Routine Info window.
 When an integer, it is the maximum number of source files displayed.
@@ -453,7 +453,7 @@ value of `!DIR'.  See also `idlwave-library-path'."
   :type 'directory)
 
 ;; Configuration files
-(defcustom idlwave-config-directory 
+(defcustom idlwave-config-directory
   (convert-standard-filename "~/.idlwave")
   "*Directory for configuration files and user-library catalog."
   :group 'idlwave-routine-info
@@ -469,7 +469,7 @@ value of `!DIR'.  See also `idlwave-library-path'."
 (defcustom idlwave-special-lib-alist nil
   "Alist of regular expressions matching special library directories.
 When listing routine source locations, IDLWAVE gives a short hint where
-the file defining the routine is located.  By default it lists `SystemLib' 
+the file defining the routine is located.  By default it lists `SystemLib'
 for routines in the system library `!DIR/lib' and `Library' for anything
 else.  This variable can define additional types.  The car of each entry
 is a regular expression matching the file name (they normally will match
@@ -480,7 +480,7 @@ chars are allowed."
           (cons regexp string)))
 
 (defcustom idlwave-auto-write-paths t
-  "Write out path (!PATH) and system directory (!DIR) info automatically.  
+  "Write out path (!PATH) and system directory (!DIR) info automatically.
 Path info is needed to locate library catalog files.  If non-nil,
 whenever the path-list changes as a result of shell-query, etc., it is
 written to file.  Otherwise, the menu option \"Write Paths\" can be
@@ -511,7 +511,7 @@ used to force a write."
 This variable determines the case (UPPER/lower/Capitalized...) of
 words inserted into the buffer by completion.  The preferred case can
 be specified separately for routine names, keywords, classes and
-methods. 
+methods.
 This alist should therefore have entries for `routine' (normal
 functions and procedures, i.e. non-methods), `keyword', `class', and
 `method'.  Plausible values are
@@ -598,7 +598,7 @@ certain methods this assumption is almost always true.  The methods
 for which to assume this can be set here."
   :group 'idlwave-routine-info
   :type '(repeat (regexp :tag "Match method:")))
-  
+
 
 (defcustom idlwave-completion-show-classes 1
   "*Number of classes to show when completing object methods and keywords.
@@ -663,7 +663,7 @@ should contain at least two elements: (method-default . VALUE) and
 specify if the class should be found during method and keyword
 completion, respectively.
 
-The alist may have additional entries specifying exceptions from the 
+The alist may have additional entries specifying exceptions from the
 keyword completion rule for specific methods, like INIT or
 GETPROPERTY.  In order to turn on class specification for the INIT
 method, add an entry (\"INIT\" . t).  The method name must be ALL-CAPS."
@@ -687,7 +687,7 @@ particular object method call.  This happens during the commands
 value of the variable `idlwave-query-class'.
 
 When you specify a class, this information can be stored as a text
-property on the `->' arrow in the source code, so that during the same 
+property on the `->' arrow in the source code, so that during the same
 editing session, IDLWAVE will not have to ask again.  When this
 variable is non-nil, IDLWAVE will store and reuse the class information.
 The class stored can be checked and removed with `\\[idlwave-routine-info]'
@@ -1065,7 +1065,7 @@ IDL process is made."
   :group 'idlwave-misc
   :type 'boolean)
 
-(defcustom idlwave-default-font-lock-items 
+(defcustom idlwave-default-font-lock-items
   '(pros-and-functions batch-files idlwave-idl-keywords label goto
                        common-blocks class-arrows)
   "Items which should be fontified on the default fontification level 2.
@@ -1127,25 +1127,25 @@ As a user, you should not set this to t.")
 ;;; and Carsten Dominik...
 
 ;; The following are the reserved words in IDL.  Maybe we should
-;; highlight some more stuff as well?       
+;; highlight some more stuff as well?
 ;; Procedure declarations.  Fontify keyword plus procedure name.
 (defvar idlwave-idl-keywords
-  ;; To update this regexp, update the list of keywords and 
+  ;; To update this regexp, update the list of keywords and
   ;; evaluate the form.
-  ;;    (insert 
+  ;;    (insert
   ;;     (prin1-to-string
-  ;;      (concat 
+  ;;      (concat
   ;;       "\\<\\("
-  ;;       (regexp-opt 
+  ;;       (regexp-opt
   ;;        '("||" "&&" "and" "or" "xor" "not"
-  ;;          "eq" "ge" "gt" "le" "lt" "ne" 
+  ;;          "eq" "ge" "gt" "le" "lt" "ne"
   ;;          "for" "do" "endfor"
-  ;;          "if" "then" "endif" "else" "endelse" 
+  ;;          "if" "then" "endif" "else" "endelse"
   ;;          "case" "of" "endcase"
   ;;          "switch" "break" "continue" "endswitch"
   ;;          "begin" "end"
   ;;          "repeat" "until" "endrep"
-  ;;          "while" "endwhile" 
+  ;;          "while" "endwhile"
   ;;          "goto" "return"
   ;;          "inherits" "mod"
   ;;          "compile_opt" "forward_function"
@@ -1168,7 +1168,7 @@ As a user, you should not set this to t.")
           (2 font-lock-reference-face nil t)      ; block name
           ("[ \t]*\\(\\sw+\\)[ ,]*"
            ;; Start with point after block name and comma
-           (goto-char (match-end 0))  ; needed for XEmacs, could be nil 
+           (goto-char (match-end 0))  ; needed for XEmacs, could be nil
            nil
            (1 font-lock-variable-name-face)       ; variable names
            )))
@@ -1223,7 +1223,7 @@ As a user, you should not set this to t.")
        ;; All operators (not used because too noisy)
        (all-operators
         '("[-*^#+<>/]" (0 font-lock-keyword-face)))
-        
+
        ;; Arrows with text property `idlwave-class'
        (class-arrows
         '(idlwave-match-class-arrows (0 idlwave-class-arrow-face))))
@@ -1260,14 +1260,14 @@ As a user, you should not set this to t.")
 
 (defvar idlwave-font-lock-defaults
   '((idlwave-font-lock-keywords
-     idlwave-font-lock-keywords-1 
+     idlwave-font-lock-keywords-1
      idlwave-font-lock-keywords-2
      idlwave-font-lock-keywords-3)
-    nil t 
-    ((?$ . "w") (?_ . "w") (?. . "w") (?| . "w") (?& . "w")) 
+    nil t
+    ((?$ . "w") (?_ . "w") (?. . "w") (?| . "w") (?& . "w"))
     beginning-of-line))
 
-(put 'idlwave-mode 'font-lock-defaults 
+(put 'idlwave-mode 'font-lock-defaults
      idlwave-font-lock-defaults) ; XEmacs
 
 (defconst idlwave-comment-line-start-skip "^[ \t]*;"
@@ -1275,7 +1275,7 @@ As a user, you should not set this to t.")
 That is the _beginning_ of a line containing a comment delimiter `;' preceded
 only by whitespace.")
 
-(defconst idlwave-begin-block-reg 
+(defconst idlwave-begin-block-reg
   "\\<\\(pro\\|function\\|begin\\|case\\|switch\\)\\>"
   "Regular expression to find the beginning of a block. The case does
 not matter. The search skips matches in comments.")
@@ -1352,17 +1352,17 @@ blocks starting with a BEGIN statement.  The matches must have associations
    '(goto . ("goto\\>" nil))
    '(case . ("case\\>" nil))
    '(switch . ("switch\\>" nil))
-   (cons 'call (list (concat "\\(" idlwave-variable "\\) *= *" 
+   (cons 'call (list (concat "\\(" idlwave-variable "\\) *= *"
                              "\\(" idlwave-method-call "\\s *\\)?"
                              idlwave-identifier
                              "\\s *(") nil))
-   (cons 'call (list (concat 
+   (cons 'call (list (concat
                       "\\(" idlwave-method-call "\\s *\\)?"
-                      idlwave-identifier 
+                      idlwave-identifier
                       "\\( *\\($\\|\\$\\)\\|\\s *,\\)") nil))
-   (cons 'assign (list (concat 
+   (cons 'assign (list (concat
                         "\\(" idlwave-variable "\\) *=") nil)))
-  
+
   "Associated list of statement matching regular expressions.
 Each regular expression matches the start of an IDL statement.  The
 first element of each association is a symbol giving the statement
@@ -1385,7 +1385,7 @@ the leftover unidentified statements containing an equal sign."  )
 ;; Note that this is documented in the v18 manuals as being a string
 ;; of length one rather than a single character.
 ;; The code in this file accepts either format for compatibility.
-(defvar idlwave-comment-indent-char ?\ 
+(defvar idlwave-comment-indent-char ?\
   "Character to be inserted for IDL comment indentation.
 Normally a space.")
 
@@ -1557,15 +1557,15 @@ Capitalize system variables - action only
          (not (equal idlwave-shell-debug-modifiers '())))
   ;; Bind the debug commands also with the special modifiers.
   (let ((shift (memq 'shift idlwave-shell-debug-modifiers))
-        (mods-noshift (delq 'shift 
+        (mods-noshift (delq 'shift
                             (copy-sequence idlwave-shell-debug-modifiers))))
-    (define-key idlwave-mode-map 
+    (define-key idlwave-mode-map
       (vector (append mods-noshift (list (if shift ?C ?c))))
       'idlwave-shell-save-and-run)
-    (define-key idlwave-mode-map 
+    (define-key idlwave-mode-map
       (vector (append mods-noshift (list (if shift ?B ?b))))
       'idlwave-shell-break-here)
-    (define-key idlwave-mode-map 
+    (define-key idlwave-mode-map
       (vector (append mods-noshift (list (if shift ?E ?e))))
       'idlwave-shell-run-region)))
 (define-key idlwave-mode-map "\C-c\C-d\C-c" 'idlwave-shell-save-and-run)
@@ -1602,7 +1602,7 @@ Capitalize system variables - action only
 (define-key idlwave-mode-map "\M-\C-i" 'idlwave-complete)
 (define-key idlwave-mode-map "\C-c\C-i" 'idlwave-update-routine-info)
 (define-key idlwave-mode-map "\C-c="    'idlwave-resolve)
-(define-key idlwave-mode-map 
+(define-key idlwave-mode-map
   (if (featurep 'xemacs) [(shift button3)] [(shift mouse-3)])
   'idlwave-mouse-context-help)
 
@@ -1617,7 +1617,7 @@ Capitalize system variables - action only
 ;; to go ahead of > and <, so >= and <= will be treated correctly
 (idlwave-action-and-binding "="  '(idlwave-expand-equal -1 -1))
 
-;; Actions for > and < are complicated by >=, <=, and ->... 
+;; Actions for > and < are complicated by >=, <=, and ->...
 (idlwave-action-and-binding "<"  '(idlwave-custom-ltgtr-surround nil))
 (idlwave-action-and-binding ">"  '(idlwave-custom-ltgtr-surround 'gtr))
 
@@ -1650,7 +1650,7 @@ idlwave-mode-abbrev-table unless TABLE is non-nil."
       (error (apply 'define-abbrev args)))))
 
 (condition-case nil
-    (modify-syntax-entry (string-to-char idlwave-abbrev-start-char) 
+    (modify-syntax-entry (string-to-char idlwave-abbrev-start-char)
                          "w" idlwave-mode-syntax-table)
   (error nil))
 
@@ -1774,7 +1774,7 @@ idlwave-mode-abbrev-table unless TABLE is non-nil."
 (defvar imenu-extract-index-name-function)
 (defvar imenu-prev-index-position-function)
 ;; defined later - so just make the compiler hush
-(defvar idlwave-mode-menu)  
+(defvar idlwave-mode-menu)
 (defvar idlwave-mode-debug-menu)
 
 ;;;###autoload
@@ -1858,7 +1858,7 @@ The main features of this mode are
    \\i         IF statement template
    \\elif      IF-ELSE statement template
    \\b         BEGIN
-   
+
    For a full list, use \\[idlwave-list-abbrevs].  Some templates also
    have direct keybindings - see the list of keybindings below.
 
@@ -1900,19 +1900,19 @@ The main features of this mode are
 
   (interactive)
   (kill-all-local-variables)
-  
+
   (if idlwave-startup-message
       (message "Emacs IDLWAVE mode version %s." idlwave-mode-version))
   (setq idlwave-startup-message nil)
-  
+
   (setq local-abbrev-table idlwave-mode-abbrev-table)
   (set-syntax-table idlwave-mode-syntax-table)
-  
+
   (set (make-local-variable 'indent-line-function) 'idlwave-indent-and-action)
-  
+
   (make-local-variable idlwave-comment-indent-function)
   (set idlwave-comment-indent-function 'idlwave-comment-hook)
-  
+
   (set (make-local-variable 'comment-start-skip) ";+[ \t]*")
   (set (make-local-variable 'comment-start) ";")
   (set (make-local-variable 'comment-add) 1) ; ";;" for new and regions
@@ -1920,7 +1920,7 @@ The main features of this mode are
   (set (make-local-variable 'abbrev-all-caps) t)
   (set (make-local-variable 'indent-tabs-mode) nil)
   (set (make-local-variable 'completion-ignore-case) t)
-  
+
   (use-local-map idlwave-mode-map)
 
   (when (featurep 'easymenu)
@@ -1930,11 +1930,11 @@ The main features of this mode are
   (setq mode-name "IDLWAVE")
   (setq major-mode 'idlwave-mode)
   (setq abbrev-mode t)
-  
+
   (set (make-local-variable idlwave-fill-function) 'idlwave-auto-fill)
   (setq comment-end "")
   (set (make-local-variable 'comment-multi-line) nil)
-  (set (make-local-variable 'paragraph-separate) 
+  (set (make-local-variable 'paragraph-separate)
        "[ \t\f]*$\\|[ \t]*;+[ \t]*$\\|;+[+=-_*]+$")
   (set (make-local-variable 'paragraph-start) "[ \t\f]\\|[ \t]*;+[ \t]")
   (set (make-local-variable 'paragraph-ignore-fill-prefix) nil)
@@ -1943,7 +1943,7 @@ The main features of this mode are
   ;; Set tag table list to use IDLTAGS as file name.
   (if (boundp 'tag-table-alist)
       (add-to-list 'tag-table-alist '("\\.pro$" . "IDLTAGS")))
-  
+
   ;; Font-lock additions - originally Phil Williams, then Ulrik Dickow
   ;; Following line is for Emacs - XEmacs uses the corresponding property
   ;; on the `idlwave-mode' symbol.
@@ -1968,7 +1968,7 @@ The main features of this mode are
                      idlwave-end-block-reg
                      ";"
                      'idlwave-forward-block nil))
-  
+
 
   ;; Make a local post-command-hook and add our hook to it
   ;; NB: `make-local-hook' needed for older/alternative Emacs compatibility
@@ -2000,16 +2000,16 @@ The main features of this mode are
   (unless idlwave-setup-done
     (if (not (file-directory-p idlwave-config-directory))
         (make-directory idlwave-config-directory))
-    (setq 
-     idlwave-user-catalog-file (expand-file-name 
-                                idlwave-user-catalog-file 
+    (setq
+     idlwave-user-catalog-file (expand-file-name
+                                idlwave-user-catalog-file
                                 idlwave-config-directory)
-     idlwave-xml-system-rinfo-converted-file 
-     (expand-file-name 
+     idlwave-xml-system-rinfo-converted-file
+     (expand-file-name
       idlwave-xml-system-rinfo-converted-file
       idlwave-config-directory)
-     idlwave-path-file (expand-file-name 
-                        idlwave-path-file 
+     idlwave-path-file (expand-file-name
+                        idlwave-path-file
                         idlwave-config-directory))
     (idlwave-read-paths)  ; we may need these early
     (setq idlwave-setup-done t)))
@@ -2028,7 +2028,7 @@ The main features of this mode are
 
 ;;
 ;; Code Formatting ----------------------------------------------------
-;; 
+;;
 
 (defun idlwave-hard-tab ()
   "Inserts TAB in buffer in current position."
@@ -2171,7 +2171,7 @@ Also checks if the correct end statement has been used."
         (if (> end-pos eol-pos)
             (setq end-pos pos))
         (goto-char end-pos)
-        (setq end (buffer-substring 
+        (setq end (buffer-substring
                    (progn
                      (skip-chars-backward "a-zA-Z")
                      (point))
@@ -2193,7 +2193,7 @@ Also checks if the correct end statement has been used."
             (sit-for 1))
            (t
             (beep)
-            (message "Warning: Shouldn't this be \"%s\" instead of \"%s\"?" 
+            (message "Warning: Shouldn't this be \"%s\" instead of \"%s\"?"
                      end1 end)
             (sit-for 1))))))))
   ;;(delete-char 1))
@@ -2205,8 +2205,8 @@ Also checks if the correct end statement has been used."
        ((looking-at "pro\\|case\\|switch\\|function\\>")
         (assoc (downcase (match-string 0)) idlwave-block-matches))
        ((looking-at "begin\\>")
-        (let ((limit (save-excursion 
-                       (idlwave-beginning-of-statement) 
+        (let ((limit (save-excursion
+                       (idlwave-beginning-of-statement)
                        (point))))
           (cond
            ((re-search-backward ":[ \t]*\\=" limit t)
@@ -2490,7 +2490,7 @@ Returns non-nil if successfull."
         (let ((eos (save-excursion
                      (idlwave-block-jump-out -1 'nomark)
                      (point))))
-          (if (setq status (idlwave-find-key 
+          (if (setq status (idlwave-find-key
                             idlwave-end-block-reg -1 'nomark eos))
               (idlwave-beginning-of-statement)
             (message "No nested block before beginning of containing block.")))
@@ -2498,7 +2498,7 @@ Returns non-nil if successfull."
       (let ((eos (save-excursion
                    (idlwave-block-jump-out 1 'nomark)
                    (point))))
-        (if (setq status (idlwave-find-key 
+        (if (setq status (idlwave-find-key
                           idlwave-begin-block-reg 1 'nomark eos))
             (idlwave-end-of-statement)
           (message "No nested block before end of containing block."))))
@@ -2512,7 +2512,7 @@ The marks are pushed."
         (here (point)))
     (goto-char (point-max))
     (if (re-search-backward idlwave-doclib-start nil t)
-        (progn 
+        (progn
           (setq beg (progn (beginning-of-line) (point)))
           (if (re-search-forward idlwave-doclib-end nil t)
               (progn
@@ -2545,7 +2545,7 @@ actual statement."
    ((eq major-mode 'idlwave-shell-mode)
     (if (re-search-backward idlwave-shell-prompt-pattern nil t)
         (goto-char (match-end 0))))
-   (t   
+   (t
     (if (save-excursion (forward-line -1) (idlwave-is-continuation-line))
         (idlwave-previous-statement)
       (beginning-of-line)))))
@@ -2622,7 +2622,7 @@ If not in a statement just moves to end of line. Returns position."
   (let ((save-point (point)))
     (when (re-search-forward ".*&" lim t)
       (goto-char (match-end 0))
-      (if (idlwave-quoted) 
+      (if (idlwave-quoted)
           (goto-char save-point)
         (if (eq (char-after (- (point) 2)) ?&) (goto-char save-point))))
     (point)))
@@ -2639,7 +2639,7 @@ If there is no label point is not moved and nil is returned."
   ;; - not in parenthesis (like a[0:3])
   ;; - not followed by another ":" in explicit class, ala a->b::c
   ;; As many in this mode, this function is heuristic and not an exact
-  ;; parser. 
+  ;; parser.
   (let* ((start (point))
          (eos (save-excursion (idlwave-end-of-statement) (point)))
          (end (idlwave-find-key ":" 1 'nomark eos)))
@@ -2716,7 +2716,7 @@ equal sign will be surrounded by BEFORE and AFTER blanks.  If
 `idlwave-pad-keyword' is t then keyword assignment is treated just
 like assignment statements.  When nil, spaces are removed for keyword
 assignment.  Any other value keeps the current space around the `='.
-Limits in for loops are treated as keyword assignment.  
+Limits in for loops are treated as keyword assignment.
 
 Starting with IDL 6.0, a number of op= assignments are available.
 Since ambiguities of the form:
@@ -2733,25 +2733,25 @@ IS-ACTION is ignored.
 
 See `idlwave-surround'."
   (if idlwave-surround-by-blank
-      (let 
+      (let
           ((non-an-ops "\\(##\\|\\*\\|\\+\\|-\\|/\\|<\\|>\\|\\^\\)\\=")
-           (an-ops 
+           (an-ops
             "\\s-\\(AND\\|EQ\\|GE\\|GT\\|LE\\|LT\\|MOD\\|NE\\|OR\\|XOR\\)\\=")
            (len 1))
-        
-        (save-excursion 
+
+        (save-excursion
           (let ((case-fold-search t))
             (backward-char)
-            (if (or 
+            (if (or
                  (re-search-backward non-an-ops nil t)
                  ;; Why doesn't ##? work for both?
-                 (re-search-backward "\\(#\\)\\=" nil t)) 
+                 (re-search-backward "\\(#\\)\\=" nil t))
                 (setq len (1+ (length (match-string 1))))
               (when (re-search-backward an-ops nil t)
                 ;(setq begin nil) ; won't modify begin
                 (setq len (1+ (length (match-string 1))))))))
-        
-        (if (eq t idlwave-pad-keyword)  
+
+        (if (eq t idlwave-pad-keyword)
             ;; Everything gets padded equally
             (idlwave-surround before after len)
           ;; Treating keywords/for variables specially...
@@ -2762,22 +2762,22 @@ See `idlwave-surround'."
                         (skip-chars-backward "= \t")
                         (nth 2 (idlwave-where)))))
             (cond ((or (memq what '(function-keyword procedure-keyword))
-                       (memq (caar st) '(for pdef))) 
-                   (cond 
+                       (memq (caar st) '(for pdef)))
+                   (cond
                     ((null idlwave-pad-keyword)
                      (idlwave-surround 0 0)
                      ) ; remove space
                     (t))) ; leave any spaces alone
                   (t (idlwave-surround before after len))))))))
-              
+
 
 (defun idlwave-indent-and-action (&optional arg)
   "Call `idlwave-indent-line' and do expand actions.
 With prefix ARG non-nil, indent the entire sub-statement."
   (interactive "p")
   (save-excursion
-    (if (and idlwave-expand-generic-end 
-             (re-search-backward "\\<\\(end\\)\\s-*\\=" 
+    (if (and idlwave-expand-generic-end
+             (re-search-backward "\\<\\(end\\)\\s-*\\="
                                  (max 0 (- (point) 10)) t)
              (looking-at "\\(end\\)\\([ \n\t]\\|\\'\\)"))
         (progn (goto-char (match-end 1))
@@ -2787,7 +2787,7 @@ With prefix ARG non-nil, indent the entire sub-statement."
   (when (and (not arg) current-prefix-arg)
     (setq arg current-prefix-arg)
     (setq current-prefix-arg nil))
-  (if arg 
+  (if arg
       (idlwave-indent-statement)
     (idlwave-indent-line t)))
 
@@ -2922,7 +2922,7 @@ Inserts spaces before markers at point."
                 (save-excursion
                   (cond
                    ;; Beginning of file
-                   ((prog1 
+                   ((prog1
                         (idlwave-previous-statement)
                       (setq beg-prev-pos (point)))
                     0)
@@ -2932,7 +2932,7 @@ Inserts spaces before markers at point."
                        idlwave-main-block-indent))
                    ;; Begin block
                    ((idlwave-look-at idlwave-begin-block-reg t)
-                    (+ (idlwave-min-current-statement-indent) 
+                    (+ (idlwave-min-current-statement-indent)
                        idlwave-block-indent))
                    ;; End Block
                    ((idlwave-look-at idlwave-end-block-reg t)
@@ -2943,7 +2943,7 @@ Inserts spaces before markers at point."
                       (idlwave-min-current-statement-indent)))
                       ;;                      idlwave-end-offset
                       ;;                      idlwave-block-indent))
-                   
+
                    ;; Default to current indent
                    ((idlwave-current-statement-indent))))))
           ;; adjust the indentation based on the current statement
@@ -2959,7 +2959,7 @@ Inserts spaces before markers at point."
 
 (defun idlwave-calculate-paren-indent (beg-reg end-reg close-exp)
   "Calculate the continuation indent inside a paren group.
-Returns a cons-cell with (open . indent), where open is the 
+Returns a cons-cell with (open . indent), where open is the
 location of the open paren"
   (let ((open (nth 1 (parse-partial-sexp beg-reg end-reg))))
     ;; Found an innermost open paren.
@@ -3000,24 +3000,24 @@ groupings, are treated separately."
            (end-reg (progn (beginning-of-line) (point)))
            (beg-last-statement (save-excursion (idlwave-previous-statement)
                                                (point)))
-           (beg-reg (progn (idlwave-start-of-substatement 'pre) 
+           (beg-reg (progn (idlwave-start-of-substatement 'pre)
                            (if (eq (line-beginning-position) end-reg)
                                (goto-char beg-last-statement)
                              (point))))
            (basic-indent (+ (idlwave-min-current-statement-indent end-reg)
                             idlwave-continuation-indent))
            fancy-nonparen-indent fancy-paren-indent)
-      (cond 
+      (cond
        ;; Align then with its matching if, etc.
        ((let ((matchers '(("\\<if\\>" . "[ \t]*then")
                           ("\\<\\(if\\|end\\(if\\)?\\)\\>" . "[ \t]*else")
                           ("\\<\\(for\\|while\\)\\>" . "[ \t]*do")
-                          ("\\<\\(repeat\\|end\\(rep\\)?\\)\\>" . 
+                          ("\\<\\(repeat\\|end\\(rep\\)?\\)\\>" .
                            "[ \t]*until")
                           ("\\<case\\>" . "[ \t]*of")))
               match cont-re)
           (goto-char end-reg)
-          (and 
+          (and
            (setq cont-re
                  (catch 'exit
                    (while (setq match (car matchers))
@@ -3026,7 +3026,7 @@ groupings, are treated separately."
                      (setq matchers (cdr matchers)))))
            (idlwave-find-key cont-re -1 'nomark beg-last-statement)))
         (if (looking-at "end") ;; that one's special
-            (- (idlwave-current-indent) 
+            (- (idlwave-current-indent)
                (+ idlwave-block-indent idlwave-end-offset))
           (idlwave-current-indent)))
 
@@ -3052,7 +3052,7 @@ groupings, are treated separately."
               (let* ((end-reg end-reg)
                     (close-exp (progn
                                  (goto-char end-reg)
-                                 (skip-chars-forward " \t") 
+                                 (skip-chars-forward " \t")
                                  (looking-at "\\s)")))
                     indent-cons)
                 (catch 'loop
@@ -3086,12 +3086,12 @@ groupings, are treated separately."
                    (if (save-match-data (looking-at "[ \t$]*\\(;.*\\)?$"))
                        nil
                      (current-column)))
-                  
+
                   ;; Continued assignment (with =):
                   ((catch 'assign ;
                      (while (looking-at "[^=\n\r]*\\(=\\)[ \t]*")
                        (goto-char (match-end 0))
-                       (if (null (idlwave-what-function beg-reg)) 
+                       (if (null (idlwave-what-function beg-reg))
                            (throw 'assign t))))
                    (unless (or
                             (idlwave-in-quote)
@@ -3153,7 +3153,7 @@ possibility of unbalanced blocks."
   (let* ((here (point))
          (case-fold-search t)
          (limit (if (>= dir 0) (point-max) (point-min)))
-         (block-limit (if (>= dir 0) 
+         (block-limit (if (>= dir 0)
                           idlwave-begin-block-reg
                         idlwave-end-block-reg))
          found
@@ -3164,7 +3164,7 @@ possibility of unbalanced blocks."
                                (idlwave-find-key
                                 idlwave-begin-unit-reg dir t limit)
                              (end-of-line)
-                             (idlwave-find-key 
+                             (idlwave-find-key
                               idlwave-end-unit-reg dir t limit)))
                          limit)))
     (if (>= dir 0) (end-of-line)) ;Make sure we are in current block
@@ -3189,7 +3189,7 @@ possibility of unbalanced blocks."
                   (or (null end-reg) (< (point) end-reg)))
         (unless comm-or-empty (setq min (min min (idlwave-current-indent)))))
       (if (or comm-or-empty (and end-reg (>= (point) end-reg)))
-          min 
+          min
         (min min (idlwave-current-indent))))))
 
 (defun idlwave-current-statement-indent (&optional last-line)
@@ -3216,10 +3216,10 @@ Blank or comment-only lines following regular continuation lines (with
 `$') count as continuations too."
   (let (p)
     (save-excursion
-      (or 
+      (or
        (idlwave-look-at "\\<\\$")
        (catch 'loop
-         (while (and (looking-at "^[ \t]*\\(;.*\\)?$") 
+         (while (and (looking-at "^[ \t]*\\(;.*\\)?$")
                      (eq (forward-line -1) 0))
            (if (setq p (idlwave-look-at "\\<\\$")) (throw 'loop p))))))))
 
@@ -3317,7 +3317,7 @@ ignored."
                                           (beginning-of-line) (point))
                                         (point))))
                "[^;]"))
-        
+
         ;; Mark the beginning and end of the paragraph
         (goto-char bcl)
         (while (and (looking-at fill-prefix-reg)
@@ -3381,7 +3381,7 @@ ignored."
                       (insert (make-string diff ?\ ))))
                 (forward-line -1))
               )
-          
+
           ;; No hang. Instead find minimum indentation of paragraph
           ;; after first line.
           ;; For the following while statement, since START is at the
@@ -3413,7 +3413,7 @@ ignored."
                   t)
                  (current-column))
                indent))
-        
+
         ;; try to keep point at its original place
         (goto-char here)
 
@@ -3462,7 +3462,7 @@ If not found returns nil."
           (current-column)))))
 
 (defun idlwave-auto-fill ()
-  "Called to break lines in auto fill mode.  
+  "Called to break lines in auto fill mode.
 Only fills non-comment lines if `idlwave-fill-comment-line-only' is
 non-nil.  Places a continuation character at the end of the line if
 not in a comment.  Splits strings with IDL concatenation operator `+'
@@ -3613,7 +3613,7 @@ is non-nil."
   (insert (current-time-string))
   (insert ", " (user-full-name))
   (if (boundp 'user-mail-address)
-      (insert " <" user-mail-address ">") 
+      (insert " <" user-mail-address ">")
     (insert " <" (user-login-name) "@" (system-name) ">"))
   ;; Remove extra spaces from line
   (idlwave-fill-paragraph)
@@ -3639,7 +3639,7 @@ location on mark ring so that the user can return to previous point."
              (setq end (match-end 0)))
         (progn
           (goto-char beg)
-          (if (re-search-forward 
+          (if (re-search-forward
                (concat idlwave-doc-modifications-keyword ":")
                end t)
               (end-of-line)
@@ -3737,7 +3737,7 @@ constants - a double quote followed by an octal digit."
      (not (idlwave-in-quote))
      (save-excursion
        (forward-char)
-       (re-search-backward (concat "\\(" idlwave-idl-keywords 
+       (re-search-backward (concat "\\(" idlwave-idl-keywords
                                    "\\|[[(*+-/=,^><]\\)\\s-*\\*") limit t)))))
 
 
@@ -3783,7 +3783,7 @@ unless the optional second argument NOINDENT is non-nil."
           (indent-region beg end nil))
       (if (stringp prompt)
           (message prompt)))))
-  
+
 (defun idlwave-rw-case (string)
   "Make STRING have the case required by `idlwave-reserved-word-upcase'."
   (if idlwave-reserved-word-upcase
@@ -3801,7 +3801,7 @@ unless the optional second argument NOINDENT is non-nil."
 (defun idlwave-case ()
   "Build skeleton IDL case statement."
   (interactive)
-  (idlwave-template 
+  (idlwave-template
    (idlwave-rw-case "case")
    (idlwave-rw-case " of\n\nendcase")
    "Selector expression"))
@@ -3809,7 +3809,7 @@ unless the optional second argument NOINDENT is non-nil."
 (defun idlwave-switch ()
   "Build skeleton IDL switch statement."
   (interactive)
-  (idlwave-template 
+  (idlwave-template
    (idlwave-rw-case "switch")
    (idlwave-rw-case " of\n\nendswitch")
    "Selector expression"))
@@ -3817,7 +3817,7 @@ unless the optional second argument NOINDENT is non-nil."
 (defun idlwave-for ()
   "Build skeleton for loop statment."
   (interactive)
-  (idlwave-template 
+  (idlwave-template
    (idlwave-rw-case "for")
    (idlwave-rw-case " do begin\n\nendfor")
    "Loop expression"))
@@ -3832,14 +3832,14 @@ unless the optional second argument NOINDENT is non-nil."
 
 (defun idlwave-procedure ()
   (interactive)
-  (idlwave-template 
+  (idlwave-template
    (idlwave-rw-case "pro")
    (idlwave-rw-case "\n\nreturn\nend")
    "Procedure name"))
 
 (defun idlwave-function ()
   (interactive)
-  (idlwave-template 
+  (idlwave-template
    (idlwave-rw-case "function")
    (idlwave-rw-case "\n\nreturn\nend")
    "Function name"))
@@ -3853,7 +3853,7 @@ unless the optional second argument NOINDENT is non-nil."
 
 (defun idlwave-while ()
   (interactive)
-  (idlwave-template 
+  (idlwave-template
    (idlwave-rw-case "while")
    (idlwave-rw-case " do begin\n\nendwhile")
    "Entry condition"))
@@ -3932,8 +3932,8 @@ Buffer containing unsaved changes require confirmation before they are killed."
 (defun idlwave-count-outlawed-buffers (tag)
   "How many outlawed buffers have tag TAG?"
   (length (delq nil
-                (mapcar 
-                 (lambda (x) (eq (cdr x) tag)) 
+                (mapcar
+                 (lambda (x) (eq (cdr x) tag))
                  idlwave-outlawed-buffers))))
 
 (defun idlwave-do-kill-autoloaded-buffers (&rest reasons)
@@ -3947,9 +3947,9 @@ Buffer containing unsaved changes require confirmation before they are killed."
                    (memq (cdr entry) reasons))
                (kill-buffer (car entry))
                (incf cnt)
-               (setq idlwave-outlawed-buffers 
+               (setq idlwave-outlawed-buffers
                      (delq entry idlwave-outlawed-buffers)))
-        (setq idlwave-outlawed-buffers 
+        (setq idlwave-outlawed-buffers
               (delq entry idlwave-outlawed-buffers))))
     (message "%d buffer%s killed" cnt (if (= cnt 1) "" "s"))))
 
@@ -3961,7 +3961,7 @@ Intended for `after-save-hook'."
          (entry (assq buf idlwave-outlawed-buffers)))
     ;; Revoke license
     (if entry
-        (setq idlwave-outlawed-buffers 
+        (setq idlwave-outlawed-buffers
               (delq entry idlwave-outlawed-buffers)))
     ;; Remove this function from the hook.
     (remove-hook 'after-save-hook 'idlwave-revoke-license-to-kill 'local)))
@@ -3980,7 +3980,7 @@ Intended for `after-save-hook'."
 (defun idlwave-expand-lib-file-name (file)
   ;; Find FILE on the scanned lib path and return a buffer visiting it
   ;; This is for, e.g., finding source with no user catalog
-  (cond 
+  (cond
    ((null file) nil)
    ((file-name-absolute-p file) file)
    (t (idlwave-locate-lib-file file))))
@@ -3995,7 +3995,7 @@ you specify /."
   (interactive)
   (let (directory directories cmd append status numdirs dir getsubdirs
                   buffer save_buffer files numfiles item errbuf)
-    
+
     ;;
     ;; Read list of directories
     (setq directory (read-string "Tag Directories: " "."))
@@ -4047,7 +4047,7 @@ you specify /."
                     (message "%s" (concat "Tagging " item "..."))
                     (setq errbuf (get-buffer-create "*idltags-error*"))
                     (setq status (+ status
-                                    (if (eq 0 (call-process 
+                                    (if (eq 0 (call-process
                                                "sh" nil errbuf nil "-c"
                                                (concat cmd append item)))
                                         0
@@ -4061,13 +4061,13 @@ you specify /."
                   (setq numfiles (1+ numfiles))
                   (setq item (nth numfiles files))
                   )))
-            
+
             (setq numdirs (1+ numdirs))
             (setq dir (nth numdirs directories)))
         (progn
           (setq numdirs (1+ numdirs))
           (setq dir (nth numdirs directories)))))
-    
+
     (setq errbuf (get-buffer-create "*idltags-error*"))
     (if (= status 0)
         (kill-buffer errbuf))
@@ -4143,7 +4143,7 @@ blank lines."
   ;; Make sure the hash functions are accessible.
   (if (or (not (fboundp 'gethash))
           (not (fboundp 'puthash)))
-      (progn 
+      (progn
         (require 'cl)
         (or (fboundp 'puthash)
             (defalias 'puthash 'cl-puthash))))
@@ -4162,7 +4162,7 @@ blank lines."
               (null (cdr idlwave-sint-routines)))
       (loop for entry in entries
         for var = (car entry) for size = (nth 1 entry)
-        do (setcdr (symbol-value var) 
+        do (setcdr (symbol-value var)
                    (make-hash-table ':size size ':test 'equal)))
       (setq idlwave-sint-dirs nil
             idlwave-sint-libnames nil))
@@ -4172,7 +4172,7 @@ blank lines."
               (null (car idlwave-sint-routines)))
       (loop for entry in entries
         for var = (car entry) for size = (nth 1 entry)
-        do (setcar (symbol-value var) 
+        do (setcar (symbol-value var)
                    (make-hash-table ':size size ':test 'equal))))))
 
 (defun idlwave-sintern-routine-or-method (name &optional class set)
@@ -4259,11 +4259,11 @@ If DEFAULT-DIR is passed, it is used as the base of the directory"
             (setq class (idlwave-sintern-class class set))
             (setq name (idlwave-sintern-method name set)))
         (setq name (idlwave-sintern-routine name set)))
-      
+
       ;; The source
       (let ((source-type (car source))
             (source-file  (nth 1 source))
-            (source-dir  (if default-dir  
+            (source-dir  (if default-dir
                              (file-name-as-directory default-dir)
                            (nth 2 source)))
             (source-lib (nth 3 source)))
@@ -4272,7 +4272,7 @@ If DEFAULT-DIR is passed, it is used as the base of the directory"
         (if (stringp source-lib)
             (setq source-lib (idlwave-sintern-libname source-lib set)))
         (setq source (list source-type source-file source-dir source-lib)))
-      
+
       ;; The keywords
       (setq kwds (mapcar (lambda (x)
                            (idlwave-sintern-keyword-list x set))
@@ -4407,15 +4407,15 @@ will re-read the catalog."
           (not (stringp idlwave-user-catalog-file))
           (not (file-regular-p idlwave-user-catalog-file)))
       (error "No catalog has been produced yet"))
-  (let* ((emacs (expand-file-name (invocation-name) (invocation-directory)))
+  (let* ((emacs (concat invocation-directory invocation-name))
          (args (list "-batch"
                      "-l" (expand-file-name "~/.emacs")
                      "-l" "idlwave"
                      "-f" "idlwave-rescan-catalog-directories"))
-         (process (apply 'start-process "idlcat" 
+         (process (apply 'start-process "idlcat"
                          nil emacs args)))
     (setq idlwave-catalog-process process)
-    (set-process-sentinel 
+    (set-process-sentinel
      process
      (lambda (pro why)
        (when (string-match "finished" why)
@@ -4432,7 +4432,7 @@ will re-read the catalog."
 ;; ("ROUTINE" type class
 ;;  (system) | (lib pro_file dir "LIBNAME") | (user pro_file dir "USERLIB") |
 ;;  (buffer pro_file dir) | (compiled pro_file dir)
-;;   "calling_string" ("HELPFILE" (("KWD1" . link1) ...)) 
+;;   "calling_string" ("HELPFILE" (("KWD1" . link1) ...))
 ;;                    ("HELPFILE2" (("KWD2" . link) ...)) ...)
 ;;
 ;; DIR will be supplied dynamically while loading library catalogs,
@@ -4491,7 +4491,7 @@ information updated immediately, leave NO-CONCATENATE nil."
            ;; The override-idle means, even if the idle timer has done some
            ;; preparing work, load and renormalize everything anyway.
            (override-idle (or arg idlwave-buffer-case-takes-precedence)))
-      
+
       (setq idlwave-buffer-routines nil
             idlwave-compiled-routines nil
             idlwave-unresolved-routines nil)
@@ -4502,7 +4502,7 @@ information updated immediately, leave NO-CONCATENATE nil."
         (idlwave-reset-sintern (cond (load t)
                                      ((null idlwave-system-routines) t)
                                      (t 'bufsh))))
-      
+
       (if idlwave-buffer-case-takes-precedence
           ;; We can safely scan the buffer stuff first
           (progn
@@ -4517,9 +4517,9 @@ information updated immediately, leave NO-CONCATENATE nil."
                                     (idlwave-shell-is-running)))
              (ask-shell (and shell-is-running
                              idlwave-query-shell-for-routine-info)))
-      
+
         ;; Load the library catalogs again, first re-scanning the path
-        (when arg 
+        (when arg
           (if shell-is-running
               (idlwave-shell-send-command idlwave-shell-path-query
                                           '(progn
@@ -4539,7 +4539,7 @@ information updated immediately, leave NO-CONCATENATE nil."
             ;;    Therefore, we do a concatenation now, even though
             ;;    the shell might do it again.
             (idlwave-concatenate-rinfo-lists nil 'run-hooks))
-      
+
         (when ask-shell
           ;; Ask the shell about the routines it knows of.
           (message "Querying the shell")
@@ -4576,26 +4576,26 @@ information updated immediately, leave NO-CONCATENATE nil."
   ;; which, if necessary, will be re-created from the XML file on
   ;; disk.  As a last fallback, load the (likely outdated) idlw-rinfo
   ;; file distributed with older IDLWAVE versions (<6.0)
-  (unless (and (load idlwave-xml-system-rinfo-converted-file 
+  (unless (and (load idlwave-xml-system-rinfo-converted-file
                      'noerror 'nomessage)
                (idlwave-xml-system-routine-info-up-to-date))
     ;; See if we can create it from XML source
     (condition-case nil
         (idlwave-convert-xml-system-routine-info)
-      (error 
-       (unless (load idlwave-xml-system-rinfo-converted-file 
+      (error
+       (unless (load idlwave-xml-system-rinfo-converted-file
                      'noerror 'nomessage)
          (if idlwave-system-routines
-             (message 
+             (message
               "Failed to load converted routine info, using old conversion.")
-           (message 
+           (message
             "Failed to convert XML routine info, falling back on idlw-rinfo.")
            (if (not (load "idlw-rinfo" 'noerror 'nomessage))
-               (message 
+               (message
                 "Could not locate any system routine information."))))))))
 
 (defun idlwave-xml-system-routine-info-up-to-date()
-  (let* ((dir (file-name-as-directory 
+  (let* ((dir (file-name-as-directory
                (expand-file-name "help/online_help" (idlwave-sys-dir))))
          (catalog-file (expand-file-name "idl_catalog.xml" dir)))
     (file-newer-than-file-p ;converted file is newer than catalog
@@ -4610,15 +4610,15 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
   "Alist of system variables and their help files.")
 (defvar idlwave-help-special-topic-words nil)
 
-                
+
 (defun idlwave-shorten-syntax (syntax name &optional class)
   ;; From a list of syntax statments, shorten with %s and group with "or"
   (let ((case-fold-search t))
-    (mapconcat 
+    (mapconcat
      (lambda (x)
        (while (string-match name x)
          (setq x (replace-match "%s" t t x)))
-       (if class 
+       (if class
            (while (string-match class x)
              (setq x (replace-match "%s" t t x))))
        x)
@@ -4670,8 +4670,8 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
                   (put 'set-props 'matched t)
                   set-props)
                  (t nil)))
-          (setq methods-entry 
-                (nconc (idlwave-xml-create-rinfo-list pelem class extra-kwds) 
+          (setq methods-entry
+                (nconc (idlwave-xml-create-rinfo-list pelem class extra-kwds)
                        methods-entry)))
          (t)))
       (setq params (cdr params)))
@@ -4681,12 +4681,12 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
     ;  (message "Failed to match GetProperty in class %s" class))
     ;(unless (get 'set-props 'matched)
     ;  (message "Failed to match SetProperty in class %s" class))
-    (setq class-entry 
-          (if inherits 
+    (setq class-entry
+          (if inherits
               (list class (append '(inherits) inherits) (list 'link link))
             (list class (list 'link link))))
     (cons class-entry methods-entry)))
-    
+
 (defun idlwave-xml-create-rinfo-list (xml-entry &optional class extra-kws)
   ;; Create correctly structured list elements from ROUTINE or METHOD
   ;; XML list structures.  Return a list of list elements, with more
@@ -4722,8 +4722,8 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
           (setq kwd (cdr (assq 'name props))
                 klink (cdr (assq 'link props)))
           (if (string-match "^\\[XY\\(Z?\\)\\]" kwd)
-              (progn 
-                (setq pref-list 
+              (progn
+                (setq pref-list
                       (if (match-string 1 kwd) '("X" "Y" "Z") '("X" "Y"))
                       kwd (substring kwd (match-end 0)))
                 (loop for x in pref-list do
@@ -4732,7 +4732,7 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
 
          (t))); Do nothing for the others
       (setq params (cdr params)))
-    
+
     ;; Debug
 ;    (if (and (null (aref syntax-vec 0))
 ;            (null (aref syntax-vec 1))
@@ -4749,16 +4749,16 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
       (setq kwds (idlwave-rinfo-group-keywords kwds link))
       (loop for idx from 0 to 1 do
             (if (aref syntax-vec idx)
-                (push (append (list name (if (eq idx 0) 'pro 'fun) 
+                (push (append (list name (if (eq idx 0) 'pro 'fun)
                                     class '(system)
-                                    (idlwave-shorten-syntax 
+                                    (idlwave-shorten-syntax
                                      (aref syntax-vec idx) name class))
                               kwds) result)))
       result)))
 
 
 (defun idlwave-rinfo-group-keywords (kwds master-link)
-  ;; Group keywords by link file, as a list with elements 
+  ;; Group keywords by link file, as a list with elements
   ;; (linkfile ( ("KWD1" . link1) ("KWD2" . link2))
   (let (kwd link anchor linkfiles block master-elt)
     (while kwds
@@ -4777,7 +4777,7 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
             linkfiles
           (cons master-elt (delq master-elt linkfiles)))
       (push (list master-link) linkfiles))))
-      
+
 (defun idlwave-convert-xml-clean-statement-aliases (aliases)
   ;; Clean up the syntax of routines which are actually aliases by
   ;; removing the "OR" from the statements
@@ -4790,7 +4790,7 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
 
 (defun idlwave-convert-xml-clean-routine-aliases (aliases)
   ;; Duplicate and trim original routine aliases from rinfo list
-  ;; This if for, e.g. OPENR/OPENW/OPENU 
+  ;; This if for, e.g. OPENR/OPENW/OPENU
   (let (alias remove-list new parts all-parts)
     (loop for x in aliases do
           (when (setq parts (split-string (cdr x) "/"))
@@ -4799,7 +4799,7 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
               (setq new (cons (cdr x) parts))
               (push new all-parts))
             (setcdr new (delete (car x) (cdr new)))))
-    
+
     ;; Add any missing aliases (separate by slashes)
     (loop for x in all-parts do
           (if (cdr x)
@@ -4843,7 +4843,7 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
               props (car (cdr pelem)))
         (cond
          ((eq ptype 'FIELD)
-          (push (cons (cdr (assq 'name props)) 
+          (push (cons (cdr (assq 'name props))
                       (cdr
                        (idlwave-split-link-target (cdr (assq 'link props)))))
                 tags))))
@@ -4857,10 +4857,10 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
 (defun idlwave-save-routine-info ()
   (if idlwave-xml-routine-info-file
       (with-temp-file idlwave-xml-system-rinfo-converted-file
-        (insert 
+        (insert
          (concat ";; *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-;; IDLWAVE Routine Information File (IDLWAVE version " idlwave-mode-version ") 
-;; Automatically generated from source file: 
+;; IDLWAVE Routine Information File (IDLWAVE version " idlwave-mode-version ")
+;; Automatically generated from source file:
 ;;  " idlwave-xml-routine-info-file "
 ;; on " (current-time-string) "
 ;; Do not edit."))
@@ -4886,11 +4886,11 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
   "Convert XML supplied IDL routine info into internal form.
 Cache to disk for quick recovery."
   (interactive)
-  (let* ((dir (file-name-as-directory 
+  (let* ((dir (file-name-as-directory
                (expand-file-name "help/online_help" (idlwave-sys-dir))))
          (catalog-file (expand-file-name "idl_catalog.xml" dir))
          (elem-cnt 0)
-         props rinfo msg-cnt elem type nelem class-result alias 
+         props rinfo msg-cnt elem type nelem class-result alias
          routines routine-aliases statement-aliases sysvar-aliases
          buf version-string)
     (if (not (file-exists-p catalog-file))
@@ -4898,7 +4898,7 @@ Cache to disk for quick recovery."
       (if (not (file-readable-p catalog-file))
           (error "Cannot read XML routine info file: %s" catalog-file)))
     (require 'xml)
-    (message "Reading XML routine info...")   
+    (message "Reading XML routine info...")
     (unwind-protect
         (progn
           ;; avoid warnings about read-only files
@@ -4909,13 +4909,13 @@ Cache to disk for quick recovery."
     (setq rinfo (assq 'CATALOG rinfo))
     (unless rinfo (error "Failed to parse XML routine info"))
     ;;(setq rinfo (car rinfo)) ; Skip the catalog stuff.
-    
+
     (setq version-string (cdr (assq 'version (nth 1 rinfo)))
           rinfo (cddr rinfo))
 
     (setq nelem (length rinfo)
           msg-cnt (/ nelem 20))
-    
+
     (setq idlwave-xml-routine-info-file nil)
     (message "Converting XML routine info...")
     (setq idlwave-system-routines nil
@@ -4932,12 +4932,12 @@ Cache to disk for quick recovery."
         (setq type (car elem)
               props (car (cdr elem)))
         (if (= (mod elem-cnt msg-cnt) 0)
-            (message "Converting XML routine info...%2d%%" 
+            (message "Converting XML routine info...%2d%%"
                      (/ (* elem-cnt 100) nelem)))
-        (cond 
+        (cond
          ((eq type 'ROUTINE)
           (if (setq alias (assq 'alias_to props))
-              (push (cons (cdr (assq 'name props)) (cdr alias)) 
+              (push (cons (cdr (assq 'name props)) (cdr alias))
                     routine-aliases)
             (setq routines (idlwave-xml-create-rinfo-list elem))
             (if (listp (cdr routines))
@@ -4945,7 +4945,7 @@ Cache to disk for quick recovery."
                       (nconc idlwave-system-routines routines))
               ;; a cons cell is an executive commands
               (push routines idlwave-executive-commands-alist))))
-         
+
          ((eq type 'CLASS)
           (setq class-result (idlwave-xml-create-class-method-lists elem))
           (push (car class-result) idlwave-system-class-info)
@@ -4963,10 +4963,10 @@ Cache to disk for quick recovery."
 
          ((eq type 'SYSVAR)
           (if (setq alias (cdr (assq 'alias_to props)))
-              (push (cons (substring (cdr (assq 'name props)) 1) 
+              (push (cons (substring (cdr (assq 'name props)) 1)
                           (substring alias 1))
                     sysvar-aliases)
-            (push (idlwave-xml-create-sysvar-alist elem) 
+            (push (idlwave-xml-create-sysvar-alist elem)
                   idlwave-system-variables-alist)))
          (t))))
     (idlwave-convert-xml-clean-routine-aliases routine-aliases)
@@ -4976,12 +4976,12 @@ Cache to disk for quick recovery."
     (setq idlwave-xml-routine-info-file catalog-file)
     (idlwave-save-routine-info)
     (message "Converting XML routine info...done")))
-      
-    
+
+
 ;; ("ROUTINE" type class
 ;;  (system) | (lib pro_file dir "LIBNAME") | (user pro_file dir "USERLIB") |
 ;;  (buffer pro_file dir) | (compiled pro_file dir)
-;;   "calling_string" ("HELPFILE" (("KWD1" . link1) ...)) 
+;;   "calling_string" ("HELPFILE" (("KWD1" . link1) ...))
 ;;                    ("HELPFILE2" (("KWD2" . link) ...)) ...)
 
 
@@ -4996,7 +4996,7 @@ Cache to disk for quick recovery."
             (message "Loading system routine info in idle time...done")
             (aset arr 0 t)
             (throw 'exit t))
-          
+
           (when (not (aref arr 1))
             (message "Normalizing idlwave-system-routines in idle time...")
             (idlwave-reset-sintern t)
@@ -5021,7 +5021,7 @@ Cache to disk for quick recovery."
                   (progn
                     (setq idlwave-library-routines nil)
                     (ding)
-                    (message "Outdated user catalog: %s... recreate" 
+                    (message "Outdated user catalog: %s... recreate"
                              idlwave-user-catalog-file))
                 (message "Loading user catalog in idle time...done")))
             (aset arr 2 t)
@@ -5030,16 +5030,16 @@ Cache to disk for quick recovery."
           (when (not (aref arr 3))
             (when idlwave-user-catalog-routines
               (message "Normalizing user catalog routines in idle time...")
-              (setq idlwave-user-catalog-routines 
+              (setq idlwave-user-catalog-routines
                     (idlwave-sintern-rinfo-list
                      idlwave-user-catalog-routines 'sys))
-              (message 
+              (message
                "Normalizing user catalog routines in idle time...done"))
             (aset arr 3 t)
             (throw 'exit t))
 
           (when (not (aref arr 4))
-            (idlwave-scan-library-catalogs 
+            (idlwave-scan-library-catalogs
              "Loading and normalizing library catalogs in idle time...")
             (aset arr 4 t)
             (throw 'exit t))
@@ -5047,7 +5047,7 @@ Cache to disk for quick recovery."
             (message "Finishing initialization in idle time...")
             (idlwave-routines)
             (message "Finishing initialization in idle time...done")
-            (aset arr 5 t)          
+            (aset arr 5 t)
             (throw 'exit nil)))
         ;; restart the timer
         (if (sit-for 1)
@@ -5082,17 +5082,17 @@ Cache to disk for quick recovery."
         (when (or force (not (aref idlwave-load-rinfo-steps-done 2)))
           (load-file idlwave-user-catalog-file))
       (error nil))
-    (when (and 
+    (when (and
            (boundp 'idlwave-library-routines)
            idlwave-library-routines)
       (setq idlwave-library-routines nil)
-      (error "Outdated user catalog: %s... recreate" 
+      (error "Outdated user catalog: %s... recreate"
              idlwave-user-catalog-file))
     (setq idlwave-true-path-alist nil)
     (when (or force (not (aref idlwave-load-rinfo-steps-done 3)))
       (message "Normalizing user catalog routines...")
-      (setq idlwave-user-catalog-routines 
-            (idlwave-sintern-rinfo-list 
+      (setq idlwave-user-catalog-routines
+            (idlwave-sintern-rinfo-list
              idlwave-user-catalog-routines 'sys))
       (message "Normalizing user catalog routines...done")))
 
@@ -5105,11 +5105,11 @@ Cache to disk for quick recovery."
 
 (defun idlwave-update-buffer-routine-info ()
   (let (res)
-    (cond 
+    (cond
      ((eq idlwave-scan-all-buffers-for-routine-info t)
       ;; Scan all buffers, current buffer last
       (message "Scanning all buffers...")
-      (setq res (idlwave-get-routine-info-from-buffers 
+      (setq res (idlwave-get-routine-info-from-buffers
                  (reverse (buffer-list)))))
      ((null idlwave-scan-all-buffers-for-routine-info)
       ;; Don't scan any buffers
@@ -5122,12 +5122,12 @@ Cache to disk for quick recovery."
             (setq res (idlwave-get-routine-info-from-buffers
                        (list (current-buffer))))))))
     ;; Put the result into the correct variable
-    (setq idlwave-buffer-routines 
+    (setq idlwave-buffer-routines
           (idlwave-sintern-rinfo-list res 'set))))
 
 (defun idlwave-concatenate-rinfo-lists (&optional quiet run-hook)
   "Put the different sources for routine information together."
-  ;; The sequence here is important because earlier definitions shadow 
+  ;; The sequence here is important because earlier definitions shadow
   ;; later ones.  We assume that if things in the buffers are newer
   ;; then in the shell of the system, they are meant to be different.
   (setcdr idlwave-last-system-routine-info-cons-cell
@@ -5139,7 +5139,7 @@ Cache to disk for quick recovery."
 
   ;; Give a message with information about the number of routines we have.
   (unless quiet
-    (message 
+    (message
      "Routines Found: buffer(%d) compiled(%d) library(%d) user(%d) system(%d)"
      (length idlwave-buffer-routines)
      (length idlwave-compiled-routines)
@@ -5157,7 +5157,7 @@ Cache to disk for quick recovery."
           (when (and (setq class (nth 2 x))
                      (not (assq class idlwave-class-alist)))
             (push (list class) idlwave-class-alist)))
-        idlwave-class-alist)))      
+        idlwave-class-alist)))
 
 ;; Three functions for the hooks
 (defun idlwave-save-buffer-update ()
@@ -5190,7 +5190,7 @@ Cache to disk for quick recovery."
 
 (defun idlwave-replace-buffer-routine-info (file new)
   "Cut the part from FILE out of `idlwave-buffer-routines' and add NEW."
-  (let ((list idlwave-buffer-routines) 
+  (let ((list idlwave-buffer-routines)
         found)
     (while list
       ;; The following test uses eq to make sure it works correctly
@@ -5201,7 +5201,7 @@ Cache to disk for quick recovery."
             (setcar list nil)
             (setq found t))
         (if found
-            ;; End of that section reached. Jump. 
+            ;; End of that section reached. Jump.
             (setq list nil)))
       (setq list (cdr list)))
     (setq idlwave-buffer-routines
@@ -5233,11 +5233,11 @@ Cache to disk for quick recovery."
       (save-restriction
         (widen)
         (goto-char (point-min))
-        (while (re-search-forward 
+        (while (re-search-forward
                 "^[ \t]*\\(pro\\|function\\)[ \t]" nil t)
           (setq string (buffer-substring-no-properties
                         (match-beginning 0)
-                        (progn 
+                        (progn
                           (idlwave-end-of-statement)
                           (point))))
           (setq entry (idlwave-parse-definition string))
@@ -5275,7 +5275,7 @@ Cache to disk for quick recovery."
         (push (match-string 1 string) args)))
     ;; Normalize and sort.
     (setq args (nreverse args))
-    (setq keywords (sort keywords (lambda (a b) 
+    (setq keywords (sort keywords (lambda (a b)
                                     (string< (downcase a) (downcase b)))))
     ;; Make and return the entry
     ;; We don't know which argument are optional, so this information
@@ -5285,7 +5285,7 @@ Cache to disk for quick recovery."
           class
           (cond ((not (boundp 'idlwave-scanning-lib))
                  (list  'buffer (buffer-file-name)))
-;               ((string= (downcase 
+;               ((string= (downcase
 ;                          (file-name-sans-extension
 ;                           (file-name-nondirectory (buffer-file-name))))
 ;                         (downcase name))
@@ -5293,7 +5293,7 @@ Cache to disk for quick recovery."
 ;               (t (cons 'lib (file-name-nondirectory (buffer-file-name))))
                 (t (list 'user (file-name-nondirectory (buffer-file-name))
                          idlwave-scanning-lib-dir "UserLib")))
-          (concat 
+          (concat
            (if (string= type "function") "Result = " "")
            (if class "Obj ->[%s::]" "")
            "%s"
@@ -5339,10 +5339,10 @@ time - so no widget will pop up."
                (> (length idlwave-user-catalog-file) 0)
                (file-accessible-directory-p
                 (file-name-directory idlwave-user-catalog-file))
-               (not (string= "" (file-name-nondirectory 
+               (not (string= "" (file-name-nondirectory
                                  idlwave-user-catalog-file))))
     (error "`idlwave-user-catalog-file' does not point to a file in an accessible directory"))
-  
+
   (cond
     ;; Rescan the known directories
    ((and arg idlwave-path-alist
@@ -5352,13 +5352,13 @@ time - so no widget will pop up."
    ;; Expand the directories from library-path and run the widget
    (idlwave-library-path
     (idlwave-display-user-catalog-widget
-     (if idlwave-true-path-alist 
+     (if idlwave-true-path-alist
          ;; Propagate any flags on the existing path-alist
          (mapcar (lambda (x)
                    (let ((path-entry (assoc (file-truename x)
                                             idlwave-true-path-alist)))
                      (if path-entry
-                         (cons x (cdr path-entry)) 
+                         (cons x (cdr path-entry))
                        (list x))))
                  (idlwave-expand-path idlwave-library-path))
        (mapcar 'list (idlwave-expand-path idlwave-library-path)))))
@@ -5383,7 +5383,7 @@ time - so no widget will pop up."
     (idlwave-scan-library-catalogs "Locating library catalogs..." 'no-load)
     (idlwave-display-user-catalog-widget idlwave-path-alist)))
 
-(defconst idlwave-user-catalog-widget-help-string 
+(defconst idlwave-user-catalog-widget-help-string
   "This is the front-end to the creation of the IDLWAVE user catalog.
 Please select the directories on IDL's search path from which you
 would like to extract routine information, to be stored in the file:
@@ -5418,7 +5418,7 @@ directories and save the routine info.
   (make-local-variable 'idlwave-widget)
   (widget-insert (format idlwave-user-catalog-widget-help-string
                          idlwave-user-catalog-file))
-  
+
   (widget-create 'push-button
                  :notify 'idlwave-widget-scan-user-lib-files
                  "Scan & Save")
@@ -5428,7 +5428,7 @@ directories and save the routine info.
                  "Delete File")
   (widget-insert "  ")
   (widget-create 'push-button
-                 :notify 
+                 :notify
                  '(lambda (&rest ignore)
                     (let ((path-list (widget-get idlwave-widget :path-dirs)))
                       (mapcar (lambda (x)
@@ -5439,7 +5439,7 @@ directories and save the routine info.
                  "Select All Non-Lib")
   (widget-insert "  ")
   (widget-create 'push-button
-                 :notify 
+                 :notify
                  '(lambda (&rest ignore)
                     (let ((path-list (widget-get idlwave-widget :path-dirs)))
                       (mapcar (lambda (x)
@@ -5455,18 +5455,18 @@ directories and save the routine info.
   (widget-insert "\n\n")
 
   (widget-insert "Select Directories: \n")
-  
+
   (setq idlwave-widget
         (apply 'widget-create
                'checklist
-               :value  (delq nil (mapcar (lambda (x) 
-                                           (if (memq 'user (cdr x)) 
+               :value  (delq nil (mapcar (lambda (x)
+                                           (if (memq 'user (cdr x))
                                                (car x)))
                                          dirs-list))
                :greedy t
                :tag "List of directories"
-               (mapcar (lambda (x) 
-                         (list 'item 
+               (mapcar (lambda (x)
+                         (list 'item
                                (if (memq 'lib (cdr x))
                                    (concat "[LIB] " (car x) )
                                  (car x)))) dirs-list)))
@@ -5476,7 +5476,7 @@ directories and save the routine info.
   (widget-setup)
   (goto-char (point-min))
   (delete-other-windows))
-  
+
 (defun idlwave-delete-user-catalog-file (&rest ignore)
   (if (yes-or-no-p
        (format "Delete file %s " idlwave-user-catalog-file))
@@ -5492,7 +5492,7 @@ directories and save the routine info.
          (this-path-alist path-alist)
          dir-entry)
     (while (setq dir-entry (pop this-path-alist))
-      (if (member 
+      (if (member
            (if (memq 'lib (cdr dir-entry))
                (concat "[LIB] " (car dir-entry))
              (car dir-entry))
@@ -5589,7 +5589,7 @@ directories and save the routine info.
     ;; Define the variable which knows the value of "!DIR"
     (insert (format "\n(setq idlwave-system-directory \"%s\")\n"
                     idlwave-system-directory))
-  
+
     ;; Define the variable which contains a list of all scanned directories
     (insert "\n(setq idlwave-path-alist\n    '(")
     (let ((standard-output (current-buffer)))
@@ -5629,7 +5629,7 @@ directories and save the routine info.
       (when (file-directory-p dir)
         (setq files (nreverse (directory-files dir t "[^.]")))
         (while (setq file (pop files))
-          (if (file-directory-p file) 
+          (if (file-directory-p file)
               (push (file-name-as-directory file) path)))
         (push dir path1)))
     path1))
@@ -5641,7 +5641,7 @@ directories and save the routine info.
 
 
 (defun idlwave-scan-library-catalogs (&optional message-base no-load)
-  "Scan for library catalog files (.idlwave_catalog) and ingest.  
+  "Scan for library catalog files (.idlwave_catalog) and ingest.
 
 All directories on `idlwave-path-alist' (or `idlwave-library-path'
 instead, if present) are searched.  Print MESSAGE-BASE along with the
@@ -5649,7 +5649,7 @@ libraries being loaded, if passed, and skip loading/normalizing if
 NO-LOAD is non-nil.  The variable `idlwave-use-library-catalogs' can
 be set to nil to disable library catalog scanning."
   (when idlwave-use-library-catalogs
-    (let ((dirs 
+    (let ((dirs
            (if idlwave-library-path
                (idlwave-expand-path idlwave-library-path)
              (mapcar 'car idlwave-path-alist)))
@@ -5658,7 +5658,7 @@ be set to nil to disable library catalog scanning."
       (if message-base (message message-base))
       (while (setq dir (pop dirs))
         (catch 'continue
-          (when (file-readable-p 
+          (when (file-readable-p
                  (setq catalog (expand-file-name ".idlwave_catalog" dir)))
             (unless no-load
               (setq idlwave-library-catalog-routines nil)
@@ -5666,20 +5666,20 @@ be set to nil to disable library catalog scanning."
               (condition-case nil
                   (load catalog t t t)
                 (error (throw 'continue t)))
-              (when (and 
-                     message-base 
-                     (not (string= idlwave-library-catalog-libname 
+              (when (and
+                     message-base
+                     (not (string= idlwave-library-catalog-libname
                                    old-libname)))
-                (message "%s" (concat message-base 
+                (message "%s" (concat message-base
                                       idlwave-library-catalog-libname))
                 (setq old-libname idlwave-library-catalog-libname))
               (when idlwave-library-catalog-routines
                 (setq all-routines
-                      (append 
+                      (append
                        (idlwave-sintern-rinfo-list
                         idlwave-library-catalog-routines 'sys dir)
                        all-routines))))
-            
+
             ;;  Add a 'lib flag if on path-alist
             (when (and idlwave-path-alist
                        (setq dir-entry (assoc dir idlwave-path-alist)))
@@ -5690,7 +5690,7 @@ be set to nil to disable library catalog scanning."
 ;;----- Communicating with the Shell -------------------
 
 ;; First, here is the idl program which can be used to query IDL for
-;; defined routines. 
+;; defined routines.
 (defconst idlwave-routine-info.pro
   "
 ;; START OF IDLWAVE SUPPORT ROUTINES
@@ -5708,10 +5708,10 @@ end
 pro idlwave_print_info_entry,name,func=func,separator=sep
   ;; See if it's an object method
   if name eq '' then return
-  func    = keyword_set(func) 
+  func    = keyword_set(func)
   methsep = strpos(name,'::')
   meth    = methsep ne -1
-  
+
   ;; Get routine info
   pars   = routine_info(name,/parameters,functions=func)
   source = routine_info(name,/source,functions=func)
@@ -5719,12 +5719,12 @@ pro idlwave_print_info_entry,name,func=func,separator=sep
   nkw    = pars.num_kw_args
   if nargs gt 0 then args = pars.args
   if nkw   gt 0 then kwargs = pars.kw_args
-  
+
   ;; Trim the class, and make the name
-  if meth then begin 
+  if meth then begin
       class = strmid(name,0,methsep)
       name  = strmid(name,methsep+2,strlen(name)-1)
-      if nargs gt 0 then begin 
+      if nargs gt 0 then begin
           ;; remove the self argument
           wh = where(args ne 'SELF',nargs)
           if nargs gt 0 then args = args[wh]
@@ -5733,7 +5733,7 @@ pro idlwave_print_info_entry,name,func=func,separator=sep
       ;; No class, just a normal routine.
       class = \"\"
   endelse
-   
+
   ;; Calling sequence
   cs = \"\"
   if func then cs = 'Result = '
@@ -5754,9 +5754,9 @@ pro idlwave_print_info_entry,name,func=func,separator=sep
           kwstring = kwstring + ' ' + kwargs[j]
       endfor
   endif
-  
+
   ret=(['IDLWAVE-PRO','IDLWAVE-FUN'])[func]
-  
+
   print,ret + ': ' + name + sep + class + sep + source[0].path  $
     + sep + cs + sep + kwstring
 end
@@ -5768,19 +5768,19 @@ pro idlwave_routine_info,file
   all = routine_info()
   fileQ=n_elements(file) ne 0
   if fileQ then file=strtrim(file,2)
-  for i=0L,n_elements(all)-1L do begin 
-     if fileQ then begin 
+  for i=0L,n_elements(all)-1L do begin
+     if fileQ then begin
         if (routine_info(all[i],/SOURCE)).path eq file then $
            idlwave_print_info_entry,all[i],separator=sep
      endif else idlwave_print_info_entry,all[i],separator=sep
-  endfor 
+  endfor
   all = routine_info(/functions)
-  for i=0L,n_elements(all)-1L do begin 
-     if fileQ then begin 
+  for i=0L,n_elements(all)-1L do begin
+     if fileQ then begin
         if (routine_info(all[i],/FUNCTIONS,/SOURCE)).path eq file then $
            idlwave_print_info_entry,all[i],separator=sep,/FUNC
      endif else idlwave_print_info_entry,all[i],separator=sep,/FUNC
-  endfor 
+  endfor
   print,'>>>END OF IDLWAVE ROUTINE INFO'
 end
 
@@ -5806,7 +5806,7 @@ pro idlwave_get_class_tags, class
   if res then print,'IDLWAVE-CLASS-TAGS: '+class+' '+strjoin(tags,' ',/single)
 end
 ;; END OF IDLWAVE SUPPORT ROUTINES
-" 
+"
   "The idl programs to get info from the shell.")
 
 (defvar idlwave-idlwave_routine_info-compiled nil
@@ -5824,11 +5824,11 @@ end
       (erase-buffer)
       (insert idlwave-routine-info.pro)
       (save-buffer 0))
-    (idlwave-shell-send-command 
+    (idlwave-shell-send-command
      (concat ".run \"" idlwave-shell-temp-pro-file "\"")
      nil 'hide wait)
     (idlwave-shell-send-command
-     (format "save,'idlwave_print_safe','idlwave_routine_info','idlwave_print_info_entry','idlwave_get_class_tags','idlwave_get_sysvars',FILE='%s',/ROUTINES" 
+     (format "save,'idlwave_print_safe','idlwave_routine_info','idlwave_print_info_entry','idlwave_get_class_tags','idlwave_get_sysvars',FILE='%s',/ROUTINES"
              (idlwave-shell-temp-file 'rinfo))
      nil 'hide)
     (setq idlwave-idlwave_routine_info-compiled t))
@@ -5929,7 +5929,7 @@ When we force a method or a method keyword, CLASS can specify the class."
          (completion-regexp-list
           (if (equal arg '(16))
               (list (read-string (concat "Completion Regexp: "))))))
-    
+
     (if (and module (string-match "::" module))
         (setq class (substring module 0 (match-beginning 0))
               module (substring module (match-end 0))))
@@ -5950,7 +5950,7 @@ When we force a method or a method keyword, CLASS can specify the class."
      ;; Check for any special completion functions
      ((and idlwave-complete-special
            (idlwave-call-special idlwave-complete-special)))
-     
+
      ((null what)
       (error "Nothing to complete here"))
 
@@ -5967,7 +5967,7 @@ When we force a method or a method keyword, CLASS can specify the class."
                               (idlwave-all-class-inherits class-selector)))
              (isa (concat "procedure" (if class-selector "-method" "")))
              (type-selector 'pro))
-        (setq idlwave-completion-help-info 
+        (setq idlwave-completion-help-info
               (list 'routine nil type-selector class-selector nil super-classes))
         (idlwave-complete-in-buffer
          'procedure (if class-selector 'method 'routine)
@@ -5975,8 +5975,8 @@ When we force a method or a method keyword, CLASS can specify the class."
          (format "Select a %s name%s"
                  isa
                  (if class-selector
-                     (format " (class is %s)" 
-                             (if (eq class-selector t) 
+                     (format " (class is %s)"
+                             (if (eq class-selector t)
                                  "unknown" class-selector))
                    ""))
          isa
@@ -5990,7 +5990,7 @@ When we force a method or a method keyword, CLASS can specify the class."
                               (idlwave-all-class-inherits class-selector)))
              (isa (concat "function" (if class-selector "-method" "")))
              (type-selector 'fun))
-        (setq idlwave-completion-help-info 
+        (setq idlwave-completion-help-info
               (list 'routine nil type-selector class-selector nil super-classes))
         (idlwave-complete-in-buffer
          'function (if class-selector 'method 'routine)
@@ -5998,7 +5998,7 @@ When we force a method or a method keyword, CLASS can specify the class."
          (format "Select a %s name%s"
                  isa
                  (if class-selector
-                     (format " (class is %s)" 
+                     (format " (class is %s)"
                              (if (eq class-selector t)
                                  "unknown" class-selector))
                    ""))
@@ -6026,18 +6026,18 @@ When we force a method or a method keyword, CLASS can specify the class."
         (unless (or entry (eq class t))
           (error "Nothing known about procedure %s"
                  (idlwave-make-full-name class name)))
-        (setq list (idlwave-fix-keywords name 'pro class list 
+        (setq list (idlwave-fix-keywords name 'pro class list
                                          super-classes system))
         (unless list (error "No keywords available for procedure %s"
                             (idlwave-make-full-name class name)))
-        (setq idlwave-completion-help-info 
+        (setq idlwave-completion-help-info
               (list 'keyword name type-selector class-selector entry super-classes))
         (idlwave-complete-in-buffer
          'keyword 'keyword list nil
          (format "Select keyword for procedure %s%s"
                  (idlwave-make-full-name class name)
                  (if (or (member '("_EXTRA") list)
-                         (member '("_REF_EXTRA") list))                  
+                         (member '("_REF_EXTRA") list))
                      " (note _EXTRA)" ""))
          isa
          'idlwave-attach-keyword-classes)))
@@ -6060,7 +6060,7 @@ When we force a method or a method keyword, CLASS can specify the class."
         (unless (or entry (eq class t))
           (error "Nothing known about function %s"
                  (idlwave-make-full-name class name)))
-        (setq list (idlwave-fix-keywords name 'fun class list 
+        (setq list (idlwave-fix-keywords name 'fun class list
                                          super-classes system))
         ;; OBJ_NEW: Messages mention the proper Init method
         (setq msg-name (if (and (null class)
@@ -6070,13 +6070,13 @@ When we force a method or a method keyword, CLASS can specify the class."
                          (idlwave-make-full-name class name)))
         (unless list (error "No keywords available for function %s"
                             msg-name))
-        (setq idlwave-completion-help-info 
+        (setq idlwave-completion-help-info
               (list 'keyword name type-selector class-selector nil super-classes))
         (idlwave-complete-in-buffer
          'keyword 'keyword list nil
          (format "Select keyword for function %s%s" msg-name
                  (if (or (member '("_EXTRA") list)
-                         (member '("_REF_EXTRA") list))                  
+                         (member '("_REF_EXTRA") list))
                      " (note _EXTRA)" ""))
          isa
          'idlwave-attach-keyword-classes)))
@@ -6114,10 +6114,10 @@ other completions will be tried.")
                       ("class")))
          (module (idlwave-sintern-routine-or-method module class))
          (class (idlwave-sintern-class class))
-         (what (cond 
+         (what (cond
                 ((equal what 0)
                  (setq what
-                       (intern (completing-read 
+                       (intern (completing-read
                                 "Complete what? " what-list nil t))))
                 ((integerp what)
                  (setq what (intern (car (nth (1- what) what-list)))))
@@ -6139,7 +6139,7 @@ other completions will be tried.")
              (super-classes nil)
              (type-selector 'pro)
              (pro (or module
-                      (idlwave-completing-read 
+                      (idlwave-completing-read
                        "Procedure: " (idlwave-routines) 'idlwave-selector))))
         (setq pro (idlwave-sintern-routine pro))
         (list nil-list nil-list 'procedure-keyword
@@ -6153,7 +6153,7 @@ other completions will be tried.")
              (super-classes nil)
              (type-selector 'fun)
              (func (or module
-                       (idlwave-completing-read 
+                       (idlwave-completing-read
                         "Function: " (idlwave-routines) 'idlwave-selector))))
         (setq func (idlwave-sintern-routine func))
         (list nil-list nil-list 'function-keyword
@@ -6193,7 +6193,7 @@ other completions will be tried.")
 
      ((eq what 'class)
       (list nil-list nil-list 'class nil-list nil))
-     
+
      (t (error "Invalid value for WHAT")))))
 
 (defun idlwave-completing-read (&rest args)
@@ -6216,7 +6216,7 @@ other completions will be tried.")
                     (stringp idlwave-shell-default-directory)
                     (file-directory-p idlwave-shell-default-directory))
                idlwave-shell-default-directory
-             default-directory)))          
+             default-directory)))
     (comint-dynamic-complete-filename)))
 
 (defun idlwave-make-full-name (class name)
@@ -6225,7 +6225,7 @@ other completions will be tried.")
 
 (defun idlwave-rinfo-assoc (name type class list)
   "Like `idlwave-rinfo-assq', but sintern strings first."
-  (idlwave-rinfo-assq 
+  (idlwave-rinfo-assq
    (idlwave-sintern-routine-or-method name class)
    type (idlwave-sintern-class class) list))
 
@@ -6249,7 +6249,7 @@ other completions will be tried.")
           (setq classes nil)))
     rtn))
 
-(defun idlwave-best-rinfo-assq (name type class list &optional with-file 
+(defun idlwave-best-rinfo-assq (name type class list &optional with-file
                                      keep-system)
   "Like `idlwave-rinfo-assq', but get all twins and sort, then return first.
 If WITH-FILE is passed, find the best rinfo entry with a file
@@ -6274,7 +6274,7 @@ syslib files."
                                     twins)))))
     (car twins)))
 
-(defun idlwave-best-rinfo-assoc (name type class list &optional with-file 
+(defun idlwave-best-rinfo-assoc (name type class list &optional with-file
                                      keep-system)
   "Like `idlwave-best-rinfo-assq', but sintern strings first."
   (idlwave-best-rinfo-assq
@@ -6365,7 +6365,7 @@ INFO is as returned by idlwave-what-function or -procedure."
 Must accept two arguments: `apos' and `info'")
 
 (defun idlwave-determine-class (info type)
-  ;; Determine the class of a routine call.  
+  ;; Determine the class of a routine call.
   ;; INFO is the `cw-list' structure as returned by idlwave-where.
   ;; The second element in this structure is the class.  When nil, we
   ;; return nil.  When t, try to get the class from text properties at
@@ -6385,7 +6385,7 @@ Must accept two arguments: `apos' and `info'")
                       (dassoc (cdr dassoc))
                       (t t)))
          (arrow (and apos (string= (buffer-substring apos (+ 2 apos)) "->")))
-         (is-self 
+         (is-self
           (and arrow
                (save-excursion (goto-char apos)
                                (forward-word -1)
@@ -6406,19 +6406,19 @@ Must accept two arguments: `apos' and `info'")
           (setq class (or (nth 2 (idlwave-current-routine)) class)))
 
       ;; Before prompting, try any special class determination routines
-      (when (and (eq t class) 
+      (when (and (eq t class)
                  idlwave-determine-class-special
                  (not force-query))
-        (setq special-class 
+        (setq special-class
               (idlwave-call-special idlwave-determine-class-special apos))
-        (if special-class 
+        (if special-class
             (setq class (idlwave-sintern-class special-class)
                   store idlwave-store-inquired-class)))
-      
+
       ;; Prompt for a class, if we need to
       (when (and (eq class t)
                  (or force-query query))
-        (setq class-alist 
+        (setq class-alist
               (mapcar 'list (idlwave-all-method-classes (car info) type)))
         (setq class
               (idlwave-sintern-class
@@ -6427,9 +6427,9 @@ Must accept two arguments: `apos' and `info'")
                  (error "No classes available with method %s" (car info)))
                 ((and (= (length class-alist) 1) (not force-query))
                  (car (car class-alist)))
-                (t 
+                (t
                  (setq store idlwave-store-inquired-class)
-                 (idlwave-completing-read 
+                 (idlwave-completing-read
                   (format "Class%s: " (if (stringp (car info))
                                           (format " for %s method %s"
                                                   type (car info))
@@ -6441,9 +6441,9 @@ Must accept two arguments: `apos' and `info'")
         ;; We have a real class here
         (when (and store arrow)
           (condition-case ()
-              (add-text-properties 
-               apos (+ apos 2) 
-               `(idlwave-class ,class face ,idlwave-class-arrow-face 
+              (add-text-properties
+               apos (+ apos 2)
+               `(idlwave-class ,class face ,idlwave-class-arrow-face
                                rear-nonsticky t))
             (error nil)))
         (setf (nth 2 info) class))
@@ -6471,14 +6471,14 @@ Must accept two arguments: `apos' and `info'")
 
 
 (defun idlwave-where ()
-  "Find out where we are. 
+  "Find out where we are.
 The return value is a list with the following stuff:
 \(PRO-LIST FUNC-LIST COMPLETE-WHAT CW-LIST LAST-CHAR)
 
 PRO-LIST       (PRO POINT CLASS ARROW)
 FUNC-LIST      (FUNC POINT CLASS ARROW)
 COMPLETE-WHAT  a symbol indicating what kind of completion makes sense here
-CW-LIST        (PRO-OR-FUNC POINT CLASS ARROW)  Like PRO-LIST, for what can 
+CW-LIST        (PRO-OR-FUNC POINT CLASS ARROW)  Like PRO-LIST, for what can
                be completed here.
 LAST-CHAR      last relevant character before point (non-white non-comment,
                not part of current identifier or leading slash).
@@ -6490,7 +6490,7 @@ POINT:  Where is this
 CLASS:  What class has the routine (nil=no, t=is method, but class unknown)
 ARROW:  Location of the arrow"
   (idlwave-routines)
-  (let* (;(bos (save-excursion (idlwave-beginning-of-statement) (point))) 
+  (let* (;(bos (save-excursion (idlwave-beginning-of-statement) (point)))
          (bos (save-excursion (idlwave-start-of-substatement 'pre) (point)))
          (func-entry (idlwave-what-function bos))
          (func (car func-entry))
@@ -6512,8 +6512,8 @@ ARROW:  Location of the arrow"
      ((string-match "\\`[ \t]*\\(pro\\|function\\)[ \t]+[a-zA-Z0-9_]*\\'"
                     match-string)
       (setq cw 'class))
-     ((string-match 
-       "\\`[ \t]*\\([a-zA-Z][a-zA-Z0-9$_]*\\)?\\'" 
+     ((string-match
+       "\\`[ \t]*\\([a-zA-Z][a-zA-Z0-9$_]*\\)?\\'"
        (if (> pro-point 0)
            (buffer-substring pro-point (point))
          match-string))
@@ -6524,11 +6524,11 @@ ARROW:  Location of the arrow"
       nil)
      ((string-match "OBJ_NEW([ \t]*['\"]\\([a-zA-Z0-9$_]*\\)?\\'"
                     match-string)
-      (setq cw 'class))                    
+      (setq cw 'class))
      ((string-match "\\<inherits\\s-+\\([a-zA-Z0-9$_]*\\)?\\'"
                     match-string)
-      (setq cw 'class))                    
-     ((and func 
+      (setq cw 'class))
+     ((and func
            (> func-point pro-point)
            (= func-level 1)
            (memq last-char '(?\( ?,)))
@@ -6574,7 +6574,7 @@ ARROW:  Location of the arrow"
   ;;    searches to this point.
 
   (catch 'exit
-    (let (pos 
+    (let (pos
           func-point
           (cnt 0)
           func arrow-start class)
@@ -6589,18 +6589,18 @@ ARROW:  Location of the arrow"
              (setq pos (point))
              (incf cnt)
              (when (and (= (following-char) ?\()
-                        (re-search-backward 
+                        (re-search-backward
                          "\\(::\\|\\<\\)\\([a-zA-Z][a-zA-Z0-9$_]*\\)[ \t]*\\="
                          bound t))
                (setq func (match-string 2)
                      func-point (goto-char (match-beginning 2))
                      pos func-point)
-               (if (re-search-backward 
+               (if (re-search-backward
                     "->[ \t]*\\(\\([a-zA-Z][a-zA-Z0-9$_]*\\)::\\)?\\=" bound t)
                    (setq arrow-start (copy-marker (match-beginning 0))
                          class (or (match-string 2) t)))
-               (throw 
-                'exit 
+               (throw
+                'exit
                 (list
                  (idlwave-sintern-routine-or-method func class)
                  (idlwave-sintern-class class)
@@ -6616,18 +6616,18 @@ ARROW:  Location of the arrow"
   ;;    searches to this point.
   (let ((pos (point)) pro-point
         pro class arrow-start string)
-    (save-excursion 
+    (save-excursion
       ;;(idlwave-beginning-of-statement)
       (idlwave-start-of-substatement 'pre)
       (setq string (buffer-substring (point) pos))
-      (if (string-match 
+      (if (string-match
            "\\`[ \t]*\\([a-zA-Z][a-zA-Z0-9$_]*\\)[ \t]*\\(,\\|\\'\\)" string)
           (setq pro (match-string 1 string)
                 pro-point (+ (point) (match-beginning 1)))
         (if (and (idlwave-skip-object)
                  (setq string (buffer-substring (point) pos))
-                 (string-match 
-                  "\\`[ \t]*\\(->\\)[ \t]*\\(\\([a-zA-Z][a-zA-Z0-9$_]*\\)::\\)?\\([a-zA-Z][a-zA-Z0-9$_]*\\)?[ \t]*\\(,\\|\\(\\$\\s *\\(;.*\\)?\\)?$\\)" 
+                 (string-match
+                  "\\`[ \t]*\\(->\\)[ \t]*\\(\\([a-zA-Z][a-zA-Z0-9$_]*\\)::\\)?\\([a-zA-Z][a-zA-Z0-9$_]*\\)?[ \t]*\\(,\\|\\(\\$\\s *\\(;.*\\)?\\)?$\\)"
                   string))
             (setq pro (if (match-beginning 4)
                           (match-string 4 string))
@@ -6671,7 +6671,7 @@ ARROW:  Location of the arrow"
               (throw 'exit nil))))
         (goto-char pos)
       nil)))
-  
+
 (defun idlwave-last-valid-char ()
   "Return the last character before point which is not white or a comment
 and also not part of the current identifier.  Since we do this in
@@ -6761,23 +6761,23 @@ accumulate information on matching completions."
      ((or (eq completion t)
           (and (= 1 (length (setq all-completions
                                   (idlwave-uniquify
-                                   (all-completions part list 
-                                                    (or special-selector 
+                                   (all-completions part list
+                                                    (or special-selector
                                                         selector))))))
                (equal dpart dcompletion)))
       ;; This is already complete
       (idlwave-after-successful-completion type slash beg)
       (message "%s is already the complete %s" part isa)
       nil)
-     (t        
+     (t
       ;; We cannot add something - offer a list.
       (message "Making completion list...")
-      
+
       (unless idlwave-completion-help-links ; already set somewhere?
         (mapcar (lambda (x)  ; Pass link prop through to highlight-linked
                   (let ((link (get-text-property 0 'link (car x))))
                     (if link
-                        (push (cons (car x) link) 
+                        (push (cons (car x) link)
                               idlwave-completion-help-links))))
                 list))
       (let* ((list all-completions)
@@ -6787,7 +6787,7 @@ accumulate information on matching completions."
 ;            (completion-fixup-function               ; Emacs
 ;             (lambda () (and (eq (preceding-char) ?>)
 ;                             (re-search-backward " <" beg t)))))
-             
+
         (setq list (sort list (lambda (a b)
                                 (string< (downcase a) (downcase b)))))
         (if prepare-display-function
@@ -6797,7 +6797,7 @@ accumulate information on matching completions."
                      idlwave-complete-empty-string-as-lower-case)
                  (not idlwave-completion-force-default-case))
             (setq list (mapcar (lambda (x)
-                                 (if (listp x) 
+                                 (if (listp x)
                                      (setcar x (downcase (car x)))
                                    (setq x (downcase x)))
                                  x)
@@ -6817,19 +6817,19 @@ accumulate information on matching completions."
            (re-search-backward "\\<\\(pro\\|function\\)[ \t]+\\="
                                (- (point) 15) t)
            (goto-char (point-min))
-           (re-search-forward 
+           (re-search-forward
             "^[ \t]*\\(pro\\|function\\)[ \t]+\\([a-zA-Z0-9_]+::\\)" nil t))))
       ;; Yank the full class specification
       (insert (match-string 2))
     ;; Do the completion, using list gathered from `idlwave-routines'
-    (idlwave-complete-in-buffer 
-     'class 'class (idlwave-class-alist) nil 
+    (idlwave-complete-in-buffer
+     'class 'class (idlwave-class-alist) nil
      "Select a class" "class"
      '(lambda (list)  ;; Push it to help-links if system help available
         (mapcar (lambda (x)
                   (let* ((entry (idlwave-class-info x))
                          (link (nth 1 (assq 'link entry))))
-                    (if link (push (cons x link) 
+                    (if link (push (cons x link)
                                    idlwave-completion-help-links))
                     x))
                 list)))))
@@ -6841,7 +6841,7 @@ accumulate information on matching completions."
   ;; SHOW-CLASSES is the value of `idlwave-completion-show-classes'.
   (if (or (null show-classes)           ; don't want to see classes
           (null class-selector)         ; not a method call
-          (and 
+          (and
            (stringp class-selector) ; the class is already known
            (not super-classes)))    ; no possibilities for inheritance
       ;; In these cases, we do not have to do anything
@@ -6856,13 +6856,13 @@ accumulate information on matching completions."
            (max (abs show-classes))
            (lmax (if do-dots (apply 'max (mapcar 'length list))))
           classes nclasses class-info space)
-      (mapcar 
+      (mapcar
        (lambda (x)
          ;; get the classes
          (if (eq type 'class-tag)
              ;; Just one class for tags
              (setq classes
-                   (list 
+                   (list
                     (idlwave-class-or-superclass-with-tag class-selector x)))
            ;; Multiple classes for method or method-keyword
            (setq classes
@@ -6871,7 +6871,7 @@ accumulate information on matching completions."
                       method-selector x type-selector)
                    (idlwave-all-method-classes x type-selector)))
            (if inherit
-               (setq classes 
+               (setq classes
                      (delq nil
                            (mapcar (lambda (x) (if (memq x inherit) x nil))
                                    classes)))))
@@ -6908,7 +6908,7 @@ accumulate information on matching completions."
 (defun idlwave-attach-class-tag-classes (list)
   ;; Call idlwave-attach-classes with class structure tags
   (idlwave-attach-classes list 'class-tag idlwave-completion-show-classes))
-                                        
+
 
 ;;----------------------------------------------------------------------
 ;;----------------------------------------------------------------------
@@ -6929,7 +6929,7 @@ sort the list before displaying"
           ((= 1 (length list))
            (setq rtn (car list)))
           ((featurep 'xemacs)
-           (if sort (setq list (sort list (lambda (a b) 
+           (if sort (setq list (sort list (lambda (a b)
                                             (string< (upcase a) (upcase b))))))
            (setq menu
                  (append (list title)
@@ -6940,7 +6940,7 @@ sort the list before displaying"
            (setq resp (get-popup-menu-response menu))
            (funcall (event-function resp) (event-object resp)))
           (t
-           (if sort (setq list (sort list (lambda (a b) 
+           (if sort (setq list (sort list (lambda (a b)
                                             (string< (upcase a) (upcase b))))))
            (setq menu (cons title
                             (list
@@ -7031,7 +7031,7 @@ sort the list before displaying"
     (setq idlwave-before-completion-wconf (current-window-configuration)))
 
   (if (featurep 'xemacs)
-      (idlwave-display-completion-list-xemacs 
+      (idlwave-display-completion-list-xemacs
        list)
     (idlwave-display-completion-list-emacs list))
 
@@ -7112,7 +7112,7 @@ If these don't exist, a letter in the string is automatically selected."
             (mapcar (lambda(x)
                       (princ (nth 1 x))
                       (princ "\n"))
-                    keys-alist))            
+                    keys-alist))
           (setq char (read-char)))
       (setq char (read-char)))
     (message nil)
@@ -7232,7 +7232,7 @@ If these don't exist, a letter in the string is automatically selected."
 (defun idlwave-make-modified-completion-map-emacs (old-map)
   "Replace `choose-completion' and `mouse-choose-completion' in OLD-MAP."
   (let ((new-map (copy-keymap old-map)))
-    (substitute-key-definition 
+    (substitute-key-definition
      'choose-completion 'idlwave-choose-completion new-map)
     (substitute-key-definition
      'mouse-choose-completion 'idlwave-mouse-choose-completion new-map)
@@ -7258,8 +7258,8 @@ If these don't exist, a letter in the string is automatically selected."
 ;;
 ;; - Go again over the documentation how to write a completion
 ;;   plugin.  It is in self.el, but currently still very bad.
-;;   This could be in a separate file in the distribution, or 
-;;   in an appendix for the manual.  
+;;   This could be in a separate file in the distribution, or
+;;   in an appendix for the manual.
 
 (defvar idlwave-struct-skip
   "[ \t]*\\(\\$.*\n\\(^[ \t]*\\(\\$[ \t]*\\)?\\(;.*\\)?\n\\)*\\)?[ \t]*"
@@ -7298,7 +7298,7 @@ Point is expected just before the opening `{' of the struct definition."
          (beg (car borders))
          (end (cdr borders))
          (case-fold-search t))
-    (re-search-forward (concat "\\(^[ \t]*\\|[,{][ \t]*\\)" tag "[ \t]*:") 
+    (re-search-forward (concat "\\(^[ \t]*\\|[,{][ \t]*\\)" tag "[ \t]*:")
                        end t)))
 
 (defun idlwave-struct-inherits ()
@@ -7313,7 +7313,7 @@ Point is expected just before the opening `{' of the struct definition."
       (goto-char beg)
       (save-restriction
         (narrow-to-region beg end)
-        (while (re-search-forward 
+        (while (re-search-forward
                 (concat "[{,]"  ;leading comma/brace
                         idlwave-struct-skip ; 4 groups
                         "inherits"    ; The INHERITS tag
@@ -7363,9 +7363,9 @@ backward."
                   (concat "\\<" (regexp-quote (downcase var)) "\\>" ws)
                 "\\(\\)")
               "=" ws "\\({\\)"
-              (if name 
+              (if name
                   (if (stringp name)
-                      (concat ws "\\(\\<" (downcase name) "\\)[^a-zA-Z0-9_$]") 
+                      (concat ws "\\(\\<" (downcase name) "\\)[^a-zA-Z0-9_$]")
                     ;; Just a generic name
                     (concat ws "\\<\\([a-zA-Z_0-9$]+\\)" ws ","))
                 ""))))
@@ -7376,7 +7376,7 @@ backward."
           (goto-char (match-beginning 3))
           (match-string-no-properties 5)))))
 
-(defvar idlwave-class-info nil) 
+(defvar idlwave-class-info nil)
 (defvar idlwave-class-reset nil) ; to reset buffer-local classes
 
 (add-hook 'idlwave-update-rinfo-hook
@@ -7388,13 +7388,13 @@ backward."
   (let (list entry)
     (if idlwave-class-info
         (if idlwave-class-reset
-            (setq           
+            (setq
              idlwave-class-reset nil
              idlwave-class-info ; Remove any visited in a buffer
-             (delq nil (mapcar 
-                        (lambda (x) 
-                          (let ((filebuf 
-                                 (idlwave-class-file-or-buffer 
+             (delq nil (mapcar
+                        (lambda (x)
+                          (let ((filebuf
+                                 (idlwave-class-file-or-buffer
                                   (or (cdr (assq 'found-in x)) (car x)))))
                             (if (cdr filebuf)
                                 nil
@@ -7432,7 +7432,7 @@ class/struct definition"
           (progn
             ;; For everything there
             (setq end-lim (save-excursion (idlwave-end-of-subprogram) (point)))
-            (while (setq name 
+            (while (setq name
                          (idlwave-find-structure-definition nil t end-lim))
               (funcall all-hook name)))
         (idlwave-find-structure-definition nil (or alt-class class))))))
@@ -7470,11 +7470,11 @@ class/struct definition"
           (insert-file-contents file))
         (save-excursion
           (goto-char 1)
-          (idlwave-find-class-definition class 
+          (idlwave-find-class-definition class
            ;; Scan all of the structures found there
            (lambda (name)
              (let* ((this-class (idlwave-sintern-class name))
-                    (entry 
+                    (entry
                      (list this-class
                            (cons 'tags (idlwave-struct-tags))
                            (cons 'inherits (idlwave-struct-inherits)))))
@@ -7499,7 +7499,7 @@ class/struct definition"
   (condition-case err
       (apply 'append (mapcar 'idlwave-class-tags
                              (cons class (idlwave-all-class-inherits class))))
-    (error           
+    (error
      (idlwave-class-tag-reset)
      (error "%s" (error-message-string err)))))
 
@@ -7536,24 +7536,24 @@ The list is cached in `idlwave-class-info' for faster access."
           all-inherits))))))
 
 (defun idlwave-entry-keywords (entry &optional record-link)
-  "Return the flat entry keywords alist from routine-info entry.  
+  "Return the flat entry keywords alist from routine-info entry.
 If RECORD-LINK is non-nil, the keyword text is copied and a text
 property indicating the link is added."
   (let (kwds)
     (mapcar
-     (lambda (key-list) 
+     (lambda (key-list)
        (let ((file (car key-list)))
          (mapcar (lambda (key-cons)
                    (let ((key (car key-cons))
                          (link (cdr key-cons)))
                      (when (and record-link file)
                          (setq key (copy-sequence key))
-                         (put-text-property 
+                         (put-text-property
                           0 (length key)
-                          'link 
-                          (concat 
-                           file 
-                           (if link 
+                          'link
+                          (concat
+                           file
+                           (if link
                                (concat idlwave-html-link-sep
                                        (number-to-string link))))
                           key))
@@ -7566,13 +7566,13 @@ property indicating the link is added."
   "Find keyword KEYWORD in entry ENTRY, and return (with link) if set"
   (catch 'exit
     (mapc
-     (lambda (key-list) 
+     (lambda (key-list)
        (let ((file (car key-list))
              (kwd (assoc keyword (cdr key-list))))
          (when kwd
-           (setq kwd (cons (car kwd) 
+           (setq kwd (cons (car kwd)
                            (if (and file (cdr kwd))
-                               (concat file 
+                               (concat file
                                        idlwave-html-link-sep
                                        (number-to-string (cdr kwd)))
                              (cdr kwd))))
@@ -7610,14 +7610,14 @@ property indicating the link is added."
           ;; Check if we need to update the "current" class
           (if (not (equal class-selector idlwave-current-tags-class))
               (idlwave-prepare-class-tag-completion class-selector))
-          (setq idlwave-completion-help-info 
+          (setq idlwave-completion-help-info
                 (list 'idlwave-complete-class-structure-tag-help
-                      (idlwave-sintern-routine 
+                      (idlwave-sintern-routine
                        (concat class-selector "__define"))
                       nil))
           (let  ((idlwave-cpl-bold idlwave-current-native-class-tags))
             (idlwave-complete-in-buffer
-             'class-tag 'class-tag 
+             'class-tag 'class-tag
              idlwave-current-class-tags nil
              (format "Select a tag of class %s" class-selector)
              "class tag"
@@ -7663,7 +7663,7 @@ property indicating the link is added."
              (skip-chars-backward "[a-zA-Z0-9_$]")
              (equal (char-before) ?!))
            (setq idlwave-completion-help-info '(idlwave-complete-sysvar-help))
-           (idlwave-complete-in-buffer 'sysvar 'sysvar 
+           (idlwave-complete-in-buffer 'sysvar 'sysvar
                                        idlwave-system-variables-alist nil
                                        "Select a system variable"
                                        "system variable")
@@ -7682,7 +7682,7 @@ property indicating the link is added."
              (or tags (error "System variable !%s is not a structure" var))
              (setq idlwave-completion-help-info
                    (list 'idlwave-complete-sysvar-tag-help var))
-             (idlwave-complete-in-buffer 'sysvartag 'sysvartag 
+             (idlwave-complete-in-buffer 'sysvartag 'sysvartag
                                          tags nil
                                          "Select a system variable tag"
                                          "system variable tag")
@@ -7711,8 +7711,8 @@ property indicating the link is added."
      ((eq mode 'test) ; we can at least link the main
       (and (stringp word) entry main))
      ((eq mode 'set)
-      (if entry 
-          (setq link 
+      (if entry
+          (setq link
                 (if (setq target (cdr (assoc word tags)))
                   (idlwave-substitute-link-target main target)
                 main)))) ;; setting dynamic!!!
@@ -7736,7 +7736,7 @@ property indicating the link is added."
 
 ;; Fake help in the source buffer for class structure tags.
 ;; KWD AND NAME ARE GLOBAL-VARIABLES HERE.
-(defvar name) 
+(defvar name)
 (defvar kwd)
 (defvar idlwave-help-do-class-struct-tag nil)
 (defun idlwave-complete-class-structure-tag-help (mode word)
@@ -7745,11 +7745,11 @@ property indicating the link is added."
     nil)
    ((eq mode 'set)
     (let (class-with found-in)
-      (when (setq class-with 
-                (idlwave-class-or-superclass-with-tag 
+      (when (setq class-with
+                (idlwave-class-or-superclass-with-tag
                  idlwave-current-tags-class
                  word))
-        (if (assq (idlwave-sintern-class class-with) 
+        (if (assq (idlwave-sintern-class class-with)
                   idlwave-system-class-info)
             (error "No help available for system class tags"))
         (if (setq found-in (idlwave-class-found-in class-with))
@@ -7762,7 +7762,7 @@ property indicating the link is added."
 (defun idlwave-class-or-superclass-with-tag (class tag)
   "Find and return the CLASS or one of its superclass with the
 associated TAG, if any."
-  (let ((sclasses (cons class (cdr (assq 'all-inherits 
+  (let ((sclasses (cons class (cdr (assq 'all-inherits
                                          (idlwave-class-info class)))))
         cl)
    (catch 'exit
@@ -7771,7 +7771,7 @@ associated TAG, if any."
        (let ((tags (idlwave-class-tags cl)))
          (while tags
            (if (eq t (compare-strings tag 0 nil (car tags) 0 nil t))
-             (throw 'exit cl))         
+             (throw 'exit cl))
            (setq tags (cdr tags))))))))
 
 
@@ -7794,8 +7794,8 @@ associated TAG, if any."
       (setcar entry (idlwave-sintern-sysvar (car entry) 'set))
       (setq tags (assq 'tags entry))
       (if tags
-          (setcdr tags 
-                  (mapcar (lambda (x) 
+          (setcdr tags
+                  (mapcar (lambda (x)
                             (cons (idlwave-sintern-sysvartag (car x) 'set)
                                   (cdr x)))
                           (cdr tags)))))))
@@ -7812,19 +7812,19 @@ associated TAG, if any."
                          text start)
       (setq start (match-end 0)
             var (match-string 1 text)
-            tags (if (match-end 3) 
+            tags (if (match-end 3)
                      (idlwave-split-string (match-string 3 text))))
       ;; Maintain old links, if present
       (setq old-entry (assq (idlwave-sintern-sysvar var) old))
       (setq link (assq 'link old-entry))
       (setq idlwave-system-variables-alist
-            (cons (list var 
-                        (cons 
-                         'tags 
-                         (mapcar (lambda (x) 
-                                   (cons x 
-                                         (cdr (assq 
-                                               (idlwave-sintern-sysvartag x) 
+            (cons (list var
+                        (cons
+                         'tags
+                         (mapcar (lambda (x)
+                                   (cons x
+                                         (cdr (assq
+                                               (idlwave-sintern-sysvartag x)
                                                (cdr (assq 'tags old-entry))))))
                                  tags)) link)
                   idlwave-system-variables-alist)))
@@ -7846,9 +7846,9 @@ associated TAG, if any."
 
 (defun idlwave-uniquify (list)
   (let ((ht (make-hash-table :size (length list) :test 'equal)))
-    (delq nil 
+    (delq nil
           (mapcar (lambda (x)
-                    (unless (gethash x ht) 
+                    (unless (gethash x ht)
                       (puthash x t ht)
                       x))
                   list))))
@@ -7876,11 +7876,11 @@ Restore the pre-completion window configuration if possible."
       nil)))
 
   ;; Restore the pre-completion window configuration if this is safe.
-  
-  (if (or (eq verify 'force)                                    ; force 
-          (and 
+
+  (if (or (eq verify 'force)                                    ; force
+          (and
            (get-buffer-window "*Completions*")                  ; visible
-           (idlwave-local-value 'idlwave-completion-p 
+           (idlwave-local-value 'idlwave-completion-p
                                 "*Completions*")                ; cib-buffer
            (eq (marker-buffer idlwave-completion-mark)
                (current-buffer))                                ; buffer OK
@@ -7978,7 +7978,7 @@ With ARG, enforce query for the class of object methods."
     (if (string-match "\\(pro\\|function\\)[ \t]+\\(\\(.*\\)::\\)?\\(.*\\)"
                       resolve)
         (setq type (match-string 1 resolve)
-              class (if (match-beginning 2) 
+              class (if (match-beginning 2)
                         (match-string 3 resolve)
                       nil)
               name (match-string 4 resolve)))
@@ -7987,15 +7987,15 @@ With ARG, enforce query for the class of object methods."
 
     (cond
      ((null class)
-      (idlwave-shell-send-command 
+      (idlwave-shell-send-command
        (format "resolve_routine,'%s'%s" (downcase name) kwd)
        'idlwave-update-routine-info
        nil t))
      (t
-      (idlwave-shell-send-command 
+      (idlwave-shell-send-command
        (format "resolve_routine,'%s__define'%s" (downcase class) kwd)
-       (list 'idlwave-shell-send-command 
-             (format "resolve_routine,'%s__%s'%s" 
+       (list 'idlwave-shell-send-command
+             (format "resolve_routine,'%s__%s'%s"
                      (downcase class) (downcase name) kwd)
              '(idlwave-update-routine-info)
              nil t))))))
@@ -8016,19 +8016,19 @@ force class query for object methods."
          (this-buffer (equal arg '(4)))
          (module (idlwave-fix-module-if-obj_new (idlwave-what-module)))
          (default (if module
-                      (concat (idlwave-make-full-name 
+                      (concat (idlwave-make-full-name
                                (nth 2 module) (car module))
                               (if (eq (nth 1 module) 'pro) "<p>" "<f>"))
                     "none"))
-         (list 
+         (list
           (idlwave-uniquify
            (delq nil
-                 (mapcar (lambda (x) 
+                 (mapcar (lambda (x)
                            (if (eq 'system (car-safe (nth 3 x)))
                                ;; Take out system routines with no source.
                                nil
                              (list
-                              (concat (idlwave-make-full-name 
+                              (concat (idlwave-make-full-name
                                        (nth 2 x) (car x))
                                       (if (eq (nth 1 x) 'pro) "<p>" "<f>")))))
                          (if this-buffer
@@ -8057,10 +8057,10 @@ force class query for object methods."
                      (t t)))
     (idlwave-do-find-module name type class nil this-buffer)))
 
-(defun idlwave-do-find-module (name type class 
+(defun idlwave-do-find-module (name type class
                                     &optional force-source this-buffer)
   (let ((name1 (idlwave-make-full-name class name))
-        source buf1 entry 
+        source buf1 entry
         (buf (current-buffer))
         (pos (point))
         file name2)
@@ -8070,11 +8070,11 @@ force class query for object methods."
           name2 (if (nth 2 entry)
                     (idlwave-make-full-name (nth 2 entry) name)
                   name1))
-    (if source  
+    (if source
         (setq file (idlwave-routine-source-file source)))
     (unless file  ; Try to find it on the path.
-      (setq file 
-            (idlwave-expand-lib-file-name 
+      (setq file
+            (idlwave-expand-lib-file-name
              (if class
                  (format "%s__define.pro" (downcase class))
                (format "%s.pro" (downcase name))))))
@@ -8082,14 +8082,14 @@ force class query for object methods."
      ((or (null name) (equal name ""))
       (error "Abort"))
      ((eq (car source) 'system)
-      (error "Source code for system routine %s is not available" 
+      (error "Source code for system routine %s is not available"
              name2))
      ((or (not file) (not (file-regular-p file)))
       (error "Source code for routine %s is not available"
              name2))
      (t
       (when (not this-buffer)
-        (setq buf1 
+        (setq buf1
               (idlwave-find-file-noselect file 'find))
         (pop-to-buffer buf1 t))
       (goto-char (point-max))
@@ -8099,7 +8099,7 @@ force class query for object methods."
                      (cond ((eq type 'fun) "function")
                            ((eq type 'pro) "pro")
                            (t "\\(pro\\|function\\)"))
-                     "\\>[ \t]+" 
+                     "\\>[ \t]+"
                      (regexp-quote (downcase name2))
                      "[^a-zA-Z0-9_$]")
              nil t)
@@ -8136,17 +8136,17 @@ Used by `idlwave-routine-info' and `idlwave-find-module'."
       (cond
        ((and (eq cw 'procedure)
              (not (equal this-word "")))
-        (setq this-word (idlwave-sintern-routine-or-method 
+        (setq this-word (idlwave-sintern-routine-or-method
                          this-word (nth 2 (nth 3 where))))
         (list this-word 'pro
-              (idlwave-determine-class 
+              (idlwave-determine-class
                (cons this-word (cdr (nth 3 where)))
                'pro)))
-       ((and (eq cw 'function) 
+       ((and (eq cw 'function)
              (not (equal this-word ""))
              (or (eq next-char ?\()     ; exclude arrays, vars.
                  (looking-at "[a-zA-Z0-9_]*[ \t]*(")))
-        (setq this-word (idlwave-sintern-routine-or-method 
+        (setq this-word (idlwave-sintern-routine-or-method
                          this-word (nth 2 (nth 3 where))))
         (list this-word 'fun
               (idlwave-determine-class
@@ -8183,7 +8183,7 @@ Used by `idlwave-routine-info' and `idlwave-find-module'."
       class)))
 
 (defun idlwave-fix-module-if-obj_new (module)
-  "Check if MODULE points to obj_new.  
+  "Check if MODULE points to obj_new.
 If yes, and if the cursor is in the keyword region, change to the
 appropriate Init method."
   (let* ((name (car module))
@@ -8204,7 +8204,7 @@ appropriate Init method."
                              (idlwave-sintern-class class)))))
     module))
 
-(defun idlwave-fix-keywords (name type class keywords 
+(defun idlwave-fix-keywords (name type class keywords
                                   &optional super-classes system)
   "Update a list of keywords.
 Translate OBJ_NEW, adding all super-class keywords, or all keywords
@@ -8225,34 +8225,34 @@ demand _EXTRA in the keyword list."
                              string)
                (setq class (idlwave-sintern-class (match-string 1 string)))
                (setq idlwave-current-obj_new-class class)
-               (setq keywords 
-                     (append keywords 
+               (setq keywords
+                     (append keywords
                              (idlwave-entry-keywords
                               (idlwave-rinfo-assq
                                (idlwave-sintern-method "INIT")
                                'fun
                                class
                                (idlwave-routines)) 'do-link))))))
-    
+
     ;; If the class is `t', combine all keywords of all methods NAME
     (when (eq class t)
       (mapc (lambda (entry)
               (and
                (nth 2 entry)             ; non-nil class
                (eq (nth 1 entry) type)   ; correct type
-               (setq keywords 
-                     (append keywords 
+               (setq keywords
+                     (append keywords
                              (idlwave-entry-keywords entry 'do-link)))))
             (idlwave-all-assq name (idlwave-routines)))
       (setq keywords (idlwave-uniquify keywords)))
-    
+
     ;; If we have inheritance, add all keywords from superclasses, if
     ;; the user indicated that method in `idlwave-keyword-class-inheritance'
-    (when (and 
+    (when (and
            super-classes
            idlwave-keyword-class-inheritance
            (stringp class)
-           (or 
+           (or
             system
             (assq (idlwave-sintern-keyword "_extra") keywords)
             (assq (idlwave-sintern-keyword "_ref_extra") keywords))
@@ -8270,7 +8270,7 @@ demand _EXTRA in the keyword list."
                  (mapcar (lambda (k) (add-to-list 'keywords k))
                          (idlwave-entry-keywords entry 'do-link))))
       (setq keywords (idlwave-uniquify keywords)))
-    
+
     ;; Return the final list
     keywords))
 
@@ -8295,14 +8295,14 @@ If we do not know about MODULE, just return KEYWORD literally."
                     (assq (idlwave-sintern-keyword "_REF_EXTRA") kwd-alist)))
          (completion-ignore-case t)
          candidates)
-    (cond ((assq kwd kwd-alist) 
+    (cond ((assq kwd kwd-alist)
            kwd)
           ((setq candidates (all-completions kwd kwd-alist))
            (if (= (length candidates) 1)
                (car candidates)
              candidates))
           ((and entry extra)
-           ;; Inheritance may cause this keyword to be correct 
+           ;; Inheritance may cause this keyword to be correct
            keyword)
           (entry
            ;; We do know the function, which does not have the keyword.
@@ -8314,13 +8314,13 @@ If we do not know about MODULE, just return KEYWORD literally."
 
 (defvar idlwave-rinfo-mouse-map (make-sparse-keymap))
 (defvar idlwave-rinfo-map (make-sparse-keymap))
-(define-key idlwave-rinfo-mouse-map 
+(define-key idlwave-rinfo-mouse-map
   (if (featurep 'xemacs) [button2] [mouse-2])
   'idlwave-mouse-active-rinfo)
-(define-key idlwave-rinfo-mouse-map 
+(define-key idlwave-rinfo-mouse-map
   (if (featurep 'xemacs) [(shift button2)] [(shift mouse-2)])
   'idlwave-mouse-active-rinfo-shift)
-(define-key idlwave-rinfo-mouse-map 
+(define-key idlwave-rinfo-mouse-map
   (if (featurep 'xemacs) [button3] [mouse-3])
   'idlwave-mouse-active-rinfo-right)
 (define-key idlwave-rinfo-mouse-map " " 'idlwave-active-rinfo-space)
@@ -8346,7 +8346,7 @@ If we do not know about MODULE, just return KEYWORD literally."
   (let* ((initial-class (or initial-class class))
          (entry (or (idlwave-best-rinfo-assq name type class
                                              (idlwave-routines))
-                    (idlwave-rinfo-assq name type class 
+                    (idlwave-rinfo-assq name type class
                                         idlwave-unresolved-routines)))
          (name (or (car entry) name))
          (class (or (nth 2 entry) class))
@@ -8371,7 +8371,7 @@ If we do not know about MODULE, just return KEYWORD literally."
          (km-prop (if (featurep 'xemacs) 'keymap 'local-map))
          (face 'idlwave-help-link)
          beg props win cnt total)
-    ;; Fix keywords, but don't add chained super-classes, since these 
+    ;; Fix keywords, but don't add chained super-classes, since these
     ;; are shown separately for that super-class
     (setq keywords (idlwave-fix-keywords name type class keywords))
     (cond
@@ -8413,7 +8413,7 @@ If we do not know about MODULE, just return KEYWORD literally."
                           km-prop idlwave-rinfo-mouse-map
                           'help-echo help-echo-use
                           'data (cons 'usage data)))
-        (if html-file (setq props (append (list 'face face 'link html-file) 
+        (if html-file (setq props (append (list 'face face 'link html-file)
                                           props)))
         (insert "Usage:    ")
         (setq beg (point))
@@ -8422,14 +8422,14 @@ If we do not know about MODULE, just return KEYWORD literally."
                   (format calling-seq name name name name))
                 "\n")
         (add-text-properties beg (point) props)
-        
+
         (insert "Keywords:")
         (if (null keywords)
             (insert " No keywords accepted.")
           (setq col 9)
           (mapcar
            (lambda (x)
-             (if (>= (+ col 1 (length (car x))) 
+             (if (>= (+ col 1 (length (car x)))
                      (window-width))
                  (progn
                    (insert "\n         ")
@@ -8447,7 +8447,7 @@ If we do not know about MODULE, just return KEYWORD literally."
              (add-text-properties beg (point) props)
              (setq col (+ col 1 (length (car x)))))
            keywords))
-        
+
         (setq cnt 1 total (length all))
         ;; Here entry is (key file (list of type-conses))
         (while (setq entry (pop all))
@@ -8460,7 +8460,7 @@ If we do not know about MODULE, just return KEYWORD literally."
                                           (cdr (car (nth 2 entry))))
                             'data (cons 'source data)))
           (idlwave-insert-source-location
-           (format "\n%-8s  %s" 
+           (format "\n%-8s  %s"
                    (if (equal cnt 1)
                        (if (> total 1) "Sources:" "Source:")
                      "")
@@ -8469,7 +8469,7 @@ If we do not know about MODULE, just return KEYWORD literally."
           (incf cnt)
           (when (and all (> cnt idlwave-rinfo-max-source-lines))
             ;; No more source lines, please
-            (insert (format 
+            (insert (format
                      "\n          Source information truncated to %d entries."
                      idlwave-rinfo-max-source-lines))
             (setq all nil)))
@@ -8483,7 +8483,7 @@ If we do not know about MODULE, just return KEYWORD literally."
               (unwind-protect
                   (progn
                     (select-window win)
-                    (enlarge-window (- (/ (frame-height) 2) 
+                    (enlarge-window (- (/ (frame-height) 2)
                                        (window-height)))
                     (shrink-window-if-larger-than-buffer))
                 (select-window ww)))))))))
@@ -8520,9 +8520,9 @@ it."
      ((and (not file) shell-flag)
       (insert "Unresolved"))
 
-     ((null file)               
+     ((null file)
       (insert "ERROR"))
-     
+
      ((idlwave-syslib-p file)
       (if (string-match "obsolete" (file-name-directory file))
           (insert "Obsolete  ")
@@ -8536,7 +8536,7 @@ it."
      ;; Old special syntax: a matching regexp
      ((setq special (idlwave-special-lib-test file))
       (insert (format "%-10s" special)))
-     
+
      ;; Catch-all with file
      ((idlwave-lib-p file)      (insert "Library   "))
 
@@ -8551,7 +8551,7 @@ it."
                (if shell-flag "S" "-")
                (if buffer-flag "B" "-")
                "] ")))
-    (when (> ndupl 1) 
+    (when (> ndupl 1)
       (setq beg (point))
       (insert (format "(%dx) " ndupl))
       (add-text-properties beg (point) (list 'face 'bold)))
@@ -8575,7 +8575,7 @@ Return the name of the special lib if there is a match."
                   alist nil)))
       rtn)
      (t nil))))
-  
+
 (defun idlwave-mouse-active-rinfo-right (ev)
   (interactive "e")
   (idlwave-mouse-active-rinfo ev 'right))
@@ -8594,7 +8594,7 @@ Optional args RIGHT and SHIFT indicate, if mouse-3 was used, and if SHIFT
 was pressed."
   (interactive "e")
   (if ev (mouse-set-point ev))
-  (let (data id name type class buf bufwin source link keyword 
+  (let (data id name type class buf bufwin source link keyword
              word initial-class)
     (setq data (get-text-property (point) 'data)
           source (get-text-property (point) 'source)
@@ -8609,9 +8609,9 @@ was pressed."
 
     (cond ((eq id 'class) ; Switch class being displayed
            (if (window-live-p bufwin) (select-window bufwin))
-           (idlwave-display-calling-sequence 
+           (idlwave-display-calling-sequence
             (idlwave-sintern-method name)
-            type (idlwave-sintern-class word) 
+            type (idlwave-sintern-class word)
             initial-class))
           ((eq id 'usage) ; Online help on this routine
            (idlwave-online-help link name type class))
@@ -8652,9 +8652,9 @@ was pressed."
       (setq bwin (get-buffer-window buffer)))
     (if (eq (preceding-char) ?/)
         (insert keyword)
-      (unless (save-excursion 
+      (unless (save-excursion
                 (re-search-backward
-                 "[(,][ \t]*\\(\\$[ \t]*\\(;.*\\)?\n\\)?[ \t]*\\=" 
+                 "[(,][ \t]*\\(\\$[ \t]*\\(;.*\\)?\n\\)?[ \t]*\\="
                  (min (- (point) 100) (point-min)) t))
         (insert ", "))
       (if shift (insert "/"))
@@ -8706,7 +8706,7 @@ the load path in order to find a definition.  The output of this
 command can be used to detect possible name clashes during this process."
   (idlwave-routines)  ; Make sure everything is loaded.
   (unless (or idlwave-user-catalog-routines idlwave-library-catalog-routines)
-    (or (y-or-n-p 
+    (or (y-or-n-p
          "You don't have any user or library catalogs.  Continue anyway? ")
         (error "Abort")))
   (let* ((routines (append idlwave-system-routines
@@ -8719,7 +8719,7 @@ command can be used to detect possible name clashes during this process."
          (keymap (make-sparse-keymap))
          (props (list 'mouse-face 'highlight
                       km-prop keymap
-                      'help-echo "Mouse2: Find source"))      
+                      'help-echo "Mouse2: Find source"))
          (nroutines (length (or special-routines routines)))
          (step (/ nroutines 100))
          (n 0)
@@ -8742,13 +8742,13 @@ command can be used to detect possible name clashes during this process."
     (message "Sorting routines...done")
 
     (define-key keymap (if (featurep 'xemacs) [(button2)] [(mouse-2)])
-      (lambda (ev) 
+      (lambda (ev)
         (interactive "e")
         (mouse-set-point ev)
         (apply 'idlwave-do-find-module
                (get-text-property (point) 'find-args))))
     (define-key keymap [(return)]
-      (lambda () 
+      (lambda ()
         (interactive)
         (apply 'idlwave-do-find-module
                (get-text-property (point) 'find-args))))
@@ -8774,13 +8774,13 @@ command can be used to detect possible name clashes during this process."
                   (> (idlwave-count-memq 'buffer (nth 2 (car dtwins))) 1))
           (incf cnt)
           (insert (format "\n%s%s"
-                          (idlwave-make-full-name (nth 2 routine) 
+                          (idlwave-make-full-name (nth 2 routine)
                                                   (car routine))
                           (if (eq (nth 1 routine) 'fun) "()" "")))
           (while (setq twin (pop dtwins))
             (setq props1 (append (list 'find-args
-                                       (list (nth 0 routine) 
-                                             (nth 1 routine) 
+                                       (list (nth 0 routine)
+                                             (nth 1 routine)
                                              (nth 2 routine)))
                                  props))
             (idlwave-insert-source-location "\n   - " twin props1))))
@@ -8803,7 +8803,7 @@ command can be used to detect possible name clashes during this process."
              (or (not (stringp sfile))
                  (not (string-match "\\S-" sfile))))
         (setq stype 'unresolved))
-    (princ (format "      %-10s %s\n" 
+    (princ (format "      %-10s %s\n"
                    stype
                    (if sfile sfile "No source code available")))))
 
@@ -8822,20 +8822,20 @@ ENTRY will also be returned, as the first item of this list."
                (eq type (nth 1 candidate))
                (eq class (nth 2 candidate)))
           (push candidate twins)))
-    (if (setq candidate (idlwave-rinfo-assq name type class 
+    (if (setq candidate (idlwave-rinfo-assq name type class
                                             idlwave-unresolved-routines))
         (push candidate twins))
     (cons entry (nreverse twins))))
 
 (defun idlwave-study-twins (entries)
-  "Return dangerous twins of first entry in ENTRIES.  
+  "Return dangerous twins of first entry in ENTRIES.
 Dangerous twins are routines with same name, but in different files on
 the load path.  If a file is in the system library and has an entry in
 the `idlwave-system-routines' list, we omit the latter as
 non-dangerous because many IDL routines are implemented as library
 routines, and may have been scanned."
   (let* ((entry (car entries))
-         (name (car entry))      ; 
+         (name (car entry))      ;
          (type (nth 1 entry))    ; Must be bound for
          (class (nth 2 entry))   ;  idlwave-routine-twin-compare
          (cnt 0)
@@ -8853,23 +8853,23 @@ routines, and may have been scanned."
                       (t 'unresolved)))
 
       ;; Check for an entry in the system library
-      (if (and file 
+      (if (and file
                (not syslibp)
                (idlwave-syslib-p file))
           (setq syslibp t))
-      
+
       ;; If there's more than one matching entry for the same file, just
       ;; append the type-cons to the type list.
       (if (setq entry (assoc key alist))
           (push type-cons (nth 2 entry))
         (push (list key file (list type-cons)) alist)))
-    
+
     (setq alist (nreverse alist))
-    
+
     (when syslibp
       ;; File is in system *library* - remove any 'system entry
       (setq alist (delq (assq 'system alist) alist)))
-    
+
     ;; If 'system remains and we've scanned the syslib, it's a builtin
     ;; (rather than a !DIR/lib/.pro file bundled as source).
     (when (and (idlwave-syslib-scanned-p)
@@ -8905,7 +8905,7 @@ compares twins on the basis of their file names and path locations."
      ((not (eq type (nth 1 b)))
       ;; Type decides
       (< (if (eq type 'fun) 1 0) (if (eq (nth 1 b) 'fun) 1 0)))
-     (t 
+     (t
       ;; A and B are twins - so the decision is more complicated.
       ;; Call twin-compare with the proper arguments.
       (idlwave-routine-entry-compare-twins a b)))))
@@ -8957,7 +8957,7 @@ This expects NAME TYPE CLASS to be bound to the right values."
          (tpath-alist (idlwave-true-path-alist))
          (apathp (and (stringp akey)
                       (assoc (file-name-directory akey) tpath-alist)))
-         (bpathp (and (stringp bkey) 
+         (bpathp (and (stringp bkey)
                       (assoc (file-name-directory bkey) tpath-alist)))
          ;; How early on search path?  High number means early since we
          ;; measure the tail of the path list
@@ -8993,7 +8993,7 @@ This expects NAME TYPE CLASS to be bound to the right values."
      (t                                nil))))  ; Default
 
 (defun idlwave-routine-source-file (source)
-  (if (nth 2 source) 
+  (if (nth 2 source)
       (expand-file-name (nth 1 source) (nth 2 source))
     (nth 1 source)))
 
@@ -9083,7 +9083,7 @@ Assumes that point is at the beginning of the unit as found by
   (forward-sexp 2)
   (forward-sexp -1)
   (let ((begin (point)))
-    (re-search-forward 
+    (re-search-forward
      "[a-zA-Z_][a-zA-Z0-9$_]+\\(::[a-zA-Z_][a-zA-Z0-9$_]+\\)?")
     (if (fboundp 'buffer-substring-no-properties)
         (buffer-substring-no-properties begin (point))
@@ -9123,7 +9123,7 @@ Assumes that point is at the beginning of the unit as found by
   (start-process "idldeclient" nil
                  idlwave-shell-explicit-file-name "-c" "-e"
                  (buffer-file-name)))
-  
+
 (defvar idlwave-help-use-assistant)
 (defun idlwave-launch-idlhelp ()
   "Start the IDLhelp application."
@@ -9131,7 +9131,7 @@ Assumes that point is at the beginning of the unit as found by
   (if idlwave-help-use-assistant
       (idlwave-help-assistant-raise)
     (start-process "idlhelp" nil idlwave-help-application)))
- 
+
 ;; Menus - using easymenu.el
 (defvar idlwave-mode-menu-def
   `("IDLWAVE"
@@ -9150,7 +9150,7 @@ Assumes that point is at the beginning of the unit as found by
      ["Block" idlwave-mark-block t]
      ["Header" idlwave-mark-doclib t])
     ("Format"
-     ["Indent Entire Statement" idlwave-indent-statement 
+     ["Indent Entire Statement" idlwave-indent-statement
       :active t :keys "C-u \\[indent-for-tab-command]" ]
      ["Indent Subprogram" idlwave-indent-subprogram t]
      ["(Un)Comment Region" idlwave-toggle-comment-region t]
@@ -9220,7 +9220,7 @@ Assumes that point is at the beginning of the unit as found by
     ("Customize"
      ["Browse IDLWAVE Group" idlwave-customize t]
      "--"
-     ["Build Full Customize Menu" idlwave-create-customize-menu 
+     ["Build Full Customize Menu" idlwave-create-customize-menu
       (fboundp 'customize-menu-create)])
     ("Documentation"
      ["Describe Mode" describe-mode t]
@@ -9237,22 +9237,22 @@ Assumes that point is at the beginning of the unit as found by
   '("Debug"
     ["Start IDL shell" idlwave-shell t]
     ["Save and .RUN buffer" idlwave-shell-save-and-run
-     (and (boundp 'idlwave-shell-automatic-start) 
+     (and (boundp 'idlwave-shell-automatic-start)
           idlwave-shell-automatic-start)]))
 
 (if (or (featurep 'easymenu) (load "easymenu" t))
     (progn
-      (easy-menu-define idlwave-mode-menu idlwave-mode-map 
-                        "IDL and WAVE CL editing menu" 
+      (easy-menu-define idlwave-mode-menu idlwave-mode-map
+                        "IDL and WAVE CL editing menu"
                         idlwave-mode-menu-def)
-      (easy-menu-define idlwave-mode-debug-menu idlwave-mode-map 
-                        "IDL and WAVE CL editing menu" 
+      (easy-menu-define idlwave-mode-debug-menu idlwave-mode-map
+                        "IDL and WAVE CL editing menu"
                         idlwave-mode-debug-menu-def)))
 
 (defun idlwave-customize ()
   "Call the customize function with idlwave as argument."
   (interactive)
-  ;; Try to load the code for the shell, so that we can customize it 
+  ;; Try to load the code for the shell, so that we can customize it
   ;; as well.
   (or (featurep 'idlw-shell)
       (load "idlw-shell" t))
@@ -9263,11 +9263,11 @@ Assumes that point is at the beginning of the unit as found by
   (interactive)
   (if (fboundp 'customize-menu-create)
       (progn
-        ;; Try to load the code for the shell, so that we can customize it 
+        ;; Try to load the code for the shell, so that we can customize it
         ;; as well.
         (or (featurep 'idlw-shell)
             (load "idlw-shell" t))
-        (easy-menu-change 
+        (easy-menu-change
          '("IDLWAVE") "Customize"
          `(["Browse IDLWAVE group" idlwave-customize t]
            "--"
@@ -9315,7 +9315,7 @@ This function was written since `list-abbrevs' looks terrible for IDLWAVE mode."
   (let ((table (symbol-value 'idlwave-mode-abbrev-table))
         abbrevs
         str rpl func fmt (len-str 0) (len-rpl 0))
-    (mapatoms 
+    (mapatoms
      (lambda (sym)
        (if (symbol-value sym)
            (progn
@@ -9341,7 +9341,7 @@ This function was written since `list-abbrevs' looks terrible for IDLWAVE mode."
     (with-output-to-temp-buffer "*Help*"
       (if arg
           (progn
-            (princ "Abbreviations and Actions in IDLWAVE-Mode\n") 
+            (princ "Abbreviations and Actions in IDLWAVE-Mode\n")
             (princ "=========================================\n\n")
             (princ (format fmt "KEY" "REPLACE" "HOOK"))
             (princ (format fmt "---" "-------" "----")))
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 109455e9e61..c7341a9f871 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -836,8 +836,8 @@ Makefile mode can be configured by modifying the following variables:
           nil nil
           ((?$ . "."))
           backward-paragraph
-          (font-lock-syntactic-keywords . makefile-font-lock-syntactic-keywords)
-          (font-lock-support-mode)))    ; JIT breaks on long series of continuation lines.
+          (font-lock-syntactic-keywords
+           . makefile-font-lock-syntactic-keywords)))
 
   ;; Add-log.
   (make-local-variable 'add-log-current-defun-function)
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 14b47475eb1..c29a259c3a6 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -41,27 +41,27 @@
 
 
 (defcustom prolog-program-name
-  (let ((names '("prolog" "gprolog")))
+  (let ((names '("prolog" "gprolog" "swipl")))
     (while (and names
                 (not (executable-find (car names))))
       (setq names (cdr names)))
     (or (car names) "prolog"))
-  "*Program name for invoking an inferior Prolog with `run-prolog'."
+  "Program name for invoking an inferior Prolog with `run-prolog'."
   :type 'string
   :group 'prolog)
 
 (defcustom prolog-consult-string "reconsult(user).\n"
-  "*(Re)Consult mode (for C-Prolog and Quintus Prolog). "
+  "(Re)Consult mode (for C-Prolog and Quintus Prolog). "
   :type 'string
   :group 'prolog)
 
 (defcustom prolog-compile-string "compile(user).\n"
-  "*Compile mode (for Quintus Prolog)."
+  "Compile mode (for Quintus Prolog)."
   :type 'string
   :group 'prolog)
 
 (defcustom prolog-eof-string "end_of_file.\n"
-  "*String that represents end of file for Prolog.
+  "String that represents end of file for Prolog.
 When nil, send actual operating system end of file."
   :type 'string
   :group 'prolog)
@@ -121,7 +121,21 @@ When nil, send actual operating system end of file."
 (defvar prolog-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map "\e\C-x" 'prolog-consult-region)
+    (define-key map "\C-c\C-l" 'inferior-prolog-load-file)
+    (define-key map "\C-c\C-z" 'switch-to-prolog)
     map))
+ 
+(easy-menu-define prolog-mode-menu prolog-mode-map "Menu for Prolog mode."
+  ;; Mostly copied from scheme-mode's menu.
+  ;; Not tremendously useful, but it's a start.
+  '("Prolog"
+    ["Indent line" indent-according-to-mode t]
+    ["Indent region" indent-region t]
+    ["Comment region" comment-region t]
+    ["Uncomment region" uncomment-region t]
+    "--"
+    ["Run interactive Prolog session" run-prolog t]
+    ))
 
 ;;;###autoload
 (defun prolog-mode ()
@@ -138,29 +152,24 @@ if that value is non-nil."
   (setq major-mode 'prolog-mode)
   (setq mode-name "Prolog")
   (prolog-mode-variables)
+  (set (make-local-variable 'comment-add) 1)
   ;; font lock
   (setq font-lock-defaults '(prolog-font-lock-keywords
                              nil nil nil
                              beginning-of-line))
   (run-mode-hooks 'prolog-mode-hook))
 
-(defun prolog-indent-line (&optional whole-exp)
+(defun prolog-indent-line ()
   "Indent current line as Prolog code.
 With argument, indent any additional lines of the same clause
 rigidly along with this one (not yet)."
   (interactive "p")
   (let ((indent (prolog-indent-level))
-        (pos (- (point-max) (point))) beg)
+        (pos (- (point-max) (point))))
     (beginning-of-line)
-    (setq beg (point))
-    (skip-chars-forward " \t")
-    (if (zerop (- indent (current-column)))
-        nil
-      (delete-region beg (point))
-      (indent-to indent))
+    (indent-line-to indent)
     (if (> (- (point-max) pos) (point))
-        (goto-char (- (point-max) pos)))
-    ))
+        (goto-char (- (point-max) pos)))))
 
 (defun prolog-indent-level ()
   "Compute Prolog indentation level."
@@ -224,6 +233,8 @@ rigidly along with this one (not yet)."
   (let ((map (make-sparse-keymap)))
     ;; This map will inherit from `comint-mode-map' when entering
     ;; inferior-prolog-mode.
+    (define-key map [remap self-insert-command]
+      'inferior-prolog-self-insert-command)
     map))
 
 (defvar inferior-prolog-mode-syntax-table prolog-mode-syntax-table)
@@ -256,36 +267,129 @@ Return not at end copies rest of line to end and sends it.
   (setq comint-prompt-regexp "^| [ ?][- ] *")
   (prolog-mode-variables))
 
+(defvar inferior-prolog-buffer nil)
+
+(defun inferior-prolog-run (&optional name)
+  (with-current-buffer (make-comint "prolog" (or name prolog-program-name))
+    (inferior-prolog-mode)
+    (setq-default inferior-prolog-buffer (current-buffer))
+    (make-local-variable 'inferior-prolog-buffer)
+    (when (and name (not (equal name prolog-program-name)))
+      (set (make-local-variable 'prolog-program-name) name))
+    (set (make-local-variable 'inferior-prolog-flavor)
+         ;; Force re-detection.
+         (let* ((proc (get-buffer-process (current-buffer)))
+                (pmark (and proc (marker-position (process-mark proc)))))
+           (cond
+            ((null pmark) (1- (point-min)))
+            ;; The use of insert-before-markers in comint.el together with
+            ;; the potential use of comint-truncate-buffer in the output
+            ;; filter, means that it's difficult to reliably keep track of
+            ;; the buffer position where the process's output started.
+            ;; If possible we use a marker at "start - 1", so that
+            ;; insert-before-marker at `start' won't shift it.  And if not,
+            ;; we fall back on using a plain integer.
+            ((> pmark (point-min)) (copy-marker (1- pmark)))
+            (t (1- pmark)))))
+    (add-hook 'comint-output-filter-functions
+              'inferior-prolog-guess-flavor nil t)))
+
+(defun inferior-prolog-process (&optional dontstart)
+  (or (and (buffer-live-p inferior-prolog-buffer)
+           (get-buffer-process inferior-prolog-buffer))
+      (unless dontstart
+        (inferior-prolog-run)
+        ;; Try again.
+        (inferior-prolog-process))))
+
+(defvar inferior-prolog-flavor 'unknown
+  "Either a symbol or a buffer position offset by one.
+If a buffer position, the flavor has not been determined yet and
+it is expected that the process's output has been or will
+be inserted at that position plus one.")
+
+(defun inferior-prolog-guess-flavor (&optional ignored)
+  (save-excursion
+    (goto-char (1+ inferior-prolog-flavor))
+    (setq inferior-prolog-flavor
+          (cond
+           ((looking-at "GNU Prolog") 'gnu)
+           ((looking-at "Welcome to SWI-Prolog") 'swi)
+           ((looking-at ".*\n") 'unknown) ;There's at least one line.
+           (t inferior-prolog-flavor))))
+  (when (symbolp inferior-prolog-flavor)
+    (remove-hook 'comint-output-filter-functions
+                 'inferior-prolog-guess-flavor t)
+    (if (eq inferior-prolog-flavor 'gnu)
+        (set (make-local-variable 'comint-process-echoes) t))))
+
 ;;;###autoload
-(defun run-prolog ()
-  "Run an inferior Prolog process, input and output via buffer *prolog*."
+(defalias 'run-prolog 'switch-to-prolog)
+;;;###autoload
+(defun switch-to-prolog (&optional name)
+  "Run an inferior Prolog process, input and output via buffer *prolog*.
+With prefix argument \\[universal-prefix], prompt for the program to use."
+  (interactive
+   (list (when current-prefix-arg
+           (let ((proc (inferior-prolog-process 'dontstart)))
+             (if proc
+                 (if (yes-or-no-p "Kill current process before starting new one? ")
+                     (kill-process proc)
+                   (error "Abort")))
+             (read-string "Run Prolog: " prolog-program-name)))))
+  (unless (inferior-prolog-process 'dontstart)
+    (inferior-prolog-run name))
+  (pop-to-buffer inferior-prolog-buffer))
+
+(defun inferior-prolog-self-insert-command ()
+  "Insert the char in the buffer or pass it directly to the process."
   (interactive)
-  (require 'comint)
-  (pop-to-buffer (make-comint "prolog" prolog-program-name))
-  (inferior-prolog-mode))
+  (let* ((proc (get-buffer-process (current-buffer)))
+         (pmark (and proc (marker-position (process-mark proc)))))
+    (if (and (eq inferior-prolog-flavor 'gnu)
+             pmark
+             (null current-prefix-arg)
+             (eobp)
+             (eq (point) pmark)
+             (save-excursion
+               (goto-char (- pmark 3))
+               (looking-at " \\? ")))
+        (comint-send-string proc (string last-command-char))
+      (call-interactively 'self-insert-command))))
 
 (defun prolog-consult-region (compile beg end)
   "Send the region to the Prolog process made by \"M-x run-prolog\".
 If COMPILE (prefix arg) is not nil, use compile mode rather than consult mode."
   (interactive "P\nr")
-  (save-excursion
-    (if compile
-        (process-send-string "prolog" prolog-compile-string)
-      (process-send-string "prolog" prolog-consult-string))
-    (process-send-region "prolog" beg end)
-    (process-send-string "prolog" "\n")         ;May be unnecessary
+  (let ((proc (inferior-prolog-process)))
+    (comint-send-string proc
+                        (if compile prolog-compile-string
+                          prolog-consult-string))
+    (comint-send-region proc beg end)
+    (comint-send-string proc "\n")              ;May be unnecessary
     (if prolog-eof-string
-        (process-send-string "prolog" prolog-eof-string)
-      (process-send-eof "prolog")))) ;Send eof to prolog process.
+        (comint-send-string proc prolog-eof-string)
+      (with-current-buffer (process-buffer proc)
+        (comint-send-eof))))) ;Send eof to prolog process.
 
 (defun prolog-consult-region-and-go (compile beg end)
   "Send the region to the inferior Prolog, and switch to *prolog* buffer.
 If COMPILE (prefix arg) is not nil, use compile mode rather than consult mode."
   (interactive "P\nr")
   (prolog-consult-region compile beg end)
-  (switch-to-buffer "*prolog*"))
+  (pop-to-buffer inferior-prolog-buffer))
+
+(defun inferior-prolog-load-file ()
+  "Pass the current buffer's file to the inferior prolog process."
+  (interactive)
+  (save-buffer)
+  (let ((file buffer-file-name)
+        (proc (inferior-prolog-process)))
+    (with-current-buffer (process-buffer proc)
+      (comint-send-string proc (concat "['" (file-relative-name file) "'].\n"))
+      (pop-to-buffer (current-buffer)))))
 
 (provide 'prolog)
 
-;;; arch-tag: f3ec6748-1272-4ab6-8826-c50cb1607636
+;; arch-tag: f3ec6748-1272-4ab6-8826-c50cb1607636
 ;;; prolog.el ends here
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index c38a6e82f83..0387c05134e 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -67,7 +67,8 @@
 (eval-when-compile
   (require 'cl)
   (require 'compile)
-  (require 'comint))
+  (require 'comint)
+  (require 'hippie-exp))
 
 (autoload 'comint-mode "comint")
 
@@ -95,7 +96,9 @@
              "import" "in" "is" "lambda" "not" "or" "pass" "print"
              "raise" "return" "try" "while" "yield"
              ;; Future keywords
-             "as" "None")
+             "as" "None"
+             ;; Not real keywords, but close enough to be fontified as such
+             "self" "True" "False")
          symbol-end)
     ;; Definitions
     (,(rx symbol-start (group "class") (1+ space) (group (1+ (or word ?_))))
@@ -1286,7 +1289,7 @@ Don't save anything for STR matching `inferior-python-filter-regexp'."
                     ;; Maybe we could be more selective here.
                     (if (zerop (length res))
                         (not (bolp))
-                      (string-match res ".\\'"))))
+                      (string-match ".\\'" res))))
            ;; The need for this seems to be system-dependent:
            ;; What is this all about, exactly?  --Stef
            ;; (if (and (eq ?. (aref s 0)))
@@ -1330,30 +1333,30 @@ buffer for a list of commands.)"
   ;; (not a name) in Python buffers from which `run-python' &c is
   ;; invoked.  Would support multiple processes better.
   (when (or new (not (comint-check-proc python-buffer)))
-    (save-current-buffer
-      (let* ((cmdlist (append (python-args-to-list cmd) '("-i")))
-             (path (getenv "PYTHONPATH"))
-             (process-environment       ; to import emacs.py
-              (cons (concat "PYTHONPATH=" data-directory
-                            (if path (concat ":" path)))
-                    process-environment)))
-        (set-buffer (apply 'make-comint-in-buffer "Python"
-                           (generate-new-buffer "*Python*")
-                           (car cmdlist) nil (cdr cmdlist)))
-        (setq-default python-buffer (current-buffer))
-        (setq python-buffer (current-buffer)))
+    (with-current-buffer
+        (let* ((cmdlist (append (python-args-to-list cmd) '("-i")))
+               (path (getenv "PYTHONPATH"))
+               (process-environment     ; to import emacs.py
+                (cons (concat "PYTHONPATH=" data-directory
+                              (if path (concat ":" path)))
+                      process-environment)))
+          (apply 'make-comint-in-buffer "Python"
+                 (if new (generate-new-buffer "*Python*") "*Python*")
+                 (car cmdlist) nil (cdr cmdlist)))
+      (setq-default python-buffer (current-buffer))
+      (setq python-buffer (current-buffer))
       (accept-process-output (get-buffer-process python-buffer) 5)
-      (inferior-python-mode)))
+      (inferior-python-mode)
+      ;; Load function definitions we need.
+      ;; Before the preoutput function was used, this was done via -c in
+      ;; cmdlist, but that loses the banner and doesn't run the startup
+      ;; file.  The code might be inline here, but there's enough that it
+      ;; seems worth putting in a separate file, and it's probably cleaner
+      ;; to put it in a module.
+      ;; Ensure we're at a prompt before doing anything else.
+      (python-send-receive "import emacs; print '_emacs_out ()'")))
   (if (derived-mode-p 'python-mode)
       (setq python-buffer (default-value 'python-buffer))) ; buffer-local
-  ;; Load function definitions we need.
-  ;; Before the preoutput function was used, this was done via -c in
-  ;; cmdlist, but that loses the banner and doesn't run the startup
-  ;; file.  The code might be inline here, but there's enough that it
-  ;; seems worth putting in a separate file, and it's probably cleaner
-  ;; to put it in a module.
-  ;; Ensure we're at a prompt before doing anything else.
-  (python-send-receive "import emacs; print '_emacs_out ()'")
   ;; Without this, help output goes into the inferior python buffer if
   ;; the process isn't already running.
   (sit-for 1 t)        ;Should we use accept-process-output instead?  --Stef
@@ -1369,15 +1372,20 @@ buffer for a list of commands.)"
 (defun python-send-command (command)
   "Like `python-send-string' but resets `compilation-shell-minor-mode'.
 COMMAND should be a single statement."
-  (assert (not (string-match "\n" command)))
-  (let ((end (marker-position (process-mark (python-proc)))))
+  ;; (assert (not (string-match "\n" command)))
+  ;; (let ((end (marker-position (process-mark (python-proc)))))
     (with-current-buffer python-buffer (goto-char (point-max)))
     (compilation-forget-errors)
-    ;; Must wait until this has completed before re-setting variables below.
-    (python-send-receive (concat command "; print '_emacs_out ()'"))
+    (python-send-string command)
     (with-current-buffer python-buffer
-      (set-marker compilation-parsing-end end)
-      (setq compilation-last-buffer (current-buffer)))))
+      (setq compilation-last-buffer (current-buffer)))
+    ;; No idea what this is for but it breaks the call to
+    ;; compilation-fake-loc in python-send-region.  -- Stef
+    ;; Must wait until this has completed before re-setting variables below.
+    ;; (python-send-receive "print '_emacs_out ()'")
+    ;; (with-current-buffer python-buffer
+    ;;   (set-marker compilation-parsing-end end))
+    ) ;;)
 
 (defun python-send-region (start end)
   "Send the region to the inferior Python process."
@@ -1419,11 +1427,13 @@ COMMAND should be a single statement."
   "Evaluate STRING in inferior Python process."
   (interactive "sPython command: ")
   (comint-send-string (python-proc) string)
-  (comint-send-string (python-proc)
-                      ;; If the string is single-line or if it ends with \n,
-                      ;; only add a single \n, otherwise add 2, so as to
-                      ;; make sure we terminate the multiline instruction.
-                      (if (string-match "\n.+\\'" string) "\n\n" "\n")))
+  (unless (string-match "\n\\'" string)
+    ;; Make sure the text is properly LF-terminated.
+    (comint-send-string (python-proc) "\n"))
+  (when (string-match "\n[ \t].*\n?\\'" string)
+    ;; If the string contains a final indented line, add a second newline so
+    ;; as to make sure we terminate the multiline instruction.
+    (comint-send-string (python-proc) "\n")))
 
 (defun python-send-buffer ()
   "Send the current buffer to the inferior Python process."
@@ -1594,24 +1604,26 @@ Only works when point is in a function name, not its arg list, for
 instance.  Assumes an inferior Python is running."
   (let ((symbol (with-syntax-table python-dotty-syntax-table
                   (current-word))))
-    ;; First try the symbol we're on.
-    (or (and symbol
-             (python-send-receive (format "emacs.eargs(%S, %s)"
-                                          symbol python-imports)))
-        ;; Try moving to symbol before enclosing parens.
-        (let ((s (syntax-ppss)))
-          (unless (zerop (car s))
-            (when (eq ?\( (char-after (nth 1 s)))
-              (save-excursion
-                (goto-char (nth 1 s))
-                (skip-syntax-backward "-")
-                (let ((point (point)))
-                  (skip-chars-backward "a-zA-Z._")
-                  (if (< (point) point)
-                      (python-send-receive
-                       (format "emacs.eargs(%S, %s)"
-                               (buffer-substring-no-properties (point) point)
-                               python-imports)))))))))))
+    ;; This is run from timers, so inhibit-quit tends to be set.
+    (with-local-quit
+      ;; First try the symbol we're on.
+      (or (and symbol
+               (python-send-receive (format "emacs.eargs(%S, %s)"
+                                            symbol python-imports)))
+          ;; Try moving to symbol before enclosing parens.
+          (let ((s (syntax-ppss)))
+            (unless (zerop (car s))
+              (when (eq ?\( (char-after (nth 1 s)))
+                (save-excursion
+                  (goto-char (nth 1 s))
+                  (skip-syntax-backward "-")
+                  (let ((point (point)))
+                    (skip-chars-backward "a-zA-Z._")
+                    (if (< (point) point)
+                        (python-send-receive
+                         (format "emacs.eargs(%S, %s)"
+                                 (buffer-substring-no-properties (point) point)
+                                 python-imports))))))))))))
 
 ;;;; Info-look functionality.
 
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index f828c36917b..83b4bdea759 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -2460,46 +2460,45 @@ we go to the end of the previous line and do not check for continuations."
   ;;
   (if (bolp)
       nil
-    (let (c min-point
-          (start (point)))
-      (save-restriction
-        (narrow-to-region
-        (if (sh-this-is-a-continuation)
-            (setq min-point (sh-prev-line nil))
-          (save-excursion
-            (beginning-of-line)
-            (setq min-point (point))))
-        (point))
-        (skip-chars-backward " \t;")
-        (unless (looking-at "\\s-*;;")
-        (skip-chars-backward "^)}];\"'`({[")
-        (setq c (char-before))))
-      (sh-debug "stopping at %d c is %s  start=%d min-point=%d"
-                (point) c start min-point)
-      (if (< (point) min-point)
-          (error "point %d < min-point %d" (point) min-point))
-      (cond
-       ((looking-at "\\s-*;;")
-        ;; (message "Found ;; !")
-       ";;")
-       ((or (eq c ?\n)
-            (eq c nil)
-            (eq c ?\;))
-       (save-excursion
-         ;; skip forward over white space newline and \ at eol
-         (skip-chars-forward " \t\n\\\\")
-         (sh-debug "Now at %d   start=%d" (point) start)
-         (if (>= (point) start)
-             (progn
-               (sh-debug "point: %d >= start: %d" (point) start)
-               nil)
-           (sh-get-word))
-         ))
-       (t
-        ;; c    -- return a string
-       (char-to-string c)
-       ))
-      )))
+    (let ((start (point))
+          (min-point (if (sh-this-is-a-continuation)
+                         (sh-prev-line nil)
+                       (line-beginning-position))))
+      (skip-chars-backward " \t;" min-point)
+      (if (looking-at "\\s-*;;")
+          ;; (message "Found ;; !")
+          ";;"
+        (skip-chars-backward "^)}];\"'`({[" min-point)
+        (let ((c (if (> (point) min-point) (char-before))))
+          (sh-debug "stopping at %d c is %s  start=%d min-point=%d"
+                    (point) c start min-point)
+          (if (not (memq c '(?\n nil ?\;)))
+              ;; c      -- return a string
+              (char-to-string c)
+            ;; Return the leading keyword of the "command" we supposedly
+            ;; skipped over.  Maybe we skipped too far (e.g. past a `do' or
+            ;; `then' that precedes the actual command), so check whether
+            ;; we're looking at such a keyword and if so, move back forward.
+            (let ((boundary (point))
+                  kwd next)
+              (while
+                  (progn
+                    ;; Skip forward over white space newline and \ at eol.
+                    (skip-chars-forward " \t\n\\\\" start)
+                    (if (>= (point) start)
+                        (progn
+                          (sh-debug "point: %d >= start: %d" (point) start)
+                          nil)
+                      (if next (setq boundary next))
+                      (sh-debug "Now at %d   start=%d" (point) start)
+                      (setq kwd (sh-get-word))
+                      (if (member kwd (sh-feature sh-leading-keywords))
+                          (progn
+                            (setq next (point))
+                            t)
+                        nil))))
+              (goto-char boundary)
+              kwd)))))))
 
 
 (defun sh-this-is-a-continuation ()
@@ -2518,7 +2517,7 @@ If AND-MOVE is non-nil then move to end of word."
         (goto-char where))
     (prog1
         (buffer-substring (point)
-                          (progn (skip-chars-forward "^ \t\n;&")(point)))
+                          (progn (skip-chars-forward "^ \t\n;&|()")(point)))
       (unless and-move
         (goto-char start)))))