Mercurial > emacs
annotate lisp/progmodes/cperl-mode.el @ 78848:38c9038666da
(compilation-error-regexp-alist-alist):
Recognize gcc's use of "note" for informational messages.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 20 Sep 2007 18:56:19 +0000 |
parents | c727abfbb05e |
children | f81c00b9c0ff 5039706521c9 |
rev | line source |
---|---|
20323 | 1 ;;; cperl-mode.el --- Perl code editing commands for Emacs |
2 | |
64699
629afbe74e61
Update copyright for release of 22.1 for progmodes directory.
Nick Roberts <nickrob@snap.net.nz>
parents:
64085
diff
changeset
|
3 ;; Copyright (C) 1985, 1986, 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1997, |
75347 | 4 ;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 |
20323 | 5 ;; Free Software Foundation, Inc. |
6 | |
7 ;; Author: Ilya Zakharevich and Bob Olson | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8 ;; Maintainer: Ilya Zakharevich <ilyaz@cpan.org> |
20323 | 9 ;; Keywords: languages, Perl |
10 | |
11 ;; This file is part of GNU Emacs. | |
12 | |
13 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
14 ;; it under the terms of the GNU General Public License as published by | |
78234
c1ec1c8a8d2e
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
77262
diff
changeset
|
15 ;; the Free Software Foundation; either version 3, or (at your option) |
20323 | 16 ;; any later version. |
17 | |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 ;; GNU General Public License for more details. | |
22 | |
23 ;; You should have received a copy of the GNU General Public License | |
24 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
64085 | 25 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
26 ;; Boston, MA 02110-1301, USA. | |
20323 | 27 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
28 ;;; Corrections made by Ilya Zakharevich ilyaz@cpan.org |
20323 | 29 |
30 ;;; Commentary: | |
31 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
32 ;; You can either fine-tune the bells and whistles of this mode or |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
33 ;; bulk enable them by putting |
20323 | 34 |
35 ;; (setq cperl-hairy t) | |
36 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
37 ;; in your .emacs file. (Emacs rulers do not consider it politically |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
38 ;; correct to make whistles enabled by default.) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
39 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
40 ;; DO NOT FORGET to read micro-docs (available from `Perl' menu) <<<<<< |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
41 ;; or as help on variables `cperl-tips', `cperl-problems', <<<<<< |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
42 ;; `cperl-praise', `cperl-speed'. <<<<<< |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
43 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
44 ;; The mode information (on C-h m) provides some customization help. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
45 ;; If you use font-lock feature of this mode, it is advisable to use |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
46 ;; either lazy-lock-mode or fast-lock-mode. I prefer lazy-lock. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
47 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
48 ;; Faces used now: three faces for first-class and second-class keywords |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
49 ;; and control flow words, one for each: comments, string, labels, |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
50 ;; functions definitions and packages, arrays, hashes, and variable |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
51 ;; definitions. If you do not see all these faces, your font-lock does |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
52 ;; not define them, so you need to define them manually. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
53 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
54 ;; This mode supports font-lock, imenu and mode-compile. In the |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
55 ;; hairy version font-lock is on, but you should activate imenu |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
56 ;; yourself (note that mode-compile is not standard yet). Well, you |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
57 ;; can use imenu from keyboard anyway (M-x imenu), but it is better |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
58 ;; to bind it like that: |
20323 | 59 |
60 ;; (define-key global-map [M-S-down-mouse-3] 'imenu) | |
61 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
62 ;;; Font lock bugs as of v4.32: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
63 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
64 ;; The following kinds of Perl code erroneously start strings: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
65 ;; \$` \$' \$" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
66 ;; $opt::s $opt_s $opt{s} (s => ...) /\s+.../ |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
67 ;; likewise with m, tr, y, q, qX instead of s |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
68 |
20323 | 69 ;;; Code: |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
70 |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
71 (defvar vc-rcs-header) |
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
72 (defvar vc-sccs-header) |
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
73 |
31821 | 74 (eval-when-compile |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
75 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
76 (require 'custom) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
77 (error nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
78 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
79 (require 'man) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
80 (error nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
81 (defconst cperl-xemacs-p (string-match "XEmacs\\|Lucid" emacs-version)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
82 (defvar cperl-can-font-lock |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
83 (or cperl-xemacs-p |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
84 (and (boundp 'emacs-major-version) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
85 (or window-system |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
86 (> emacs-major-version 20))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
87 (if cperl-can-font-lock |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
88 (require 'font-lock)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
89 (defvar msb-menu-cond) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
90 (defvar gud-perldb-history) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
91 (defvar font-lock-background-mode) ; not in Emacs |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
92 (defvar font-lock-display-type) ; ditto |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
93 (defvar paren-backwards-message) ; Not in newer XEmacs? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
94 (or (fboundp 'defgroup) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
95 (defmacro defgroup (name val doc &rest arr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
96 nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
97 (or (fboundp 'custom-declare-variable) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
98 (defmacro defcustom (name val doc &rest arr) |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
99 `(defvar ,name ,val ,doc))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
100 (or (and (fboundp 'custom-declare-variable) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
101 (string< "19.31" emacs-version)) ; Checked with 19.30: defface does not work |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
102 (defmacro defface (&rest arr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
103 nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
104 ;; Avoid warning (tmp definitions) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
105 (or (fboundp 'x-color-defined-p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
106 (defmacro x-color-defined-p (col) |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
107 (cond ((fboundp 'color-defined-p) `(color-defined-p ,col)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
108 ;; XEmacs >= 19.12 |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
109 ((fboundp 'valid-color-name-p) `(valid-color-name-p ,col)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
110 ;; XEmacs 19.11 |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
111 ((fboundp 'x-valid-color-name-p) `(x-valid-color-name-p ,col)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
112 (t '(error "Cannot implement color-defined-p"))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
113 (defmacro cperl-is-face (arg) ; Takes quoted arg |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
114 (cond ((fboundp 'find-face) |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
115 `(find-face ,arg)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
116 (;;(and (fboundp 'face-list) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
117 ;; (face-list)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
118 (fboundp 'face-list) |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
119 `(member ,arg (and (fboundp 'face-list) |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
120 (face-list)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
121 (t |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
122 `(boundp ,arg)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
123 (defmacro cperl-make-face (arg descr) ; Takes unquoted arg |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
124 (cond ((fboundp 'make-face) |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
125 `(make-face (quote ,arg))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
126 (t |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
127 `(defvar ,arg (quote ,arg) ,descr)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
128 (defmacro cperl-force-face (arg descr) ; Takes unquoted arg |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
129 `(progn |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
130 (or (cperl-is-face (quote ,arg)) |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
131 (cperl-make-face ,arg ,descr)) |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
132 (or (boundp (quote ,arg)) ; We use unquoted variants too |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
133 (defvar ,arg (quote ,arg) ,descr)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
134 (if cperl-xemacs-p |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
135 (defmacro cperl-etags-snarf-tag (file line) |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
136 `(progn |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
137 (beginning-of-line 2) |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
138 (list ,file ,line))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
139 (defmacro cperl-etags-snarf-tag (file line) |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
140 `(etags-snarf-tag))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
141 (if cperl-xemacs-p |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
142 (defmacro cperl-etags-goto-tag-location (elt) |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
143 ;;(progn |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
144 ;; (switch-to-buffer (get-file-buffer (elt ,elt 0))) |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
145 ;; (set-buffer (get-file-buffer (elt ,elt 0))) |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
146 ;; Probably will not work due to some save-excursion??? |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
147 ;; Or save-file-position? |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
148 ;; (message "Did I get to line %s?" (elt ,elt 1)) |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
149 `(goto-line (string-to-int (elt ,elt 1)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
150 ;;) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
151 (defmacro cperl-etags-goto-tag-location (elt) |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
152 `(etags-goto-tag-location ,elt)))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
153 |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
154 (defconst cperl-xemacs-p (string-match "XEmacs\\|Lucid" emacs-version)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
155 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
156 (defvar cperl-can-font-lock |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
157 (or cperl-xemacs-p |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
158 (and (boundp 'emacs-major-version) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
159 (or window-system |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
160 (> emacs-major-version 20))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
161 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
162 (defun cperl-choose-color (&rest list) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
163 (let (answer) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
164 (while list |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
165 (or answer |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
166 (if (or (x-color-defined-p (car list)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
167 (null (cdr list))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
168 (setq answer (car list)))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
169 (setq list (cdr list))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
170 answer)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
171 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
172 (defgroup cperl nil |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
173 "Major mode for editing Perl code." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
174 :prefix "cperl-" |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
175 :group 'languages |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
176 :version "20.3") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
177 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
178 (defgroup cperl-indentation-details nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
179 "Indentation." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
180 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
181 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
182 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
183 (defgroup cperl-affected-by-hairy nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
184 "Variables affected by `cperl-hairy'." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
185 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
186 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
187 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
188 (defgroup cperl-autoinsert-details nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
189 "Auto-insert tuneup." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
190 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
191 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
192 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
193 (defgroup cperl-faces nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
194 "Fontification colors." |
66963
a11fdee52c05
Add :link (custom-group-link font-lock-faces) to defgroup.
Juri Linkov <juri@jurta.org>
parents:
65229
diff
changeset
|
195 :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
196 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
197 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
198 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
199 (defgroup cperl-speed nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
200 "Speed vs. validity tuneup." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
201 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
202 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
203 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
204 (defgroup cperl-help-system nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
205 "Help system tuneup." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
206 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
207 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
208 |
20323 | 209 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
210 (defcustom cperl-extra-newline-before-brace nil |
20323 | 211 "*Non-nil means that if, elsif, while, until, else, for, foreach |
212 and do constructs look like: | |
213 | |
214 if () | |
215 { | |
216 } | |
217 | |
218 instead of: | |
219 | |
220 if () { | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
221 }" |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
222 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
223 :group 'cperl-autoinsert-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
224 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
225 (defcustom cperl-extra-newline-before-brace-multiline |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
226 cperl-extra-newline-before-brace |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
227 "*Non-nil means the same as `cperl-extra-newline-before-brace', but |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
228 for constructs with multiline if/unless/while/until/for/foreach condition." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
229 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
230 :group 'cperl-autoinsert-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
231 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
232 (defcustom cperl-indent-level 2 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
233 "*Indentation of CPerl statements with respect to containing block." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
234 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
235 :group 'cperl-indentation-details) |
78660
ccfc1f1f4817
* progmodes/cperl-mode.el (cperl-indent-level): Autoload the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78643
diff
changeset
|
236 |
ccfc1f1f4817
* progmodes/cperl-mode.el (cperl-indent-level): Autoload the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78643
diff
changeset
|
237 ;; Is is not unusual to put both perl-indent-level and |
ccfc1f1f4817
* progmodes/cperl-mode.el (cperl-indent-level): Autoload the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78643
diff
changeset
|
238 ;; cperl-indent-level in the local variable section of a file. If only |
ccfc1f1f4817
* progmodes/cperl-mode.el (cperl-indent-level): Autoload the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78643
diff
changeset
|
239 ;; one of perl-mode and cperl-mode is in use, a warning will be issued |
ccfc1f1f4817
* progmodes/cperl-mode.el (cperl-indent-level): Autoload the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78643
diff
changeset
|
240 ;; about the variable. Autoload this here, so that no warning is |
ccfc1f1f4817
* progmodes/cperl-mode.el (cperl-indent-level): Autoload the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78643
diff
changeset
|
241 ;; issued when using either perl-mode or cperl-mode. |
ccfc1f1f4817
* progmodes/cperl-mode.el (cperl-indent-level): Autoload the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78643
diff
changeset
|
242 ;;;###autoload(put 'cperl-indent-level 'safe-local-variable 'integerp) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
243 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
244 (defcustom cperl-lineup-step nil |
20323 | 245 "*`cperl-lineup' will always lineup at multiple of this number. |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
246 If nil, the value of `cperl-indent-level' will be used." |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
247 :type '(choice (const nil) integer) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
248 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
249 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
250 (defcustom cperl-brace-imaginary-offset 0 |
20323 | 251 "*Imagined indentation of a Perl open brace that actually follows a statement. |
252 An open brace following other text is treated as if it were this far | |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
253 to the right of the start of its line." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
254 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
255 :group 'cperl-indentation-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
256 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
257 (defcustom cperl-brace-offset 0 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
258 "*Extra indentation for braces, compared with other text in same context." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
259 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
260 :group 'cperl-indentation-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
261 (defcustom cperl-label-offset -2 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
262 "*Offset of CPerl label lines relative to usual indentation." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
263 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
264 :group 'cperl-indentation-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
265 (defcustom cperl-min-label-indent 1 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
266 "*Minimal offset of CPerl label lines." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
267 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
268 :group 'cperl-indentation-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
269 (defcustom cperl-continued-statement-offset 2 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
270 "*Extra indent for lines not starting new statements." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
271 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
272 :group 'cperl-indentation-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
273 (defcustom cperl-continued-brace-offset 0 |
20323 | 274 "*Extra indent for substatements that start with open-braces. |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
275 This is in addition to cperl-continued-statement-offset." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
276 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
277 :group 'cperl-indentation-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
278 (defcustom cperl-close-paren-offset -1 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
279 "*Extra indent for substatements that start with close-parenthesis." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
280 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
281 :group 'cperl-indentation-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
282 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
283 (defcustom cperl-indent-wrt-brace t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
284 "*Non-nil means indent statements in if/etc block relative brace, not if/etc. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
285 Versions 5.2 ... 5.20 behaved as if this were `nil'." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
286 :type 'boolean |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
287 :group 'cperl-indentation-details) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
288 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
289 (defcustom cperl-auto-newline nil |
20323 | 290 "*Non-nil means automatically newline before and after braces, |
291 and after colons and semicolons, inserted in CPerl code. The following | |
292 \\[cperl-electric-backspace] will remove the inserted whitespace. | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
293 Insertion after colons requires both this variable and |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
294 `cperl-auto-newline-after-colon' set." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
295 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
296 :group 'cperl-autoinsert-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
297 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
298 (defcustom cperl-autoindent-on-semi nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
299 "*Non-nil means automatically indent after insertion of (semi)colon. |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
300 Active if `cperl-auto-newline' is false." |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
301 :type 'boolean |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
302 :group 'cperl-autoinsert-details) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
303 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
304 (defcustom cperl-auto-newline-after-colon nil |
20323 | 305 "*Non-nil means automatically newline even after colons. |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
306 Subject to `cperl-auto-newline' setting." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
307 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
308 :group 'cperl-autoinsert-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
309 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
310 (defcustom cperl-tab-always-indent t |
20323 | 311 "*Non-nil means TAB in CPerl mode should always reindent the current line, |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
312 regardless of where in the line point is when the TAB command is used." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
313 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
314 :group 'cperl-indentation-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
315 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
316 (defcustom cperl-font-lock nil |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
317 "*Non-nil (and non-null) means CPerl buffers will use `font-lock-mode'. |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
318 Can be overwritten by `cperl-hairy' if nil." |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
319 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
320 :group 'cperl-affected-by-hairy) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
321 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
322 (defcustom cperl-electric-lbrace-space nil |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
323 "*Non-nil (and non-null) means { after $ should be preceded by ` '. |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
324 Can be overwritten by `cperl-hairy' if nil." |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
325 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
326 :group 'cperl-affected-by-hairy) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
327 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
328 (defcustom cperl-electric-parens-string "({[]})<" |
20323 | 329 "*String of parentheses that should be electric in CPerl. |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
330 Closing ones are electric only if the region is highlighted." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
331 :type 'string |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
332 :group 'cperl-affected-by-hairy) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
333 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
334 (defcustom cperl-electric-parens nil |
20323 | 335 "*Non-nil (and non-null) means parentheses should be electric in CPerl. |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
336 Can be overwritten by `cperl-hairy' if nil." |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
337 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
338 :group 'cperl-affected-by-hairy) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
339 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
340 (defvar zmacs-regions) ; Avoid warning |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
341 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
342 (defcustom cperl-electric-parens-mark |
20323 | 343 (and window-system |
344 (or (and (boundp 'transient-mark-mode) ; For Emacs | |
345 transient-mark-mode) | |
346 (and (boundp 'zmacs-regions) ; For XEmacs | |
347 zmacs-regions))) | |
348 "*Not-nil means that electric parens look for active mark. | |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
349 Default is yes if there is visual feedback on mark." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
350 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
351 :group 'cperl-autoinsert-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
352 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
353 (defcustom cperl-electric-linefeed nil |
20323 | 354 "*If true, LFD should be hairy in CPerl, otherwise C-c LFD is hairy. |
355 In any case these two mean plain and hairy linefeeds together. | |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
356 Can be overwritten by `cperl-hairy' if nil." |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
357 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
358 :group 'cperl-affected-by-hairy) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
359 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
360 (defcustom cperl-electric-keywords nil |
20323 | 361 "*Not-nil (and non-null) means keywords are electric in CPerl. |
75304
c8f5a9de4a5e
(cperl-electric-keywords): Document in the doc string how to use personal
Eli Zaretskii <eliz@gnu.org>
parents:
74429
diff
changeset
|
362 Can be overwritten by `cperl-hairy' if nil. |
c8f5a9de4a5e
(cperl-electric-keywords): Document in the doc string how to use personal
Eli Zaretskii <eliz@gnu.org>
parents:
74429
diff
changeset
|
363 |
c8f5a9de4a5e
(cperl-electric-keywords): Document in the doc string how to use personal
Eli Zaretskii <eliz@gnu.org>
parents:
74429
diff
changeset
|
364 Uses `abbrev-mode' to do the expansion. If you want to use your |
c8f5a9de4a5e
(cperl-electric-keywords): Document in the doc string how to use personal
Eli Zaretskii <eliz@gnu.org>
parents:
74429
diff
changeset
|
365 own abbrevs in cperl-mode, but do not want keywords to be |
c8f5a9de4a5e
(cperl-electric-keywords): Document in the doc string how to use personal
Eli Zaretskii <eliz@gnu.org>
parents:
74429
diff
changeset
|
366 electric, you must redefine `cperl-mode-abbrev-table': do |
c8f5a9de4a5e
(cperl-electric-keywords): Document in the doc string how to use personal
Eli Zaretskii <eliz@gnu.org>
parents:
74429
diff
changeset
|
367 \\[edit-abbrevs], search for `cperl-mode-abbrev-table', and, in |
c8f5a9de4a5e
(cperl-electric-keywords): Document in the doc string how to use personal
Eli Zaretskii <eliz@gnu.org>
parents:
74429
diff
changeset
|
368 that paragraph, delete the words that appear at the ends of lines and |
c8f5a9de4a5e
(cperl-electric-keywords): Document in the doc string how to use personal
Eli Zaretskii <eliz@gnu.org>
parents:
74429
diff
changeset
|
369 that begin with \"cperl-electric\". |
c8f5a9de4a5e
(cperl-electric-keywords): Document in the doc string how to use personal
Eli Zaretskii <eliz@gnu.org>
parents:
74429
diff
changeset
|
370 " |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
371 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
372 :group 'cperl-affected-by-hairy) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
373 |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
374 (defcustom cperl-electric-backspace-untabify t |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
375 "*Not-nil means electric-backspace will untabify in CPerl." |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
376 :type 'boolean |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
377 :group 'cperl-autoinsert-details) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
378 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
379 (defcustom cperl-hairy nil |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
380 "*Not-nil means most of the bells and whistles are enabled in CPerl. |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
381 Affects: `cperl-font-lock', `cperl-electric-lbrace-space', |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
382 `cperl-electric-parens', `cperl-electric-linefeed', `cperl-electric-keywords', |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
383 `cperl-info-on-command-no-prompt', `cperl-clobber-lisp-bindings', |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
384 `cperl-lazy-help-time'." |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
385 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
386 :group 'cperl-affected-by-hairy) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
387 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
388 (defcustom cperl-comment-column 32 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
389 "*Column to put comments in CPerl (use \\[cperl-indent] to lineup with code)." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
390 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
391 :group 'cperl-indentation-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
392 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
393 (defcustom cperl-indent-comment-at-column-0 nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
394 "*Non-nil means that comment started at column 0 should be indentable." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
395 :type 'boolean |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
396 :group 'cperl-indentation-details) |
62686
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
397 |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
398 (defcustom cperl-vc-sccs-header '("($sccs) = ('%W\%' =~ /(\\d+(\\.\\d+)+)/) ;") |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
399 "*Special version of `vc-sccs-header' that is used in CPerl mode buffers." |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
400 :type '(repeat string) |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
401 :group 'cperl) |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
402 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
403 (defcustom cperl-vc-rcs-header '("($rcs) = (' $Id\$ ' =~ /(\\d+(\\.\\d+)+)/);") |
62686
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
404 "*Special version of `vc-rcs-header' that is used in CPerl mode buffers." |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
405 :type '(repeat string) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
406 :group 'cperl) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
407 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
408 ;; This became obsolete... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
409 (defvar cperl-vc-header-alist nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
410 (make-obsolete-variable |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
411 'cperl-vc-header-alist |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
412 "use cperl-vc-rcs-header or cperl-vc-sccs-header instead.") |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
413 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
414 (defcustom cperl-clobber-mode-lists |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
415 (not |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
416 (and |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
417 (boundp 'interpreter-mode-alist) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
418 (assoc "miniperl" interpreter-mode-alist) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
419 (assoc "\\.\\([pP][Llm]\\|al\\)$" auto-mode-alist))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
420 "*Whether to install us into `interpreter-' and `extension' mode lists." |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
421 :type 'boolean |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
422 :group 'cperl) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
423 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
424 (defcustom cperl-info-on-command-no-prompt nil |
20323 | 425 "*Not-nil (and non-null) means not to prompt on C-h f. |
63274
b870276d9ea5
(cperl-info-on-command-no-prompt, cperl-mode): Fix spellings in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
62686
diff
changeset
|
426 The opposite behavior is always available if prefixed with C-c. |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
427 Can be overwritten by `cperl-hairy' if nil." |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
428 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
429 :group 'cperl-affected-by-hairy) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
430 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
431 (defcustom cperl-clobber-lisp-bindings nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
432 "*Not-nil (and non-null) means not overwrite C-h f. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
433 The function is available on \\[cperl-info-on-command], \\[cperl-get-help]. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
434 Can be overwritten by `cperl-hairy' if nil." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
435 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
436 :group 'cperl-affected-by-hairy) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
437 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
438 (defcustom cperl-lazy-help-time nil |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
439 "*Not-nil (and non-null) means to show lazy help after given idle time. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
440 Can be overwritten by `cperl-hairy' to be 5 sec if nil." |
23270
fe5ca8d66639
(cperl-lazy-help-time): Fix customize
Andreas Schwab <schwab@suse.de>
parents:
22409
diff
changeset
|
441 :type '(choice (const null) (const nil) integer) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
442 :group 'cperl-affected-by-hairy) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
443 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
444 (defcustom cperl-pod-face 'font-lock-comment-face |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
445 "*Face for POD highlighting." |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
446 :type 'face |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
447 :group 'cperl-faces) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
448 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
449 (defcustom cperl-pod-head-face 'font-lock-variable-name-face |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
450 "*Face for POD highlighting. |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
451 Font for POD headers." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
452 :type 'face |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
453 :group 'cperl-faces) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
454 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
455 (defcustom cperl-here-face 'font-lock-string-face |
31821 | 456 "*Face for here-docs highlighting." |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
457 :type 'face |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
458 :group 'cperl-faces) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
459 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
460 ;;; Some double-evaluation happened with font-locks... Needed with 21.2... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
461 (defvar cperl-singly-quote-face cperl-xemacs-p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
462 |
73461
c09fdf139d4a
* progmodes/cperl-mode.el (cperl-invalid-face): Fix defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
73457
diff
changeset
|
463 (defcustom cperl-invalid-face 'underline |
c09fdf139d4a
* progmodes/cperl-mode.el (cperl-invalid-face): Fix defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
73457
diff
changeset
|
464 "*Face for highlighting trailing whitespace." |
31821 | 465 :type 'face |
35013
587807c5e8e6
(cperl-invalid-face): Don't double-quote
Dave Love <fx@gnu.org>
parents:
32880
diff
changeset
|
466 :version "21.1" |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
467 :group 'cperl-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
468 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
469 (defcustom cperl-pod-here-fontify '(featurep 'font-lock) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
470 "*Not-nil after evaluation means to highlight POD and here-docs sections." |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
471 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
472 :group 'cperl-faces) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
473 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
474 (defcustom cperl-fontify-m-as-s t |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
475 "*Not-nil means highlight 1arg regular expressions operators same as 2arg." |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
476 :type 'boolean |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
477 :group 'cperl-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
478 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
479 (defcustom cperl-highlight-variables-indiscriminately nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
480 "*Non-nil means perform additional highlighting on variables. |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
481 Currently only changes how scalar variables are highlighted. |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
482 Note that that variable is only read at initialization time for |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
483 the variable `cperl-font-lock-keywords-2', so changing it after you've |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
484 entered CPerl mode the first time will have no effect." |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
485 :type 'boolean |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
486 :group 'cperl) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
487 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
488 (defcustom cperl-pod-here-scan t |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
489 "*Not-nil means look for POD and here-docs sections during startup. |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
490 You can always make lookup from menu or using \\[cperl-find-pods-heres]." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
491 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
492 :group 'cperl-speed) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
493 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
494 (defcustom cperl-regexp-scan t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
495 "*Not-nil means make marking of regular expression more thorough. |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
496 Effective only with `cperl-pod-here-scan'." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
497 :type 'boolean |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
498 :group 'cperl-speed) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
499 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
500 (defcustom cperl-hook-after-change t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
501 "*Not-nil means install hook to know which regions of buffer are changed. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
502 May significantly speed up delayed fontification. Changes take effect |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
503 after reload." |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
504 :type 'boolean |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
505 :group 'cperl-speed) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
506 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
507 (defcustom cperl-imenu-addback nil |
20323 | 508 "*Not-nil means add backreferences to generated `imenu's. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
509 May require patched `imenu' and `imenu-go'. Obsolete." |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
510 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
511 :group 'cperl-help-system) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
512 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
513 (defcustom cperl-max-help-size 66 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
514 "*Non-nil means shrink-wrapping of info-buffer allowed up to these percents." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
515 :type '(choice integer (const nil)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
516 :group 'cperl-help-system) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
517 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
518 (defcustom cperl-shrink-wrap-info-frame t |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
519 "*Non-nil means shrink-wrapping of info-buffer-frame allowed." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
520 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
521 :group 'cperl-help-system) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
522 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
523 (defcustom cperl-info-page "perl" |
20323 | 524 "*Name of the info page containing perl docs. |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
525 Older version of this page was called `perl5', newer `perl'." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
526 :type 'string |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
527 :group 'cperl-help-system) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
528 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
529 (defcustom cperl-use-syntax-table-text-property |
20323 | 530 (boundp 'parse-sexp-lookup-properties) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
531 "*Non-nil means CPerl sets up and uses `syntax-table' text property." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
532 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
533 :group 'cperl-speed) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
534 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
535 (defcustom cperl-use-syntax-table-text-property-for-tags |
20323 | 536 cperl-use-syntax-table-text-property |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
537 "*Non-nil means: set up and use `syntax-table' text property generating TAGS." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
538 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
539 :group 'cperl-speed) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
540 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
541 (defcustom cperl-scan-files-regexp "\\.\\([pP][Llm]\\|xs\\)$" |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
542 "*Regexp to match files to scan when generating TAGS." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
543 :type 'regexp |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
544 :group 'cperl) |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
545 |
47334
e3cfc5df817a
(cperl-noscan-files-regexp): In addition to RCS, exclude CVS directories.
Richard M. Stallman <rms@gnu.org>
parents:
46132
diff
changeset
|
546 (defcustom cperl-noscan-files-regexp |
e3cfc5df817a
(cperl-noscan-files-regexp): In addition to RCS, exclude CVS directories.
Richard M. Stallman <rms@gnu.org>
parents:
46132
diff
changeset
|
547 "/\\(\\.\\.?\\|SCCS\\|RCS\\|CVS\\|blib\\)$" |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
548 "*Regexp to match files/dirs to skip when generating TAGS." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
549 :type 'regexp |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
550 :group 'cperl) |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
551 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
552 (defcustom cperl-regexp-indent-step nil |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
553 "*Indentation used when beautifying regexps. |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
554 If nil, the value of `cperl-indent-level' will be used." |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
555 :type '(choice integer (const nil)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
556 :group 'cperl-indentation-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
557 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
558 (defcustom cperl-indent-left-aligned-comments t |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
559 "*Non-nil means that the comment starting in leftmost column should indent." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
560 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
561 :group 'cperl-indentation-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
562 |
26667
a11929b241ab
(cperl-under-as-char): Make nil the default value.
Richard M. Stallman <rms@gnu.org>
parents:
26455
diff
changeset
|
563 (defcustom cperl-under-as-char nil |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
564 "*Non-nil means that the _ (underline) should be treated as word char." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
565 :type 'boolean |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
566 :group 'cperl) |
20323 | 567 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
568 (defcustom cperl-extra-perl-args "" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
569 "*Extra arguments to use when starting Perl. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
570 Currently used with `cperl-check-syntax' only." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
571 :type 'string |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
572 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
573 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
574 (defcustom cperl-message-electric-keyword t |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
575 "*Non-nil means that the `cperl-electric-keyword' prints a help message." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
576 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
577 :group 'cperl-help-system) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
578 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
579 (defcustom cperl-indent-region-fix-constructs 1 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
580 "*Amount of space to insert between `}' and `else' or `elsif' |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
581 in `cperl-indent-region'. Set to nil to leave as is. Values other |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
582 than 1 and nil will probably not work." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
583 :type '(choice (const nil) (const 1)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
584 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
585 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
586 (defcustom cperl-break-one-line-blocks-when-indent t |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
587 "*Non-nil means that one-line if/unless/while/until/for/foreach BLOCKs |
46132
4d83b6d5d27a
(cperl-break-one-line-blocks-when-indent): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
46024
diff
changeset
|
588 need to be reformatted into multiline ones when indenting a region." |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
589 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
590 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
591 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
592 (defcustom cperl-fix-hanging-brace-when-indent t |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
593 "*Non-nil means that BLOCK-end `}' may be put on a separate line |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
594 when indenting a region. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
595 Braces followed by else/elsif/while/until are excepted." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
596 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
597 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
598 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
599 (defcustom cperl-merge-trailing-else t |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
600 "*Non-nil means that BLOCK-end `}' followed by else/elsif/continue |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
601 may be merged to be on the same line when indenting a region." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
602 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
603 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
604 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
605 (defcustom cperl-indent-parens-as-block nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
606 "*Non-nil means that non-block ()-, {}- and []-groups are indented as blocks, |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
607 but for trailing \",\" inside the group, which won't increase indentation. |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
608 One should tune up `cperl-close-paren-offset' as well." |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
609 :type 'boolean |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
610 :group 'cperl-indentation-details) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
611 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
612 (defcustom cperl-syntaxify-by-font-lock |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
613 (and cperl-can-font-lock |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
614 (boundp 'parse-sexp-lookup-properties)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
615 "*Non-nil means that CPerl uses `font-lock's routines for syntaxification." |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
616 :type '(choice (const message) boolean) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
617 :group 'cperl-speed) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
618 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
619 (defcustom cperl-syntaxify-unwind |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
620 t |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
621 "*Non-nil means that CPerl unwinds to a start of a long construction |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
622 when syntaxifying a chunk of buffer." |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
623 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
624 :group 'cperl-speed) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
625 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
626 (defcustom cperl-syntaxify-for-menu |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
627 t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
628 "*Non-nil means that CPerl syntaxifies up to the point before showing menu. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
629 This way enabling/disabling of menu items is more correct." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
630 :type 'boolean |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
631 :group 'cperl-speed) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
632 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
633 (defcustom cperl-ps-print-face-properties |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
634 '((font-lock-keyword-face nil nil bold shadow) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
635 (font-lock-variable-name-face nil nil bold) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
636 (font-lock-function-name-face nil nil bold italic box) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
637 (font-lock-constant-face nil "LightGray" bold) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
638 (cperl-array-face nil "LightGray" bold underline) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
639 (cperl-hash-face nil "LightGray" bold italic underline) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
640 (font-lock-comment-face nil "LightGray" italic) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
641 (font-lock-string-face nil nil italic underline) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
642 (cperl-nonoverridable-face nil nil italic underline) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
643 (font-lock-type-face nil nil underline) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
644 (font-lock-warning-face nil "LightGray" bold italic box) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
645 (underline nil "LightGray" strikeout)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
646 "List given as an argument to `ps-extend-face-list' in `cperl-ps-print'." |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
647 :type '(repeat (cons symbol |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
648 (cons (choice (const nil) string) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
649 (cons (choice (const nil) string) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
650 (repeat symbol))))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
651 :group 'cperl-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
652 |
49304
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
653 (defvar cperl-dark-background |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
654 (cperl-choose-color "navy" "os2blue" "darkgreen")) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
655 (defvar cperl-dark-foreground |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
656 (cperl-choose-color "orchid1" "orange")) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
657 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
658 (defface cperl-nonoverridable-face |
49304
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
659 `((((class grayscale) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
660 (:background "Gray90" :slant italic :underline t)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
661 (((class grayscale) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
662 (:foreground "Gray80" :slant italic :underline t :weight bold)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
663 (((class color) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
664 (:foreground "chartreuse3")) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
665 (((class color) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
666 (:foreground ,cperl-dark-foreground)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
667 (t (:weight bold :underline t))) |
50788
2a3bf1afbe82
(cperl-nonoverridable-face): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
50255
diff
changeset
|
668 "Font Lock mode face used non-overridable keywords and modifiers of regexps." |
49304
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
669 :group 'cperl-faces) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
670 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
671 (defface cperl-array-face |
49304
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
672 `((((class grayscale) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
673 (:background "Gray90" :weight bold)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
674 (((class grayscale) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
675 (:foreground "Gray80" :weight bold)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
676 (((class color) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
677 (:foreground "Blue" :background "lightyellow2" :weight bold)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
678 (((class color) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
679 (:foreground "yellow" :background ,cperl-dark-background :weight bold)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
680 (t (:weight bold))) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
681 "Font Lock mode face used to highlight array names." |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
682 :group 'cperl-faces) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
683 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
684 (defface cperl-hash-face |
49304
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
685 `((((class grayscale) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
686 (:background "Gray90" :weight bold :slant italic)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
687 (((class grayscale) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
688 (:foreground "Gray80" :weight bold :slant italic)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
689 (((class color) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
690 (:foreground "Red" :background "lightyellow2" :weight bold :slant italic)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
691 (((class color) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
692 (:foreground "Red" :background ,cperl-dark-background :weight bold :slant italic)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
693 (t (:weight bold :slant italic))) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
694 "Font Lock mode face used to highlight hash names." |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
695 :group 'cperl-faces) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
696 |
20323 | 697 |
698 | |
699 ;;; Short extra-docs. | |
700 | |
701 (defvar cperl-tips 'please-ignore-this-line | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
702 "Get maybe newer version of this package from |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
703 http://ilyaz.org/software/emacs |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
704 Subdirectory `cperl-mode' may contain yet newer development releases and/or |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
705 patches to related files. |
20323 | 706 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
707 For best results apply to an older Emacs the patches from |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
708 ftp://ftp.math.ohio-state.edu/pub/users/ilya/cperl-mode/patches |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
709 \(this upgrades syntax-parsing abilities of Emacsen v19.34 and |
41351
d103d22e5b4f
(cperl-problems, cperl-tips, cperl-non-problems, cperl-praise): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
41309
diff
changeset
|
710 v20.2 up to the level of Emacs v20.3 - a must for a good Perl |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
711 mode.) As of beginning of 2003, XEmacs may provide a similar ability. |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
712 |
20323 | 713 Get support packages choose-color.el (or font-lock-extra.el before |
714 19.30), imenu-go.el from the same place. \(Look for other files there | |
715 too... ;-). Get a patch for imenu.el in 19.29. Note that for 19.30 and | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
716 later you should use choose-color.el *instead* of font-lock-extra.el |
20323 | 717 \(and you will not get smart highlighting in C :-(). |
718 | |
719 Note that to enable Compile choices in the menu you need to install | |
720 mode-compile.el. | |
721 | |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
722 If your Emacs does not default to `cperl-mode' on Perl files, and you |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
723 want it to: put the following into your .emacs file: |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
724 |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
725 (defalias 'perl-mode 'cperl-mode) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
726 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
727 Get perl5-info from |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
728 $CPAN/doc/manual/info/perl5-old/perl5-info.tar.gz |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
729 Also, one can generate a newer documentation running `pod2texi' converter |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
730 $CPAN/doc/manual/info/perl5/pod2texi-0.1.tar.gz |
20323 | 731 |
732 If you use imenu-go, run imenu on perl5-info buffer (you can do it | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
733 from Perl menu). If many files are related, generate TAGS files from |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
734 Tools/Tags submenu in Perl menu. |
20323 | 735 |
736 If some class structure is too complicated, use Tools/Hierarchy-view | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
737 from Perl menu, or hierarchic view of imenu. The second one uses the |
20323 | 738 current buffer only, the first one requires generation of TAGS from |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
739 Perl/Tools/Tags menu beforehand. |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
740 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
741 Run Perl/Tools/Insert-spaces-if-needed to fix your lazy typing. |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
742 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
743 Switch auto-help on/off with Perl/Tools/Auto-help. |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
744 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
745 Though with contemporary Emaxen CPerl mode should maintain the correct |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
746 parsing of Perl even when editing, sometimes it may be lost. Fix this by |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
747 |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
748 \\[normal-mode] |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
749 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
750 In cases of more severe confusion sometimes it is helpful to do |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
751 |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
752 \\[load-library] cperl-mode RET |
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
753 \\[normal-mode] |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
754 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
755 Before reporting (non-)problems look in the problem section of online |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
756 micro-docs on what I know about CPerl problems.") |
20323 | 757 |
758 (defvar cperl-problems 'please-ignore-this-line | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
759 "Description of problems in CPerl mode. |
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
760 Some faces will not be shown on some versions of Emacs unless you |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
761 install choose-color.el, available from |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
762 http://ilyaz.org/software/emacs |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
763 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
764 `fill-paragraph' on a comment may leave the point behind the |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
765 paragraph. It also triggers a bug in some versions of Emacs (CPerl tries |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
766 to detect it and bulk out). |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
767 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
768 See documentation of a variable `cperl-problems-old-emaxen' for the |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
769 problems which disappear if you upgrade Emacs to a reasonably new |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
770 version (20.3 for Emacs, and those of 2004 for XEmacs).") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
771 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
772 (defvar cperl-problems-old-emaxen 'please-ignore-this-line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
773 "Description of problems in CPerl mode specific for older Emacs versions. |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
774 |
41351
d103d22e5b4f
(cperl-problems, cperl-tips, cperl-non-problems, cperl-praise): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
41309
diff
changeset
|
775 Emacs had a _very_ restricted syntax parsing engine until version |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
776 20.1. Most problems below are corrected starting from this version of |
41351
d103d22e5b4f
(cperl-problems, cperl-tips, cperl-non-problems, cperl-praise): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
41309
diff
changeset
|
777 Emacs, and all of them should be fixed in version 20.3. (Or apply |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
778 patches to Emacs 19.33/34 - see tips.) XEmacs was very backward in |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
779 this respect (until 2003). |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
780 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
781 Note that even with newer Emacsen in some very rare cases the details |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
782 of interaction of `font-lock' and syntaxification may be not cleaned |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
783 up yet. You may get slightly different colors basing on the order of |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
784 fontification and syntaxification. Say, the initial faces is correct, |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
785 but editing the buffer breaks this. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
786 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
787 Even with older Emacsen CPerl mode tries to corrects some Emacs |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
788 misunderstandings, however, for efficiency reasons the degree of |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
789 correction is different for different operations. The partially |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
790 corrected problems are: POD sections, here-documents, regexps. The |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
791 operations are: highlighting, indentation, electric keywords, electric |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
792 braces. |
20323 | 793 |
794 This may be confusing, since the regexp s#//#/#\; may be highlighted | |
795 as a comment, but it will be recognized as a regexp by the indentation | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
796 code. Or the opposite case, when a POD section is highlighted, but |
20323 | 797 may break the indentation of the following code (though indentation |
798 should work if the balance of delimiters is not broken by POD). | |
799 | |
800 The main trick (to make $ a \"backslash\") makes constructions like | |
801 ${aaa} look like unbalanced braces. The only trick I can think of is | |
60925
a9c571ede913
* progmodes/cperl-mode.el, progmodes/idlw-shell.el,
Werner LEMBERG <wl@gnu.org>
parents:
59242
diff
changeset
|
802 to insert it as $ {aaa} (valid in perl5, not in perl4). |
20323 | 803 |
804 Similar problems arise in regexps, when /(\\s|$)/ should be rewritten | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
805 as /($|\\s)/. Note that such a transposition is not always possible. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
806 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
807 The solution is to upgrade your Emacs or patch an older one. Note |
41351
d103d22e5b4f
(cperl-problems, cperl-tips, cperl-non-problems, cperl-praise): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
41309
diff
changeset
|
808 that Emacs 20.2 has some bugs related to `syntax-table' text |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
809 properties. Patches are available on the main CPerl download site, |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
810 and on CPAN. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
811 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
812 If these bugs cannot be fixed on your machine (say, you have an inferior |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
813 environment and cannot recompile), you may still disable all the fancy stuff |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
814 via `cperl-use-syntax-table-text-property'.") |
20323 | 815 |
816 (defvar cperl-praise 'please-ignore-this-line | |
41351
d103d22e5b4f
(cperl-problems, cperl-tips, cperl-non-problems, cperl-praise): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
41309
diff
changeset
|
817 "Advantages of CPerl mode. |
20323 | 818 |
819 0) It uses the newest `syntax-table' property ;-); | |
820 | |
821 1) It does 99% of Perl syntax correct (as opposed to 80-90% in Perl | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
822 mode - but the latter number may have improved too in last years) even |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
823 with old Emaxen which do not support `syntax-table' property. |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
824 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
825 When using `syntax-table' property for syntax assist hints, it should |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
826 handle 99.995% of lines correct - or somesuch. It automatically |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
827 updates syntax assist hints when you edit your script. |
20323 | 828 |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
829 2) It is generally believed to be \"the most user-friendly Emacs |
20323 | 830 package\" whatever it may mean (I doubt that the people who say similar |
831 things tried _all_ the rest of Emacs ;-), but this was not a lonely | |
832 voice); | |
833 | |
834 3) Everything is customizable, one-by-one or in a big sweep; | |
835 | |
836 4) It has many easily-accessable \"tools\": | |
837 a) Can run program, check syntax, start debugger; | |
838 b) Can lineup vertically \"middles\" of rows, like `=' in | |
839 a = b; | |
840 cc = d; | |
841 c) Can insert spaces where this impoves readability (in one | |
842 interactive sweep over the buffer); | |
843 d) Has support for imenu, including: | |
844 1) Separate unordered list of \"interesting places\"; | |
845 2) Separate TOC of POD sections; | |
846 3) Separate list of packages; | |
847 4) Hierarchical view of methods in (sub)packages; | |
848 5) and functions (by the full name - with package); | |
849 e) Has an interface to INFO docs for Perl; The interface is | |
850 very flexible, including shrink-wrapping of | |
851 documentation buffer/frame; | |
852 f) Has a builtin list of one-line explanations for perl constructs. | |
853 g) Can show these explanations if you stay long enough at the | |
854 corresponding place (or on demand); | |
855 h) Has an enhanced fontification (using 3 or 4 additional faces | |
856 comparing to font-lock - basically, different | |
857 namespaces in Perl have different colors); | |
858 i) Can construct TAGS basing on its knowledge of Perl syntax, | |
859 the standard menu has 6 different way to generate | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
860 TAGS (if \"by directory\", .xs files - with C-language |
20323 | 861 bindings - are included in the scan); |
862 j) Can build a hierarchical view of classes (via imenu) basing | |
863 on generated TAGS file; | |
864 k) Has electric parentheses, electric newlines, uses Abbrev | |
865 for electric logical constructs | |
866 while () {} | |
867 with different styles of expansion (context sensitive | |
868 to be not so bothering). Electric parentheses behave | |
869 \"as they should\" in a presence of a visible region. | |
870 l) Changes msb.el \"on the fly\" to insert a group \"Perl files\"; | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
871 m) Can convert from |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
872 if (A) { B } |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
873 to |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
874 B if A; |
20323 | 875 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
876 n) Highlights (by user-choice) either 3-delimiters constructs |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
877 (such as tr/a/b/), or regular expressions and `y/tr'; |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
878 o) Highlights trailing whitespace; |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
879 p) Is able to manipulate Perl Regular Expressions to ease |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
880 conversion to a more readable form. |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
881 q) Can ispell POD sections and HERE-DOCs. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
882 r) Understands comments and character classes inside regular |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
883 expressions; can find matching () and [] in a regular expression. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
884 s) Allows indentation of //x-style regular expressions; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
885 t) Highlights different symbols in regular expressions according |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
886 to their function; much less problems with backslashitis; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
887 u) Allows to find regular expressions which contain interpolated parts. |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
888 |
20323 | 889 5) The indentation engine was very smart, but most of tricks may be |
890 not needed anymore with the support for `syntax-table' property. Has | |
891 progress indicator for indentation (with `imenu' loaded). | |
892 | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
893 6) Indent-region improves inline-comments as well; also corrects |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
894 whitespace *inside* the conditional/loop constructs. |
20323 | 895 |
896 7) Fill-paragraph correctly handles multi-line comments; | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
897 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
898 8) Can switch to different indentation styles by one command, and restore |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
899 the settings present before the switch. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
900 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
901 9) When doing indentation of control constructs, may correct |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
902 line-breaks/spacing between elements of the construct. |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
903 |
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
904 10) Uses a linear-time algorith for indentation of regions (on Emaxen with |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
905 capable syntax engines). |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
906 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
907 11) Syntax-highlight, indentation, sexp-recognition inside regular expressions. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
908 ") |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
909 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
910 (defvar cperl-speed 'please-ignore-this-line |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
911 "This is an incomplete compendium of what is available in other parts |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
912 of CPerl documentation. (Please inform me if I skept anything.) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
913 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
914 There is a perception that CPerl is slower than alternatives. This part |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
915 of documentation is designed to overcome this misconception. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
916 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
917 *By default* CPerl tries to enable the most comfortable settings. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
918 From most points of view, correctly working package is infinitely more |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
919 comfortable than a non-correctly working one, thus by default CPerl |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
920 prefers correctness over speed. Below is the guide how to change |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
921 settings if your preferences are different. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
922 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
923 A) Speed of loading the file. When loading file, CPerl may perform a |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
924 scan which indicates places which cannot be parsed by primitive Emacs |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
925 syntax-parsing routines, and marks them up so that either |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
926 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
927 A1) CPerl may work around these deficiencies (for big chunks, mostly |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
928 PODs and HERE-documents), or |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
929 A2) On capable Emaxen CPerl will use improved syntax-handlings |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
930 which reads mark-up hints directly. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
931 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
932 The scan in case A2 is much more comprehensive, thus may be slower. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
933 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
934 User can disable syntax-engine-helping scan of A2 by setting |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
935 `cperl-use-syntax-table-text-property' |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
936 variable to nil (if it is set to t). |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
937 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
938 One can disable the scan altogether (both A1 and A2) by setting |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
939 `cperl-pod-here-scan' |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
940 to nil. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
941 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
942 B) Speed of editing operations. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
943 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
944 One can add a (minor) speedup to editing operations by setting |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
945 `cperl-use-syntax-table-text-property' |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
946 variable to nil (if it is set to t). This will disable |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
947 syntax-engine-helping scan, thus will make many more Perl |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
948 constructs be wrongly recognized by CPerl, thus may lead to |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
949 wrongly matched parentheses, wrong indentation, etc. |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
950 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
951 One can unset `cperl-syntaxify-unwind'. This might speed up editing |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
952 of, say, long POD sections.") |
20323 | 953 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
954 (defvar cperl-tips-faces 'please-ignore-this-line |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
955 "CPerl mode uses following faces for highlighting: |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
956 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
957 `cperl-array-face' Array names |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
958 `cperl-hash-face' Hash names |
32422 | 959 `font-lock-comment-face' Comments, PODs and whatever is considered |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
960 syntaxically to be not code |
32422 | 961 `font-lock-constant-face' HERE-doc delimiters, labels, delimiters of |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
962 2-arg operators s/y/tr/ or of RExen, |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
963 `font-lock-warning-face' Special-cased m// and s//foo/, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
964 `font-lock-function-name-face' _ as a target of a file tests, file tests, |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
965 subroutine names at the moment of definition |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
966 (except those conflicting with Perl operators), |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
967 package names (when recognized), format names |
32422 | 968 `font-lock-keyword-face' Control flow switch constructs, declarators |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
969 `cperl-nonoverridable-face' Non-overridable keywords, modifiers of RExen |
32422 | 970 `font-lock-string-face' Strings, qw() constructs, RExen, POD sections, |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
971 literal parts and the terminator of formats |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
972 and whatever is syntaxically considered |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
973 as string literals |
32422 | 974 `font-lock-type-face' Overridable keywords |
975 `font-lock-variable-name-face' Variable declarations, indirect array and | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
976 hash names, POD headers/item names |
63458
3265e9c7ab3d
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-418
Miles Bader <miles@gnu.org>
parents:
63350
diff
changeset
|
977 `cperl-invalid' Trailing whitespace |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
978 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
979 Note that in several situations the highlighting tries to inform about |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
980 possible confusion, such as different colors for function names in |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
981 declarations depending on what they (do not) override, or special cases |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
982 m// and s/// which do not do what one would expect them to do. |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
983 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
984 Help with best setup of these faces for printout requested (for each of |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
985 the faces: please specify bold, italic, underline, shadow and box.) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
986 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
987 In regular expressions (except character classes): |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
988 `font-lock-string-face' \"Normal\" stuff and non-0-length constructs |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
989 `font-lock-constant-face': Delimiters |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
990 `font-lock-warning-face' Special-cased m// and s//foo/, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
991 Mismatched closing delimiters, parens |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
992 we couldn't match, misplaced quantifiers, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
993 unrecognized escape sequences |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
994 `cperl-nonoverridable-face' Modifiers, as gism in m/REx/gism |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
995 `font-lock-type-face' POSIX classes inside charclasses, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
996 escape sequences with arguments (\x \23 \p \N) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
997 and others match-a-char escape sequences |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
998 `font-lock-keyword-face' Capturing parens, and | |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
999 `font-lock-function-name-face' Special symbols: $ ^ . [ ] [^ ] (?{ }) (??{ }) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1000 `font-lock-builtin-face' \"Remaining\" 0-length constructs, executable |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1001 parts of a REx, not-capturing parens |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1002 `font-lock-variable-name-face' Interpolated constructs, embedded code |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1003 `font-lock-comment-face' Embedded comments |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1004 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1005 ") |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1006 |
20323 | 1007 |
1008 | |
1009 ;;; Portability stuff: | |
1010 | |
1011 (defmacro cperl-define-key (emacs-key definition &optional xemacs-key) | |
26455 | 1012 `(define-key cperl-mode-map |
1013 ,(if xemacs-key | |
1014 `(if cperl-xemacs-p ,xemacs-key ,emacs-key) | |
1015 emacs-key) | |
1016 ,definition)) | |
20323 | 1017 |
1018 (defvar cperl-del-back-ch | |
1019 (car (append (where-is-internal 'delete-backward-char) | |
1020 (where-is-internal 'backward-delete-char-untabify))) | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
1021 "Character generated by key bound to `delete-backward-char'.") |
20323 | 1022 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1023 (and (vectorp cperl-del-back-ch) (= (length cperl-del-back-ch) 1) |
20323 | 1024 (setq cperl-del-back-ch (aref cperl-del-back-ch 0))) |
1025 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1026 (defun cperl-mark-active () (mark)) ; Avoid undefined warning |
20323 | 1027 (if cperl-xemacs-p |
1028 (progn | |
1029 ;; "Active regions" are on: use region only if active | |
1030 ;; "Active regions" are off: use region unconditionally | |
1031 (defun cperl-use-region-p () | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1032 (if zmacs-regions (mark) t))) |
20323 | 1033 (defun cperl-use-region-p () |
1034 (if transient-mark-mode mark-active t)) | |
1035 (defun cperl-mark-active () mark-active)) | |
1036 | |
1037 (defsubst cperl-enable-font-lock () | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1038 cperl-can-font-lock) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1039 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1040 (defun cperl-putback-char (c) ; Emacs 19 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1041 (set 'unread-command-events (list c))) ; Avoid undefined warning |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1042 |
55049
20627b978043
(cperl-putback-char): Delete Emacs 18 definition.
Richard M. Stallman <rms@gnu.org>
parents:
54556
diff
changeset
|
1043 (if cperl-xemacs-p |
20627b978043
(cperl-putback-char): Delete Emacs 18 definition.
Richard M. Stallman <rms@gnu.org>
parents:
54556
diff
changeset
|
1044 (defun cperl-putback-char (c) ; XEmacs >= 19.12 |
20627b978043
(cperl-putback-char): Delete Emacs 18 definition.
Richard M. Stallman <rms@gnu.org>
parents:
54556
diff
changeset
|
1045 (setq unread-command-events (list (eval '(character-to-event c)))))) |
20323 | 1046 |
1047 (or (fboundp 'uncomment-region) | |
1048 (defun uncomment-region (beg end) | |
1049 (interactive "r") | |
1050 (comment-region beg end -1))) | |
1051 | |
1052 (defvar cperl-do-not-fontify | |
1053 (if (string< emacs-version "19.30") | |
1054 'fontified | |
1055 'lazy-lock) | |
1056 "Text property which inhibits refontification.") | |
1057 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1058 (defsubst cperl-put-do-not-fontify (from to &optional post) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1059 ;; If POST, do not do it with postponed fontification |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1060 (if (and post cperl-syntaxify-by-font-lock) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1061 nil |
20323 | 1062 (put-text-property (max (point-min) (1- from)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1063 to cperl-do-not-fontify t))) |
20323 | 1064 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
1065 (defcustom cperl-mode-hook nil |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
1066 "Hook run by CPerl mode." |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
1067 :type 'hook |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
1068 :group 'cperl) |
20323 | 1069 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1070 (defvar cperl-syntax-state nil) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1071 (defvar cperl-syntax-done-to nil) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1072 (defvar cperl-emacs-can-parse (> (length (save-excursion |
44446
9b08deb1030e
(cperl-make-face, cperl-force-face):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43943
diff
changeset
|
1073 (parse-partial-sexp (point) (point)))) 9)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1074 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1075 ;; Make customization possible "in reverse" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1076 (defsubst cperl-val (symbol &optional default hairy) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1077 (cond |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1078 ((eq (symbol-value symbol) 'null) default) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1079 (cperl-hairy (or hairy t)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1080 (t (symbol-value symbol)))) |
20323 | 1081 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1082 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1083 (defun cperl-make-indent (column &optional minimum keep) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1084 "Makes indent of the current line the requested amount. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1085 Unless KEEP, removes the old indentation. Works around a bug in ancient |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1086 versions of Emacs." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1087 (let ((prop (get-text-property (point) 'syntax-type))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1088 (or keep |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1089 (delete-horizontal-space)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1090 (indent-to column minimum) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1091 ;; In old versions (e.g., 19.33) `indent-to' would not inherit properties |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1092 (and prop |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1093 (> (current-column) 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1094 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1095 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1096 (or (get-text-property (point) 'syntax-type) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1097 (and (looking-at "\\=[ \t]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1098 (put-text-property (point) (match-end 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1099 'syntax-type prop))))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1100 |
20323 | 1101 ;;; Probably it is too late to set these guys already, but it can help later: |
1102 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1103 ;;;(and cperl-clobber-mode-lists |
20323 | 1104 ;;;(setq auto-mode-alist |
1105 ;;; (append '(("\\.\\([pP][Llm]\\|al\\)$" . perl-mode)) auto-mode-alist )) | |
1106 ;;;(and (boundp 'interpreter-mode-alist) | |
1107 ;;; (setq interpreter-mode-alist (append interpreter-mode-alist | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1108 ;;; '(("miniperl" . perl-mode)))))) |
31821 | 1109 (eval-when-compile |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1110 (mapcar (lambda (p) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1111 (condition-case nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1112 (require p) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1113 (error nil))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1114 '(imenu easymenu etags timer man info)) |
31821 | 1115 (if (fboundp 'ps-extend-face-list) |
1116 (defmacro cperl-ps-extend-face-list (arg) | |
1117 `(ps-extend-face-list ,arg)) | |
1118 (defmacro cperl-ps-extend-face-list (arg) | |
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37569
diff
changeset
|
1119 `(error "This version of Emacs has no `ps-extend-face-list'"))) |
31821 | 1120 ;; Calling `cperl-enable-font-lock' below doesn't compile on XEmacs, |
1121 ;; macros instead of defsubsts don't work on Emacs, so we do the | |
1122 ;; expansion manually. Any other suggestions? | |
1123 (require 'cl)) | |
20323 | 1124 |
1125 (defvar cperl-mode-abbrev-table nil | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
1126 "Abbrev table in use in CPerl mode buffers.") |
20323 | 1127 |
1128 (add-hook 'edit-var-mode-alist '(perl-mode (regexp . "^cperl-"))) | |
1129 | |
1130 (defvar cperl-mode-map () "Keymap used in CPerl mode.") | |
1131 | |
1132 (if cperl-mode-map nil | |
1133 (setq cperl-mode-map (make-sparse-keymap)) | |
1134 (cperl-define-key "{" 'cperl-electric-lbrace) | |
1135 (cperl-define-key "[" 'cperl-electric-paren) | |
1136 (cperl-define-key "(" 'cperl-electric-paren) | |
1137 (cperl-define-key "<" 'cperl-electric-paren) | |
1138 (cperl-define-key "}" 'cperl-electric-brace) | |
1139 (cperl-define-key "]" 'cperl-electric-rparen) | |
1140 (cperl-define-key ")" 'cperl-electric-rparen) | |
1141 (cperl-define-key ";" 'cperl-electric-semi) | |
1142 (cperl-define-key ":" 'cperl-electric-terminator) | |
1143 (cperl-define-key "\C-j" 'newline-and-indent) | |
1144 (cperl-define-key "\C-c\C-j" 'cperl-linefeed) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1145 (cperl-define-key "\C-c\C-t" 'cperl-invert-if-unless) |
20323 | 1146 (cperl-define-key "\C-c\C-a" 'cperl-toggle-auto-newline) |
1147 (cperl-define-key "\C-c\C-k" 'cperl-toggle-abbrev) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1148 (cperl-define-key "\C-c\C-w" 'cperl-toggle-construct-fix) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1149 (cperl-define-key "\C-c\C-f" 'auto-fill-mode) |
20323 | 1150 (cperl-define-key "\C-c\C-e" 'cperl-toggle-electric) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1151 (cperl-define-key "\C-c\C-b" 'cperl-find-bad-style) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1152 (cperl-define-key "\C-c\C-p" 'cperl-pod-spell) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1153 (cperl-define-key "\C-c\C-d" 'cperl-here-doc-spell) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1154 (cperl-define-key "\C-c\C-n" 'cperl-narrow-to-here-doc) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1155 (cperl-define-key "\C-c\C-v" 'cperl-next-interpolated-REx) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1156 (cperl-define-key "\C-c\C-x" 'cperl-next-interpolated-REx-0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1157 (cperl-define-key "\C-c\C-y" 'cperl-next-interpolated-REx-1) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1158 (cperl-define-key "\C-c\C-ha" 'cperl-toggle-autohelp) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1159 (cperl-define-key "\C-c\C-hp" 'cperl-perldoc) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1160 (cperl-define-key "\C-c\C-hP" 'cperl-perldoc-at-point) |
20323 | 1161 (cperl-define-key "\e\C-q" 'cperl-indent-exp) ; Usually not bound |
1162 (cperl-define-key [?\C-\M-\|] 'cperl-lineup | |
1163 [(control meta |)]) | |
1164 ;;(cperl-define-key "\M-q" 'cperl-fill-paragraph) | |
1165 ;;(cperl-define-key "\e;" 'cperl-indent-for-comment) | |
1166 (cperl-define-key "\177" 'cperl-electric-backspace) | |
1167 (cperl-define-key "\t" 'cperl-indent-command) | |
1168 ;; don't clobber the backspace binding: | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1169 (cperl-define-key "\C-c\C-hF" 'cperl-info-on-command |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1170 [(control c) (control h) F]) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1171 (if (cperl-val 'cperl-clobber-lisp-bindings) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1172 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1173 (cperl-define-key "\C-hf" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1174 ;;(concat (char-to-string help-char) "f") ; does not work |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1175 'cperl-info-on-command |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1176 [(control h) f]) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1177 (cperl-define-key "\C-hv" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1178 ;;(concat (char-to-string help-char) "v") ; does not work |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1179 'cperl-get-help |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1180 [(control h) v]) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1181 (cperl-define-key "\C-c\C-hf" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1182 ;;(concat (char-to-string help-char) "f") ; does not work |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1183 (key-binding "\C-hf") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1184 [(control c) (control h) f]) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1185 (cperl-define-key "\C-c\C-hv" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1186 ;;(concat (char-to-string help-char) "v") ; does not work |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1187 (key-binding "\C-hv") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1188 [(control c) (control h) v])) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1189 (cperl-define-key "\C-c\C-hf" 'cperl-info-on-current-command |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1190 [(control c) (control h) f]) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1191 (cperl-define-key "\C-c\C-hv" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1192 ;;(concat (char-to-string help-char) "v") ; does not work |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1193 'cperl-get-help |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1194 [(control c) (control h) v])) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1195 (if (and cperl-xemacs-p |
20323 | 1196 (<= emacs-minor-version 11) (<= emacs-major-version 19)) |
1197 (progn | |
1198 ;; substitute-key-definition is usefulness-deenhanced... | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1199 ;;;;;(cperl-define-key "\M-q" 'cperl-fill-paragraph) |
20323 | 1200 (cperl-define-key "\e;" 'cperl-indent-for-comment) |
1201 (cperl-define-key "\e\C-\\" 'cperl-indent-region)) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1202 (or (boundp 'fill-paragraph-function) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1203 (substitute-key-definition |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1204 'fill-paragraph 'cperl-fill-paragraph |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1205 cperl-mode-map global-map)) |
20323 | 1206 (substitute-key-definition |
1207 'indent-sexp 'cperl-indent-exp | |
1208 cperl-mode-map global-map) | |
1209 (substitute-key-definition | |
1210 'indent-region 'cperl-indent-region | |
1211 cperl-mode-map global-map) | |
1212 (substitute-key-definition | |
1213 'indent-for-comment 'cperl-indent-for-comment | |
1214 cperl-mode-map global-map))) | |
1215 | |
1216 (defvar cperl-menu) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1217 (defvar cperl-lazy-installed) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1218 (defvar cperl-old-style nil) |
20323 | 1219 (condition-case nil |
1220 (progn | |
1221 (require 'easymenu) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1222 (easy-menu-define |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1223 cperl-menu cperl-mode-map "Menu for CPerl mode" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1224 '("Perl" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1225 ["Beginning of function" beginning-of-defun t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1226 ["End of function" end-of-defun t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1227 ["Mark function" mark-defun t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1228 ["Indent expression" cperl-indent-exp t] |
53779
5b728a418323
(cperl-mode-map, cperl-do-auto-fill, cperl-menu): Use fill-paragraph,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
1229 ["Fill paragraph/comment" fill-paragraph t] |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1230 "----" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1231 ["Line up a construction" cperl-lineup (cperl-use-region-p)] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1232 ["Invert if/unless/while etc" cperl-invert-if-unless t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1233 ("Regexp" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1234 ["Beautify" cperl-beautify-regexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1235 cperl-use-syntax-table-text-property] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1236 ["Beautify one level deep" (cperl-beautify-regexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1237 cperl-use-syntax-table-text-property] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1238 ["Beautify a group" cperl-beautify-level |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1239 cperl-use-syntax-table-text-property] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1240 ["Beautify a group one level deep" (cperl-beautify-level 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1241 cperl-use-syntax-table-text-property] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1242 ["Contract a group" cperl-contract-level |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1243 cperl-use-syntax-table-text-property] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1244 ["Contract groups" cperl-contract-levels |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1245 cperl-use-syntax-table-text-property] |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1246 "----" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1247 ["Find next interpolated" cperl-next-interpolated-REx |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1248 (next-single-property-change (point-min) 'REx-interpolated)] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1249 ["Find next interpolated (no //o)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1250 cperl-next-interpolated-REx-0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1251 (or (text-property-any (point-min) (point-max) 'REx-interpolated t) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1252 (text-property-any (point-min) (point-max) 'REx-interpolated 1))] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1253 ["Find next interpolated (neither //o nor whole-REx)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1254 cperl-next-interpolated-REx-1 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1255 (text-property-any (point-min) (point-max) 'REx-interpolated t)]) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1256 ["Insert spaces if needed to fix style" cperl-find-bad-style t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1257 ["Refresh \"hard\" constructions" cperl-find-pods-heres t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1258 "----" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1259 ["Indent region" cperl-indent-region (cperl-use-region-p)] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1260 ["Comment region" cperl-comment-region (cperl-use-region-p)] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1261 ["Uncomment region" cperl-uncomment-region (cperl-use-region-p)] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1262 "----" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1263 ["Run" mode-compile (fboundp 'mode-compile)] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1264 ["Kill" mode-compile-kill (and (fboundp 'mode-compile-kill) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1265 (get-buffer "*compilation*"))] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1266 ["Next error" next-error (get-buffer "*compilation*")] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1267 ["Check syntax" cperl-check-syntax (fboundp 'mode-compile)] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1268 "----" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1269 ["Debugger" cperl-db t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1270 "----" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1271 ("Tools" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1272 ["Imenu" imenu (fboundp 'imenu)] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1273 ["Imenu on Perl Info" cperl-imenu-on-info (featurep 'imenu)] |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1274 "----" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1275 ["Ispell PODs" cperl-pod-spell |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1276 ;; Better not to update syntaxification here: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1277 ;; debugging syntaxificatio can be broken by this??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1278 (or |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1279 (get-text-property (point-min) 'in-pod) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1280 (< (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1281 (and cperl-syntaxify-for-menu |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1282 (cperl-update-syntaxification (point-max) (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1283 (next-single-property-change (point-min) 'in-pod nil (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1284 (point-max)))] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1285 ["Ispell HERE-DOCs" cperl-here-doc-spell |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1286 (< (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1287 (and cperl-syntaxify-for-menu |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1288 (cperl-update-syntaxification (point-max) (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1289 (next-single-property-change (point-min) 'here-doc-group nil (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1290 (point-max))] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1291 ["Narrow to this HERE-DOC" cperl-narrow-to-here-doc |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1292 (eq 'here-doc (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1293 (and cperl-syntaxify-for-menu |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1294 (cperl-update-syntaxification (point) (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1295 (get-text-property (point) 'syntax-type)))] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1296 ["Select this HERE-DOC or POD section" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1297 cperl-select-this-pod-or-here-doc |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1298 (memq (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1299 (and cperl-syntaxify-for-menu |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1300 (cperl-update-syntaxification (point) (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1301 (get-text-property (point) 'syntax-type)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1302 '(here-doc pod))] |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1303 "----" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1304 ["CPerl pretty print (exprmntl)" cperl-ps-print |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1305 (fboundp 'ps-extend-face-list)] |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1306 "----" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1307 ["Syntaxify region" cperl-find-pods-heres-region |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1308 (cperl-use-region-p)] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1309 ["Profile syntaxification" cperl-time-fontification t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1310 ["Debug errors in delayed fontification" cperl-emulate-lazy-lock t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1311 ["Debug unwind for syntactic scan" cperl-toggle-set-debug-unwind t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1312 ["Debug backtrace on syntactic scan (BEWARE!!!)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1313 (cperl-toggle-set-debug-unwind nil t) t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1314 "----" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1315 ["Class Hierarchy from TAGS" cperl-tags-hier-init t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1316 ;;["Update classes" (cperl-tags-hier-init t) tags-table-list] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1317 ("Tags" |
20323 | 1318 ;;; ["Create tags for current file" cperl-etags t] |
1319 ;;; ["Add tags for current file" (cperl-etags t) t] | |
1320 ;;; ["Create tags for Perl files in directory" (cperl-etags nil t) t] | |
1321 ;;; ["Add tags for Perl files in directory" (cperl-etags t t) t] | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1322 ;;; ["Create tags for Perl files in (sub)directories" |
20323 | 1323 ;;; (cperl-etags nil 'recursive) t] |
1324 ;;; ["Add tags for Perl files in (sub)directories" | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1325 ;;; (cperl-etags t 'recursive) t]) |
20323 | 1326 ;;;; cperl-write-tags (&optional file erase recurse dir inbuffer) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1327 ["Create tags for current file" (cperl-write-tags nil t) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1328 ["Add tags for current file" (cperl-write-tags) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1329 ["Create tags for Perl files in directory" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1330 (cperl-write-tags nil t nil t) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1331 ["Add tags for Perl files in directory" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1332 (cperl-write-tags nil nil nil t) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1333 ["Create tags for Perl files in (sub)directories" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1334 (cperl-write-tags nil t t t) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1335 ["Add tags for Perl files in (sub)directories" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1336 (cperl-write-tags nil nil t t) t])) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1337 ("Perl docs" |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
1338 ["Define word at point" imenu-go-find-at-position |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1339 (fboundp 'imenu-go-find-at-position)] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1340 ["Help on function" cperl-info-on-command t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1341 ["Help on function at point" cperl-info-on-current-command t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1342 ["Help on symbol at point" cperl-get-help t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1343 ["Perldoc" cperl-perldoc t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1344 ["Perldoc on word at point" cperl-perldoc-at-point t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1345 ["View manpage of POD in this file" cperl-build-manpage t] |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
1346 ["Auto-help on" cperl-lazy-install |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1347 (and (fboundp 'run-with-idle-timer) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1348 (not cperl-lazy-installed))] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1349 ["Auto-help off" cperl-lazy-unstall |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1350 (and (fboundp 'run-with-idle-timer) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1351 cperl-lazy-installed)]) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1352 ("Toggle..." |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1353 ["Auto newline" cperl-toggle-auto-newline t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1354 ["Electric parens" cperl-toggle-electric t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1355 ["Electric keywords" cperl-toggle-abbrev t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1356 ["Fix whitespace on indent" cperl-toggle-construct-fix t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1357 ["Auto-help on Perl constructs" cperl-toggle-autohelp t] |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
1358 ["Auto fill" auto-fill-mode t]) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1359 ("Indent styles..." |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1360 ["CPerl" (cperl-set-style "CPerl") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1361 ["PerlStyle" (cperl-set-style "PerlStyle") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1362 ["GNU" (cperl-set-style "GNU") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1363 ["C++" (cperl-set-style "C++") t] |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1364 ["K&R" (cperl-set-style "K&R") t] |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1365 ["BSD" (cperl-set-style "BSD") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1366 ["Whitesmith" (cperl-set-style "Whitesmith") t] |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1367 ["Memorize Current" (cperl-set-style "Current") t] |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1368 ["Memorized" (cperl-set-style-back) cperl-old-style]) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1369 ("Micro-docs" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1370 ["Tips" (describe-variable 'cperl-tips) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1371 ["Problems" (describe-variable 'cperl-problems) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1372 ["Speed" (describe-variable 'cperl-speed) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1373 ["Praise" (describe-variable 'cperl-praise) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1374 ["Faces" (describe-variable 'cperl-tips-faces) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1375 ["CPerl mode" (describe-function 'cperl-mode) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1376 ["CPerl version" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1377 (message "The version of master-file for this CPerl is %s-Emacs" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1378 cperl-version) t])))) |
20323 | 1379 (error nil)) |
1380 | |
1381 (autoload 'c-macro-expand "cmacexp" | |
1382 "Display the result of expanding all C macros occurring in the region. | |
1383 The expansion is entirely correct because it uses the C preprocessor." | |
1384 t) | |
1385 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1386 ;;; These two must be unwound, otherwise take exponential time |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1387 (defconst cperl-maybe-white-and-comment-rex "[ \t\n]*\\(#[^\n]*\n[ \t\n]*\\)*" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1388 "Regular expression to match optional whitespace with interpspersed comments. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1389 Should contain exactly one group.") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1390 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1391 ;;; This one is tricky to unwind; still very inefficient... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1392 (defconst cperl-white-and-comment-rex "\\([ \t\n]\\|#[^\n]*\n\\)+" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1393 "Regular expression to match whitespace with interpspersed comments. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1394 Should contain exactly one group.") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1395 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1396 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1397 ;;; Is incorporated in `cperl-imenu--function-name-regexp-perl' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1398 ;;; `cperl-outline-regexp', `defun-prompt-regexp'. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1399 ;;; Details of groups in this may be used in several functions; see comments |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1400 ;;; near mentioned above variable(s)... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1401 ;;; sub($$):lvalue{} sub:lvalue{} Both allowed... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1402 (defsubst cperl-after-sub-regexp (named attr) ; 9 groups without attr... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1403 "Match the text after `sub' in a subroutine declaration. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1404 If NAMED is nil, allows anonymous subroutines. Matches up to the first \":\" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1405 of attributes (if present), or end of the name or prototype (whatever is |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1406 the last)." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1407 (concat ; Assume n groups before this... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1408 "\\(" ; n+1=name-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1409 cperl-white-and-comment-rex ; n+2=pre-name |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1410 "\\(::[a-zA-Z_0-9:']+\\|[a-zA-Z_'][a-zA-Z_0-9:']*\\)" ; n+3=name |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1411 "\\)" ; END n+1=name-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1412 (if named "" "?") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1413 "\\(" ; n+4=proto-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1414 cperl-maybe-white-and-comment-rex ; n+5=pre-proto |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1415 "\\(([^()]*)\\)" ; n+6=prototype |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1416 "\\)?" ; END n+4=proto-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1417 "\\(" ; n+7=attr-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1418 cperl-maybe-white-and-comment-rex ; n+8=pre-attr |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1419 "\\(" ; n+9=start-attr |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1420 ":" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1421 (if attr (concat |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1422 "\\(" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1423 cperl-maybe-white-and-comment-rex ; whitespace-comments |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1424 "\\(\\sw\\|_\\)+" ; attr-name |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1425 ;; attr-arg (1 level of internal parens allowed!) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1426 "\\((\\(\\\\.\\|[^\\\\()]\\|([^\\\\()]*)\\)*)\\)?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1427 "\\(" ; optional : (XXX allows trailing???) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1428 cperl-maybe-white-and-comment-rex ; whitespace-comments |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1429 ":\\)?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1430 "\\)+") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1431 "[^:]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1432 "\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1433 "\\)?" ; END n+6=proto-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1434 )) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1435 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1436 ;;; Details of groups in this are used in `cperl-imenu--create-perl-index' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1437 ;;; and `cperl-outline-level'. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1438 ;;;; Was: 2=sub|package; now 2=package-group, 5=package-name 8=sub-name (+3) |
43943
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1439 (defvar cperl-imenu--function-name-regexp-perl |
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1440 (concat |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1441 "^\\(" ; 1 = all |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1442 "\\([ \t]*package" ; 2 = package-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1443 "\\(" ; 3 = package-name-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1444 cperl-white-and-comment-rex ; 4 = pre-package-name |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1445 "\\([a-zA-Z_0-9:']+\\)\\)?\\)" ; 5 = package-name |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1446 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1447 "[ \t]*sub" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1448 (cperl-after-sub-regexp 'named nil) ; 8=name 11=proto 14=attr-start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1449 cperl-maybe-white-and-comment-rex ; 15=pre-block |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1450 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1451 "=head\\([1-4]\\)[ \t]+" ; 16=level |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1452 "\\([^\n]+\\)$" ; 17=text |
43943
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1453 "\\)")) |
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1454 |
43899
2b9c79cd9ecb
(cperl-outline-regexp): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
43688
diff
changeset
|
1455 (defvar cperl-outline-regexp |
2b9c79cd9ecb
(cperl-outline-regexp): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
43688
diff
changeset
|
1456 (concat cperl-imenu--function-name-regexp-perl "\\|" "\\`")) |
2b9c79cd9ecb
(cperl-outline-regexp): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
43688
diff
changeset
|
1457 |
20323 | 1458 (defvar cperl-mode-syntax-table nil |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
1459 "Syntax table in use in CPerl mode buffers.") |
20323 | 1460 |
1461 (defvar cperl-string-syntax-table nil | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
1462 "Syntax table in use in CPerl mode string-like chunks.") |
20323 | 1463 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1464 (defsubst cperl-1- (p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1465 (max (point-min) (1- p))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1466 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1467 (defsubst cperl-1+ (p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1468 (min (point-max) (1+ p))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1469 |
20323 | 1470 (if cperl-mode-syntax-table |
1471 () | |
1472 (setq cperl-mode-syntax-table (make-syntax-table)) | |
1473 (modify-syntax-entry ?\\ "\\" cperl-mode-syntax-table) | |
1474 (modify-syntax-entry ?/ "." cperl-mode-syntax-table) | |
1475 (modify-syntax-entry ?* "." cperl-mode-syntax-table) | |
1476 (modify-syntax-entry ?+ "." cperl-mode-syntax-table) | |
1477 (modify-syntax-entry ?- "." cperl-mode-syntax-table) | |
1478 (modify-syntax-entry ?= "." cperl-mode-syntax-table) | |
1479 (modify-syntax-entry ?% "." cperl-mode-syntax-table) | |
1480 (modify-syntax-entry ?< "." cperl-mode-syntax-table) | |
1481 (modify-syntax-entry ?> "." cperl-mode-syntax-table) | |
1482 (modify-syntax-entry ?& "." cperl-mode-syntax-table) | |
1483 (modify-syntax-entry ?$ "\\" cperl-mode-syntax-table) | |
1484 (modify-syntax-entry ?\n ">" cperl-mode-syntax-table) | |
1485 (modify-syntax-entry ?# "<" cperl-mode-syntax-table) | |
1486 (modify-syntax-entry ?' "\"" cperl-mode-syntax-table) | |
1487 (modify-syntax-entry ?` "\"" cperl-mode-syntax-table) | |
1488 (if cperl-under-as-char | |
1489 (modify-syntax-entry ?_ "w" cperl-mode-syntax-table)) | |
1490 (modify-syntax-entry ?: "_" cperl-mode-syntax-table) | |
1491 (modify-syntax-entry ?| "." cperl-mode-syntax-table) | |
1492 (setq cperl-string-syntax-table (copy-syntax-table cperl-mode-syntax-table)) | |
1493 (modify-syntax-entry ?$ "." cperl-string-syntax-table) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1494 (modify-syntax-entry ?\{ "." cperl-string-syntax-table) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1495 (modify-syntax-entry ?\} "." cperl-string-syntax-table) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1496 (modify-syntax-entry ?# "." cperl-string-syntax-table)) ; (?# comment ) |
20323 | 1497 |
1498 | |
1499 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1500 (defvar cperl-faces-init nil) |
20323 | 1501 ;; Fix for msb.el |
1502 (defvar cperl-msb-fixed nil) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1503 (defvar cperl-use-major-mode 'cperl-mode) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1504 (defvar cperl-font-lock-multiline-start nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1505 (defvar cperl-font-lock-multiline nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1506 (defvar cperl-font-locking nil) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1507 |
78407
377800d78812
(cperl-compilation-error-regexp-alist): Remove duplicate defvar
Glenn Morris <rgm@gnu.org>
parents:
78234
diff
changeset
|
1508 ;; NB as it stands the code in cperl-mode assumes this only has one |
377800d78812
(cperl-compilation-error-regexp-alist): Remove duplicate defvar
Glenn Morris <rgm@gnu.org>
parents:
78234
diff
changeset
|
1509 ;; element. If Xemacs 19 support were dropped, this could all be simplified. |
377800d78812
(cperl-compilation-error-regexp-alist): Remove duplicate defvar
Glenn Morris <rgm@gnu.org>
parents:
78234
diff
changeset
|
1510 (defvar cperl-compilation-error-regexp-alist |
377800d78812
(cperl-compilation-error-regexp-alist): Remove duplicate defvar
Glenn Morris <rgm@gnu.org>
parents:
78234
diff
changeset
|
1511 ;; This look like a paranoiac regexp: could anybody find a better one? (which WORKS). |
377800d78812
(cperl-compilation-error-regexp-alist): Remove duplicate defvar
Glenn Morris <rgm@gnu.org>
parents:
78234
diff
changeset
|
1512 '(("^[^\n]* \\(file\\|at\\) \\([^ \t\n]+\\) [^\n]*line \\([0-9]+\\)[\\., \n]" |
377800d78812
(cperl-compilation-error-regexp-alist): Remove duplicate defvar
Glenn Morris <rgm@gnu.org>
parents:
78234
diff
changeset
|
1513 2 3)) |
377800d78812
(cperl-compilation-error-regexp-alist): Remove duplicate defvar
Glenn Morris <rgm@gnu.org>
parents:
78234
diff
changeset
|
1514 "Alist that specifies how to match errors in perl output.") |
377800d78812
(cperl-compilation-error-regexp-alist): Remove duplicate defvar
Glenn Morris <rgm@gnu.org>
parents:
78234
diff
changeset
|
1515 |
20323 | 1516 ;;;###autoload |
1517 (defun cperl-mode () | |
1518 "Major mode for editing Perl code. | |
1519 Expression and list commands understand all C brackets. | |
1520 Tab indents for Perl code. | |
1521 Paragraphs are separated by blank lines only. | |
1522 Delete converts tabs to spaces as it moves back. | |
1523 | |
1524 Various characters in Perl almost always come in pairs: {}, (), [], | |
1525 sometimes <>. When the user types the first, she gets the second as | |
1526 well, with optional special formatting done on {}. (Disabled by | |
1527 default.) You can always quote (with \\[quoted-insert]) the left | |
1528 \"paren\" to avoid the expansion. The processing of < is special, | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
1529 since most the time you mean \"less\". CPerl mode tries to guess |
20323 | 1530 whether you want to type pair <>, and inserts is if it |
1531 appropriate. You can set `cperl-electric-parens-string' to the string that | |
1532 contains the parenths from the above list you want to be electrical. | |
1533 Electricity of parenths is controlled by `cperl-electric-parens'. | |
1534 You may also set `cperl-electric-parens-mark' to have electric parens | |
1535 look for active mark and \"embrace\" a region if possible.' | |
1536 | |
1537 CPerl mode provides expansion of the Perl control constructs: | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1538 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1539 if, else, elsif, unless, while, until, continue, do, |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1540 for, foreach, formy and foreachmy. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1541 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1542 and POD directives (Disabled by default, see `cperl-electric-keywords'.) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1543 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1544 The user types the keyword immediately followed by a space, which |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1545 causes the construct to be expanded, and the point is positioned where |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1546 she is most likely to want to be. eg. when the user types a space |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1547 following \"if\" the following appears in the buffer: if () { or if () |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1548 } { } and the cursor is between the parentheses. The user can then |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1549 type some boolean expression within the parens. Having done that, |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1550 typing \\[cperl-linefeed] places you - appropriately indented - on a |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1551 new line between the braces (if you typed \\[cperl-linefeed] in a POD |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1552 directive line, then appropriate number of new lines is inserted). |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1553 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1554 If CPerl decides that you want to insert \"English\" style construct like |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1555 |
20323 | 1556 bite if angry; |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1557 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1558 it will not do any expansion. See also help on variable |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1559 `cperl-extra-newline-before-brace'. (Note that one can switch the |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1560 help message on expansion by setting `cperl-message-electric-keyword' |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1561 to nil.) |
20323 | 1562 |
1563 \\[cperl-linefeed] is a convenience replacement for typing carriage | |
1564 return. It places you in the next line with proper indentation, or if | |
1565 you type it inside the inline block of control construct, like | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1566 |
20323 | 1567 foreach (@lines) {print; print} |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1568 |
20323 | 1569 and you are on a boundary of a statement inside braces, it will |
1570 transform the construct into a multiline and will place you into an | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1571 appropriately indented blank line. If you need a usual |
63274
b870276d9ea5
(cperl-info-on-command-no-prompt, cperl-mode): Fix spellings in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
62686
diff
changeset
|
1572 `newline-and-indent' behavior, it is on \\[newline-and-indent], |
20323 | 1573 see documentation on `cperl-electric-linefeed'. |
1574 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1575 Use \\[cperl-invert-if-unless] to change a construction of the form |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1576 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1577 if (A) { B } |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1578 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1579 into |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1580 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1581 B if A; |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1582 |
20323 | 1583 \\{cperl-mode-map} |
1584 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1585 Setting the variable `cperl-font-lock' to t switches on font-lock-mode |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1586 \(even with older Emacsen), `cperl-electric-lbrace-space' to t switches |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1587 on electric space between $ and {, `cperl-electric-parens-string' is |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1588 the string that contains parentheses that should be electric in CPerl |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1589 \(see also `cperl-electric-parens-mark' and `cperl-electric-parens'), |
20323 | 1590 setting `cperl-electric-keywords' enables electric expansion of |
1591 control structures in CPerl. `cperl-electric-linefeed' governs which | |
1592 one of two linefeed behavior is preferable. You can enable all these | |
1593 options simultaneously (recommended mode of use) by setting | |
1594 `cperl-hairy' to t. In this case you can switch separate options off | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1595 by setting them to `null'. Note that one may undo the extra |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1596 whitespace inserted by semis and braces in `auto-newline'-mode by |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1597 consequent \\[cperl-electric-backspace]. |
20323 | 1598 |
1599 If your site has perl5 documentation in info format, you can use commands | |
1600 \\[cperl-info-on-current-command] and \\[cperl-info-on-command] to access it. | |
1601 These keys run commands `cperl-info-on-current-command' and | |
1602 `cperl-info-on-command', which one is which is controlled by variable | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1603 `cperl-info-on-command-no-prompt' and `cperl-clobber-lisp-bindings' |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1604 \(in turn affected by `cperl-hairy'). |
20323 | 1605 |
1606 Even if you have no info-format documentation, short one-liner-style | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1607 help is available on \\[cperl-get-help], and one can run perldoc or |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1608 man via menu. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1609 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1610 It is possible to show this help automatically after some idle time. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1611 This is regulated by variable `cperl-lazy-help-time'. Default with |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1612 `cperl-hairy' (if the value of `cperl-lazy-help-time' is nil) is 5 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1613 secs idle time . It is also possible to switch this on/off from the |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1614 menu, or via \\[cperl-toggle-autohelp]. Requires `run-with-idle-timer'. |
20323 | 1615 |
1616 Use \\[cperl-lineup] to vertically lineup some construction - put the | |
1617 beginning of the region at the start of construction, and make region | |
1618 span the needed amount of lines. | |
1619 | |
1620 Variables `cperl-pod-here-scan', `cperl-pod-here-fontify', | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1621 `cperl-pod-face', `cperl-pod-head-face' control processing of POD and |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1622 here-docs sections. With capable Emaxen results of scan are used |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1623 for indentation too, otherwise they are used for highlighting only. |
20323 | 1624 |
1625 Variables controlling indentation style: | |
1626 `cperl-tab-always-indent' | |
1627 Non-nil means TAB in CPerl mode should always reindent the current line, | |
1628 regardless of where in the line point is when the TAB command is used. | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1629 `cperl-indent-left-aligned-comments' |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1630 Non-nil means that the comment starting in leftmost column should indent. |
20323 | 1631 `cperl-auto-newline' |
1632 Non-nil means automatically newline before and after braces, | |
1633 and after colons and semicolons, inserted in Perl code. The following | |
1634 \\[cperl-electric-backspace] will remove the inserted whitespace. | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1635 Insertion after colons requires both this variable and |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1636 `cperl-auto-newline-after-colon' set. |
20323 | 1637 `cperl-auto-newline-after-colon' |
1638 Non-nil means automatically newline even after colons. | |
1639 Subject to `cperl-auto-newline' setting. | |
1640 `cperl-indent-level' | |
1641 Indentation of Perl statements within surrounding block. | |
1642 The surrounding block's indentation is the indentation | |
1643 of the line on which the open-brace appears. | |
1644 `cperl-continued-statement-offset' | |
1645 Extra indentation given to a substatement, such as the | |
1646 then-clause of an if, or body of a while, or just a statement continuation. | |
1647 `cperl-continued-brace-offset' | |
1648 Extra indentation given to a brace that starts a substatement. | |
1649 This is in addition to `cperl-continued-statement-offset'. | |
1650 `cperl-brace-offset' | |
1651 Extra indentation for line if it starts with an open brace. | |
1652 `cperl-brace-imaginary-offset' | |
1653 An open brace following other text is treated as if it the line started | |
1654 this far to the right of the actual line indentation. | |
1655 `cperl-label-offset' | |
1656 Extra indentation for line that is a label. | |
1657 `cperl-min-label-indent' | |
1658 Minimal indentation for line that is a label. | |
1659 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1660 Settings for classic indent-styles: K&R BSD=C++ GNU PerlStyle=Whitesmith |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1661 `cperl-indent-level' 5 4 2 4 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1662 `cperl-brace-offset' 0 0 0 0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1663 `cperl-continued-brace-offset' -5 -4 0 0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1664 `cperl-label-offset' -5 -4 -2 -4 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1665 `cperl-continued-statement-offset' 5 4 2 4 |
20323 | 1666 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1667 CPerl knows several indentation styles, and may bulk set the |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1668 corresponding variables. Use \\[cperl-set-style] to do this. Use |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1669 \\[cperl-set-style-back] to restore the memorized preexisting values |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1670 \(both available from menu). See examples in `cperl-style-examples'. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1671 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1672 Part of the indentation style is how different parts of if/elsif/else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1673 statements are broken into lines; in CPerl, this is reflected on how |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1674 templates for these constructs are created (controlled by |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1675 `cperl-extra-newline-before-brace'), and how reflow-logic should treat \"continuation\" blocks of else/elsif/continue, controlled by the same variable, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1676 and by `cperl-extra-newline-before-brace-multiline', |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1677 `cperl-merge-trailing-else', `cperl-indent-region-fix-constructs'. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1678 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1679 If `cperl-indent-level' is 0, the statement after opening brace in |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1680 column 0 is indented on |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1681 `cperl-brace-offset'+`cperl-continued-statement-offset'. |
20323 | 1682 |
1683 Turning on CPerl mode calls the hooks in the variable `cperl-mode-hook' | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1684 with no args. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1685 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1686 DO NOT FORGET to read micro-docs (available from `Perl' menu) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1687 or as help on variables `cperl-tips', `cperl-problems', |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
1688 `cperl-praise', `cperl-speed'." |
20323 | 1689 (interactive) |
1690 (kill-all-local-variables) | |
1691 (use-local-map cperl-mode-map) | |
1692 (if (cperl-val 'cperl-electric-linefeed) | |
1693 (progn | |
1694 (local-set-key "\C-J" 'cperl-linefeed) | |
1695 (local-set-key "\C-C\C-J" 'newline-and-indent))) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1696 (if (and |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1697 (cperl-val 'cperl-clobber-lisp-bindings) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1698 (cperl-val 'cperl-info-on-command-no-prompt)) |
20323 | 1699 (progn |
1700 ;; don't clobber the backspace binding: | |
1701 (cperl-define-key "\C-hf" 'cperl-info-on-current-command [(control h) f]) | |
1702 (cperl-define-key "\C-c\C-hf" 'cperl-info-on-command | |
1703 [(control c) (control h) f]))) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1704 (setq major-mode cperl-use-major-mode) |
20323 | 1705 (setq mode-name "CPerl") |
74429
79a5ffc89507
(cperl-mode): Define abbrevs even if abbrev-table is non-nil (saved
Glenn Morris <rgm@gnu.org>
parents:
73921
diff
changeset
|
1706 (let ((prev-a-c abbrevs-changed)) |
79a5ffc89507
(cperl-mode): Define abbrevs even if abbrev-table is non-nil (saved
Glenn Morris <rgm@gnu.org>
parents:
73921
diff
changeset
|
1707 (define-abbrev-table 'cperl-mode-abbrev-table '( |
20323 | 1708 ("if" "if" cperl-electric-keyword 0) |
1709 ("elsif" "elsif" cperl-electric-keyword 0) | |
1710 ("while" "while" cperl-electric-keyword 0) | |
1711 ("until" "until" cperl-electric-keyword 0) | |
1712 ("unless" "unless" cperl-electric-keyword 0) | |
1713 ("else" "else" cperl-electric-else 0) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1714 ("continue" "continue" cperl-electric-else 0) |
20323 | 1715 ("for" "for" cperl-electric-keyword 0) |
1716 ("foreach" "foreach" cperl-electric-keyword 0) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1717 ("formy" "formy" cperl-electric-keyword 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1718 ("foreachmy" "foreachmy" cperl-electric-keyword 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1719 ("do" "do" cperl-electric-keyword 0) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1720 ("=pod" "=pod" cperl-electric-pod 0) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1721 ("=over" "=over" cperl-electric-pod 0) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1722 ("=head1" "=head1" cperl-electric-pod 0) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1723 ("=head2" "=head2" cperl-electric-pod 0) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1724 ("pod" "pod" cperl-electric-pod 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1725 ("over" "over" cperl-electric-pod 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1726 ("head1" "head1" cperl-electric-pod 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1727 ("head2" "head2" cperl-electric-pod 0))) |
74429
79a5ffc89507
(cperl-mode): Define abbrevs even if abbrev-table is non-nil (saved
Glenn Morris <rgm@gnu.org>
parents:
73921
diff
changeset
|
1728 (setq abbrevs-changed prev-a-c)) |
20323 | 1729 (setq local-abbrev-table cperl-mode-abbrev-table) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1730 (if (cperl-val 'cperl-electric-keywords) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1731 (abbrev-mode 1)) |
20323 | 1732 (set-syntax-table cperl-mode-syntax-table) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1733 ;; Until Emacs is multi-threaded, we do not actually need it local: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1734 (make-local-variable 'cperl-font-lock-multiline-start) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1735 (make-local-variable 'cperl-font-locking) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1736 (make-local-variable 'outline-regexp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1737 ;; (setq outline-regexp imenu-example--function-name-regexp-perl) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1738 (setq outline-regexp cperl-outline-regexp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1739 (make-local-variable 'outline-level) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1740 (setq outline-level 'cperl-outline-level) |
20323 | 1741 (make-local-variable 'paragraph-start) |
1742 (setq paragraph-start (concat "^$\\|" page-delimiter)) | |
1743 (make-local-variable 'paragraph-separate) | |
1744 (setq paragraph-separate paragraph-start) | |
1745 (make-local-variable 'paragraph-ignore-fill-prefix) | |
1746 (setq paragraph-ignore-fill-prefix t) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1747 (if cperl-xemacs-p |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1748 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1749 (make-local-variable 'paren-backwards-message) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1750 (set 'paren-backwards-message t))) |
20323 | 1751 (make-local-variable 'indent-line-function) |
1752 (setq indent-line-function 'cperl-indent-line) | |
1753 (make-local-variable 'require-final-newline) | |
59242
520077017d32
(cperl-mode): Use mode-require-final-newline.
Richard M. Stallman <rms@gnu.org>
parents:
59103
diff
changeset
|
1754 (setq require-final-newline mode-require-final-newline) |
20323 | 1755 (make-local-variable 'comment-start) |
1756 (setq comment-start "# ") | |
1757 (make-local-variable 'comment-end) | |
1758 (setq comment-end "") | |
1759 (make-local-variable 'comment-column) | |
1760 (setq comment-column cperl-comment-column) | |
1761 (make-local-variable 'comment-start-skip) | |
1762 (setq comment-start-skip "#+ *") | |
1763 (make-local-variable 'defun-prompt-regexp) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1764 ;;; "[ \t]*sub" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1765 ;;; (cperl-after-sub-regexp 'named nil) ; 8=name 11=proto 14=attr-start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1766 ;;; cperl-maybe-white-and-comment-rex ; 15=pre-block |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1767 (setq defun-prompt-regexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1768 (concat "^[ \t]*\\(sub" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1769 (cperl-after-sub-regexp 'named 'attr-groups) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1770 "\\|" ; per toke.c |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1771 "\\(BEGIN\\|CHECK\\|INIT\\|END\\|AUTOLOAD\\|DESTROY\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1772 "\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1773 cperl-maybe-white-and-comment-rex)) |
20323 | 1774 (make-local-variable 'comment-indent-function) |
1775 (setq comment-indent-function 'cperl-comment-indent) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1776 (and (boundp 'fill-paragraph-function) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1777 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1778 (make-local-variable 'fill-paragraph-function) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1779 (set 'fill-paragraph-function 'cperl-fill-paragraph))) |
20323 | 1780 (make-local-variable 'parse-sexp-ignore-comments) |
1781 (setq parse-sexp-ignore-comments t) | |
1782 (make-local-variable 'indent-region-function) | |
1783 (setq indent-region-function 'cperl-indent-region) | |
1784 ;;(setq auto-fill-function 'cperl-do-auto-fill) ; Need to switch on and off! | |
1785 (make-local-variable 'imenu-create-index-function) | |
1786 (setq imenu-create-index-function | |
31821 | 1787 (function cperl-imenu--create-perl-index)) |
20323 | 1788 (make-local-variable 'imenu-sort-function) |
1789 (setq imenu-sort-function nil) | |
62686
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
1790 (make-local-variable 'vc-rcs-header) |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
1791 (set 'vc-rcs-header cperl-vc-rcs-header) |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
1792 (make-local-variable 'vc-sccs-header) |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
1793 (set 'vc-sccs-header cperl-vc-sccs-header) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1794 ;; This one is obsolete... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1795 (make-local-variable 'vc-header-alist) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1796 (set 'vc-header-alist (or cperl-vc-header-alist ; Avoid warning |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
1797 `((SCCS ,(car cperl-vc-sccs-header)) |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
1798 (RCS ,(car cperl-vc-rcs-header))))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1799 (cond ((boundp 'compilation-error-regexp-alist-alist);; xemacs 20.x |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1800 (make-local-variable 'compilation-error-regexp-alist-alist) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1801 (set 'compilation-error-regexp-alist-alist |
78407
377800d78812
(cperl-compilation-error-regexp-alist): Remove duplicate defvar
Glenn Morris <rgm@gnu.org>
parents:
78234
diff
changeset
|
1802 (cons (cons 'cperl (car cperl-compilation-error-regexp-alist)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1803 (symbol-value 'compilation-error-regexp-alist-alist))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1804 (if (fboundp 'compilation-build-compilation-error-regexp-alist) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1805 (let ((f 'compilation-build-compilation-error-regexp-alist)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1806 (funcall f)) |
73921
9bcc33b6d297
(cperl-mode): Before adding to it, make `compilation-error-regexp-alist'
Romain Francoise <romain@orebokech.com>
parents:
73461
diff
changeset
|
1807 (make-local-variable 'compilation-error-regexp-alist) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1808 (push 'cperl compilation-error-regexp-alist))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1809 ((boundp 'compilation-error-regexp-alist);; xmeacs 19.x |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1810 (make-local-variable 'compilation-error-regexp-alist) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1811 (set 'compilation-error-regexp-alist |
76299
08cc2843c940
(cperl-mode): Modify cperl-compilation-error-regexp-alist by appending.
Richard M. Stallman <rms@gnu.org>
parents:
75347
diff
changeset
|
1812 (append cperl-compilation-error-regexp-alist |
08cc2843c940
(cperl-mode): Modify cperl-compilation-error-regexp-alist by appending.
Richard M. Stallman <rms@gnu.org>
parents:
75347
diff
changeset
|
1813 (symbol-value 'compilation-error-regexp-alist))))) |
20323 | 1814 (make-local-variable 'font-lock-defaults) |
1815 (setq font-lock-defaults | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1816 (cond |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1817 ((string< emacs-version "19.30") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1818 '(cperl-font-lock-keywords-2 nil nil ((?_ . "w")))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1819 ((string< emacs-version "19.33") ; Which one to use? |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
1820 '((cperl-font-lock-keywords |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
1821 cperl-font-lock-keywords-1 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1822 cperl-font-lock-keywords-2) nil nil ((?_ . "w")))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1823 (t |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1824 '((cperl-load-font-lock-keywords |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1825 cperl-load-font-lock-keywords-1 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1826 cperl-load-font-lock-keywords-2) nil nil ((?_ . "w")))))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1827 (make-local-variable 'cperl-syntax-state) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1828 (setq cperl-syntax-state nil) ; reset syntaxification cache |
20323 | 1829 (if cperl-use-syntax-table-text-property |
1830 (progn | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
1831 (make-local-variable 'parse-sexp-lookup-properties) |
20323 | 1832 ;; Do not introduce variable if not needed, we check it! |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1833 (set 'parse-sexp-lookup-properties t) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1834 ;; Fix broken font-lock: |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1835 (or (boundp 'font-lock-unfontify-region-function) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1836 (set 'font-lock-unfontify-region-function |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1837 'font-lock-default-unfontify-region)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1838 (unless cperl-xemacs-p ; Our: just a plug for wrong font-lock |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1839 (make-local-variable 'font-lock-unfontify-region-function) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1840 (set 'font-lock-unfontify-region-function ; not present with old Emacs |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1841 'cperl-font-lock-unfontify-region-function)) |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
1842 (make-local-variable 'cperl-syntax-done-to) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1843 (setq cperl-syntax-done-to nil) ; reset syntaxification cache |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
1844 (make-local-variable 'font-lock-syntactic-keywords) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1845 (setq font-lock-syntactic-keywords |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1846 (if cperl-syntaxify-by-font-lock |
61892
6acaa6301fd7
(cperl-mode): Don't precompile the font-lock-fontify-syntactic-keywords.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60925
diff
changeset
|
1847 '((cperl-fontify-syntaxically)) |
6acaa6301fd7
(cperl-mode): Don't precompile the font-lock-fontify-syntactic-keywords.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60925
diff
changeset
|
1848 ;; unless font-lock-syntactic-keywords, font-lock (pre-22.1) |
6acaa6301fd7
(cperl-mode): Don't precompile the font-lock-fontify-syntactic-keywords.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60925
diff
changeset
|
1849 ;; used to ignore syntax-table text-properties. (t) is a hack |
6acaa6301fd7
(cperl-mode): Don't precompile the font-lock-fontify-syntactic-keywords.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60925
diff
changeset
|
1850 ;; to make font-lock think that font-lock-syntactic-keywords |
6acaa6301fd7
(cperl-mode): Don't precompile the font-lock-fontify-syntactic-keywords.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60925
diff
changeset
|
1851 ;; are defined. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1852 '(t))))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1853 (if (boundp 'font-lock-multiline) ; Newer font-lock; use its facilities |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1854 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1855 (setq cperl-font-lock-multiline t) ; Not localized... |
73457
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
1856 (set (make-local-variable 'font-lock-multiline) t)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1857 (make-local-variable 'font-lock-fontify-region-function) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1858 (set 'font-lock-fontify-region-function ; not present with old Emacs |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1859 'cperl-font-lock-fontify-region-function)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1860 (make-local-variable 'font-lock-fontify-region-function) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1861 (set 'font-lock-fontify-region-function ; not present with old Emacs |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1862 'cperl-font-lock-fontify-region-function) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1863 (make-local-variable 'cperl-old-style) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1864 (if (boundp 'normal-auto-fill-function) ; 19.33 and later |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1865 (set (make-local-variable 'normal-auto-fill-function) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1866 'cperl-do-auto-fill) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1867 (or (fboundp 'cperl-old-auto-fill-mode) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1868 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1869 (fset 'cperl-old-auto-fill-mode (symbol-function 'auto-fill-mode)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1870 (defun auto-fill-mode (&optional arg) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1871 (interactive "P") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1872 (eval '(cperl-old-auto-fill-mode arg)) ; Avoid a warning |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1873 (and auto-fill-function (memq major-mode '(perl-mode cperl-mode)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1874 (setq auto-fill-function 'cperl-do-auto-fill)))))) |
20323 | 1875 (if (cperl-enable-font-lock) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1876 (if (cperl-val 'cperl-font-lock) |
20323 | 1877 (progn (or cperl-faces-init (cperl-init-faces)) |
1878 (font-lock-mode 1)))) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1879 (set (make-local-variable 'facemenu-add-face-function) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1880 'cperl-facemenu-add-face-function) ; XXXX What this guy is for??? |
20323 | 1881 (and (boundp 'msb-menu-cond) |
1882 (not cperl-msb-fixed) | |
1883 (cperl-msb-fix)) | |
1884 (if (featurep 'easymenu) | |
22392
7300e6ab99d2
(cperl-problems): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
22391
diff
changeset
|
1885 (easy-menu-add cperl-menu)) ; A NOP in Emacs. |
58190
71f3f7fc6fcd
run-mode-hooks instead of run-hooks
Daniel Pfeiffer <occitan@esperanto.org>
parents:
58003
diff
changeset
|
1886 (run-mode-hooks 'cperl-mode-hook) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1887 (if cperl-hook-after-change |
77103
5e661f4001f4
(cperl-mode): Remove unnecessary call to obsolete function
Glenn Morris <rgm@gnu.org>
parents:
76299
diff
changeset
|
1888 (add-hook 'after-change-functions 'cperl-after-change-function nil t)) |
20323 | 1889 ;; After hooks since fontification will break this |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1890 (if cperl-pod-here-scan |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1891 (or cperl-syntaxify-by-font-lock |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1892 (progn (or cperl-faces-init (cperl-init-faces-weak)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1893 (cperl-find-pods-heres))))) |
20323 | 1894 |
1895 ;; Fix for perldb - make default reasonable | |
1896 (defun cperl-db () | |
1897 (interactive) | |
1898 (require 'gud) | |
1899 (perldb (read-from-minibuffer "Run perldb (like this): " | |
1900 (if (consp gud-perldb-history) | |
1901 (car gud-perldb-history) | |
1902 (concat "perl " ;;(file-name-nondirectory | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1903 ;; I have problems |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1904 ;; in OS/2 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1905 ;; otherwise |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1906 (buffer-file-name))) |
20323 | 1907 nil nil |
1908 '(gud-perldb-history . 1)))) | |
1909 | |
1910 (defun cperl-msb-fix () | |
1911 ;; Adds perl files to msb menu, supposes that msb is already loaded | |
1912 (setq cperl-msb-fixed t) | |
1913 (let* ((l (length msb-menu-cond)) | |
1914 (last (nth (1- l) msb-menu-cond)) | |
1915 (precdr (nthcdr (- l 2) msb-menu-cond)) ; cdr of this is last | |
1916 (handle (1- (nth 1 last)))) | |
1917 (setcdr precdr (list | |
1918 (list | |
36602
4bcc2745d610
(cperl-msb-fix, cperl-get-help-defer):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36601
diff
changeset
|
1919 '(memq major-mode '(cperl-mode perl-mode)) |
20323 | 1920 handle |
1921 "Perl Files (%d)") | |
1922 last)))) | |
1923 | |
1924 ;; This is used by indent-for-comment | |
1925 ;; to decide how much to indent a comment in CPerl code | |
1926 ;; based on its context. Do fallback if comment is found wrong. | |
1927 | |
1928 (defvar cperl-wrong-comment) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1929 (defvar cperl-st-cfence '(14)) ; Comment-fence |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1930 (defvar cperl-st-sfence '(15)) ; String-fence |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1931 (defvar cperl-st-punct '(1)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1932 (defvar cperl-st-word '(2)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1933 (defvar cperl-st-bra '(4 . ?\>)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1934 (defvar cperl-st-ket '(5 . ?\<)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1935 |
20323 | 1936 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1937 (defun cperl-comment-indent () ; called at point at supposed comment |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1938 (let ((p (point)) (c (current-column)) was phony) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1939 (if (and (not cperl-indent-comment-at-column-0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1940 (looking-at "^#")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1941 0 ; Existing comment at bol stays there. |
20323 | 1942 ;; Wrong comment found |
1943 (save-excursion | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1944 (setq was (cperl-to-comment-or-eol) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1945 phony (eq (get-text-property (point) 'syntax-table) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1946 cperl-st-cfence)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1947 (if phony |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1948 (progn ; Too naive??? |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1949 (re-search-forward "#\\|$") ; Hmm, what about embedded #? |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1950 (if (eq (preceding-char) ?\#) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1951 (forward-char -1)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1952 (setq was nil))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1953 (if (= (point) p) ; Our caller found a correct place |
20323 | 1954 (progn |
1955 (skip-chars-backward " \t") | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1956 (setq was (current-column)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1957 (if (eq was 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1958 comment-column |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1959 (max (1+ was) ; Else indent at comment column |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1960 comment-column))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1961 ;; No, the caller found a random place; we need to edit ourselves |
20323 | 1962 (if was nil |
1963 (insert comment-start) | |
1964 (backward-char (length comment-start))) | |
1965 (setq cperl-wrong-comment t) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1966 (cperl-make-indent comment-column 1) ; Indent min 1 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1967 c))))) |
20323 | 1968 |
1969 ;;;(defun cperl-comment-indent-fallback () | |
1970 ;;; "Is called if the standard comment-search procedure fails. | |
1971 ;;;Point is at start of real comment." | |
1972 ;;; (let ((c (current-column)) target cnt prevc) | |
1973 ;;; (if (= c comment-column) nil | |
1974 ;;; (setq cnt (skip-chars-backward "[ \t]")) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1975 ;;; (setq target (max (1+ (setq prevc |
20323 | 1976 ;;; (current-column))) ; Else indent at comment column |
1977 ;;; comment-column)) | |
1978 ;;; (if (= c comment-column) nil | |
1979 ;;; (delete-backward-char cnt) | |
1980 ;;; (while (< prevc target) | |
1981 ;;; (insert "\t") | |
1982 ;;; (setq prevc (current-column))) | |
1983 ;;; (if (> prevc target) (progn (delete-char -1) (setq prevc (current-column)))) | |
1984 ;;; (while (< prevc target) | |
1985 ;;; (insert " ") | |
1986 ;;; (setq prevc (current-column))))))) | |
1987 | |
1988 (defun cperl-indent-for-comment () | |
1989 "Substitute for `indent-for-comment' in CPerl." | |
1990 (interactive) | |
1991 (let (cperl-wrong-comment) | |
1992 (indent-for-comment) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1993 (if cperl-wrong-comment ; set by `cperl-comment-indent' |
20323 | 1994 (progn (cperl-to-comment-or-eol) |
1995 (forward-char (length comment-start)))))) | |
1996 | |
1997 (defun cperl-comment-region (b e arg) | |
1998 "Comment or uncomment each line in the region in CPerl mode. | |
1999 See `comment-region'." | |
2000 (interactive "r\np") | |
2001 (let ((comment-start "#")) | |
2002 (comment-region b e arg))) | |
2003 | |
2004 (defun cperl-uncomment-region (b e arg) | |
2005 "Uncomment or comment each line in the region in CPerl mode. | |
2006 See `comment-region'." | |
2007 (interactive "r\np") | |
2008 (let ((comment-start "#")) | |
2009 (comment-region b e (- arg)))) | |
2010 | |
2011 (defvar cperl-brace-recursing nil) | |
2012 | |
2013 (defun cperl-electric-brace (arg &optional only-before) | |
2014 "Insert character and correct line's indentation. | |
2015 If ONLY-BEFORE and `cperl-auto-newline', will insert newline before the | |
2016 place (even in empty line), but not after. If after \")\" and the inserted | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2017 char is \"{\", insert extra newline before only if |
20323 | 2018 `cperl-extra-newline-before-brace'." |
2019 (interactive "P") | |
2020 (let (insertpos | |
2021 (other-end (if (and cperl-electric-parens-mark | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2022 (cperl-mark-active) |
20323 | 2023 (< (mark) (point))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2024 (mark) |
20323 | 2025 nil))) |
2026 (if (and other-end | |
2027 (not cperl-brace-recursing) | |
2028 (cperl-val 'cperl-electric-parens) | |
2029 (>= (save-excursion (cperl-to-comment-or-eol) (point)) (point))) | |
2030 ;; Need to insert a matching pair | |
2031 (progn | |
2032 (save-excursion | |
2033 (setq insertpos (point-marker)) | |
2034 (goto-char other-end) | |
2035 (setq last-command-char ?\{) | |
2036 (cperl-electric-lbrace arg insertpos)) | |
2037 (forward-char 1)) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2038 ;; Check whether we close something "usual" with `}' |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2039 (if (and (eq last-command-char ?\}) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2040 (not |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2041 (condition-case nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2042 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2043 (up-list (- (prefix-numeric-value arg))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2044 ;;(cperl-after-block-p (point-min)) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2045 (or (cperl-after-expr-p nil "{;)") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2046 ;; after sub, else, continue |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2047 (cperl-after-block-p nil 'pre))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2048 (error nil)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2049 ;; Just insert the guy |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2050 (self-insert-command (prefix-numeric-value arg)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2051 (if (and (not arg) ; No args, end (of empty line or auto) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2052 (eolp) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2053 (or (and (null only-before) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2054 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2055 (skip-chars-backward " \t") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2056 (bolp))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2057 (and (eq last-command-char ?\{) ; Do not insert newline |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2058 ;; if after ")" and `cperl-extra-newline-before-brace' |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2059 ;; is nil, do not insert extra newline. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2060 (not cperl-extra-newline-before-brace) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2061 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2062 (skip-chars-backward " \t") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2063 (eq (preceding-char) ?\)))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2064 (if cperl-auto-newline |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2065 (progn (cperl-indent-line) (newline) t) nil))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2066 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2067 (self-insert-command (prefix-numeric-value arg)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2068 (cperl-indent-line) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2069 (if cperl-auto-newline |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2070 (setq insertpos (1- (point)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2071 (if (and cperl-auto-newline (null only-before)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2072 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2073 (newline) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2074 (cperl-indent-line))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2075 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2076 (if insertpos (progn (goto-char insertpos) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2077 (search-forward (make-string |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2078 1 last-command-char)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2079 (setq insertpos (1- (point))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2080 (delete-char -1)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2081 (if insertpos |
20323 | 2082 (save-excursion |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2083 (goto-char insertpos) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2084 (self-insert-command (prefix-numeric-value arg))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2085 (self-insert-command (prefix-numeric-value arg))))))) |
20323 | 2086 |
2087 (defun cperl-electric-lbrace (arg &optional end) | |
2088 "Insert character, correct line's indentation, correct quoting by space." | |
2089 (interactive "P") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2090 (let ((cperl-brace-recursing t) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2091 (cperl-auto-newline cperl-auto-newline) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2092 (other-end (or end |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2093 (if (and cperl-electric-parens-mark |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2094 (cperl-mark-active) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2095 (> (mark) (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2096 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2097 (goto-char (mark)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2098 (point-marker)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2099 nil))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2100 pos after) |
20323 | 2101 (and (cperl-val 'cperl-electric-lbrace-space) |
2102 (eq (preceding-char) ?$) | |
2103 (save-excursion | |
2104 (skip-chars-backward "$") | |
2105 (looking-at "\\(\\$\\$\\)*\\$\\([^\\$]\\|$\\)")) | |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
2106 (insert ?\s)) |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2107 ;; Check whether we are in comment |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2108 (if (and |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2109 (save-excursion |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2110 (beginning-of-line) |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2111 (not (looking-at "[ \t]*#"))) |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2112 (cperl-after-expr-p nil "{;)")) |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2113 nil |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2114 (setq cperl-auto-newline nil)) |
20323 | 2115 (cperl-electric-brace arg) |
2116 (and (cperl-val 'cperl-electric-parens) | |
2117 (eq last-command-char ?{) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2118 (memq last-command-char |
20323 | 2119 (append cperl-electric-parens-string nil)) |
2120 (or (if other-end (goto-char (marker-position other-end))) | |
2121 t) | |
2122 (setq last-command-char ?} pos (point)) | |
2123 (progn (cperl-electric-brace arg t) | |
2124 (goto-char pos))))) | |
2125 | |
2126 (defun cperl-electric-paren (arg) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2127 "Insert an opening parenthesis or a matching pair of parentheses. |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2128 See `cperl-electric-parens'." |
20323 | 2129 (interactive "P") |
2130 (let ((beg (save-excursion (beginning-of-line) (point))) | |
2131 (other-end (if (and cperl-electric-parens-mark | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2132 (cperl-mark-active) |
20323 | 2133 (> (mark) (point))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2134 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2135 (goto-char (mark)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2136 (point-marker)) |
20323 | 2137 nil))) |
2138 (if (and (cperl-val 'cperl-electric-parens) | |
2139 (memq last-command-char | |
2140 (append cperl-electric-parens-string nil)) | |
2141 (>= (save-excursion (cperl-to-comment-or-eol) (point)) (point)) | |
2142 ;;(not (save-excursion (search-backward "#" beg t))) | |
2143 (if (eq last-command-char ?<) | |
2144 (progn | |
2145 (and abbrev-mode ; later it is too late, may be after `for' | |
2146 (expand-abbrev)) | |
2147 (cperl-after-expr-p nil "{;(,:=")) | |
2148 1)) | |
2149 (progn | |
2150 (self-insert-command (prefix-numeric-value arg)) | |
2151 (if other-end (goto-char (marker-position other-end))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2152 (insert (make-string |
20323 | 2153 (prefix-numeric-value arg) |
2154 (cdr (assoc last-command-char '((?{ .?}) | |
2155 (?[ . ?]) | |
2156 (?( . ?)) | |
2157 (?< . ?>)))))) | |
2158 (forward-char (- (prefix-numeric-value arg)))) | |
2159 (self-insert-command (prefix-numeric-value arg))))) | |
2160 | |
2161 (defun cperl-electric-rparen (arg) | |
2162 "Insert a matching pair of parentheses if marking is active. | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2163 If not, or if we are not at the end of marking range, would self-insert. |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2164 Affected by `cperl-electric-parens'." |
20323 | 2165 (interactive "P") |
2166 (let ((beg (save-excursion (beginning-of-line) (point))) | |
2167 (other-end (if (and cperl-electric-parens-mark | |
2168 (cperl-val 'cperl-electric-parens) | |
2169 (memq last-command-char | |
2170 (append cperl-electric-parens-string nil)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2171 (cperl-mark-active) |
20323 | 2172 (< (mark) (point))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2173 (mark) |
20323 | 2174 nil)) |
2175 p) | |
2176 (if (and other-end | |
2177 (cperl-val 'cperl-electric-parens) | |
2178 (memq last-command-char '( ?\) ?\] ?\} ?\> )) | |
2179 (>= (save-excursion (cperl-to-comment-or-eol) (point)) (point)) | |
2180 ;;(not (save-excursion (search-backward "#" beg t))) | |
2181 ) | |
2182 (progn | |
2183 (self-insert-command (prefix-numeric-value arg)) | |
2184 (setq p (point)) | |
2185 (if other-end (goto-char other-end)) | |
2186 (insert (make-string | |
2187 (prefix-numeric-value arg) | |
2188 (cdr (assoc last-command-char '((?\} . ?\{) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2189 (?\] . ?\[) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2190 (?\) . ?\() |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2191 (?\> . ?\<)))))) |
20323 | 2192 (goto-char (1+ p))) |
2193 (self-insert-command (prefix-numeric-value arg))))) | |
2194 | |
2195 (defun cperl-electric-keyword () | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2196 "Insert a construction appropriate after a keyword. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2197 Help message may be switched off by setting `cperl-message-electric-keyword' |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2198 to nil." |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2199 (let ((beg (save-excursion (beginning-of-line) (point))) |
20323 | 2200 (dollar (and (eq last-command-char ?$) |
2201 (eq this-command 'self-insert-command))) | |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
2202 (delete (and (memq last-command-char '(?\s ?\n ?\t ?\f)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2203 (memq this-command '(self-insert-command newline)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2204 my do) |
20323 | 2205 (and (save-excursion |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2206 (condition-case nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2207 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2208 (backward-sexp 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2209 (setq do (looking-at "do\\>"))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2210 (error nil)) |
20323 | 2211 (cperl-after-expr-p nil "{;:")) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2212 (save-excursion |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2213 (not |
20323 | 2214 (re-search-backward |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2215 "[#\"'`]\\|\\<q\\(\\|[wqxr]\\)\\>" |
20323 | 2216 beg t))) |
2217 (save-excursion (or (not (re-search-backward "^=" nil t)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2218 (or |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2219 (looking-at "=cut") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2220 (and cperl-use-syntax-table-text-property |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2221 (not (eq (get-text-property (point) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2222 'syntax-type) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2223 'pod)))))) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2224 (save-excursion (forward-sexp -1) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2225 (not (memq (following-char) (append "$@%&*" nil)))) |
20323 | 2226 (progn |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2227 (and (eq (preceding-char) ?y) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2228 (progn ; "foreachmy" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2229 (forward-char -2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2230 (insert " ") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2231 (forward-char 2) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2232 (setq my t dollar t |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2233 delete |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2234 (memq this-command '(self-insert-command newline))))) |
20323 | 2235 (and dollar (insert " $")) |
2236 (cperl-indent-line) | |
2237 ;;(insert " () {\n}") | |
2238 (cond | |
2239 (cperl-extra-newline-before-brace | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2240 (insert (if do "\n" " ()\n")) |
20323 | 2241 (insert "{") |
2242 (cperl-indent-line) | |
2243 (insert "\n") | |
2244 (cperl-indent-line) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2245 (insert "\n}") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2246 (and do (insert " while ();"))) |
20323 | 2247 (t |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2248 (insert (if do " {\n} while ();" " () {\n}")))) |
20323 | 2249 (or (looking-at "[ \t]\\|$") (insert " ")) |
2250 (cperl-indent-line) | |
2251 (if dollar (progn (search-backward "$") | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2252 (if my |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2253 (forward-char 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2254 (delete-char 1))) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2255 (search-backward ")") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2256 (if (eq last-command-char ?\() |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2257 (progn ; Avoid "if (())" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2258 (delete-backward-char 1) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2259 (delete-backward-char -1)))) |
20323 | 2260 (if delete |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2261 (cperl-putback-char cperl-del-back-ch)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2262 (if cperl-message-electric-keyword |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2263 (message "Precede char by C-q to avoid expansion")))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2264 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2265 (defun cperl-ensure-newlines (n &optional pos) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2266 "Make sure there are N newlines after the point." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2267 (or pos (setq pos (point))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2268 (if (looking-at "\n") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2269 (forward-char 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2270 (insert "\n")) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2271 (if (> n 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2272 (cperl-ensure-newlines (1- n) pos) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2273 (goto-char pos))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2274 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2275 (defun cperl-electric-pod () |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2276 "Insert a POD chunk appropriate after a =POD directive." |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
2277 (let ((delete (and (memq last-command-char '(?\s ?\n ?\t ?\f)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2278 (memq this-command '(self-insert-command newline)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2279 head1 notlast name p really-delete over) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2280 (and (save-excursion |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2281 (forward-word -1) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
2282 (and |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2283 (eq (preceding-char) ?=) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2284 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2285 (setq head1 (looking-at "head1\\>[ \t]*$")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2286 (setq over (and (looking-at "over\\>[ \t]*$") |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2287 (not (looking-at "over[ \t]*\n\n\n*=item\\>")))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2288 (forward-char -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2289 (bolp)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2290 (or |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2291 (get-text-property (point) 'in-pod) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2292 (cperl-after-expr-p nil "{;:") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2293 (and (re-search-backward "\\(\\`\n?\\|^\n\\)=\\sw+" (point-min) t) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2294 (not (looking-at "\n*=cut")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2295 (or (not cperl-use-syntax-table-text-property) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2296 (eq (get-text-property (point) 'syntax-type) 'pod)))))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2297 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2298 (save-excursion |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2299 (setq notlast (re-search-forward "^\n=" nil t))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2300 (or notlast |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2301 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2302 (insert "\n\n=cut") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2303 (cperl-ensure-newlines 2) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2304 (forward-word -2) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
2305 (if (and head1 |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
2306 (not |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2307 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2308 (forward-char -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2309 (re-search-backward "\\(\\`\n?\\|\n\n\\)=head1\\>" |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2310 nil t)))) ; Only one |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
2311 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2312 (forward-word 1) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2313 (setq name (file-name-sans-extension |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2314 (file-name-nondirectory (buffer-file-name))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2315 p (point)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2316 (insert " NAME\n\n" name |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
2317 " - \n\n=head1 SYNOPSIS\n\n\n\n" |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2318 "=head1 DESCRIPTION") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2319 (cperl-ensure-newlines 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2320 (goto-char p) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2321 (forward-word 2) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2322 (end-of-line) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2323 (setq really-delete t)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2324 (forward-word 1)))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2325 (if over |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2326 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2327 (setq p (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2328 (insert "\n\n=item \n\n\n\n" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2329 "=back") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2330 (cperl-ensure-newlines 2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2331 (goto-char p) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2332 (forward-word 1) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2333 (end-of-line) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2334 (setq really-delete t))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2335 (if (and delete really-delete) |
20323 | 2336 (cperl-putback-char cperl-del-back-ch)))))) |
2337 | |
2338 (defun cperl-electric-else () | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2339 "Insert a construction appropriate after a keyword. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2340 Help message may be switched off by setting `cperl-message-electric-keyword' |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2341 to nil." |
20323 | 2342 (let ((beg (save-excursion (beginning-of-line) (point)))) |
2343 (and (save-excursion | |
2344 (backward-sexp 1) | |
2345 (cperl-after-expr-p nil "{;:")) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2346 (save-excursion |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2347 (not |
20323 | 2348 (re-search-backward |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2349 "[#\"'`]\\|\\<q\\(\\|[wqxr]\\)\\>" |
20323 | 2350 beg t))) |
2351 (save-excursion (or (not (re-search-backward "^=" nil t)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2352 (looking-at "=cut") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2353 (and cperl-use-syntax-table-text-property |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2354 (not (eq (get-text-property (point) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2355 'syntax-type) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2356 'pod))))) |
20323 | 2357 (progn |
2358 (cperl-indent-line) | |
2359 ;;(insert " {\n\n}") | |
2360 (cond | |
2361 (cperl-extra-newline-before-brace | |
2362 (insert "\n") | |
2363 (insert "{") | |
2364 (cperl-indent-line) | |
2365 (insert "\n\n}")) | |
2366 (t | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2367 (insert " {\n\n}"))) |
20323 | 2368 (or (looking-at "[ \t]\\|$") (insert " ")) |
2369 (cperl-indent-line) | |
2370 (forward-line -1) | |
2371 (cperl-indent-line) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2372 (cperl-putback-char cperl-del-back-ch) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2373 (setq this-command 'cperl-electric-else) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2374 (if cperl-message-electric-keyword |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2375 (message "Precede char by C-q to avoid expansion")))))) |
20323 | 2376 |
2377 (defun cperl-linefeed () | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2378 "Go to end of line, open a new line and indent appropriately. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2379 If in POD, insert appropriate lines." |
20323 | 2380 (interactive) |
2381 (let ((beg (save-excursion (beginning-of-line) (point))) | |
2382 (end (save-excursion (end-of-line) (point))) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2383 (pos (point)) start over cut res) |
20323 | 2384 (if (and ; Check if we need to split: |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2385 ; i.e., on a boundary and inside "{...}" |
20323 | 2386 (save-excursion (cperl-to-comment-or-eol) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2387 (>= (point) pos)) ; Not in a comment |
20323 | 2388 (or (save-excursion |
2389 (skip-chars-backward " \t" beg) | |
2390 (forward-char -1) | |
2391 (looking-at "[;{]")) ; After { or ; + spaces | |
2392 (looking-at "[ \t]*}") ; Before } | |
2393 (re-search-forward "\\=[ \t]*;" end t)) ; Before spaces + ; | |
2394 (save-excursion | |
2395 (and | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2396 (eq (car (parse-partial-sexp pos end -1)) -1) |
20323 | 2397 ; Leave the level of parens |
2398 (looking-at "[,; \t]*\\($\\|#\\)") ; Comma to allow anon subr | |
2399 ; Are at end | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2400 (cperl-after-block-p (point-min)) |
20323 | 2401 (progn |
2402 (backward-sexp 1) | |
2403 (setq start (point-marker)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2404 (<= start pos))))) ; Redundant? Are after the |
20323 | 2405 ; start of parens group. |
2406 (progn | |
2407 (skip-chars-backward " \t") | |
2408 (or (memq (preceding-char) (append ";{" nil)) | |
2409 (insert ";")) | |
2410 (insert "\n") | |
2411 (forward-line -1) | |
2412 (cperl-indent-line) | |
2413 (goto-char start) | |
2414 (or (looking-at "{[ \t]*$") ; If there is a statement | |
2415 ; before, move it to separate line | |
2416 (progn | |
2417 (forward-char 1) | |
2418 (insert "\n") | |
2419 (cperl-indent-line))) | |
2420 (forward-line 1) ; We are on the target line | |
2421 (cperl-indent-line) | |
2422 (beginning-of-line) | |
2423 (or (looking-at "[ \t]*}[,; \t]*$") ; If there is a statement | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2424 ; after, move it to separate line |
20323 | 2425 (progn |
2426 (end-of-line) | |
2427 (search-backward "}" beg) | |
2428 (skip-chars-backward " \t") | |
2429 (or (memq (preceding-char) (append ";{" nil)) | |
2430 (insert ";")) | |
2431 (insert "\n") | |
2432 (cperl-indent-line) | |
2433 (forward-line -1))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2434 (forward-line -1) ; We are on the line before target |
20323 | 2435 (end-of-line) |
2436 (newline-and-indent)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2437 (end-of-line) ; else - no splitting |
20323 | 2438 (cond |
2439 ((and (looking-at "\n[ \t]*{$") | |
2440 (save-excursion | |
2441 (skip-chars-backward " \t") | |
2442 (eq (preceding-char) ?\)))) ; Probably if () {} group | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2443 ; with an extra newline. |
20323 | 2444 (forward-line 2) |
2445 (cperl-indent-line)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2446 ((save-excursion ; In POD header |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2447 (forward-paragraph -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2448 ;; (re-search-backward "\\(\\`\n?\\|\n\n\\)=head1\\b") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2449 ;; We are after \n now, so look for the rest |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2450 (if (looking-at "\\(\\`\n?\\|\n\\)=\\sw+") |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2451 (progn |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2452 (setq cut (looking-at "\\(\\`\n?\\|\n\\)=cut\\>")) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2453 (setq over (looking-at "\\(\\`\n?\\|\n\\)=over\\>")) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2454 t))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2455 (if (and over |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2456 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2457 (forward-paragraph -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2458 (forward-word 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2459 (setq pos (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2460 (setq cut (buffer-substring (point) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2461 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2462 (end-of-line) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2463 (point)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2464 (delete-char (- (save-excursion (end-of-line) (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2465 (point))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2466 (setq res (expand-abbrev)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2467 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2468 (goto-char pos) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2469 (insert cut)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2470 res)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2471 nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2472 (cperl-ensure-newlines (if cut 2 4)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2473 (forward-line 2))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2474 ((get-text-property (point) 'in-pod) ; In POD section |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2475 (cperl-ensure-newlines 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2476 (forward-line 2)) |
20323 | 2477 ((looking-at "\n[ \t]*$") ; Next line is empty - use it. |
2478 (forward-line 1) | |
2479 (cperl-indent-line)) | |
2480 (t | |
2481 (newline-and-indent)))))) | |
2482 | |
2483 (defun cperl-electric-semi (arg) | |
2484 "Insert character and correct line's indentation." | |
2485 (interactive "P") | |
2486 (if cperl-auto-newline | |
2487 (cperl-electric-terminator arg) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2488 (self-insert-command (prefix-numeric-value arg)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2489 (if cperl-autoindent-on-semi |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2490 (cperl-indent-line)))) |
20323 | 2491 |
2492 (defun cperl-electric-terminator (arg) | |
2493 "Insert character and correct line's indentation." | |
2494 (interactive "P") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2495 (let ((end (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2496 (auto (and cperl-auto-newline |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2497 (or (not (eq last-command-char ?:)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2498 cperl-auto-newline-after-colon))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2499 insertpos) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2500 (if (and ;;(not arg) |
20323 | 2501 (eolp) |
2502 (not (save-excursion | |
2503 (beginning-of-line) | |
2504 (skip-chars-forward " \t") | |
2505 (or | |
2506 ;; Ignore in comment lines | |
2507 (= (following-char) ?#) | |
2508 ;; Colon is special only after a label | |
2509 ;; So quickly rule out most other uses of colon | |
2510 ;; and do no indentation for them. | |
2511 (and (eq last-command-char ?:) | |
2512 (save-excursion | |
2513 (forward-word 1) | |
2514 (skip-chars-forward " \t") | |
2515 (and (< (point) end) | |
2516 (progn (goto-char (- end 1)) | |
2517 (not (looking-at ":")))))) | |
2518 (progn | |
2519 (beginning-of-defun) | |
2520 (let ((pps (parse-partial-sexp (point) end))) | |
2521 (or (nth 3 pps) (nth 4 pps) (nth 5 pps)))))))) | |
2522 (progn | |
2523 (self-insert-command (prefix-numeric-value arg)) | |
2524 ;;(forward-char -1) | |
2525 (if auto (setq insertpos (point-marker))) | |
2526 ;;(forward-char 1) | |
2527 (cperl-indent-line) | |
2528 (if auto | |
2529 (progn | |
2530 (newline) | |
2531 (cperl-indent-line))) | |
2532 (save-excursion | |
2533 (if insertpos (goto-char (1- (marker-position insertpos))) | |
2534 (forward-char -1)) | |
2535 (delete-char 1)))) | |
2536 (if insertpos | |
2537 (save-excursion | |
2538 (goto-char insertpos) | |
2539 (self-insert-command (prefix-numeric-value arg))) | |
2540 (self-insert-command (prefix-numeric-value arg))))) | |
2541 | |
2542 (defun cperl-electric-backspace (arg) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2543 "Backspace, or remove the whitespace around the point inserted by an electric |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2544 key. Will untabify if `cperl-electric-backspace-untabify' is non-nil." |
20323 | 2545 (interactive "p") |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2546 (if (and cperl-auto-newline |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2547 (memq last-command '(cperl-electric-semi |
20323 | 2548 cperl-electric-terminator |
2549 cperl-electric-lbrace)) | |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
2550 (memq (preceding-char) '(?\s ?\t ?\n))) |
20323 | 2551 (let (p) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2552 (if (eq last-command 'cperl-electric-lbrace) |
20323 | 2553 (skip-chars-forward " \t\n")) |
2554 (setq p (point)) | |
2555 (skip-chars-backward " \t\n") | |
2556 (delete-region (point) p)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2557 (and (eq last-command 'cperl-electric-else) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2558 ;; We are removing the whitespace *inside* cperl-electric-else |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2559 (setq this-command 'cperl-electric-else-really)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2560 (if (and cperl-auto-newline |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2561 (eq last-command 'cperl-electric-else-really) |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
2562 (memq (preceding-char) '(?\s ?\t ?\n))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2563 (let (p) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2564 (skip-chars-forward " \t\n") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2565 (setq p (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2566 (skip-chars-backward " \t\n") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2567 (delete-region (point) p)) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2568 (if cperl-electric-backspace-untabify |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2569 (backward-delete-char-untabify arg) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2570 (delete-backward-char arg))))) |
20323 | 2571 |
50255
a716a67fdf9d
(cperl-electric-backspace): Add delete-selection property.
Kim F. Storm <storm@cua.dk>
parents:
49919
diff
changeset
|
2572 (put 'cperl-electric-backspace 'delete-selection 'supersede) |
a716a67fdf9d
(cperl-electric-backspace): Add delete-selection property.
Kim F. Storm <storm@cua.dk>
parents:
49919
diff
changeset
|
2573 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2574 (defun cperl-inside-parens-p () ;; NOT USED???? |
20323 | 2575 (condition-case () |
2576 (save-excursion | |
2577 (save-restriction | |
2578 (narrow-to-region (point) | |
2579 (progn (beginning-of-defun) (point))) | |
2580 (goto-char (point-max)) | |
2581 (= (char-after (or (scan-lists (point) -1 1) (point-min))) ?\())) | |
2582 (error nil))) | |
2583 | |
2584 (defun cperl-indent-command (&optional whole-exp) | |
2585 "Indent current line as Perl code, or in some cases insert a tab character. | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2586 If `cperl-tab-always-indent' is non-nil (the default), always indent current |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2587 line. Otherwise, indent the current line only if point is at the left margin |
20323 | 2588 or in the line's indentation; otherwise insert a tab. |
2589 | |
2590 A numeric argument, regardless of its value, | |
2591 means indent rigidly all the lines of the expression starting after point | |
2592 so that this line becomes properly indented. | |
2593 The relative indentation among the lines of the expression are preserved." | |
2594 (interactive "P") | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2595 (cperl-update-syntaxification (point) (point)) |
20323 | 2596 (if whole-exp |
2597 ;; If arg, always indent this line as Perl | |
2598 ;; and shift remaining lines of expression the same amount. | |
2599 (let ((shift-amt (cperl-indent-line)) | |
2600 beg end) | |
2601 (save-excursion | |
2602 (if cperl-tab-always-indent | |
2603 (beginning-of-line)) | |
2604 (setq beg (point)) | |
2605 (forward-sexp 1) | |
2606 (setq end (point)) | |
2607 (goto-char beg) | |
2608 (forward-line 1) | |
2609 (setq beg (point))) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2610 (if (and shift-amt (> end beg)) |
20323 | 2611 (indent-code-rigidly beg end shift-amt "#"))) |
2612 (if (and (not cperl-tab-always-indent) | |
2613 (save-excursion | |
2614 (skip-chars-backward " \t") | |
2615 (not (bolp)))) | |
2616 (insert-tab) | |
2617 (cperl-indent-line)))) | |
2618 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2619 (defun cperl-indent-line (&optional parse-data) |
20323 | 2620 "Indent current line as Perl code. |
2621 Return the amount the indentation changed by." | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2622 (let ((case-fold-search nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2623 (pos (- (point-max) (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2624 indent i beg shift-amt) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2625 (setq indent (cperl-calculate-indent parse-data) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2626 i indent) |
20323 | 2627 (beginning-of-line) |
2628 (setq beg (point)) | |
2629 (cond ((or (eq indent nil) (eq indent t)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2630 (setq indent (current-indentation) i nil)) |
20323 | 2631 ;;((eq indent t) ; Never? |
2632 ;; (setq indent (cperl-calculate-indent-within-comment))) | |
2633 ;;((looking-at "[ \t]*#") | |
2634 ;; (setq indent 0)) | |
2635 (t | |
2636 (skip-chars-forward " \t") | |
2637 (if (listp indent) (setq indent (car indent))) | |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
2638 (cond ((and (looking-at "[A-Za-z_][A-Za-z_0-9]*:[^:]") |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
2639 (not (looking-at "[smy]:\\|tr:"))) |
20323 | 2640 (and (> indent 0) |
2641 (setq indent (max cperl-min-label-indent | |
2642 (+ indent cperl-label-offset))))) | |
2643 ((= (following-char) ?}) | |
2644 (setq indent (- indent cperl-indent-level))) | |
2645 ((memq (following-char) '(?\) ?\])) ; To line up with opening paren. | |
2646 (setq indent (+ indent cperl-close-paren-offset))) | |
2647 ((= (following-char) ?{) | |
2648 (setq indent (+ indent cperl-brace-offset)))))) | |
2649 (skip-chars-forward " \t") | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2650 (setq shift-amt (and i (- indent (current-column)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2651 (if (or (not shift-amt) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2652 (zerop shift-amt)) |
20323 | 2653 (if (> (- (point-max) pos) (point)) |
2654 (goto-char (- (point-max) pos))) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2655 ;;;(delete-region beg (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2656 ;;;(indent-to indent) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2657 (cperl-make-indent indent) |
20323 | 2658 ;; If initial point was within line's indentation, |
2659 ;; position after the indentation. Else stay at same point in text. | |
2660 (if (> (- (point-max) pos) (point)) | |
2661 (goto-char (- (point-max) pos)))) | |
2662 shift-amt)) | |
2663 | |
2664 (defun cperl-after-label () | |
2665 ;; Returns true if the point is after label. Does not do save-excursion. | |
2666 (and (eq (preceding-char) ?:) | |
2667 (memq (char-syntax (char-after (- (point) 2))) | |
2668 '(?w ?_)) | |
2669 (progn | |
2670 (backward-sexp) | |
2671 (looking-at "[a-zA-Z_][a-zA-Z0-9_]*:[^:]")))) | |
2672 | |
2673 (defun cperl-get-state (&optional parse-start start-state) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2674 ;; returns list (START STATE DEPTH PRESTART), |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2675 ;; START is a good place to start parsing, or equal to |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2676 ;; PARSE-START if preset, |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2677 ;; STATE is what is returned by `parse-partial-sexp'. |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2678 ;; DEPTH is true is we are immediately after end of block |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2679 ;; which contains START. |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2680 ;; PRESTART is the position basing on which START was found. |
20323 | 2681 (save-excursion |
2682 (let ((start-point (point)) depth state start prestart) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2683 (if (and parse-start |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2684 (<= parse-start start-point)) |
20323 | 2685 (goto-char parse-start) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2686 (beginning-of-defun) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2687 (setq start-state nil)) |
20323 | 2688 (setq prestart (point)) |
2689 (if start-state nil | |
2690 ;; Try to go out, if sub is not on the outermost level | |
2691 (while (< (point) start-point) | |
2692 (setq start (point) parse-start start depth nil | |
2693 state (parse-partial-sexp start start-point -1)) | |
2694 (if (> (car state) -1) nil | |
2695 ;; The current line could start like }}}, so the indentation | |
2696 ;; corresponds to a different level than what we reached | |
2697 (setq depth t) | |
2698 (beginning-of-line 2))) ; Go to the next line. | |
2699 (if start (goto-char start))) ; Not at the start of file | |
2700 (setq start (point)) | |
2701 (or state (setq state (parse-partial-sexp start start-point -1 nil start-state))) | |
2702 (list start state depth prestart)))) | |
2703 | |
2704 (defvar cperl-look-for-prop '((pod in-pod) (here-doc-delim here-doc-group))) | |
2705 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2706 (defun cperl-beginning-of-property (p prop &optional lim) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2707 "Given that P has a property PROP, find where the property starts. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2708 Will not look before LIM." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2709 ;;; XXXX What to do at point-max??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2710 (or (previous-single-property-change (cperl-1+ p) prop lim) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2711 (point-min)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2712 ;;; (cond ((eq p (point-min)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2713 ;;; p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2714 ;;; ((and lim (<= p lim)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2715 ;;; p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2716 ;;; ((not (get-text-property (1- p) prop)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2717 ;;; p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2718 ;;; (t (or (previous-single-property-change p look-prop lim) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2719 ;;; (point-min)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2720 ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2721 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2722 (defun cperl-sniff-for-indent (&optional parse-data) ; was parse-start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2723 ;; Old workhorse for calculation of indentation; the major problem |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2724 ;; is that it mixes the sniffer logic to understand what the current line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2725 ;; MEANS with the logic to actually calculate where to indent it. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2726 ;; The latter part should be eventually moved to `cperl-calculate-indent'; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2727 ;; actually, this is mostly done now... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2728 (cperl-update-syntaxification (point) (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2729 (let ((res (get-text-property (point) 'syntax-type))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2730 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2731 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2732 ((and (memq res '(pod here-doc here-doc-delim format)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2733 (not (get-text-property (point) 'indentable))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2734 (vector res)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2735 ;; before start of POD - whitespace found since do not have 'pod! |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2736 ((looking-at "[ \t]*\n=") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2737 (error "Spaces before POD section!")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2738 ((and (not cperl-indent-left-aligned-comments) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2739 (looking-at "^#")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2740 [comment-special:at-beginning-of-line]) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2741 ((get-text-property (point) 'in-pod) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2742 [in-pod]) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2743 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2744 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2745 (let* ((indent-point (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2746 (char-after-pos (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2747 (skip-chars-forward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2748 (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2749 (char-after (char-after char-after-pos)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2750 (pre-indent-point (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2751 p prop look-prop is-block delim) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2752 (save-excursion ; Know we are not in POD, find appropriate pos before |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2753 (cperl-backward-to-noncomment nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2754 (setq p (max (point-min) (1- (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2755 prop (get-text-property p 'syntax-type) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2756 look-prop (or (nth 1 (assoc prop cperl-look-for-prop)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2757 'syntax-type)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2758 (if (memq prop '(pod here-doc format here-doc-delim)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2759 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2760 (goto-char (cperl-beginning-of-property p look-prop)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2761 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2762 (setq pre-indent-point (point))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2763 (goto-char pre-indent-point) ; Orig line skipping preceeding pod/etc |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2764 (let* ((case-fold-search nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2765 (s-s (cperl-get-state (car parse-data) (nth 1 parse-data))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2766 (start (or (nth 2 parse-data) ; last complete sexp terminated |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2767 (nth 0 s-s))) ; Good place to start parsing |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2768 (state (nth 1 s-s)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2769 (containing-sexp (car (cdr state))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2770 old-indent) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2771 (if (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2772 ;;containing-sexp ;; We are buggy at toplevel :-( |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2773 parse-data) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2774 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2775 (setcar parse-data pre-indent-point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2776 (setcar (cdr parse-data) state) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2777 (or (nth 2 parse-data) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2778 (setcar (cddr parse-data) start)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2779 ;; Before this point: end of statement |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2780 (setq old-indent (nth 3 parse-data)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2781 (cond ((get-text-property (point) 'indentable) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2782 ;; indent to "after" the surrounding open |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2783 ;; (same offset as `cperl-beautify-regexp-piece'), |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2784 ;; skip blanks if we do not close the expression. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2785 (setq delim ; We do not close the expression |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2786 (get-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2787 (cperl-1+ char-after-pos) 'indentable) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2788 p (1+ (cperl-beginning-of-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2789 (point) 'indentable)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2790 is-block ; misused for: preceeding line in REx |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2791 (save-excursion ; Find preceeding line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2792 (cperl-backward-to-noncomment p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2793 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2794 (if (<= (point) p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2795 (progn ; get indent from the first line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2796 (goto-char p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2797 (skip-chars-forward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2798 (if (memq (char-after (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2799 (append "#\n" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2800 nil ; Can't use intentation of this line... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2801 (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2802 (skip-chars-forward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2803 (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2804 prop (parse-partial-sexp p char-after-pos)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2805 (cond ((not delim) ; End the REx, ignore is-block |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2806 (vector 'indentable 'terminator p is-block)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2807 (is-block ; Indent w.r.t. preceeding line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2808 (vector 'indentable 'cont-line char-after-pos |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2809 is-block char-after p)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2810 (t ; No preceeding line... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2811 (vector 'indentable 'first-line p)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2812 ((get-text-property char-after-pos 'REx-part2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2813 (vector 'REx-part2 (point))) |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
2814 ((nth 4 state) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2815 [comment]) |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
2816 ((nth 3 state) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2817 [string]) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2818 ;; XXXX Do we need to special-case this? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2819 ((null containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2820 ;; Line is at top level. May be data or function definition, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2821 ;; or may be function argument declaration. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2822 ;; Indent like the previous top level line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2823 ;; unless that ends in a closeparen without semicolon, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2824 ;; in which case this line is the first argument decl. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2825 (skip-chars-forward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2826 (cperl-backward-to-noncomment (or old-indent (point-min))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2827 (setq state |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2828 (or (bobp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2829 (eq (point) old-indent) ; old-indent was at comment |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2830 (eq (preceding-char) ?\;) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2831 ;; Had ?\) too |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2832 (and (eq (preceding-char) ?\}) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2833 (cperl-after-block-and-statement-beg |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2834 (point-min))) ; Was start - too close |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2835 (memq char-after (append ")]}" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2836 (and (eq (preceding-char) ?\:) ; label |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2837 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2838 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2839 (skip-chars-backward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2840 (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*[ \t]*:"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2841 (get-text-property (point) 'first-format-line))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2842 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2843 ;; Look at previous line that's at column 0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2844 ;; to determine whether we are in top-level decls |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2845 ;; or function's arg decls. Set basic-indent accordingly. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2846 ;; Now add a little if this is a continuation line. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2847 (and state |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2848 parse-data |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2849 (not (eq char-after ?\C-j)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2850 (setcdr (cddr parse-data) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2851 (list pre-indent-point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2852 (vector 'toplevel start char-after state (nth 2 s-s))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2853 ((not |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2854 (or (setq is-block |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2855 (and (setq delim (= (char-after containing-sexp) ?{)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2856 (save-excursion ; Is it a hash? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2857 (goto-char containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2858 (cperl-block-p)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2859 cperl-indent-parens-as-block)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2860 ;; group is an expression, not a block: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2861 ;; indent to just after the surrounding open parens, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2862 ;; skip blanks if we do not close the expression. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2863 (goto-char (1+ containing-sexp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2864 (or (memq char-after |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2865 (append (if delim "}" ")]}") nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2866 (looking-at "[ \t]*\\(#\\|$\\)") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2867 (skip-chars-forward " \t")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2868 (setq old-indent (point)) ; delim=is-brace |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2869 (vector 'in-parens char-after (point) delim containing-sexp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2870 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2871 ;; Statement level. Is it a continuation or a new statement? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2872 ;; Find previous non-comment character. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2873 (goto-char pre-indent-point) ; Skip one level of POD/etc |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2874 (cperl-backward-to-noncomment containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2875 ;; Back up over label lines, since they don't |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2876 ;; affect whether our line is a continuation. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2877 ;; (Had \, too) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2878 (while;;(or (eq (preceding-char) ?\,) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2879 (and (eq (preceding-char) ?:) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2880 (or;;(eq (char-after (- (point) 2)) ?\') ; ???? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2881 (memq (char-syntax (char-after (- (point) 2))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2882 '(?w ?_)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2883 ;;) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2884 ;; This is always FALSE? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2885 (if (eq (preceding-char) ?\,) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2886 ;; Will go to beginning of line, essentially. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2887 ;; Will ignore embedded sexpr XXXX. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2888 (cperl-backward-to-start-of-continued-exp containing-sexp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2889 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2890 (cperl-backward-to-noncomment containing-sexp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2891 ;; Now we get non-label preceeding the indent point |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2892 (if (not (or (eq (1- (point)) containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2893 (memq (preceding-char) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2894 (append (if is-block " ;{" " ,;{") '(nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2895 (and (eq (preceding-char) ?\}) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2896 (cperl-after-block-and-statement-beg |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2897 containing-sexp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2898 (get-text-property (point) 'first-format-line))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2899 ;; This line is continuation of preceding line's statement; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2900 ;; indent `cperl-continued-statement-offset' more than the |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2901 ;; previous line of the statement. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2902 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2903 ;; There might be a label on this line, just |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2904 ;; consider it bad style and ignore it. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2905 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2906 (cperl-backward-to-start-of-continued-exp containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2907 (vector 'continuation (point) char-after is-block delim)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2908 ;; This line starts a new statement. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2909 ;; Position following last unclosed open brace |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2910 (goto-char containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2911 ;; Is line first statement after an open-brace? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2912 (or |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2913 ;; If no, find that first statement and indent like |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2914 ;; it. If the first statement begins with label, do |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2915 ;; not believe when the indentation of the label is too |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2916 ;; small. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2917 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2918 (forward-char 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2919 (let ((colon-line-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2920 (while |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2921 (progn (skip-chars-forward " \t\n") |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
2922 ;; s: foo : bar :x is NOT label |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
2923 (and (looking-at "#\\|\\([a-zA-Z0-9_$]+\\):[^:]\\|=[a-zA-Z]") |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
2924 (not (looking-at "[sym]:\\|tr:")))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2925 ;; Skip over comments and labels following openbrace. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2926 (cond ((= (following-char) ?\#) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2927 (forward-line 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2928 ((= (following-char) ?\=) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2929 (goto-char |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2930 (or (next-single-property-change (point) 'in-pod) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2931 (point-max)))) ; do not loop if no syntaxification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2932 ;; label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2933 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2934 (save-excursion (end-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2935 (setq colon-line-end (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2936 (search-forward ":")))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2937 ;; We are at beginning of code (NOT label or comment) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2938 ;; First, the following code counts |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2939 ;; if it is before the line we want to indent. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2940 (and (< (point) indent-point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2941 (vector 'have-prev-sibling (point) colon-line-end |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2942 containing-sexp)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2943 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2944 ;; If no previous statement, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2945 ;; indent it relative to line brace is on. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2946 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2947 ;; For open-braces not the first thing in a line, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2948 ;; add in cperl-brace-imaginary-offset. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2949 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2950 ;; If first thing on a line: ????? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2951 ;; Move back over whitespace before the openbrace. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2952 (setq ; brace first thing on a line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2953 old-indent (progn (skip-chars-backward " \t") (bolp))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2954 ;; Should we indent w.r.t. earlier than start? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2955 ;; Move to start of control group, possibly on a different line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2956 (or cperl-indent-wrt-brace |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2957 (cperl-backward-to-noncomment (point-min))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2958 ;; If the openbrace is preceded by a parenthesized exp, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2959 ;; move to the beginning of that; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2960 (if (eq (preceding-char) ?\)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2961 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2962 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2963 (cperl-backward-to-noncomment (point-min)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2964 ;; In the case it starts a subroutine, indent with |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2965 ;; respect to `sub', not with respect to the |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2966 ;; first thing on the line, say in the case of |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2967 ;; anonymous sub in a hash. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2968 (if (and;; Is it a sub in group starting on this line? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2969 (cond ((get-text-property (point) 'attrib-group) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2970 (goto-char (cperl-beginning-of-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2971 (point) 'attrib-group))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2972 ((eq (preceding-char) ?b) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2973 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2974 (looking-at "sub\\>"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2975 (setq p (nth 1 ; start of innermost containing list |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2976 (parse-partial-sexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2977 (save-excursion (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2978 (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2979 (point))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2980 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2981 (goto-char (1+ p)) ; enclosing block on the same line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2982 (skip-chars-forward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2983 (vector 'code-start-in-block containing-sexp char-after |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2984 (and delim (not is-block)) ; is a HASH |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2985 old-indent ; brace first thing on a line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2986 t (point) ; have something before... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2987 ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2988 ;;(current-column) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2989 ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2990 ;; Get initial indentation of the line we are on. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2991 ;; If line starts with label, calculate label indentation |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2992 (vector 'code-start-in-block containing-sexp char-after |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2993 (and delim (not is-block)) ; is a HASH |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2994 old-indent ; brace first thing on a line |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
2995 nil (point))))))))))))))) ; nothing interesting before |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2996 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2997 (defvar cperl-indent-rules-alist |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2998 '((pod nil) ; via `syntax-type' property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2999 (here-doc nil) ; via `syntax-type' property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3000 (here-doc-delim nil) ; via `syntax-type' property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3001 (format nil) ; via `syntax-type' property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3002 (in-pod nil) ; via `in-pod' property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3003 (comment-special:at-beginning-of-line nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3004 (string t) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3005 (comment nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3006 "Alist of indentation rules for CPerl mode. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3007 The values mean: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3008 nil: do not indent; |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
3009 number: add this amount of indentation.") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3010 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3011 (defun cperl-calculate-indent (&optional parse-data) ; was parse-start |
20323 | 3012 "Return appropriate indentation for current line as Perl code. |
3013 In usual case returns an integer: the column to indent to. | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3014 Returns nil if line starts inside a string, t if in a comment. |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3015 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3016 Will not correct the indentation for labels, but will correct it for braces |
49516
774eed0b5c78
(cperl-beautify-level, cperl-beautify-regexp): Fix use of
Juanma Barranquero <lekktu@gmail.com>
parents:
49304
diff
changeset
|
3017 and closing parentheses and brackets." |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3018 ;; This code is still a broken architecture: in some cases we need to |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3019 ;; compensate for some modifications which `cperl-indent-line' will add later |
20323 | 3020 (save-excursion |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3021 (let ((i (cperl-sniff-for-indent parse-data)) what p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3022 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3023 ;;((or (null i) (eq i t) (numberp i)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3024 ;; i) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3025 ((vectorp i) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3026 (setq what (assoc (elt i 0) cperl-indent-rules-alist)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3027 (cond |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3028 (what (cadr what)) ; Load from table |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3029 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3030 ;; Indenters for regular expressions with //x and qw() |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3031 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3032 ((eq 'REx-part2 (elt i 0)) ;; [self start] start of /REP in s//REP/x |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3033 (goto-char (elt i 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3034 (condition-case nil ; Use indentation of the 1st part |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3035 (forward-sexp -1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3036 (current-column)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3037 ((eq 'indentable (elt i 0)) ; Indenter for REGEXP qw() etc |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3038 (cond ;;; [indentable terminator start-pos is-block] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3039 ((eq 'terminator (elt i 1)) ; Lone terminator of "indentable string" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3040 (goto-char (elt i 2)) ; After opening parens |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3041 (1- (current-column))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3042 ((eq 'first-line (elt i 1)); [indentable first-line start-pos] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3043 (goto-char (elt i 2)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3044 (+ (or cperl-regexp-indent-step cperl-indent-level) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3045 -1 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3046 (current-column))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3047 ((eq 'cont-line (elt i 1)); [indentable cont-line pos prev-pos first-char start-pos] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3048 ;; Indent as the level after closing parens |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3049 (goto-char (elt i 2)) ; indent line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3050 (skip-chars-forward " \t)") ; Skip closing parens |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3051 (setq p (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3052 (goto-char (elt i 3)) ; previous line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3053 (skip-chars-forward " \t)") ; Skip closing parens |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3054 ;; Number of parens in between: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3055 (setq p (nth 0 (parse-partial-sexp (point) p)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3056 what (elt i 4)) ; First char on current line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3057 (goto-char (elt i 3)) ; previous line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3058 (+ (* p (or cperl-regexp-indent-step cperl-indent-level)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3059 (cond ((eq what ?\) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3060 (- cperl-close-paren-offset)) ; compensate |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3061 ((eq what ?\| ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3062 (- (or cperl-regexp-indent-step cperl-indent-level))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3063 (t 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3064 (if (eq (following-char) ?\| ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3065 (or cperl-regexp-indent-step cperl-indent-level) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3066 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3067 (current-column))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3068 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3069 (error "Unrecognized value of indent: %s" i)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3070 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3071 ;; Indenter for stuff at toplevel |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3072 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3073 ((eq 'toplevel (elt i 0)) ;; [toplevel start char-after state immed-after-block] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3074 (+ (save-excursion ; To beg-of-defun, or end of last sexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3075 (goto-char (elt i 1)) ; start = Good place to start parsing |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3076 (- (current-indentation) ; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3077 (if (elt i 4) cperl-indent-level 0))) ; immed-after-block |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3078 (if (eq (elt i 2) ?{) cperl-continued-brace-offset 0) ; char-after |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3079 ;; Look at previous line that's at column 0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3080 ;; to determine whether we are in top-level decls |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3081 ;; or function's arg decls. Set basic-indent accordingly. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3082 ;; Now add a little if this is a continuation line. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3083 (if (elt i 3) ; state (XXX What is the semantic???) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3084 0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3085 cperl-continued-statement-offset))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3086 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3087 ;; Indenter for stuff in "parentheses" (or brackets, braces-as-hash) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3088 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3089 ((eq 'in-parens (elt i 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3090 ;; in-parens char-after old-indent-point is-brace containing-sexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3091 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3092 ;; group is an expression, not a block: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3093 ;; indent to just after the surrounding open parens, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3094 ;; skip blanks if we do not close the expression. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3095 (+ (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3096 (goto-char (elt i 2)) ; old-indent-point |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3097 (current-column)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3098 (if (and (elt i 3) ; is-brace |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3099 (eq (elt i 1) ?\})) ; char-after |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3100 ;; Correct indentation of trailing ?\} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3101 (+ cperl-indent-level cperl-close-paren-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3102 0))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3103 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3104 ;; Indenter for continuation lines |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3105 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3106 ((eq 'continuation (elt i 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3107 ;; [continuation statement-start char-after is-block is-brace] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3108 (goto-char (elt i 1)) ; statement-start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3109 (+ (if (memq (elt i 2) (append "}])" nil)) ; char-after |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3110 0 ; Closing parenth |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3111 cperl-continued-statement-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3112 (if (or (elt i 3) ; is-block |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3113 (not (elt i 4)) ; is-brace |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3114 (not (eq (elt i 2) ?\}))) ; char-after |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3115 0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3116 ;; Now it is a hash reference |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3117 (+ cperl-indent-level cperl-close-paren-offset)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3118 ;; Labels do not take :: ... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3119 (if (looking-at "\\(\\w\\|_\\)+[ \t]*:") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3120 (if (> (current-indentation) cperl-min-label-indent) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3121 (- (current-indentation) cperl-label-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3122 ;; Do not move `parse-data', this should |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3123 ;; be quick anyway (this comment comes |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3124 ;; from different location): |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3125 (cperl-calculate-indent)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3126 (current-column)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3127 (if (eq (elt i 2) ?\{) ; char-after |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3128 cperl-continued-brace-offset 0))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3129 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3130 ;; Indenter for lines in a block which are not leading lines |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3131 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3132 ((eq 'have-prev-sibling (elt i 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3133 ;; [have-prev-sibling sibling-beg colon-line-end block-start] |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
3134 (goto-char (elt i 1)) ; sibling-beg |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
3135 (if (> (elt i 2) (point)) ; colon-line-end; have label before point |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3136 (if (> (current-indentation) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3137 cperl-min-label-indent) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3138 (- (current-indentation) cperl-label-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3139 ;; Do not believe: `max' was involved in calculation of indent |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3140 (+ cperl-indent-level |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3141 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3142 (goto-char (elt i 3)) ; block-start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3143 (current-indentation)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3144 (current-column))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3145 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3146 ;; Indenter for the first line in a block |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3147 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3148 ((eq 'code-start-in-block (elt i 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3149 ;;[code-start-in-block before-brace char-after |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3150 ;; is-a-HASH-ref brace-is-first-thing-on-a-line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3151 ;; group-starts-before-start-of-sub start-of-control-group] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3152 (goto-char (elt i 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3153 ;; For open brace in column zero, don't let statement |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3154 ;; start there too. If cperl-indent-level=0, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3155 ;; use cperl-brace-offset + cperl-continued-statement-offset instead. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3156 (+ (if (and (bolp) (zerop cperl-indent-level)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3157 (+ cperl-brace-offset cperl-continued-statement-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3158 cperl-indent-level) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3159 (if (and (elt i 3) ; is-a-HASH-ref |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3160 (eq (elt i 2) ?\})) ; char-after: End of a hash reference |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3161 (+ cperl-indent-level cperl-close-paren-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3162 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3163 ;; Unless openbrace is the first nonwhite thing on the line, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3164 ;; add the cperl-brace-imaginary-offset. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3165 (if (elt i 4) 0 ; brace-is-first-thing-on-a-line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3166 cperl-brace-imaginary-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3167 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3168 (goto-char (elt i 6)) ; start-of-control-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3169 (if (elt i 5) ; group-starts-before-start-of-sub |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3170 (current-column) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3171 ;; Get initial indentation of the line we are on. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3172 ;; If line starts with label, calculate label indentation |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3173 (if (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3174 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3175 (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*:[^:]")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3176 (if (> (current-indentation) cperl-min-label-indent) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3177 (- (current-indentation) cperl-label-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3178 ;; Do not move `parse-data', this should |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3179 ;; be quick anyway: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3180 (cperl-calculate-indent)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3181 (current-indentation)))))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3182 (t |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3183 (error "Unrecognized value of indent: %s" i)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3184 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3185 (error "Got strange value of indent: %s" i)))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3186 |
20323 | 3187 (defun cperl-calculate-indent-within-comment () |
3188 "Return the indentation amount for line, assuming that | |
3189 the current line is to be regarded as part of a block comment." | |
3190 (let (end star-start) | |
3191 (save-excursion | |
3192 (beginning-of-line) | |
3193 (skip-chars-forward " \t") | |
3194 (setq end (point)) | |
3195 (and (= (following-char) ?#) | |
3196 (forward-line -1) | |
3197 (cperl-to-comment-or-eol) | |
3198 (setq end (point))) | |
3199 (goto-char end) | |
3200 (current-column)))) | |
3201 | |
3202 | |
3203 (defun cperl-to-comment-or-eol () | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
3204 "Go to position before comment on the current line, or to end of line. |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3205 Returns true if comment is found. In POD will not move the point." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3206 ;; If the line is inside other syntax groups (qq-style strings, HERE-docs) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3207 ;; then looks for literal # or end-of-line. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3208 (let (state stop-in cpoint (lim (progn (end-of-line) (point))) pr e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3209 (or cperl-font-locking |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3210 (cperl-update-syntaxification lim lim)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3211 (beginning-of-line) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3212 (if (setq pr (get-text-property (point) 'syntax-type)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3213 (setq e (next-single-property-change (point) 'syntax-type nil (point-max)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3214 (if (or (eq pr 'pod) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3215 (if (or (not e) (> e lim)) ; deep inside a group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3216 (re-search-forward "\\=[ \t]*\\(#\\|$\\)" lim t))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3217 (if (eq (preceding-char) ?\#) (progn (backward-char 1) t)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3218 ;; Else - need to do it the hard way |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3219 (and (and e (<= e lim)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3220 (goto-char e)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3221 (while (not stop-in) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3222 (setq state (parse-partial-sexp (point) lim nil nil nil t)) |
20323 | 3223 ; stop at comment |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3224 ;; If fails (beginning-of-line inside sexp), then contains not-comment |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3225 (if (nth 4 state) ; After `#'; |
20323 | 3226 ; (nth 2 state) can be |
3227 ; beginning of m,s,qq and so | |
3228 ; on | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3229 (if (nth 2 state) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3230 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3231 (setq cpoint (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3232 (goto-char (nth 2 state)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3233 (cond |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3234 ((looking-at "\\(s\\|tr\\)\\>") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3235 (or (re-search-forward |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3236 "\\=\\w+[ \t]*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3237 lim 'move) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3238 (setq stop-in t))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3239 ((looking-at "\\(m\\|q\\([qxwr]\\)?\\)\\>") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3240 (or (re-search-forward |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3241 "\\=\\w+[ \t]*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*#" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3242 lim 'move) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3243 (setq stop-in t))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3244 (t ; It was fair comment |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3245 (setq stop-in t) ; Finish |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3246 (goto-char (1- cpoint))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3247 (setq stop-in t) ; Finish |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3248 (forward-char -1)) |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
3249 (setq stop-in t))) ; Finish |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3250 (nth 4 state)))) |
20323 | 3251 |
3252 (defsubst cperl-modify-syntax-type (at how) | |
3253 (if (< at (point-max)) | |
3254 (progn | |
3255 (put-text-property at (1+ at) 'syntax-table how) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3256 (put-text-property at (1+ at) 'rear-nonsticky '(syntax-table))))) |
20323 | 3257 |
3258 (defun cperl-protect-defun-start (s e) | |
3259 ;; C code looks for "^\\s(" to skip comment backward in "hard" situations | |
3260 (save-excursion | |
3261 (goto-char s) | |
3262 (while (re-search-forward "^\\s(" e 'to-end) | |
3263 (put-text-property (1- (point)) (point) 'syntax-table cperl-st-punct)))) | |
3264 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3265 (defun cperl-commentify (bb e string &optional noface) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3266 (if cperl-use-syntax-table-text-property |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3267 (if (eq noface 'n) ; Only immediate |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3268 nil |
20323 | 3269 ;; We suppose that e is _after_ the end of construction, as after eol. |
3270 (setq string (if string cperl-st-sfence cperl-st-cfence)) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3271 (if (> bb (- e 2)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3272 ;; one-char string/comment?! |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3273 (cperl-modify-syntax-type bb cperl-st-punct) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3274 (cperl-modify-syntax-type bb string) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3275 (cperl-modify-syntax-type (1- e) string)) |
20323 | 3276 (if (and (eq string cperl-st-sfence) (> (- e 2) bb)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3277 (put-text-property (1+ bb) (1- e) |
20323 | 3278 'syntax-table cperl-string-syntax-table)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3279 (cperl-protect-defun-start bb e)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3280 ;; Fontify |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3281 (or noface |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3282 (not cperl-pod-here-fontify) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3283 (put-text-property bb e 'face (if string 'font-lock-string-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3284 'font-lock-comment-face))))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3285 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3286 (defvar cperl-starters '(( ?\( . ?\) ) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3287 ( ?\[ . ?\] ) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3288 ( ?\{ . ?\} ) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3289 ( ?\< . ?\> ))) |
20323 | 3290 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3291 (defun cperl-cached-syntax-table (st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3292 "Get a syntax table cached in ST, or create and cache into ST a syntax table. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3293 All the entries of the syntax table are \".\", except for a backslash, which |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3294 is quoting." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3295 (if (car-safe st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3296 (car st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3297 (setcar st (make-syntax-table)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3298 (setq st (car st)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3299 (let ((i 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3300 (while (< i 256) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3301 (modify-syntax-entry i "." st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3302 (setq i (1+ i)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3303 (modify-syntax-entry ?\\ "\\" st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3304 st)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3305 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3306 (defun cperl-forward-re (lim end is-2arg st-l err-l argument |
20323 | 3307 &optional ostart oend) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3308 "Find the end of a regular expression or a stringish construct (q[] etc). |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3309 The point should be before the starting delimiter. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3310 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3311 Goes to LIM if none is found. If IS-2ARG is non-nil, assumes that it |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3312 is s/// or tr/// like expression. If END is nil, generates an error |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3313 message if needed. If SET-ST is non-nil, will use (or generate) a |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3314 cached syntax table in ST-L. If ERR-L is non-nil, will store the |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3315 error message in its CAR (unless it already contains some error |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3316 message). ARGUMENT should be the name of the construct (used in error |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3317 messages). OSTART, OEND may be set in recursive calls when processing |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3318 the second argument of 2ARG construct. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3319 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3320 Works *before* syntax recognition is done. In IS-2ARG situation may |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3321 modify syntax-type text property if the situation is too hard." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3322 (let (b starter ender st i i2 go-forward reset-st set-st) |
20323 | 3323 (skip-chars-forward " \t") |
3324 ;; ender means matching-char matcher. | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3325 (setq b (point) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3326 starter (if (eobp) 0 (char-after b)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3327 ender (cdr (assoc starter cperl-starters))) |
20323 | 3328 ;; What if starter == ?\\ ???? |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3329 (setq st (cperl-cached-syntax-table st-l)) |
20323 | 3330 (setq set-st t) |
3331 ;; Whether we have an intermediate point | |
3332 (setq i nil) | |
3333 ;; Prepare the syntax table: | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3334 (if (not ender) ; m/blah/, s/x//, s/x/y/ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3335 (modify-syntax-entry starter "$" st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3336 (modify-syntax-entry starter (concat "(" (list ender)) st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3337 (modify-syntax-entry ender (concat ")" (list starter)) st)) |
20323 | 3338 (condition-case bb |
3339 (progn | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3340 ;; We use `$' syntax class to find matching stuff, but $$ |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3341 ;; is recognized the same as $, so we need to check this manually. |
20323 | 3342 (if (and (eq starter (char-after (cperl-1+ b))) |
3343 (not ender)) | |
3344 ;; $ has TeXish matching rules, so $$ equiv $... | |
3345 (forward-char 2) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3346 (setq reset-st (syntax-table)) |
20323 | 3347 (set-syntax-table st) |
3348 (forward-sexp 1) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3349 (if (<= (point) (1+ b)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3350 (error "Unfinished regular expression")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3351 (set-syntax-table reset-st) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3352 (setq reset-st nil) |
20323 | 3353 ;; Now the problem is with m;blah;; |
3354 (and (not ender) | |
3355 (eq (preceding-char) | |
3356 (char-after (- (point) 2))) | |
3357 (save-excursion | |
3358 (forward-char -2) | |
3359 (= 0 (% (skip-chars-backward "\\\\") 2))) | |
3360 (forward-char -1))) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3361 ;; Now we are after the first part. |
20323 | 3362 (and is-2arg ; Have trailing part |
3363 (not ender) | |
3364 (eq (following-char) starter) ; Empty trailing part | |
3365 (progn | |
3366 (or (eq (char-syntax (following-char)) ?.) | |
3367 ;; Make trailing letter into punctuation | |
3368 (cperl-modify-syntax-type (point) cperl-st-punct)) | |
3369 (setq is-2arg nil go-forward t))) ; Ignore the tail | |
3370 (if is-2arg ; Not number => have second part | |
3371 (progn | |
3372 (setq i (point) i2 i) | |
3373 (if ender | |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
3374 (if (memq (following-char) '(?\s ?\t ?\n ?\f)) |
20323 | 3375 (progn |
3376 (if (looking-at "[ \t\n\f]+\\(#[^\n]*\n[ \t\n\f]*\\)+") | |
3377 (goto-char (match-end 0)) | |
3378 (skip-chars-forward " \t\n\f")) | |
3379 (setq i2 (point)))) | |
3380 (forward-char -1)) | |
3381 (modify-syntax-entry starter (if (eq starter ?\\) "\\" ".") st) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3382 (if ender (modify-syntax-entry ender "." st)) |
20323 | 3383 (setq set-st nil) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3384 (setq ender (cperl-forward-re lim end nil st-l err-l |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3385 argument starter ender) |
20323 | 3386 ender (nth 2 ender))))) |
3387 (error (goto-char lim) | |
3388 (setq set-st nil) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3389 (if reset-st |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3390 (set-syntax-table reset-st)) |
20323 | 3391 (or end |
3392 (message | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3393 "End of `%s%s%c ... %c' string/RE not found: %s" |
20323 | 3394 argument |
3395 (if ostart (format "%c ... %c" ostart (or oend ostart)) "") | |
3396 starter (or ender starter) bb) | |
3397 (or (car err-l) (setcar err-l b))))) | |
3398 (if set-st | |
3399 (progn | |
3400 (modify-syntax-entry starter (if (eq starter ?\\) "\\" ".") st) | |
3401 (if ender (modify-syntax-entry ender "." st)))) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3402 ;; i: have 2 args, after end of the first arg |
78487
419c5c316b51
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78407
diff
changeset
|
3403 ;; i2: start of the second arg, if any (before delim if `ender'). |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3404 ;; ender: the last arg bounded by parens-like chars, the second one of them |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3405 ;; starter: the starting delimiter of the first arg |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3406 ;; go-forward: has 2 args, and the second part is empty |
20323 | 3407 (list i i2 ender starter go-forward))) |
3408 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3409 (defun cperl-forward-group-in-re (&optional st-l) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3410 "Find the end of a group in a REx. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3411 Return the error message (if any). Does not work if delimiter is `)'. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3412 Works before syntax recognition is done." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3413 ;; Works *before* syntax recognition is done |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3414 (or st-l (setq st-l (list nil))) ; Avoid overwriting '() |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3415 (let (st b reset-st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3416 (condition-case b |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3417 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3418 (setq st (cperl-cached-syntax-table st-l)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3419 (modify-syntax-entry ?\( "()" st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3420 (modify-syntax-entry ?\) ")(" st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3421 (setq reset-st (syntax-table)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3422 (set-syntax-table st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3423 (forward-sexp 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3424 (error (message |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3425 "cperl-forward-group-in-re: error %s" b))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3426 ;; now restore the initial state |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3427 (if st |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3428 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3429 (modify-syntax-entry ?\( "." st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3430 (modify-syntax-entry ?\) "." st))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3431 (if reset-st |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3432 (set-syntax-table reset-st)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3433 b)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3434 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3435 |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3436 (defvar font-lock-string-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3437 ;;(defvar font-lock-reference-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3438 (defvar font-lock-constant-face) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3439 (defsubst cperl-postpone-fontification (b e type val &optional now) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3440 ;; Do after syntactic fontification? |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3441 (if cperl-syntaxify-by-font-lock |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3442 (or now (put-text-property b e 'cperl-postpone (cons type val))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3443 (put-text-property b e type val))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3444 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3445 ;;; Here is how the global structures (those which cannot be |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3446 ;;; recognized locally) are marked: |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3447 ;; a) PODs: |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3448 ;; Start-to-end is marked `in-pod' ==> t |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3449 ;; Each non-literal part is marked `syntax-type' ==> `pod' |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3450 ;; Each literal part is marked `syntax-type' ==> `in-pod' |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3451 ;; b) HEREs: |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3452 ;; Start-to-end is marked `here-doc-group' ==> t |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3453 ;; The body is marked `syntax-type' ==> `here-doc' |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3454 ;; The delimiter is marked `syntax-type' ==> `here-doc-delim' |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3455 ;; c) FORMATs: |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3456 ;; First line (to =) marked `first-format-line' ==> t |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3457 ;; After-this--to-end is marked `syntax-type' ==> `format' |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3458 ;; d) 'Q'uoted string: |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3459 ;; part between markers inclusive is marked `syntax-type' ==> `string' |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3460 ;; part between `q' and the first marker is marked `syntax-type' ==> `prestring' |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3461 ;; second part of s///e is marked `syntax-type' ==> `multiline' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3462 ;; e) Attributes of subroutines: `attrib-group' ==> t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3463 ;; (or 0 if declaration); up to `{' or ';': `syntax-type' => `sub-decl'. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3464 ;; f) Multiline my/our declaration lists etc: `syntax-type' => `multiline' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3465 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3466 ;;; In addition, some parts of RExes may be marked as `REx-interpolated' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3467 ;;; (value: 0 in //o, 1 if "interpolated variable" is whole-REx, t otherwise). |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3468 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3469 (defun cperl-unwind-to-safe (before &optional end) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3470 ;; if BEFORE, go to the previous start-of-line on each step of unwinding |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3471 (let ((pos (point)) opos) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3472 (while (and pos (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3473 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3474 (get-text-property (setq pos (point)) 'syntax-type))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3475 (setq opos pos |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3476 pos (cperl-beginning-of-property pos 'syntax-type)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3477 (if (eq pos (point-min)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3478 (setq pos nil)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3479 (if pos |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3480 (if before |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3481 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3482 (goto-char (cperl-1- pos)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3483 (beginning-of-line) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3484 (setq pos (point))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3485 (goto-char (setq pos (cperl-1- pos)))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3486 ;; Up to the start |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3487 (goto-char (point-min)))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3488 ;; Skip empty lines |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3489 (and (looking-at "\n*=") |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3490 (/= 0 (skip-chars-backward "\n")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3491 (forward-char)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3492 (setq pos (point)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3493 (if end |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3494 ;; Do the same for end, going small steps |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3495 (save-excursion |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3496 (while (and end (get-text-property end 'syntax-type)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3497 (setq pos end |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3498 end (next-single-property-change end 'syntax-type nil (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3499 (if end (progn (goto-char end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3500 (or (bolp) (forward-line 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3501 (setq end (point))))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3502 (or end pos))))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3503 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3504 ;;; These are needed for byte-compile (at least with v19) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3505 (defvar cperl-nonoverridable-face) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3506 (defvar font-lock-variable-name-face) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3507 (defvar font-lock-function-name-face) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3508 (defvar font-lock-keyword-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3509 (defvar font-lock-builtin-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3510 (defvar font-lock-type-face) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3511 (defvar font-lock-comment-face) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3512 (defvar font-lock-warning-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3513 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3514 (defun cperl-find-sub-attrs (&optional st-l b-fname e-fname pos) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3515 "Syntaxically mark (and fontify) attributes of a subroutine. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3516 Should be called with the point before leading colon of an attribute." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3517 ;; Works *before* syntax recognition is done |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3518 (or st-l (setq st-l (list nil))) ; Avoid overwriting '() |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3519 (let (st b p reset-st after-first (start (point)) start1 end1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3520 (condition-case b |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3521 (while (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3522 (concat |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3523 "\\(" ; 1=optional? colon |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3524 ":" cperl-maybe-white-and-comment-rex ; 2=whitespace/comment? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3525 "\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3526 (if after-first "?" "") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3527 ;; No space between name and paren allowed... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3528 "\\(\\sw+\\)" ; 3=name |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3529 "\\((\\)?")) ; 4=optional paren |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3530 (and (match-beginning 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3531 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3532 (match-beginning 0) (cperl-1+ (match-beginning 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3533 'face font-lock-constant-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3534 (setq start1 (match-beginning 3) end1 (match-end 3)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3535 (cperl-postpone-fontification start1 end1 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3536 'face font-lock-constant-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3537 (goto-char end1) ; end or before `(' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3538 (if (match-end 4) ; Have attribute arguments... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3539 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3540 (if st nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3541 (setq st (cperl-cached-syntax-table st-l)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3542 (modify-syntax-entry ?\( "()" st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3543 (modify-syntax-entry ?\) ")(" st)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3544 (setq reset-st (syntax-table) p (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3545 (set-syntax-table st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3546 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3547 (set-syntax-table reset-st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3548 (setq reset-st nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3549 (cperl-commentify p (point) t))) ; mark as string |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3550 (forward-comment (buffer-size)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3551 (setq after-first t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3552 (error (message |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3553 "L%d: attribute `%s': %s" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3554 (count-lines (point-min) (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3555 (and start1 end1 (buffer-substring start1 end1)) b) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3556 (setq start nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3557 (and start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3558 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3559 (put-text-property start (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3560 'attrib-group (if (looking-at "{") t 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3561 (and pos |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3562 (< 1 (count-lines (+ 3 pos) (point))) ; end of `sub' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3563 ;; Apparently, we do not need `multiline': faces added now |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3564 (put-text-property (+ 3 pos) (cperl-1+ (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3565 'syntax-type 'sub-decl)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3566 (and b-fname ; Fontify here: the following condition |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3567 (cperl-postpone-fontification ; is too hard to determine by |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3568 b-fname e-fname 'face ; a REx, so do it here |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3569 (if (looking-at "{") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3570 font-lock-function-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3571 font-lock-variable-name-face))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3572 ;; now restore the initial state |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3573 (if st |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3574 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3575 (modify-syntax-entry ?\( "." st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3576 (modify-syntax-entry ?\) "." st))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3577 (if reset-st |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3578 (set-syntax-table reset-st)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3579 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3580 (defsubst cperl-look-at-leading-count (is-x-REx e) |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
3581 (if (and |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
3582 (< (point) e) |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
3583 (re-search-forward (concat "\\=" (if is-x-REx "[ \t\n]*" "") "[{?+*]") |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
3584 (1- e) t)) ; return nil on failure, no moving |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3585 (if (eq ?\{ (preceding-char)) nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3586 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3587 (1- (point)) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3588 'face font-lock-warning-face)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3589 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3590 ;;; Debugging this may require (setq max-specpdl-size 2000)... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3591 (defun cperl-find-pods-heres (&optional min max non-inter end ignore-max end-of-here-doc) |
20323 | 3592 "Scans the buffer for hard-to-parse Perl constructions. |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3593 If `cperl-pod-here-fontify' is not-nil after evaluation, will fontify |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3594 the sections using `cperl-pod-head-face', `cperl-pod-face', |
20323 | 3595 `cperl-here-face'." |
3596 (interactive) | |
78582
d168a4166b80
Fix s{a}{b} parsing
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
78487
diff
changeset
|
3597 (or min (setq min (point-min) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3598 cperl-syntax-state nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3599 cperl-syntax-done-to min)) |
20323 | 3600 (or max (setq max (point-max))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3601 (let* ((cperl-pod-here-fontify (eval cperl-pod-here-fontify)) go tmpend |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3602 face head-face here-face b e bb tag qtag b1 e1 argument i c tail tb |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3603 is-REx is-x-REx REx-subgr-start REx-subgr-end was-subgr i2 hairy-RE |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3604 (case-fold-search nil) (inhibit-read-only t) (buffer-undo-list t) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3605 (modified (buffer-modified-p)) overshoot is-o-REx |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3606 (after-change-functions nil) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3607 (cperl-font-locking t) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3608 (use-syntax-state (and cperl-syntax-state |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3609 (>= min (car cperl-syntax-state)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3610 (state-point (if use-syntax-state |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3611 (car cperl-syntax-state) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3612 (point-min))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3613 (state (if use-syntax-state |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3614 (cdr cperl-syntax-state))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3615 ;; (st-l '(nil)) (err-l '(nil)) ; Would overwrite - propagates from a function call to a function call! |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3616 (st-l (list nil)) (err-l (list nil)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3617 ;; Somehow font-lock may be not loaded yet... |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3618 ;; (e.g., when building TAGS via command-line call) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3619 (font-lock-string-face (if (boundp 'font-lock-string-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3620 font-lock-string-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3621 'font-lock-string-face)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3622 (my-cperl-delimiters-face (if (boundp 'font-lock-constant-face) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3623 font-lock-constant-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3624 'font-lock-constant-face)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3625 (my-cperl-REx-spec-char-face ; [] ^.$ and wrapper-of ({}) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3626 (if (boundp 'font-lock-function-name-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3627 font-lock-function-name-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3628 'font-lock-function-name-face)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3629 (font-lock-variable-name-face ; interpolated vars and ({})-code |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3630 (if (boundp 'font-lock-variable-name-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3631 font-lock-variable-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3632 'font-lock-variable-name-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3633 (font-lock-function-name-face ; used in `cperl-find-sub-attrs' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3634 (if (boundp 'font-lock-function-name-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3635 font-lock-function-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3636 'font-lock-function-name-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3637 (font-lock-constant-face ; used in `cperl-find-sub-attrs' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3638 (if (boundp 'font-lock-constant-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3639 font-lock-constant-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3640 'font-lock-constant-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3641 (my-cperl-REx-0length-face ; 0-length, (?:)etc, non-literal \ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3642 (if (boundp 'font-lock-builtin-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3643 font-lock-builtin-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3644 'font-lock-builtin-face)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3645 (font-lock-comment-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3646 (if (boundp 'font-lock-comment-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3647 font-lock-comment-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3648 'font-lock-comment-face)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3649 (font-lock-warning-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3650 (if (boundp 'font-lock-warning-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3651 font-lock-warning-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3652 'font-lock-warning-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3653 (my-cperl-REx-ctl-face ; (|) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3654 (if (boundp 'font-lock-keyword-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3655 font-lock-keyword-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3656 'font-lock-keyword-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3657 (my-cperl-REx-modifiers-face ; //gims |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3658 (if (boundp 'cperl-nonoverridable-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3659 cperl-nonoverridable-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3660 'cperl-nonoverridable-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3661 (my-cperl-REx-length1-face ; length=1 escaped chars, POSIX classes |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3662 (if (boundp 'font-lock-type-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3663 font-lock-type-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3664 'font-lock-type-face)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3665 (stop-point (if ignore-max |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3666 (point-max) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3667 max)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3668 (search |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3669 (concat |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3670 "\\(\\`\n?\\|^\n\\)=" ; POD |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3671 "\\|" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3672 ;; One extra () before this: |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3673 "<<" ; HERE-DOC |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3674 "\\(" ; 1 + 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3675 ;; First variant "BLAH" or just ``. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3676 "[ \t]*" ; Yes, whitespace is allowed! |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3677 "\\([\"'`]\\)" ; 2 + 1 = 3 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3678 "\\([^\"'`\n]*\\)" ; 3 + 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3679 "\\3" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3680 "\\|" |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3681 ;; Second variant: Identifier or \ID (same as 'ID') or empty |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3682 "\\\\?\\(\\([a-zA-Z_][a-zA-Z_0-9]*\\)?\\)" ; 4 + 1, 5 + 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3683 ;; Do not have <<= or << 30 or <<30 or << $blah. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3684 ;; "\\([^= \t0-9$@%&]\\|[ \t]+[^ \t\n0-9$@%&]\\)" ; 6 + 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3685 "\\(\\)" ; To preserve count of pars :-( 6 + 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3686 "\\)" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3687 "\\|" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3688 ;; 1+6 extra () before this: |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3689 "^[ \t]*\\(format\\)[ \t]*\\([a-zA-Z0-9_]+\\)?[ \t]*=[ \t]*$" ;FRMAT |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3690 (if cperl-use-syntax-table-text-property |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3691 (concat |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3692 "\\|" |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3693 ;; 1+6+2=9 extra () before this: |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3694 "\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>" ; QUOTED CONSTRUCT |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3695 "\\|" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3696 ;; 1+6+2+1=10 extra () before this: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3697 "\\([?/<]\\)" ; /blah/ or ?blah? or <file*glob> |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3698 "\\|" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3699 ;; 1+6+2+1+1=11 extra () before this |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3700 "\\<sub\\>" ; sub with proto/attr |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3701 "\\(" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3702 cperl-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3703 "\\(::[a-zA-Z_:'0-9]*\\|[a-zA-Z_'][a-zA-Z_:'0-9]*\\)\\)?" ; name |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3704 "\\(" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3705 cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3706 "\\(([^()]*)\\|:[^:]\\)\\)" ; prototype or attribute start |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3707 "\\|" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3708 ;; 1+6+2+1+1+6=17 extra () before this: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3709 "\\$\\(['{]\\)" ; $' or ${foo} |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3710 "\\|" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3711 ;; 1+6+2+1+1+6+1=18 extra () before this (old pack'var syntax; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3712 ;; we do not support intervening comments...): |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3713 "\\(\\<sub[ \t\n\f]+\\|[&*$@%]\\)[a-zA-Z0-9_]*'" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3714 ;; 1+6+2+1+1+6+1+1=19 extra () before this: |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3715 "\\|" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3716 "__\\(END\\|DATA\\)__" ; __END__ or __DATA__ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3717 ;; 1+6+2+1+1+6+1+1+1=20 extra () before this: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3718 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3719 "\\\\\\(['`\"($]\\)") ; BACKWACKED something-hairy |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3720 "")))) |
20323 | 3721 (unwind-protect |
3722 (progn | |
3723 (save-excursion | |
3724 (or non-inter | |
3725 (message "Scanning for \"hard\" Perl constructions...")) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3726 ;;(message "find: %s --> %s" min max) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3727 (and cperl-pod-here-fontify |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3728 ;; We had evals here, do not know why... |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3729 (setq face cperl-pod-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3730 head-face cperl-pod-head-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3731 here-face cperl-here-face)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3732 (remove-text-properties min max |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3733 '(syntax-type t in-pod t syntax-table t |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3734 attrib-group t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3735 REx-interpolated t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3736 cperl-postpone t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3737 syntax-subtype t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3738 rear-nonsticky t |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3739 front-sticky t |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3740 here-doc-group t |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3741 first-format-line t |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3742 REx-part2 t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3743 indentable t)) |
20323 | 3744 ;; Need to remove face as well... |
3745 (goto-char min) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3746 (and (eq system-type 'emx) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3747 (eq (point) 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3748 (let ((case-fold-search t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3749 (looking-at "extproc[ \t]")) ; Analogue of #! |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3750 (cperl-commentify min |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3751 (save-excursion (end-of-line) (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3752 nil)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3753 (while (and |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3754 (< (point) max) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3755 (re-search-forward search max t)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3756 (setq tmpend nil) ; Valid for most cases |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3757 (setq b (match-beginning 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3758 state (save-excursion (parse-partial-sexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3759 state-point b nil nil state)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3760 state-point b) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3761 (cond |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3762 ;; 1+6+2+1+1+6=17 extra () before this: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3763 ;; "\\$\\(['{]\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3764 ((match-beginning 18) ; $' or ${foo} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3765 (if (eq (preceding-char) ?\') ; $' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3766 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3767 (setq b (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3768 state (parse-partial-sexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3769 state-point (1- b) nil nil state) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3770 state-point (1- b)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3771 (if (nth 3 state) ; in string |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3772 (cperl-modify-syntax-type (1- b) cperl-st-punct)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3773 (goto-char (1+ b))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3774 ;; else: ${ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3775 (setq bb (match-beginning 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3776 (cperl-modify-syntax-type bb cperl-st-punct))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3777 ;; No processing in strings/comments beyond this point: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3778 ((or (nth 3 state) (nth 4 state)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3779 t) ; Do nothing in comment/string |
20323 | 3780 ((match-beginning 1) ; POD section |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3781 ;; "\\(\\`\n?\\|^\n\\)=" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3782 (setq b (match-beginning 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3783 state (parse-partial-sexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3784 state-point b nil nil state) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3785 state-point b) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3786 (if (or (nth 3 state) (nth 4 state) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3787 (looking-at "cut\\>")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3788 (if (or (nth 3 state) (nth 4 state) ignore-max) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3789 nil ; Doing a chunk only |
20323 | 3790 (message "=cut is not preceded by a POD section") |
3791 (or (car err-l) (setcar err-l (point)))) | |
3792 (beginning-of-line) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3793 |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3794 (setq b (point) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3795 bb b |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3796 tb (match-beginning 0) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3797 b1 nil) ; error condition |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3798 ;; We do not search to max, since we may be called from |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3799 ;; some hook of fontification, and max is random |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3800 (or (re-search-forward "^\n=cut\\>" stop-point 'toend) |
20323 | 3801 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3802 (goto-char b) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3803 (if (re-search-forward "\n=cut\\>" stop-point 'toend) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3804 (progn |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3805 (message "=cut is not preceded by an empty line") |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3806 (setq b1 t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3807 (or (car err-l) (setcar err-l b)))))) |
20323 | 3808 (beginning-of-line 2) ; An empty line after =cut is not POD! |
3809 (setq e (point)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3810 (and (> e max) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3811 (progn |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3812 (remove-text-properties |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3813 max e '(syntax-type t in-pod t syntax-table t |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3814 attrib-group t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3815 REx-interpolated t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3816 cperl-postpone t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3817 syntax-subtype t |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3818 here-doc-group t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3819 rear-nonsticky t |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3820 front-sticky t |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3821 first-format-line t |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3822 REx-part2 t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3823 indentable t)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3824 (setq tmpend tb))) |
20323 | 3825 (put-text-property b e 'in-pod t) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3826 (put-text-property b e 'syntax-type 'in-pod) |
20323 | 3827 (goto-char b) |
3828 (while (re-search-forward "\n\n[ \t]" e t) | |
3829 ;; We start 'pod 1 char earlier to include the preceding line | |
3830 (beginning-of-line) | |
3831 (put-text-property (cperl-1- b) (point) 'syntax-type 'pod) | |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3832 (cperl-put-do-not-fontify b (point) t) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3833 ;; mark the non-literal parts as PODs |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3834 (if cperl-pod-here-fontify |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3835 (cperl-postpone-fontification b (point) 'face face t)) |
20323 | 3836 (re-search-forward "\n\n[^ \t\f\n]" e 'toend) |
3837 (beginning-of-line) | |
3838 (setq b (point))) | |
3839 (put-text-property (cperl-1- (point)) e 'syntax-type 'pod) | |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3840 (cperl-put-do-not-fontify (point) e t) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3841 (if cperl-pod-here-fontify |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3842 (progn |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3843 ;; mark the non-literal parts as PODs |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3844 (cperl-postpone-fontification (point) e 'face face t) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3845 (goto-char bb) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3846 (if (looking-at |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3847 "=[a-zA-Z0-9_]+\\>[ \t]*\\(\\(\n?[^\n]\\)+\\)$") |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3848 ;; mark the headers |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3849 (cperl-postpone-fontification |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3850 (match-beginning 1) (match-end 1) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3851 'face head-face)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3852 (while (re-search-forward |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3853 ;; One paragraph |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3854 "^\n=[a-zA-Z0-9_]+\\>[ \t]*\\(\\(\n?[^\n]\\)+\\)$" |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3855 e 'toend) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3856 ;; mark the headers |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3857 (cperl-postpone-fontification |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3858 (match-beginning 1) (match-end 1) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3859 'face head-face)))) |
20323 | 3860 (cperl-commentify bb e nil) |
3861 (goto-char e) | |
3862 (or (eq e (point-max)) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3863 (forward-char -1)))) ; Prepare for immediate POD start. |
20323 | 3864 ;; Here document |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3865 ;; We can do many here-per-line; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3866 ;; but multiline quote on the same line as <<HERE confuses us... |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3867 ;; ;; One extra () before this: |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3868 ;;"<<" |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3869 ;; "\\(" ; 1 + 1 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3870 ;; ;; First variant "BLAH" or just ``. |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3871 ;; "[ \t]*" ; Yes, whitespace is allowed! |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3872 ;; "\\([\"'`]\\)" ; 2 + 1 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3873 ;; "\\([^\"'`\n]*\\)" ; 3 + 1 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3874 ;; "\\3" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3875 ;; "\\|" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3876 ;; ;; Second variant: Identifier or \ID or empty |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3877 ;; "\\\\?\\(\\([a-zA-Z_][a-zA-Z_0-9]*\\)?\\)" ; 4 + 1, 5 + 1 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3878 ;; ;; Do not have <<= or << 30 or <<30 or << $blah. |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3879 ;; ;; "\\([^= \t0-9$@%&]\\|[ \t]+[^ \t\n0-9$@%&]\\)" ; 6 + 1 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3880 ;; "\\(\\)" ; To preserve count of pars :-( 6 + 1 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3881 ;; "\\)" |
20323 | 3882 ((match-beginning 2) ; 1 + 1 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3883 (setq b (point) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3884 tb (match-beginning 0) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3885 c (and ; not HERE-DOC |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3886 (match-beginning 5) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3887 (save-match-data |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3888 (or (looking-at "[ \t]*(") ; << function_call() |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3889 (save-excursion ; 1 << func_name, or $foo << 10 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3890 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3891 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3892 (goto-char tb) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3893 ;;; XXX What to do: foo <<bar ??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3894 ;;; XXX Need to support print {a} <<B ??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3895 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3896 (save-match-data |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3897 ; $foo << b; $f .= <<B; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3898 ; ($f+1) << b; a($f) . <<B; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3899 ; foo 1, <<B; $x{a} <<b; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3900 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3901 ((looking-at "[0-9$({]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3902 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3903 (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3904 (looking-at "[ \t]*<<") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3905 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3906 ;; print $foo <<EOF |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3907 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3908 (forward-sexp -2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3909 (not |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3910 (looking-at "\\(printf?\\|system\\|exec\\|sort\\)\\>"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3911 (error t))))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3912 (error nil))) ; func(<<EOF) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3913 (and (not (match-beginning 6)) ; Empty |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3914 (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3915 "[ \t]*[=0-9$@%&(]")))))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3916 (if c ; Not here-doc |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3917 nil ; Skip it. |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3918 (setq c (match-end 2)) ; 1 + 1 |
20323 | 3919 (if (match-beginning 5) ;4 + 1 |
3920 (setq b1 (match-beginning 5) ; 4 + 1 | |
3921 e1 (match-end 5)) ; 4 + 1 | |
3922 (setq b1 (match-beginning 4) ; 3 + 1 | |
3923 e1 (match-end 4))) ; 3 + 1 | |
3924 (setq tag (buffer-substring b1 e1) | |
3925 qtag (regexp-quote tag)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3926 (cond (cperl-pod-here-fontify |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3927 ;; Highlight the starting delimiter |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3928 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3929 b1 e1 'face my-cperl-delimiters-face) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3930 (cperl-put-do-not-fontify b1 e1 t))) |
20323 | 3931 (forward-line) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3932 (setq i (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3933 (if end-of-here-doc |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3934 (goto-char end-of-here-doc)) |
20323 | 3935 (setq b (point)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3936 ;; We do not search to max, since we may be called from |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3937 ;; some hook of fontification, and max is random |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3938 (or (and (re-search-forward (concat "^" qtag "$") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3939 stop-point 'toend) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3940 ;;;(eq (following-char) ?\n) ; XXXX WHY??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3941 ) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3942 (progn ; Pretend we matched at the end |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3943 (goto-char (point-max)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3944 (re-search-forward "\\'") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3945 (message "End of here-document `%s' not found." tag) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3946 (or (car err-l) (setcar err-l b)))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3947 (if cperl-pod-here-fontify |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3948 (progn |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3949 ;; Highlight the ending delimiter |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3950 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3951 (match-beginning 0) (match-end 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3952 'face my-cperl-delimiters-face) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3953 (cperl-put-do-not-fontify b (match-end 0) t) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3954 ;; Highlight the HERE-DOC |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3955 (cperl-postpone-fontification b (match-beginning 0) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3956 'face here-face))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3957 (setq e1 (cperl-1+ (match-end 0))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3958 (put-text-property b (match-beginning 0) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3959 'syntax-type 'here-doc) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3960 (put-text-property (match-beginning 0) e1 |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3961 'syntax-type 'here-doc-delim) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3962 (put-text-property b e1 'here-doc-group t) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3963 ;; This makes insertion at the start of HERE-DOC update |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3964 ;; the whole construct: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3965 (put-text-property b (cperl-1+ b) 'front-sticky '(syntax-type)) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3966 (cperl-commentify b e1 nil) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3967 (cperl-put-do-not-fontify b (match-end 0) t) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3968 ;; Cache the syntax info... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3969 (setq cperl-syntax-state (cons state-point state)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3970 ;; ... and process the rest of the line... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3971 (setq overshoot |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3972 (elt ; non-inter ignore-max |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3973 (cperl-find-pods-heres c i t end t e1) 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3974 (if (and overshoot (> overshoot (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3975 (goto-char overshoot) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3976 (setq overshoot e1)) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3977 (if (> e1 max) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3978 (setq tmpend tb)))) |
20323 | 3979 ;; format |
3980 ((match-beginning 8) | |
3981 ;; 1+6=7 extra () before this: | |
3982 ;;"^[ \t]*\\(format\\)[ \t]*\\([a-zA-Z0-9_]+\\)?[ \t]*=[ \t]*$" | |
3983 (setq b (point) | |
3984 name (if (match-beginning 8) ; 7 + 1 | |
3985 (buffer-substring (match-beginning 8) ; 7 + 1 | |
3986 (match-end 8)) ; 7 + 1 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3987 "") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3988 tb (match-beginning 0)) |
20323 | 3989 (setq argument nil) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3990 (put-text-property (save-excursion |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3991 (beginning-of-line) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3992 (point)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3993 b 'first-format-line 't) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3994 (if cperl-pod-here-fontify |
20323 | 3995 (while (and (eq (forward-line) 0) |
3996 (not (looking-at "^[.;]$"))) | |
3997 (cond | |
3998 ((looking-at "^#")) ; Skip comments | |
3999 ((and argument ; Skip argument multi-lines | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4000 (looking-at "^[ \t]*{")) |
20323 | 4001 (forward-sexp 1) |
4002 (setq argument nil)) | |
4003 (argument ; Skip argument lines | |
4004 (setq argument nil)) | |
4005 (t ; Format line | |
4006 (setq b1 (point)) | |
4007 (setq argument (looking-at "^[^\n]*[@^]")) | |
4008 (end-of-line) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4009 ;; Highlight the format line |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4010 (cperl-postpone-fontification b1 (point) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4011 'face font-lock-string-face) |
20323 | 4012 (cperl-commentify b1 (point) nil) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4013 (cperl-put-do-not-fontify b1 (point) t)))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4014 ;; We do not search to max, since we may be called from |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4015 ;; some hook of fontification, and max is random |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4016 (re-search-forward "^[.;]$" stop-point 'toend)) |
20323 | 4017 (beginning-of-line) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4018 (if (looking-at "^\\.$") ; ";" is not supported yet |
20323 | 4019 (progn |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4020 ;; Highlight the ending delimiter |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4021 (cperl-postpone-fontification (point) (+ (point) 2) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4022 'face font-lock-string-face) |
20323 | 4023 (cperl-commentify (point) (+ (point) 2) nil) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4024 (cperl-put-do-not-fontify (point) (+ (point) 2) t)) |
20323 | 4025 (message "End of format `%s' not found." name) |
4026 (or (car err-l) (setcar err-l b))) | |
4027 (forward-line) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4028 (if (> (point) max) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4029 (setq tmpend tb)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4030 (put-text-property b (point) 'syntax-type 'format)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4031 ;; qq-like String or Regexp: |
20323 | 4032 ((or (match-beginning 10) (match-beginning 11)) |
4033 ;; 1+6+2=9 extra () before this: | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4034 ;; "\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>" |
20323 | 4035 ;; "\\|" |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4036 ;; "\\([?/<]\\)" ; /blah/ or ?blah? or <file*glob> |
20323 | 4037 (setq b1 (if (match-beginning 10) 10 11) |
4038 argument (buffer-substring | |
4039 (match-beginning b1) (match-end b1)) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4040 b (point) ; end of qq etc |
20323 | 4041 i b |
4042 c (char-after (match-beginning b1)) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4043 bb (char-after (1- (match-beginning b1))) ; tmp holder |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4044 ;; bb == "Not a stringy" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4045 bb (if (eq b1 10) ; user variables/whatever |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4046 (and (memq bb (append "$@%*#_:-&>" nil)) ; $#y) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4047 (cond ((eq bb ?-) (eq c ?s)) ; -s file test |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4048 ((eq bb ?\:) ; $opt::s |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4049 (eq (char-after |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4050 (- (match-beginning b1) 2)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4051 ?\:)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4052 ((eq bb ?\>) ; $foo->s |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4053 (eq (char-after |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4054 (- (match-beginning b1) 2)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4055 ?\-)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4056 ((eq bb ?\&) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4057 (not (eq (char-after ; &&m/blah/ |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4058 (- (match-beginning b1) 2)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4059 ?\&))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4060 (t t))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4061 ;; <file> or <$file> |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4062 (and (eq c ?\<) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4063 ;; Do not stringify <FH>, <$fh> : |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4064 (save-match-data |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4065 (looking-at |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4066 "\\$?\\([_a-zA-Z:][_a-zA-Z0-9:]*\\)?>")))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4067 tb (match-beginning 0)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4068 (goto-char (match-beginning b1)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4069 (cperl-backward-to-noncomment (point-min)) |
20323 | 4070 (or bb |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4071 (if (eq b1 11) ; bare /blah/ or ?blah? or <foo> |
20323 | 4072 (setq argument "" |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4073 b1 nil |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4074 bb ; Not a regexp? |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4075 (not |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4076 ;; What is below: regexp-p? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4077 (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4078 (or (memq (preceding-char) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4079 (append (if (memq c '(?\? ?\<)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4080 ;; $a++ ? 1 : 2 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4081 "~{(=|&*!,;:[" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4082 "~{(=|&+-*!,;:[") nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4083 (and (eq (preceding-char) ?\}) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4084 (cperl-after-block-p (point-min))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4085 (and (eq (char-syntax (preceding-char)) ?w) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4086 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4087 (forward-sexp -1) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4088 ;; After these keywords `/' starts a RE. One should add all the |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4089 ;; functions/builtins which expect an argument, but ... |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4090 (if (eq (preceding-char) ?-) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4091 ;; -d ?foo? is a RE |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4092 (looking-at "[a-zA-Z]\\>") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4093 (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4094 (not (memq (preceding-char) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4095 '(?$ ?@ ?& ?%))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4096 (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4097 "\\(while\\|if\\|unless\\|until\\|and\\|or\\|not\\|xor\\|split\\|grep\\|map\\|print\\)\\>"))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4098 (and (eq (preceding-char) ?.) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4099 (eq (char-after (- (point) 2)) ?.)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4100 (bobp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4101 ;; m|blah| ? foo : bar; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4102 (not |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4103 (and (eq c ?\?) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4104 cperl-use-syntax-table-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4105 (not (bobp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4106 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4107 (forward-char -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4108 (looking-at "\\s|")))))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4109 b (1- b)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4110 ;; s y tr m |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4111 ;; Check for $a -> y |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4112 (setq b1 (preceding-char) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4113 go (point)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4114 (if (and (eq b1 ?>) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4115 (eq (char-after (- go 2)) ?-)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4116 ;; Not a regexp |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4117 (setq bb t)))) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4118 (or bb |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4119 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4120 (goto-char b) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4121 (if (looking-at "[ \t\n\f]+\\(#[^\n]*\n[ \t\n\f]*\\)+") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4122 (goto-char (match-end 0)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4123 (skip-chars-forward " \t\n\f")) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4124 (cond ((and (eq (following-char) ?\}) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4125 (eq b1 ?\{)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4126 ;; Check for $a[23]->{ s }, @{s} and *{s::foo} |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4127 (goto-char (1- go)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4128 (skip-chars-backward " \t\n\f") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4129 (if (memq (preceding-char) (append "$@%&*" nil)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4130 (setq bb t) ; @{y} |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4131 (condition-case nil |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4132 (forward-sexp -1) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4133 (error nil))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4134 (if (or bb |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4135 (looking-at ; $foo -> {s} |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4136 "[$@]\\$*\\([a-zA-Z0-9_:]+\\|[^{]\\)\\([ \t\n]*->\\)?[ \t\n]*{") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4137 (and ; $foo[12] -> {s} |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4138 (memq (following-char) '(?\{ ?\[)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4139 (progn |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4140 (forward-sexp 1) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4141 (looking-at "\\([ \t\n]*->\\)?[ \t\n]*{")))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4142 (setq bb t) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4143 (goto-char b))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4144 ((and (eq (following-char) ?=) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4145 (eq (char-after (1+ (point))) ?\>)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4146 ;; Check for { foo => 1, s => 2 } |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4147 ;; Apparently s=> is never a substitution... |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4148 (setq bb t)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4149 ((and (eq (following-char) ?:) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4150 (eq b1 ?\{) ; Check for $ { s::bar } |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4151 (looking-at "::[a-zA-Z0-9_:]*[ \t\n\f]*}") |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
4152 (progn |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4153 (goto-char (1- go)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4154 (skip-chars-backward " \t\n\f") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4155 (memq (preceding-char) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4156 (append "$@%&*" nil)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4157 (setq bb t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4158 ((eobp) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4159 (setq bb t))))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4160 (if bb |
20323 | 4161 (goto-char i) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4162 ;; Skip whitespace and comments... |
20323 | 4163 (if (looking-at "[ \t\n\f]+\\(#[^\n]*\n[ \t\n\f]*\\)+") |
4164 (goto-char (match-end 0)) | |
4165 (skip-chars-forward " \t\n\f")) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4166 (if (> (point) b) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4167 (put-text-property b (point) 'syntax-type 'prestring)) |
20323 | 4168 ;; qtag means two-arg matcher, may be reset to |
4169 ;; 2 or 3 later if some special quoting is needed. | |
4170 ;; e1 means matching-char matcher. | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4171 (setq b (point) ; before the first delimiter |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4172 ;; has 2 args |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4173 i2 (string-match "^\\([sy]\\|tr\\)$" argument) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4174 ;; We do not search to max, since we may be called from |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4175 ;; some hook of fontification, and max is random |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4176 i (cperl-forward-re stop-point end |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4177 i2 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4178 st-l err-l argument) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4179 ;; If `go', then it is considered as 1-arg, `b1' is nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4180 ;; as in s/foo//x; the point is before final "slash" |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4181 b1 (nth 1 i) ; start of the second part |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4182 tag (nth 2 i) ; ender-char, true if second part |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4183 ; is with matching chars [] |
20323 | 4184 go (nth 4 i) ; There is a 1-char part after the end |
4185 i (car i) ; intermediate point | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4186 e1 (point) ; end |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4187 ;; Before end of the second part if non-matching: /// |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4188 tail (if (and i (not tag)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4189 (1- e1)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4190 e (if i i e1) ; end of the first part |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4191 qtag nil ; need to preserve backslashitis |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4192 is-x-REx nil is-o-REx nil); REx has //x //o modifiers |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4193 ;; If s{} (), then b/b1 are at "{", "(", e1/i after ")", "}" |
20323 | 4194 ;; Commenting \\ is dangerous, what about ( ? |
4195 (and i tail | |
4196 (eq (char-after i) ?\\) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4197 (setq qtag t)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4198 (and (if go (looking-at ".\\sw*x") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4199 (looking-at "\\sw*x")) ; qr//x |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4200 (setq is-x-REx t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4201 (and (if go (looking-at ".\\sw*o") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4202 (looking-at "\\sw*o")) ; //o |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4203 (setq is-o-REx t)) |
20323 | 4204 (if (null i) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4205 ;; Considered as 1arg form |
20323 | 4206 (progn |
4207 (cperl-commentify b (point) t) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4208 (put-text-property b (point) 'syntax-type 'string) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4209 (if (or is-x-REx |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4210 ;; ignore other text properties: |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4211 (string-match "^qw$" argument)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4212 (put-text-property b (point) 'indentable t)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4213 (and go |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4214 (setq e1 (cperl-1+ e1)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4215 (or (eobp) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4216 (forward-char 1)))) |
20323 | 4217 (cperl-commentify b i t) |
4218 (if (looking-at "\\sw*e") ; s///e | |
4219 (progn | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4220 ;; Cache the syntax info... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4221 (setq cperl-syntax-state (cons state-point state)) |
20323 | 4222 (and |
4223 ;; silent: | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4224 (car (cperl-find-pods-heres b1 (1- (point)) t end)) |
20323 | 4225 ;; Error |
4226 (goto-char (1+ max))) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4227 (if (and tag (eq (preceding-char) ?\>)) |
20323 | 4228 (progn |
4229 (cperl-modify-syntax-type (1- (point)) cperl-st-ket) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4230 (cperl-modify-syntax-type i cperl-st-bra))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4231 (put-text-property b i 'syntax-type 'string) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4232 (put-text-property i (point) 'syntax-type 'multiline) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4233 (if is-x-REx |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4234 (put-text-property b i 'indentable t))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4235 (cperl-commentify b1 (point) t) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4236 (put-text-property b (point) 'syntax-type 'string) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4237 (if is-x-REx |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4238 (put-text-property b i 'indentable t)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4239 (if qtag |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4240 (cperl-modify-syntax-type (1+ i) cperl-st-punct)) |
20323 | 4241 (setq tail nil))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4242 ;; Now: tail: if the second part is non-matching without ///e |
20323 | 4243 (if (eq (char-syntax (following-char)) ?w) |
4244 (progn | |
4245 (forward-word 1) ; skip modifiers s///s | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4246 (if tail (cperl-commentify tail (point) t)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4247 (cperl-postpone-fontification |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4248 e1 (point) 'face my-cperl-REx-modifiers-face))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4249 ;; Check whether it is m// which means "previous match" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4250 ;; and highlight differently |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4251 (setq is-REx |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4252 (and (string-match "^\\([sm]?\\|qr\\)$" argument) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4253 (or (not (= (length argument) 0)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4254 (not (eq c ?\<))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4255 (if (and is-REx |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4256 (eq e (+ 2 b)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4257 ;; split // *is* using zero-pattern |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4258 (save-excursion |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4259 (condition-case nil |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4260 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4261 (goto-char tb) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4262 (forward-sexp -1) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4263 (not (looking-at "split\\>"))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4264 (error t)))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4265 (cperl-postpone-fontification |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4266 b e 'face font-lock-warning-face) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4267 (if (or i2 ; Has 2 args |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4268 (and cperl-fontify-m-as-s |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4269 (or |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4270 (string-match "^\\(m\\|qr\\)$" argument) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4271 (and (eq 0 (length argument)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4272 (not (eq ?\< (char-after b))))))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4273 (progn |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4274 (cperl-postpone-fontification |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4275 b (cperl-1+ b) 'face my-cperl-delimiters-face) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4276 (cperl-postpone-fontification |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4277 (1- e) e 'face my-cperl-delimiters-face))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4278 (if (and is-REx cperl-regexp-scan) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4279 ;; Process RExen: embedded comments, charclasses and ] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4280 ;;;/\3333\xFg\x{FFF}a\ppp\PPP\qqq\C\99f(?{ foo })(??{ foo })/; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4281 ;;;/a\.b[^a[:ff:]b]x$ab->$[|$,$ab->[cd]->[ef]|$ab[xy].|^${a,b}{c,d}/; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4282 ;;;/(?<=foo)(?<!bar)(x)(?:$ab|\$\/)$|\\\b\x888\776\[\:$/xxx; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4283 ;;;m?(\?\?{b,a})? + m/(??{aa})(?(?=xx)aa|bb)(?#aac)/; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4284 ;;;m$(^ab[c]\$)$ + m+(^ab[c]\$\+)+ + m](^ab[c\]$|.+)] + m)(^ab[c]$|.+\)); |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4285 ;;;m^a[\^b]c^ + m.a[^b]\.c.; |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4286 (save-excursion |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4287 (goto-char (1+ b)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4288 ;; First |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4289 (cperl-look-at-leading-count is-x-REx e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4290 (setq hairy-RE |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4291 (concat |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4292 (if is-x-REx |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4293 (if (eq (char-after b) ?\#) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4294 "\\((\\?\\\\#\\)\\|\\(\\\\#\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4295 "\\((\\?#\\)\\|\\(#\\)") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4296 ;; keep the same count: add a fake group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4297 (if (eq (char-after b) ?\#) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4298 "\\((\\?\\\\#\\)\\(\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4299 "\\((\\?#\\)\\(\\)")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4300 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4301 "\\(\\[\\)" ; 3=[ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4302 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4303 "\\(]\\)" ; 4=] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4304 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4305 ;; XXXX Will not be able to use it in s))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4306 (if (eq (char-after b) ?\) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4307 "\\())))\\)" ; Will never match |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4308 (if (eq (char-after b) ?? ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4309 ;;"\\((\\\\\\?\\(\\\\\\?\\)?{\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4310 "\\((\\\\\\?\\\\\\?{\\|()\\\\\\?{\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4311 "\\((\\?\\??{\\)")) ; 5= (??{ (?{ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4312 "\\|" ; 6= 0-length, 7: name, 8,9:code, 10:group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4313 "\\(" ;; XXXX 1-char variables, exc. |()\s |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4314 "[$@]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4315 "\\(" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4316 "[_a-zA-Z:][_a-zA-Z0-9:]*" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4317 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4318 "{[^{}]*}" ; only one-level allowed |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4319 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4320 "[^{(|) \t\r\n\f]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4321 "\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4322 "\\(" ;;8,9:code part of array/hash elt |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4323 "\\(" "->" "\\)?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4324 "\\[[^][]*\\]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4325 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4326 "{[^{}]*}" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4327 "\\)*" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4328 ;; XXXX: what if u is delim? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4329 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4330 "[)^|$.*?+]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4331 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4332 "{[0-9]+}" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4333 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4334 "{[0-9]+,[0-9]*}" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4335 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4336 "\\\\[luLUEQbBAzZG]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4337 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4338 "(" ; Group opener |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4339 "\\(" ; 10 group opener follower |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4340 "\\?\\((\\?\\)" ; 11: in (?(?=C)A|B) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4341 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4342 "\\?[:=!>?{]" ; "?" something |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4343 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4344 "\\?[-imsx]+[:)]" ; (?i) (?-s:.) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4345 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4346 "\\?([0-9]+)" ; (?(1)foo|bar) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4347 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4348 "\\?<[=!]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4349 ;;;"\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4350 ;;; "\\?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4351 "\\)?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4352 "\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4353 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4354 "\\\\\\(.\\)" ; 12=\SYMBOL |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4355 )) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4356 (while |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4357 (and (< (point) (1- e)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4358 (re-search-forward hairy-RE (1- e) 'to-end)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4359 (goto-char (match-beginning 0)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4360 (setq REx-subgr-start (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4361 was-subgr (following-char)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4362 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4363 ((match-beginning 6) ; 0-length builtins, groups |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4364 (goto-char (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4365 (if (match-beginning 11) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4366 (goto-char (match-beginning 11))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4367 (if (>= (point) e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4368 (goto-char (1- e))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4369 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4370 (match-beginning 0) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4371 'face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4372 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4373 ((eq was-subgr ?\) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4374 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4375 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4376 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4377 (if (> (point) b) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4378 (if (if (eq (char-after b) ?? ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4379 (looking-at "(\\\\\\?") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4380 (eq (char-after (1+ (point))) ?\?)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4381 my-cperl-REx-0length-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4382 my-cperl-REx-ctl-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4383 font-lock-warning-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4384 (error font-lock-warning-face))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4385 ((eq was-subgr ?\| ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4386 my-cperl-REx-ctl-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4387 ((eq was-subgr ?\$ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4388 (if (> (point) (1+ REx-subgr-start)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4389 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4390 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4391 (match-beginning 0) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4392 'REx-interpolated |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4393 (if is-o-REx 0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4394 (if (and (eq (match-beginning 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4395 (1+ b)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4396 (eq (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4397 (1- e))) 1 t))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4398 font-lock-variable-name-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4399 my-cperl-REx-spec-char-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4400 ((memq was-subgr (append "^." nil) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4401 my-cperl-REx-spec-char-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4402 ((eq was-subgr ?\( ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4403 (if (not (match-beginning 10)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4404 my-cperl-REx-ctl-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4405 my-cperl-REx-0length-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4406 (t my-cperl-REx-0length-face))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4407 (if (and (memq was-subgr (append "(|" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4408 (not (string-match "(\\?[-imsx]+)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4409 (match-string 0)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4410 (cperl-look-at-leading-count is-x-REx e)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4411 (setq was-subgr nil)) ; We do stuff here |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4412 ((match-beginning 12) ; \SYMBOL |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4413 (forward-char 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4414 (if (>= (point) e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4415 (goto-char (1- e)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4416 ;; How many chars to not highlight: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4417 ;; 0-len special-alnums in other branch => |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4418 ;; Generic: \non-alnum (1), \alnum (1+face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4419 ;; Is-delim: \non-alnum (1/spec-2) alnum-1 (=what hai) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4420 (setq REx-subgr-start (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4421 qtag (preceding-char)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4422 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4423 (- (point) 2) (- (point) 1) 'face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4424 (if (memq qtag |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4425 (append "ghijkmoqvFHIJKMORTVY" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4426 font-lock-warning-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4427 my-cperl-REx-0length-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4428 (if (and (eq (char-after b) qtag) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4429 (memq qtag (append ".])^$|*?+" nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4430 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4431 (if (and cperl-use-syntax-table-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4432 (eq qtag ?\) )) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4433 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4434 REx-subgr-start (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4435 'syntax-table cperl-st-punct)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4436 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4437 (1- (point)) (point) 'face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4438 ; \] can't appear below |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4439 (if (memq qtag (append ".]^$" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4440 'my-cperl-REx-spec-char-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4441 (if (memq qtag (append "*?+" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4442 'my-cperl-REx-0length-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4443 'my-cperl-REx-ctl-face))))) ; )| |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4444 ;; Test for arguments: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4445 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4446 ;; This is not pretty: the 5.8.7 logic: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4447 ;; \0numx -> octal (up to total 3 dig) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4448 ;; \DIGIT -> backref unless \0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4449 ;; \DIGITs -> backref if legal |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4450 ;; otherwise up to 3 -> octal |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4451 ;; Do not try to distinguish, we guess |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4452 ((or (and (memq qtag (append "01234567" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4453 (re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4454 "\\=[01234567]?[01234567]?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4455 (1- e) 'to-end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4456 (and (memq qtag (append "89" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4457 (re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4458 "\\=[0123456789]*" (1- e) 'to-end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4459 (and (eq qtag ?x) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4460 (re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4461 "\\=[0-9a-fA-F][0-9a-fA-F]?\\|\\={[0-9a-fA-F]+}" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4462 (1- e) 'to-end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4463 (and (memq qtag (append "pPN" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4464 (re-search-forward "\\={[^{}]+}\\|." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4465 (1- e) 'to-end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4466 (eq (char-syntax qtag) ?w)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4467 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4468 (1- REx-subgr-start) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4469 'face my-cperl-REx-length1-face)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4470 (setq was-subgr nil)) ; We do stuff here |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4471 ((match-beginning 3) ; [charclass] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4472 (forward-char 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4473 (if (eq (char-after b) ?^ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4474 (and (eq (following-char) ?\\ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4475 (eq (char-after (cperl-1+ (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4476 ?^ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4477 (forward-char 2)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4478 (and (eq (following-char) ?^ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4479 (forward-char 1))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4480 (setq argument b ; continue? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4481 tag nil ; list of POSIX classes |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4482 qtag (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4483 (if (eq (char-after b) ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4484 (and (eq (following-char) ?\\ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4485 (eq (char-after (cperl-1+ (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4486 ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4487 (setq qtag (1+ qtag)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4488 (forward-char 2)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4489 (and (eq (following-char) ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4490 (forward-char 1))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4491 ;; Apparently, I can't put \] into a charclass |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4492 ;; in m]]: m][\\\]\]] produces [\\]] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4493 ;;; POSIX? [:word:] [:^word:] only inside [] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4494 ;;; "\\=\\(\\\\.\\|[^][\\\\]\\|\\[:\\^?\sw+:]\\|\\[[^:]\\)*]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4495 (while |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4496 (and argument |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4497 (re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4498 (if (eq (char-after b) ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4499 "\\=\\(\\\\[^]]\\|[^]\\\\]\\)*\\\\]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4500 "\\=\\(\\\\.\\|[^]\\\\]\\)*]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4501 (1- e) 'toend)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4502 ;; Is this ] an end of POSIX class? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4503 (if (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4504 (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4505 (search-backward "[" argument t) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4506 (< REx-subgr-start (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4507 (not |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4508 (and ; Should work with delim = \ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4509 (eq (preceding-char) ?\\ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4510 (= (% (skip-chars-backward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4511 "\\\\") 2) 0))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4512 (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4513 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4514 ((eq (char-after b) ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4515 "\\\\*\\[:\\^?\\sw+:\\\\\\]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4516 ((eq (char-after b) ?\: ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4517 "\\\\*\\[\\\\:\\^?\\sw+\\\\:]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4518 ((eq (char-after b) ?^ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4519 "\\\\*\\[:\\(\\\\\\^\\)?\\sw+:\]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4520 ((eq (char-syntax (char-after b)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4521 ?w) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4522 (concat |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4523 "\\\\*\\[:\\(\\\\\\^\\)?\\(\\\\" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4524 (char-to-string (char-after b)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4525 "\\|\\sw\\)+:\]")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4526 (t "\\\\*\\[:\\^?\\sw*:]"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4527 (setq argument (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4528 (setq tag (cons (cons argument (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4529 tag) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4530 argument (point)) ; continue |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4531 (setq argument nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4532 (and argument |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4533 (message "Couldn't find end of charclass in a REx, pos=%s" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4534 REx-subgr-start)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4535 (if (and cperl-use-syntax-table-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4536 (> (- (point) 2) REx-subgr-start)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4537 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4538 (1+ REx-subgr-start) (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4539 'syntax-table cperl-st-punct)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4540 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4541 REx-subgr-start qtag |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4542 'face my-cperl-REx-spec-char-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4543 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4544 (1- (point)) (point) 'face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4545 my-cperl-REx-spec-char-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4546 (if (eq (char-after b) ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4547 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4548 (- (point) 2) (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4549 'face my-cperl-REx-0length-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4550 (while tag |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4551 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4552 (car (car tag)) (cdr (car tag)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4553 'face my-cperl-REx-length1-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4554 (setq tag (cdr tag))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4555 (setq was-subgr nil)) ; did facing already |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4556 ;; Now rare stuff: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4557 ((and (match-beginning 2) ; #-comment |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4558 (/= (match-beginning 2) (match-end 2))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4559 (beginning-of-line 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4560 (if (> (point) e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4561 (goto-char (1- e)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4562 ((match-beginning 4) ; character "]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4563 (setq was-subgr nil) ; We do stuff here |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4564 (goto-char (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4565 (if cperl-use-syntax-table-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4566 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4567 (1- (point)) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4568 'syntax-table cperl-st-punct)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4569 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4570 (1- (point)) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4571 'face font-lock-warning-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4572 ((match-beginning 5) ; before (?{}) (??{}) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4573 (setq tag (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4574 (if (or (setq qtag |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4575 (cperl-forward-group-in-re st-l)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4576 (and (>= (point) e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4577 (setq qtag "no matching `)' found")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4578 (and (not (eq (char-after (- (point) 2)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4579 ?\} )) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4580 (setq qtag "Can't find })"))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4581 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4582 (goto-char (1- e)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4583 (message qtag)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4584 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4585 (1- tag) (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4586 'face font-lock-variable-name-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4587 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4588 REx-subgr-start (1- tag) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4589 'face my-cperl-REx-spec-char-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4590 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4591 (1- (point)) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4592 'face my-cperl-REx-spec-char-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4593 (if cperl-use-syntax-table-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4594 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4595 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4596 (- (point) 2) (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4597 'syntax-table cperl-st-cfence) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4598 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4599 (+ REx-subgr-start 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4600 (+ REx-subgr-start 3) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4601 'syntax-table cperl-st-cfence)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4602 (setq was-subgr nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4603 (t ; (?#)-comment |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4604 ;; Inside "(" and "\" arn't special in any way |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4605 ;; Works also if the outside delimiters are (). |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4606 (or;;(if (eq (char-after b) ?\) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4607 ;;(re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4608 ;; "[^\\\\]\\(\\\\\\\\\\)*\\\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4609 ;; (1- e) 'toend) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4610 (search-forward ")" (1- e) 'toend) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4611 ;;) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4612 (message |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4613 "Couldn't find end of (?#...)-comment in a REx, pos=%s" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4614 REx-subgr-start)))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4615 (if (>= (point) e) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4616 (goto-char (1- e))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4617 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4618 (was-subgr |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4619 (setq REx-subgr-end (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4620 (cperl-commentify |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4621 REx-subgr-start REx-subgr-end nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4622 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4623 REx-subgr-start REx-subgr-end |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4624 'face font-lock-comment-face)))))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4625 (if (and is-REx is-x-REx) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4626 (put-text-property (1+ b) (1- e) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4627 'syntax-subtype 'x-REx))) |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4628 (if (and i2 e1 b1 (> e1 b1)) |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4629 (progn ; No errors finding the second part... |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4630 (cperl-postpone-fontification |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4631 (1- e1) e1 'face my-cperl-delimiters-face) |
78582
d168a4166b80
Fix s{a}{b} parsing
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
78487
diff
changeset
|
4632 (if (and (not (eobp)) |
d168a4166b80
Fix s{a}{b} parsing
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
78487
diff
changeset
|
4633 (assoc (char-after b) cperl-starters)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4634 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4635 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4636 b1 (1+ b1) 'face my-cperl-delimiters-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4637 (put-text-property b1 (1+ b1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4638 'REx-part2 t))))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4639 (if (> (point) max) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4640 (setq tmpend tb)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4641 ((match-beginning 17) ; sub with prototype or attribute |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4642 ;; 1+6+2+1+1=11 extra () before this (sub with proto/attr): |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4643 ;;"\\<sub\\>\\(" ;12 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4644 ;; cperl-white-and-comment-rex ;13 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4645 ;; "\\([a-zA-Z_:'0-9]+\\)\\)?" ; name ;14 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4646 ;;"\\(" cperl-maybe-white-and-comment-rex ;15,16 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4647 ;; "\\(([^()]*)\\|:[^:]\\)\\)" ; 17:proto or attribute start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4648 (setq b1 (match-beginning 14) e1 (match-end 14)) |
20323 | 4649 (if (memq (char-after (1- b)) |
4650 '(?\$ ?\@ ?\% ?\& ?\*)) | |
4651 nil | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4652 (goto-char b) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4653 (if (eq (char-after (match-beginning 17)) ?\( ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4654 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4655 (cperl-commentify ; Prototypes; mark as string |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4656 (match-beginning 17) (match-end 17) t) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4657 (goto-char (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4658 ;; Now look for attributes after prototype: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4659 (forward-comment (buffer-size)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4660 (and (looking-at ":[^:]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4661 (cperl-find-sub-attrs st-l b1 e1 b))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4662 ;; treat attributes without prototype |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4663 (goto-char (match-beginning 17)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4664 (cperl-find-sub-attrs st-l b1 e1 b)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4665 ;; 1+6+2+1+1+6+1=18 extra () before this: |
20323 | 4666 ;; "\\(\\<sub[ \t\n\f]+\\|[&*$@%]\\)[a-zA-Z0-9_]*'") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4667 ((match-beginning 19) ; old $abc'efg syntax |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4668 (setq bb (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4669 ;;;(if (nth 3 state) nil ; in string |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4670 (put-text-property (1- bb) bb 'syntax-table cperl-st-word) |
20323 | 4671 (goto-char bb)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4672 ;; 1+6+2+1+1+6+1+1=19 extra () before this: |
20323 | 4673 ;; "__\\(END\\|DATA\\)__" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4674 ((match-beginning 20) ; __END__, __DATA__ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4675 (setq bb (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4676 ;; (put-text-property b (1+ bb) 'syntax-type 'pod) ; Cheat |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4677 (cperl-commentify b bb nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4678 (setq end t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4679 ;; "\\\\\\(['`\"($]\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4680 ((match-beginning 21) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4681 ;; Trailing backslash; make non-quoting outside string/comment |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4682 (setq bb (match-end 0)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4683 (goto-char b) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4684 (skip-chars-backward "\\\\") |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4685 ;;;(setq i2 (= (% (skip-chars-backward "\\\\") 2) -1)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4686 (cperl-modify-syntax-type b cperl-st-punct) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4687 (goto-char bb)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4688 (t (error "Error in regexp of the sniffer"))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4689 (if (> (point) stop-point) |
20323 | 4690 (progn |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4691 (if end |
20323 | 4692 (message "Garbage after __END__/__DATA__ ignored") |
4693 (message "Unbalanced syntax found while scanning") | |
4694 (or (car err-l) (setcar err-l b))) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4695 (goto-char stop-point)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4696 (setq cperl-syntax-state (cons state-point state) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4697 ;; Do not mark syntax as done past tmpend??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4698 cperl-syntax-done-to (or tmpend (max (point) max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4699 ;;(message "state-at=%s, done-to=%s" state-point cperl-syntax-done-to) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4700 ) |
20323 | 4701 (if (car err-l) (goto-char (car err-l)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4702 (or non-inter |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4703 (message "Scanning for \"hard\" Perl constructions... done")))) |
20323 | 4704 (and (buffer-modified-p) |
4705 (not modified) | |
4706 (set-buffer-modified-p nil)) | |
63836
e6973993a720
(cperl-find-pods-heres): Don't gratuitously
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63518
diff
changeset
|
4707 ;; I do not understand what this is doing here. It breaks font-locking |
e6973993a720
(cperl-find-pods-heres): Don't gratuitously
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63518
diff
changeset
|
4708 ;; because it resets the syntax-table from font-lock-syntax-table to |
e6973993a720
(cperl-find-pods-heres): Don't gratuitously
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63518
diff
changeset
|
4709 ;; cperl-mode-syntax-table. |
e6973993a720
(cperl-find-pods-heres): Don't gratuitously
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63518
diff
changeset
|
4710 ;; (set-syntax-table cperl-mode-syntax-table) |
e6973993a720
(cperl-find-pods-heres): Don't gratuitously
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63518
diff
changeset
|
4711 ) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4712 (list (car err-l) overshoot))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4713 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4714 (defun cperl-find-pods-heres-region (min max) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4715 (interactive "r") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4716 (cperl-find-pods-heres min max)) |
20323 | 4717 |
4718 (defun cperl-backward-to-noncomment (lim) | |
4719 ;; Stops at lim or after non-whitespace that is not in comment | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4720 ;; XXXX Wrongly understands end-of-multiline strings with # as comment |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4721 (let (stop p pr) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4722 (while (and (not stop) (> (point) (or lim (point-min)))) |
20323 | 4723 (skip-chars-backward " \t\n\f" lim) |
4724 (setq p (point)) | |
4725 (beginning-of-line) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4726 (if (memq (setq pr (get-text-property (point) 'syntax-type)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4727 '(pod here-doc here-doc-delim)) |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4728 (progn |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4729 (cperl-unwind-to-safe nil) |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4730 (setq pr (get-text-property (point) 'syntax-type)))) |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4731 (or (and (looking-at "^[ \t]*\\(#\\|$\\)") |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4732 (not (memq pr '(string prestring)))) |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4733 (progn (cperl-to-comment-or-eol) (bolp)) |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4734 (progn |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4735 (skip-chars-backward " \t") |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4736 (if (< p (point)) (goto-char p)) |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4737 (setq stop t)))))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4738 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4739 ;; Used only in `cperl-calculate-indent'... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4740 (defun cperl-block-p () ; Do not C-M-q ! One string contains ";" ! |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4741 ;; Positions is before ?\{. Checks whether it starts a block. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4742 ;; No save-excursion! This is more a distinguisher of a block/hash ref... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4743 (cperl-backward-to-noncomment (point-min)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4744 (or (memq (preceding-char) (append ";){}$@&%\C-@" nil)) ; Or label! \C-@ at bobp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4745 ; Label may be mixed up with `$blah :' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4746 (save-excursion (cperl-after-label)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4747 (get-text-property (cperl-1- (point)) 'attrib-group) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4748 (and (memq (char-syntax (preceding-char)) '(?w ?_)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4749 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4750 (backward-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4751 ;; sub {BLK}, print {BLK} $data, but NOT `bless', `return', `tr' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4752 (or (and (looking-at "[a-zA-Z0-9_:]+[ \t\n\f]*[{#]") ; Method call syntax |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4753 (not (looking-at "\\(bless\\|return\\|q[wqrx]?\\|tr\\|[smy]\\)\\>"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4754 ;; sub bless::foo {} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4755 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4756 (cperl-backward-to-noncomment (point-min)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4757 (and (eq (preceding-char) ?b) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4758 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4759 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4760 (looking-at "sub[ \t\n\f#]"))))))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4761 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4762 ;;; What is the difference of (cperl-after-block-p lim t) and (cperl-block-p)? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4763 ;;; No save-excursion; condition-case ... In (cperl-block-p) the block |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4764 ;;; may be a part of an in-statement construct, such as |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4765 ;;; ${something()}, print {FH} $data. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4766 ;;; Moreover, one takes positive approach (looks for else,grep etc) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4767 ;;; another negative (looks for bless,tr etc) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4768 (defun cperl-after-block-p (lim &optional pre-block) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4769 "Return true if the preceeding } (if PRE-BLOCK, following {) delimits a block. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4770 Would not look before LIM. Assumes that LIM is a good place to begin a |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4771 statement. The kind of block we treat here is one after which a new |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4772 statement would start; thus the block in ${func()} does not count." |
20323 | 4773 (save-excursion |
4774 (condition-case nil | |
4775 (progn | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4776 (or pre-block (forward-sexp -1)) |
20323 | 4777 (cperl-backward-to-noncomment lim) |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
4778 (or (eq (point) lim) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4779 ;; if () {} // sub f () {} // sub f :a(') {} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4780 (eq (preceding-char) ?\) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4781 ;; label: {} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4782 (save-excursion (cperl-after-label)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4783 ;; sub :attr {} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4784 (get-text-property (cperl-1- (point)) 'attrib-group) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4785 (if (memq (char-syntax (preceding-char)) '(?w ?_)) ; else {} |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4786 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4787 (forward-sexp -1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4788 ;; else {} but not else::func {} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4789 (or (and (looking-at "\\(else\\|continue\\|grep\\|map\\|BEGIN\\|END\\|CHECK\\|INIT\\)\\>") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4790 (not (looking-at "\\(\\sw\\|_\\)+::"))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4791 ;; sub f {} |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4792 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4793 (cperl-backward-to-noncomment lim) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4794 (and (eq (preceding-char) ?b) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4795 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4796 (forward-sexp -1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4797 (looking-at "sub[ \t\n\f#]")))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4798 ;; What preceeds is not word... XXXX Last statement in sub??? |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4799 (cperl-after-expr-p lim)))) |
20323 | 4800 (error nil)))) |
4801 | |
4802 (defun cperl-after-expr-p (&optional lim chars test) | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
4803 "Return true if the position is good for start of expression. |
20323 | 4804 TEST is the expression to evaluate at the found position. If absent, |
4805 CHARS is a string that contains good characters to have before us (however, | |
4806 `}' is treated \"smartly\" if it is not in the list)." | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4807 (let ((lim (or lim (point-min))) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4808 stop p pr) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4809 (cperl-update-syntaxification (point) (point)) |
20323 | 4810 (save-excursion |
4811 (while (and (not stop) (> (point) lim)) | |
4812 (skip-chars-backward " \t\n\f" lim) | |
4813 (setq p (point)) | |
4814 (beginning-of-line) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4815 ;;(memq (setq pr (get-text-property (point) 'syntax-type)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4816 ;; '(pod here-doc here-doc-delim)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4817 (if (get-text-property (point) 'here-doc-group) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4818 (progn |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4819 (goto-char |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4820 (cperl-beginning-of-property (point) 'here-doc-group)) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4821 (beginning-of-line 0))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4822 (if (get-text-property (point) 'in-pod) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4823 (progn |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4824 (goto-char |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4825 (cperl-beginning-of-property (point) 'in-pod)) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4826 (beginning-of-line 0))) |
20323 | 4827 (if (looking-at "^[ \t]*\\(#\\|$\\)") nil ; Only comment, skip |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4828 ;; Else: last iteration, or a label |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4829 (cperl-to-comment-or-eol) ; Will not move past "." after a format |
20323 | 4830 (skip-chars-backward " \t") |
4831 (if (< p (point)) (goto-char p)) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4832 (setq p (point)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4833 (if (and (eq (preceding-char) ?:) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4834 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4835 (forward-char -1) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4836 (skip-chars-backward " \t\n\f" lim) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4837 (memq (char-syntax (preceding-char)) '(?w ?_)))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4838 (forward-sexp -1) ; Possibly label. Skip it |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4839 (goto-char p) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4840 (setq stop t)))) |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
4841 (or (bobp) ; ???? Needed |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
4842 (eq (point) lim) |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
4843 (looking-at "[ \t]*__\\(END\\|DATA\\)__") ; After this anything goes |
20323 | 4844 (progn |
4845 (if test (eval test) | |
4846 (or (memq (preceding-char) (append (or chars "{;") nil)) | |
4847 (and (eq (preceding-char) ?\}) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4848 (cperl-after-block-p lim)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4849 (and (eq (following-char) ?.) ; in format: see comment above |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4850 (eq (get-text-property (point) 'syntax-type) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4851 'format))))))))) |
20323 | 4852 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4853 (defun cperl-backward-to-start-of-expr (&optional lim) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4854 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4855 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4856 (while (and (or (not lim) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4857 (> (point) lim)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4858 (not (cperl-after-expr-p lim))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4859 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4860 ;; May be after $, @, $# etc of a variable |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4861 (skip-chars-backward "$@%#"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4862 (error nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4863 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4864 (defun cperl-at-end-of-expr (&optional lim) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4865 ;; Since the SEXP approach below is very fragile, do some overengineering |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4866 (or (looking-at (concat cperl-maybe-white-and-comment-rex "[;}]")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4867 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4868 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4869 ;; If nothing interesting after, does as (forward-sexp -1); |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4870 ;; otherwise fails, or ends at a start of following sexp. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4871 ;; XXXX PROBLEMS: if what follows (after ";") @FOO, or ${bar} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4872 ;; may be stuck after @ or $; just put some stupid workaround now: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4873 (let ((p (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4874 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4875 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4876 (while (memq (preceding-char) (append "%&@$*" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4877 (forward-char -1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4878 (or (< (point) p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4879 (cperl-after-expr-p lim)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4880 (error t)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4881 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4882 (defun cperl-forward-to-end-of-expr (&optional lim) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4883 (let ((p (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4884 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4885 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4886 (while (and (< (point) (or lim (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4887 (not (cperl-at-end-of-expr))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4888 (forward-sexp 1))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4889 (error nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4890 |
20323 | 4891 (defun cperl-backward-to-start-of-continued-exp (lim) |
4892 (if (memq (preceding-char) (append ")]}\"'`" nil)) | |
4893 (forward-sexp -1)) | |
4894 (beginning-of-line) | |
4895 (if (<= (point) lim) | |
4896 (goto-char (1+ lim))) | |
4897 (skip-chars-forward " \t")) | |
4898 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4899 (defun cperl-after-block-and-statement-beg (lim) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4900 ;; We assume that we are after ?\} |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4901 (and |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4902 (cperl-after-block-p lim) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4903 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4904 (forward-sexp -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4905 (cperl-backward-to-noncomment (point-min)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4906 (or (bobp) |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
4907 (eq (point) lim) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4908 (not (= (char-syntax (preceding-char)) ?w)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4909 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4910 (forward-sexp -1) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4911 (not |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4912 (looking-at |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4913 "\\(map\\|grep\\|printf?\\|system\\|exec\\|tr\\|s\\)\\>"))))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4914 |
20323 | 4915 |
4916 (defun cperl-indent-exp () | |
4917 "Simple variant of indentation of continued-sexp. | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4918 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4919 Will not indent comment if it starts at `comment-indent' or looks like |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4920 continuation of the comment on the previous line. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4921 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4922 If `cperl-indent-region-fix-constructs', will improve spacing on |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4923 conditional/loop constructs." |
20323 | 4924 (interactive) |
4925 (save-excursion | |
4926 (let ((tmp-end (progn (end-of-line) (point))) top done) | |
4927 (save-excursion | |
4928 (beginning-of-line) | |
4929 (while (null done) | |
4930 (setq top (point)) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4931 ;; Plan A: if line has an unfinished paren-group, go to end-of-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4932 (while (= -1 (nth 0 (parse-partial-sexp (point) tmp-end -1))) |
20323 | 4933 (setq top (point))) ; Get the outermost parenths in line |
4934 (goto-char top) | |
4935 (while (< (point) tmp-end) | |
4936 (parse-partial-sexp (point) tmp-end nil t) ; To start-sexp or eol | |
4937 (or (eolp) (forward-sexp 1))) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4938 (if (> (point) tmp-end) ; Yes, there an unfinished block |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4939 nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4940 (if (eq ?\) (preceding-char)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4941 (progn ;; Plan B: find by REGEXP block followup this line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4942 (setq top (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4943 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4944 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4945 (forward-sexp -2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4946 (if (eq (following-char) ?$ ) ; for my $var (list) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4947 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4948 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4949 (if (looking-at "\\(my\\|local\\|our\\)\\>") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4950 (forward-sexp -1)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4951 (if (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4952 (concat "\\(\\elsif\\|if\\|unless\\|while\\|until" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4953 "\\|for\\(each\\)?\\>\\(\\(" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4954 cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4955 "\\(my\\|local\\|our\\)\\)?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4956 cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4957 "\\$[_a-zA-Z0-9]+\\)?\\)\\>")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4958 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4959 (goto-char top) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4960 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4961 (setq top (point))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4962 (error (setq done t))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4963 (goto-char top)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4964 (if (looking-at ; Try Plan C: continuation block |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4965 (concat cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4966 "\\<\\(else\\|elsif\|continue\\)\\>")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4967 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4968 (goto-char (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4969 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4970 (end-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4971 (setq tmp-end (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4972 (setq done t)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4973 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4974 (end-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4975 (setq tmp-end (point)))) |
20323 | 4976 (goto-char tmp-end) |
4977 (setq tmp-end (point-marker))) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4978 (if cperl-indent-region-fix-constructs |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4979 (cperl-fix-line-spacing tmp-end)) |
20323 | 4980 (cperl-indent-region (point) tmp-end)))) |
4981 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4982 (defun cperl-fix-line-spacing (&optional end parse-data) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4983 "Improve whitespace in a conditional/loop construct. |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4984 Returns some position at the last line." |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4985 (interactive) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4986 (or end |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4987 (setq end (point-max))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4988 (let ((ee (save-excursion (end-of-line) (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4989 (cperl-indent-region-fix-constructs |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4990 (or cperl-indent-region-fix-constructs 1)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4991 p pp ml have-brace ret) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4992 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4993 (beginning-of-line) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4994 (setq ret (point)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4995 ;; }? continue |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4996 ;; blah; } |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4997 (if (not |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4998 (or (looking-at "[ \t]*\\(els\\(e\\|if\\)\\|continue\\|if\\|while\\|for\\(each\\)?\\|until\\)") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4999 (setq have-brace (save-excursion (search-forward "}" ee t))))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5000 nil ; Do not need to do anything |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5001 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5002 ;; } |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5003 ;; else |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5004 (if cperl-merge-trailing-else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5005 (if (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5006 "[ \t]*}[ \t]*\n[ \t\n]*\\(els\\(e\\|if\\)\\|continue\\)\\>") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5007 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5008 (search-forward "}") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5009 (setq p (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5010 (skip-chars-forward " \t\n") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5011 (delete-region p (point)) |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5012 (insert (make-string cperl-indent-region-fix-constructs ?\s)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5013 (beginning-of-line))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5014 (if (looking-at "[ \t]*}[ \t]*\\(els\\(e\\|if\\)\\|continue\\)\\>") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5015 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5016 (search-forward "}") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5017 (delete-horizontal-space) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5018 (insert "\n") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5019 (setq ret (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5020 (if (cperl-indent-line parse-data) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5021 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5022 (cperl-fix-line-spacing end parse-data) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5023 (setq ret (point))))))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5024 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5025 ;; } else |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5026 (if (looking-at "[ \t]*}\\(\t*\\|[ \t][ \t]+\\)\\<\\(els\\(e\\|if\\)\\|continue\\)\\>") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5027 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5028 (search-forward "}") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5029 (delete-horizontal-space) |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5030 (insert (make-string cperl-indent-region-fix-constructs ?\s)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5031 (beginning-of-line))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5032 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5033 ;; else { |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5034 (if (looking-at |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5035 "[ \t]*}?[ \t]*\\<\\(\\els\\(e\\|if\\)\\|continue\\|unless\\|if\\|while\\|for\\(each\\)?\\|until\\)\\>\\(\t*\\|[ \t][ \t]+\\)[^ \t\n#]") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5036 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5037 (forward-word 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5038 (delete-horizontal-space) |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5039 (insert (make-string cperl-indent-region-fix-constructs ?\s)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5040 (beginning-of-line))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5041 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5042 ;; foreach my $var |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5043 (if (looking-at |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5044 "[ \t]*\\<for\\(each\\)?[ \t]+\\(my\\|local\\|our\\)\\(\t*\\|[ \t][ \t]+\\)[^ \t\n]") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5045 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5046 (forward-word 2) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5047 (delete-horizontal-space) |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5048 (insert (make-string cperl-indent-region-fix-constructs ?\s)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5049 (beginning-of-line))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5050 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5051 ;; foreach my $var ( |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5052 (if (looking-at |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5053 "[ \t]*\\<for\\(each\\)?[ \t]+\\(my\\|local\\|our\\)[ \t]*\\$[_a-zA-Z0-9]+\\(\t*\\|[ \t][ \t]+\\)[^ \t\n#]") |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5054 (progn |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
5055 (forward-sexp 3) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5056 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5057 (insert |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5058 (make-string cperl-indent-region-fix-constructs ?\s)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5059 (beginning-of-line))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5060 ;; Looking at (with or without "}" at start, ending after "({"): |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5061 ;; } foreach my $var () OR { |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5062 (if (looking-at |
44446
9b08deb1030e
(cperl-make-face, cperl-force-face):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43943
diff
changeset
|
5063 "[ \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]*{") |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5064 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5065 (setq ml (match-beginning 8)) ; "(" or "{" after control word |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5066 (re-search-forward "[({]") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5067 (forward-char -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5068 (setq p (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5069 (if (eq (following-char) ?\( ) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5070 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5071 (forward-sexp 1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5072 (setq pp (point))) ; past parenth-group |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5073 ;; after `else' or nothing |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5074 (if ml ; after `else' |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5075 (skip-chars-backward " \t\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5076 (beginning-of-line)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5077 (setq pp nil)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5078 ;; Now after the sexp before the brace |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5079 ;; Multiline expr should be special |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5080 (setq ml (and pp (save-excursion (goto-char p) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5081 (search-forward "\n" pp t)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5082 (if (and (or (not pp) (< pp end)) ; Do not go too far... |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5083 (looking-at "[ \t\n]*{")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5084 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5085 (cond |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5086 ((bolp) ; Were before `{', no if/else/etc |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5087 nil) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5088 ((looking-at "\\(\t*\\| [ \t]+\\){") ; Not exactly 1 SPACE |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5089 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5090 (if (if ml |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5091 cperl-extra-newline-before-brace-multiline |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5092 cperl-extra-newline-before-brace) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5093 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5094 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5095 (insert "\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5096 (setq ret (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5097 (if (cperl-indent-line parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5098 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5099 (cperl-fix-line-spacing end parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5100 (setq ret (point))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5101 (insert |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5102 (make-string cperl-indent-region-fix-constructs ?\s)))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5103 ((and (looking-at "[ \t]*\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5104 (not (if ml |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5105 cperl-extra-newline-before-brace-multiline |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5106 cperl-extra-newline-before-brace))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5107 (setq pp (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5108 (skip-chars-forward " \t\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5109 (delete-region pp (point)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5110 (insert |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5111 (make-string cperl-indent-region-fix-constructs ?\ ))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5112 ((and (looking-at "[\t ]*{") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5113 (if ml cperl-extra-newline-before-brace-multiline |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5114 cperl-extra-newline-before-brace)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5115 (delete-horizontal-space) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5116 (insert "\n") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5117 (setq ret (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5118 (if (cperl-indent-line parse-data) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5119 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5120 (cperl-fix-line-spacing end parse-data) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5121 (setq ret (point)))))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5122 ;; Now we are before `{' |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5123 (if (looking-at "[ \t\n]*{[ \t]*[^ \t\n#]") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5124 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5125 (skip-chars-forward " \t\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5126 (setq pp (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5127 (forward-sexp 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5128 (setq p (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5129 (goto-char pp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5130 (setq ml (search-forward "\n" p t)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5131 (if (or cperl-break-one-line-blocks-when-indent ml) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5132 ;; not good: multi-line BLOCK |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5133 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5134 (goto-char (1+ pp)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5135 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5136 (insert "\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5137 (setq ret (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5138 (if (cperl-indent-line parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5139 (setq ret (cperl-fix-line-spacing end parse-data))))))))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5140 (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5141 (setq p (point) pp (save-excursion (end-of-line) (point))) ; May be different from ee. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5142 ;; Now check whether there is a hanging `}' |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5143 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5144 ;; } blah |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5145 (if (and |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5146 cperl-fix-hanging-brace-when-indent |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5147 have-brace |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5148 (not (looking-at "[ \t]*}[ \t]*\\(\\<\\(els\\(if\\|e\\)\\|continue\\|while\\|until\\)\\>\\|$\\|#\\)")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5149 (condition-case nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5150 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5151 (up-list 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5152 (if (and (<= (point) pp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5153 (eq (preceding-char) ?\} ) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5154 (cperl-after-block-and-statement-beg (point-min))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5155 t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5156 (goto-char p) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5157 nil)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5158 (error nil))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5159 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5160 (forward-char -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5161 (skip-chars-backward " \t") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5162 (if (bolp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5163 ;; `}' was the first thing on the line, insert NL *after* it. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5164 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5165 (cperl-indent-line parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5166 (search-forward "}") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5167 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5168 (insert "\n")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5169 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5170 (or (eq (preceding-char) ?\;) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5171 (bolp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5172 (and (eq (preceding-char) ?\} ) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5173 (cperl-after-block-p (point-min))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5174 (insert ";")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5175 (insert "\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5176 (setq ret (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5177 (if (cperl-indent-line parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5178 (setq ret (cperl-fix-line-spacing end parse-data))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5179 (beginning-of-line))))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5180 ret)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5181 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5182 (defvar cperl-update-start) ; Do not need to make them local |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5183 (defvar cperl-update-end) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5184 (defun cperl-delay-update-hook (beg end old-len) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5185 (setq cperl-update-start (min beg (or cperl-update-start (point-max)))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5186 (setq cperl-update-end (max end (or cperl-update-end (point-min))))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5187 |
20323 | 5188 (defun cperl-indent-region (start end) |
5189 "Simple variant of indentation of region in CPerl mode. | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5190 Should be slow. Will not indent comment if it starts at `comment-indent' |
20323 | 5191 or looks like continuation of the comment on the previous line. |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5192 Indents all the lines whose first character is between START and END |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5193 inclusive. |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5194 |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5195 If `cperl-indent-region-fix-constructs', will improve spacing on |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5196 conditional/loop constructs." |
20323 | 5197 (interactive "r") |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5198 (cperl-update-syntaxification end end) |
20323 | 5199 (save-excursion |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5200 (let (cperl-update-start cperl-update-end (h-a-c after-change-functions)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5201 (let ((indent-info (if cperl-emacs-can-parse |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5202 (list nil nil nil) ; Cannot use '(), since will modify |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5203 nil)) |
58356
4ca1b78a471f
(cperl-indent-region): Don't mind imenu-scanning-message.
Richard M. Stallman <rms@gnu.org>
parents:
58190
diff
changeset
|
5204 (pm 0) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5205 after-change-functions ; Speed it up! |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5206 st comm old-comm-indent new-comm-indent p pp i empty) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5207 (if h-a-c (add-hook 'after-change-functions 'cperl-delay-update-hook)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5208 (goto-char start) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5209 (setq old-comm-indent (and (cperl-to-comment-or-eol) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5210 (current-column)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5211 new-comm-indent old-comm-indent) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5212 (goto-char start) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5213 (setq end (set-marker (make-marker) end)) ; indentation changes pos |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5214 (or (bolp) (beginning-of-line 2)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5215 (while (and (<= (point) end) (not (eobp))) ; bol to check start |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5216 (setq st (point)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5217 (if (or |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5218 (setq empty (looking-at "[ \t]*\n")) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5219 (and (setq comm (looking-at "[ \t]*#")) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5220 (or (eq (current-indentation) (or old-comm-indent |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5221 comment-column)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5222 (setq old-comm-indent nil)))) |
20323 | 5223 (if (and old-comm-indent |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5224 (not empty) |
20323 | 5225 (= (current-indentation) old-comm-indent) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5226 (not (eq (get-text-property (point) 'syntax-type) 'pod)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5227 (not (eq (get-text-property (point) 'syntax-table) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5228 cperl-st-cfence))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5229 (let ((comment-column new-comm-indent)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5230 (indent-for-comment))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5231 (progn |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5232 (setq i (cperl-indent-line indent-info)) |
20323 | 5233 (or comm |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5234 (not i) |
20323 | 5235 (progn |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5236 (if cperl-indent-region-fix-constructs |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5237 (goto-char (cperl-fix-line-spacing end indent-info))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5238 (if (setq old-comm-indent |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5239 (and (cperl-to-comment-or-eol) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5240 (not (memq (get-text-property (point) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5241 'syntax-type) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5242 '(pod here-doc))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5243 (not (eq (get-text-property (point) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5244 'syntax-table) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5245 cperl-st-cfence)) |
20323 | 5246 (current-column))) |
5247 (progn (indent-for-comment) | |
5248 (skip-chars-backward " \t") | |
5249 (skip-chars-backward "#") | |
5250 (setq new-comm-indent (current-column)))))))) | |
58492
4edc8e8a8ed6
(cperl-indent-region, cperl-imenu--create-perl-index, cperl-xsub-scan):
Richard M. Stallman <rms@gnu.org>
parents:
58356
diff
changeset
|
5251 (beginning-of-line 2))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5252 ;; Now run the update hooks |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5253 (and after-change-functions |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5254 cperl-update-end |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5255 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5256 (goto-char cperl-update-end) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5257 (insert " ") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5258 (delete-char -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5259 (goto-char cperl-update-start) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5260 (insert " ") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5261 (delete-char -1)))))) |
20323 | 5262 |
5263 ;; Stolen from lisp-mode with a lot of improvements | |
5264 | |
5265 (defun cperl-fill-paragraph (&optional justify iteration) | |
53779
5b728a418323
(cperl-mode-map, cperl-do-auto-fill, cperl-menu): Use fill-paragraph,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
5266 "Like `fill-paragraph', but handle CPerl comments. |
20323 | 5267 If any of the current line is a comment, fill the comment or the |
5268 block of it that point is in, preserving the comment's initial | |
5269 indentation and initial hashes. Behaves usually outside of comment." | |
53779
5b728a418323
(cperl-mode-map, cperl-do-auto-fill, cperl-menu): Use fill-paragraph,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
5270 ;; (interactive "P") ; Only works when called from fill-paragraph. -stef |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5271 (let (;; Non-nil if the current line contains a comment. |
20323 | 5272 has-comment |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5273 fill-paragraph-function ; do not recurse |
20323 | 5274 ;; If has-comment, the appropriate fill-prefix for the comment. |
5275 comment-fill-prefix | |
5276 ;; Line that contains code and comment (or nil) | |
5277 start | |
5278 c spaces len dc (comment-column comment-column)) | |
5279 ;; Figure out what kind of comment we are looking at. | |
5280 (save-excursion | |
5281 (beginning-of-line) | |
5282 (cond | |
5283 | |
5284 ;; A line with nothing but a comment on it? | |
5285 ((looking-at "[ \t]*#[# \t]*") | |
5286 (setq has-comment t | |
5287 comment-fill-prefix (buffer-substring (match-beginning 0) | |
5288 (match-end 0)))) | |
5289 | |
5290 ;; A line with some code, followed by a comment? Remember that the | |
5291 ;; semi which starts the comment shouldn't be part of a string or | |
5292 ;; character. | |
5293 ((cperl-to-comment-or-eol) | |
5294 (setq has-comment t) | |
5295 (looking-at "#+[ \t]*") | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5296 (setq start (point) c (current-column) |
20323 | 5297 comment-fill-prefix |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5298 (concat (make-string (current-column) ?\s) |
20323 | 5299 (buffer-substring (match-beginning 0) (match-end 0))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5300 spaces (progn (skip-chars-backward " \t") |
20323 | 5301 (buffer-substring (point) start)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5302 dc (- c (current-column)) len (- start (point)) |
20323 | 5303 start (point-marker)) |
5304 (delete-char len) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5305 (insert (make-string dc ?-))))) ; Placeholder (to avoid splitting???) |
20323 | 5306 (if (not has-comment) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5307 (fill-paragraph justify) ; Do the usual thing outside of comment |
20323 | 5308 ;; Narrow to include only the comment, and then fill the region. |
5309 (save-restriction | |
5310 (narrow-to-region | |
5311 ;; Find the first line we should include in the region to fill. | |
5312 (if start (progn (beginning-of-line) (point)) | |
5313 (save-excursion | |
5314 (while (and (zerop (forward-line -1)) | |
5315 (looking-at "^[ \t]*#+[ \t]*[^ \t\n#]"))) | |
5316 ;; We may have gone to far. Go forward again. | |
5317 (or (looking-at "^[ \t]*#+[ \t]*[^ \t\n#]") | |
5318 (forward-line 1)) | |
5319 (point))) | |
5320 ;; Find the beginning of the first line past the region to fill. | |
5321 (save-excursion | |
5322 (while (progn (forward-line 1) | |
5323 (looking-at "^[ \t]*#+[ \t]*[^ \t\n#]"))) | |
5324 (point))) | |
5325 ;; Remove existing hashes | |
53812
80c9f33653f7
(cperl-fill-paragraph): Call fill-paragraph
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53779
diff
changeset
|
5326 (save-excursion |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5327 (goto-char (point-min)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5328 (while (progn (forward-line 1) (< (point) (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5329 (skip-chars-forward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5330 (if (looking-at "#+") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5331 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5332 (if (and (eq (point) (match-beginning 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5333 (not (eq (point) (match-end 0)))) nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5334 (error |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5335 "Bug in Emacs: `looking-at' in `narrow-to-region': match-data is garbage")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5336 (delete-char (- (match-end 0) (match-beginning 0))))))) |
20323 | 5337 |
5338 ;; Lines with only hashes on them can be paragraph boundaries. | |
5339 (let ((paragraph-start (concat paragraph-start "\\|^[ \t#]*$")) | |
5340 (paragraph-separate (concat paragraph-start "\\|^[ \t#]*$")) | |
5341 (fill-prefix comment-fill-prefix)) | |
5342 (fill-paragraph justify))) | |
5343 (if (and start) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5344 (progn |
20323 | 5345 (goto-char start) |
5346 (if (> dc 0) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5347 (progn (delete-char dc) (insert spaces))) |
20323 | 5348 (if (or (= (current-column) c) iteration) nil |
5349 (setq comment-column c) | |
5350 (indent-for-comment) | |
5351 ;; Repeat once more, flagging as iteration | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5352 (cperl-fill-paragraph justify t)))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5353 t) |
20323 | 5354 |
5355 (defun cperl-do-auto-fill () | |
5356 ;; Break out if the line is short enough | |
5357 (if (> (save-excursion | |
5358 (end-of-line) | |
5359 (current-column)) | |
5360 fill-column) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5361 (let ((c (save-excursion (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5362 (cperl-to-comment-or-eol) (point))) |
63853
123dae8639ec
(cperl-do-auto-fill): Change space constants followed by a sexp to "?\s ".
Juanma Barranquero <lekktu@gmail.com>
parents:
63836
diff
changeset
|
5363 (s (memq (following-char) '(?\s ?\t))) marker) |
53779
5b728a418323
(cperl-mode-map, cperl-do-auto-fill, cperl-menu): Use fill-paragraph,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
5364 (if (>= c (point)) |
5b728a418323
(cperl-mode-map, cperl-do-auto-fill, cperl-menu): Use fill-paragraph,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
5365 ;; Don't break line inside code: only inside comment. |
5b728a418323
(cperl-mode-map, cperl-do-auto-fill, cperl-menu): Use fill-paragraph,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
5366 nil |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5367 (setq marker (point-marker)) |
53779
5b728a418323
(cperl-mode-map, cperl-do-auto-fill, cperl-menu): Use fill-paragraph,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
5368 (fill-paragraph nil) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5369 (goto-char marker) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5370 ;; Is not enough, sometimes marker is a start of line |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5371 (if (bolp) (progn (re-search-forward "#+[ \t]*") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5372 (goto-char (match-end 0)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5373 ;; Following space could have gone: |
63853
123dae8639ec
(cperl-do-auto-fill): Change space constants followed by a sexp to "?\s ".
Juanma Barranquero <lekktu@gmail.com>
parents:
63836
diff
changeset
|
5374 (if (or (not s) (memq (following-char) '(?\s ?\t))) nil |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5375 (insert " ") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5376 (backward-char 1)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5377 ;; Previous space could have gone: |
63853
123dae8639ec
(cperl-do-auto-fill): Change space constants followed by a sexp to "?\s ".
Juanma Barranquero <lekktu@gmail.com>
parents:
63836
diff
changeset
|
5378 (or (memq (preceding-char) '(?\s ?\t)) (insert " ")))))) |
20323 | 5379 |
5380 (defun cperl-imenu-addback (lst &optional isback name) | |
5381 ;; We suppose that the lst is a DAG, unless the first element only | |
5382 ;; loops back, and ISBACK is set. Thus this function cannot be | |
5383 ;; applied twice without ISBACK set. | |
5384 (cond ((not cperl-imenu-addback) lst) | |
5385 (t | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5386 (or name |
20323 | 5387 (setq name "+++BACK+++")) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5388 (mapcar (lambda (elt) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5389 (if (and (listp elt) (listp (cdr elt))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5390 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5391 ;; In the other order it goes up |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5392 ;; one level only ;-( |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5393 (setcdr elt (cons (cons name lst) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5394 (cdr elt))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5395 (cperl-imenu-addback (cdr elt) t name)))) |
20323 | 5396 (if isback (cdr lst) lst)) |
5397 lst))) | |
5398 | |
31821 | 5399 (defun cperl-imenu--create-perl-index (&optional regexp) |
20323 | 5400 (require 'imenu) ; May be called from TAGS creator |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5401 (let ((index-alist '()) (index-pack-alist '()) (index-pod-alist '()) |
20323 | 5402 (index-unsorted-alist '()) (i-s-f (default-value 'imenu-sort-function)) |
5403 (index-meth-alist '()) meth | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5404 packages ends-ranges p marker is-proto |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5405 (prev-pos 0) is-pack index index1 name (end-range 0) package) |
20323 | 5406 (goto-char (point-min)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5407 (cperl-update-syntaxification (point-max) (point-max)) |
20323 | 5408 ;; Search for the function |
5409 (progn ;;save-match-data | |
5410 (while (re-search-forward | |
31821 | 5411 (or regexp cperl-imenu--function-name-regexp-perl) |
20323 | 5412 nil t) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5413 ;; 2=package-group, 5=package-name 8=sub-name |
20323 | 5414 (cond |
5415 ((and ; Skip some noise if building tags | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5416 (match-beginning 5) ; package name |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5417 ;;(eq (char-after (match-beginning 2)) ?p) ; package |
20323 | 5418 (not (save-match-data |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5419 (looking-at "[ \t\n]*;")))) ; Plain text word 'package' |
20323 | 5420 nil) |
5421 ((and | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5422 (or (match-beginning 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5423 (match-beginning 8)) ; package or sub |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5424 ;; Skip if quoted (will not skip multi-line ''-strings :-(): |
20323 | 5425 (null (get-text-property (match-beginning 1) 'syntax-table)) |
5426 (null (get-text-property (match-beginning 1) 'syntax-type)) | |
5427 (null (get-text-property (match-beginning 1) 'in-pod))) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5428 (setq is-pack (match-beginning 2)) |
20323 | 5429 ;; (if (looking-at "([^()]*)[ \t\n\f]*") |
5430 ;; (goto-char (match-end 0))) ; Messes what follows | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5431 (setq meth nil |
20323 | 5432 p (point)) |
5433 (while (and ends-ranges (>= p (car ends-ranges))) | |
5434 ;; delete obsolete entries | |
5435 (setq ends-ranges (cdr ends-ranges) packages (cdr packages))) | |
5436 (setq package (or (car packages) "") | |
5437 end-range (or (car ends-ranges) 0)) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5438 (if is-pack ; doing "package" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5439 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5440 (if (match-beginning 5) ; named package |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5441 (setq name (buffer-substring (match-beginning 5) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5442 (match-end 5)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5443 name (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5444 (set-text-properties 0 (length name) nil name) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5445 name) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5446 package (concat name "::") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5447 name (concat "package " name)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5448 ;; Support nameless packages |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5449 (setq name "package;" package "")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5450 (setq end-range |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5451 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5452 (parse-partial-sexp (point) (point-max) -1) (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5453 ends-ranges (cons end-range ends-ranges) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5454 packages (cons package packages))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5455 (setq is-proto |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5456 (or (eq (following-char) ?\;) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5457 (eq 0 (get-text-property (point) 'attrib-group))))) |
20323 | 5458 ;; Skip this function name if it is a prototype declaration. |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5459 (if (and is-proto (not is-pack)) nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5460 (or is-pack |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5461 (setq name |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5462 (buffer-substring (match-beginning 8) (match-end 8))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5463 (set-text-properties 0 (length name) nil name)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5464 (setq marker (make-marker)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5465 (set-marker marker (match-end (if is-pack 2 8))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5466 (cond (is-pack nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5467 ((string-match "[:']" name) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5468 (setq meth t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5469 ((> p end-range) nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5470 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5471 (setq name (concat package name) meth t))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5472 (setq index (cons name marker)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5473 (if is-pack |
20323 | 5474 (push index index-pack-alist) |
5475 (push index index-alist)) | |
5476 (if meth (push index index-meth-alist)) | |
5477 (push index index-unsorted-alist))) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5478 ((match-beginning 16) ; POD section |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5479 (setq name (buffer-substring (match-beginning 17) (match-end 17)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5480 marker (make-marker)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5481 (set-marker marker (match-beginning 17)) |
20323 | 5482 (set-text-properties 0 (length name) nil name) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5483 (setq name (concat (make-string |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5484 (* 3 (- (char-after (match-beginning 16)) ?1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5485 ?\ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5486 name) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5487 index (cons name marker)) |
20323 | 5488 (setq index1 (cons (concat "=" name) (cdr index))) |
5489 (push index index-pod-alist) | |
5490 (push index1 index-unsorted-alist))))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5491 (setq index-alist |
20323 | 5492 (if (default-value 'imenu-sort-function) |
5493 (sort index-alist (default-value 'imenu-sort-function)) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5494 (nreverse index-alist))) |
20323 | 5495 (and index-pod-alist |
5496 (push (cons "+POD headers+..." | |
5497 (nreverse index-pod-alist)) | |
5498 index-alist)) | |
5499 (and (or index-pack-alist index-meth-alist) | |
5500 (let ((lst index-pack-alist) hier-list pack elt group name) | |
5501 ;; Remove "package ", reverse and uniquify. | |
5502 (while lst | |
5503 (setq elt (car lst) lst (cdr lst) name (substring (car elt) 8)) | |
5504 (if (assoc name hier-list) nil | |
5505 (setq hier-list (cons (cons name (cdr elt)) hier-list)))) | |
5506 (setq lst index-meth-alist) | |
5507 (while lst | |
5508 (setq elt (car lst) lst (cdr lst)) | |
5509 (cond ((string-match "\\(::\\|'\\)[_a-zA-Z0-9]+$" (car elt)) | |
5510 (setq pack (substring (car elt) 0 (match-beginning 0))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5511 (if (setq group (assoc pack hier-list)) |
20323 | 5512 (if (listp (cdr group)) |
5513 ;; Have some functions already | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5514 (setcdr group |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5515 (cons (cons (substring |
20323 | 5516 (car elt) |
5517 (+ 2 (match-beginning 0))) | |
5518 (cdr elt)) | |
5519 (cdr group))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5520 (setcdr group (list (cons (substring |
20323 | 5521 (car elt) |
5522 (+ 2 (match-beginning 0))) | |
5523 (cdr elt))))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5524 (setq hier-list |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5525 (cons (cons pack |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5526 (list (cons (substring |
20323 | 5527 (car elt) |
5528 (+ 2 (match-beginning 0))) | |
5529 (cdr elt)))) | |
5530 hier-list)))))) | |
5531 (push (cons "+Hierarchy+..." | |
5532 hier-list) | |
5533 index-alist))) | |
5534 (and index-pack-alist | |
5535 (push (cons "+Packages+..." | |
5536 (nreverse index-pack-alist)) | |
5537 index-alist)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5538 (and (or index-pack-alist index-pod-alist |
20323 | 5539 (default-value 'imenu-sort-function)) |
5540 index-unsorted-alist | |
5541 (push (cons "+Unsorted List+..." | |
5542 (nreverse index-unsorted-alist)) | |
5543 index-alist)) | |
5544 (cperl-imenu-addback index-alist))) | |
5545 | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5546 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5547 ;; Suggested by Mark A. Hershberger |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5548 (defun cperl-outline-level () |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5549 (looking-at outline-regexp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5550 (cond ((not (match-beginning 1)) 0) ; beginning-of-file |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5551 ;;;; 2=package-group, 5=package-name 8=sub-name 16=head-level |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5552 ((match-beginning 2) 0) ; package |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5553 ((match-beginning 8) 1) ; sub |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5554 ((match-beginning 16) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5555 (- (char-after (match-beginning 16)) ?0)) ; headN ==> N |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5556 (t 5))) ; should not happen |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5557 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5558 |
20323 | 5559 (defun cperl-windowed-init () |
5560 "Initialization under windowed version." | |
73457
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5561 (cond ((featurep 'ps-print) |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
5562 (or cperl-faces-init |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
5563 (progn |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
5564 (and (boundp 'font-lock-multiline) |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
5565 (setq cperl-font-lock-multiline t)) |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
5566 (cperl-init-faces)))) |
73457
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5567 ((not cperl-faces-init) |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5568 (add-hook 'font-lock-mode-hook |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5569 (function |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5570 (lambda () |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5571 (if (memq major-mode '(perl-mode cperl-mode)) |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5572 (progn |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5573 (or cperl-faces-init (cperl-init-faces))))))) |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5574 (if (fboundp 'eval-after-load) |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5575 (eval-after-load |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5576 "ps-print" |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5577 '(or cperl-faces-init (cperl-init-faces))))))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5578 |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5579 (defvar cperl-font-lock-keywords-1 nil |
31821 | 5580 "Additional expressions to highlight in Perl mode. Minimal set.") |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5581 (defvar cperl-font-lock-keywords nil |
31821 | 5582 "Additional expressions to highlight in Perl mode. Default set.") |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5583 (defvar cperl-font-lock-keywords-2 nil |
31821 | 5584 "Additional expressions to highlight in Perl mode. Maximal set") |
5585 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5586 (defun cperl-load-font-lock-keywords () |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5587 (or cperl-faces-init (cperl-init-faces)) |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5588 cperl-font-lock-keywords) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5589 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5590 (defun cperl-load-font-lock-keywords-1 () |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5591 (or cperl-faces-init (cperl-init-faces)) |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5592 cperl-font-lock-keywords-1) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5593 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5594 (defun cperl-load-font-lock-keywords-2 () |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5595 (or cperl-faces-init (cperl-init-faces)) |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5596 cperl-font-lock-keywords-2) |
20323 | 5597 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5598 (defun cperl-init-faces-weak () |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5599 ;; Allow `cperl-find-pods-heres' to run. |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5600 (or (boundp 'font-lock-constant-face) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5601 (cperl-force-face font-lock-constant-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5602 "Face for constant and label names")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5603 (or (boundp 'font-lock-warning-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5604 (cperl-force-face font-lock-warning-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5605 "Face for things which should stand out")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5606 ;;(setq font-lock-constant-face 'font-lock-constant-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5607 ) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5608 |
20323 | 5609 (defun cperl-init-faces () |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5610 (condition-case errs |
20323 | 5611 (progn |
5612 (require 'font-lock) | |
5613 (and (fboundp 'font-lock-fontify-anchored-keywords) | |
5614 (featurep 'font-lock-extra) | |
5615 (message "You have an obsolete package `font-lock-extra'. Install `choose-color'.")) | |
5616 (let (t-font-lock-keywords t-font-lock-keywords-1 font-lock-anchored) | |
5617 (if (fboundp 'font-lock-fontify-anchored-keywords) | |
5618 (setq font-lock-anchored t)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5619 (setq |
20323 | 5620 t-font-lock-keywords |
5621 (list | |
35013
587807c5e8e6
(cperl-invalid-face): Don't double-quote
Dave Love <fx@gnu.org>
parents:
32880
diff
changeset
|
5622 `("[ \t]+$" 0 ',cperl-invalid-face t) |
20323 | 5623 (cons |
5624 (concat | |
5625 "\\(^\\|[^$@%&\\]\\)\\<\\(" | |
5626 (mapconcat | |
5627 'identity | |
5628 '("if" "until" "while" "elsif" "else" "unless" "for" | |
5629 "foreach" "continue" "exit" "die" "last" "goto" "next" | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5630 "redo" "return" "local" "exec" "sub" "do" "dump" "use" "our" |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5631 "require" "package" "eval" "my" "BEGIN" "END" "CHECK" "INIT") |
20323 | 5632 "\\|") ; Flow control |
5633 "\\)\\>") 2) ; was "\\)[ \n\t;():,\|&]" | |
5634 ; In what follows we use `type' style | |
5635 ; for overwritable builtins | |
5636 (list | |
5637 (concat | |
5638 "\\(^\\|[^$@%&\\]\\)\\<\\(" | |
5639 ;; "CORE" "__FILE__" "__LINE__" "abs" "accept" "alarm" | |
5640 ;; "and" "atan2" "bind" "binmode" "bless" "caller" | |
5641 ;; "chdir" "chmod" "chown" "chr" "chroot" "close" | |
5642 ;; "closedir" "cmp" "connect" "continue" "cos" "crypt" | |
5643 ;; "dbmclose" "dbmopen" "die" "dump" "endgrent" | |
5644 ;; "endhostent" "endnetent" "endprotoent" "endpwent" | |
5645 ;; "endservent" "eof" "eq" "exec" "exit" "exp" "fcntl" | |
5646 ;; "fileno" "flock" "fork" "formline" "ge" "getc" | |
5647 ;; "getgrent" "getgrgid" "getgrnam" "gethostbyaddr" | |
5648 ;; "gethostbyname" "gethostent" "getlogin" | |
5649 ;; "getnetbyaddr" "getnetbyname" "getnetent" | |
5650 ;; "getpeername" "getpgrp" "getppid" "getpriority" | |
5651 ;; "getprotobyname" "getprotobynumber" "getprotoent" | |
5652 ;; "getpwent" "getpwnam" "getpwuid" "getservbyname" | |
5653 ;; "getservbyport" "getservent" "getsockname" | |
5654 ;; "getsockopt" "glob" "gmtime" "gt" "hex" "index" "int" | |
5655 ;; "ioctl" "join" "kill" "lc" "lcfirst" "le" "length" | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5656 ;; "link" "listen" "localtime" "lock" "log" "lstat" "lt" |
20323 | 5657 ;; "mkdir" "msgctl" "msgget" "msgrcv" "msgsnd" "ne" |
5658 ;; "not" "oct" "open" "opendir" "or" "ord" "pack" "pipe" | |
5659 ;; "quotemeta" "rand" "read" "readdir" "readline" | |
5660 ;; "readlink" "readpipe" "recv" "ref" "rename" "require" | |
5661 ;; "reset" "reverse" "rewinddir" "rindex" "rmdir" "seek" | |
5662 ;; "seekdir" "select" "semctl" "semget" "semop" "send" | |
5663 ;; "setgrent" "sethostent" "setnetent" "setpgrp" | |
5664 ;; "setpriority" "setprotoent" "setpwent" "setservent" | |
5665 ;; "setsockopt" "shmctl" "shmget" "shmread" "shmwrite" | |
5666 ;; "shutdown" "sin" "sleep" "socket" "socketpair" | |
5667 ;; "sprintf" "sqrt" "srand" "stat" "substr" "symlink" | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5668 ;; "syscall" "sysopen" "sysread" "system" "syswrite" "tell" |
20323 | 5669 ;; "telldir" "time" "times" "truncate" "uc" "ucfirst" |
5670 ;; "umask" "unlink" "unpack" "utime" "values" "vec" | |
5671 ;; "wait" "waitpid" "wantarray" "warn" "write" "x" "xor" | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5672 "a\\(bs\\|ccept\\|tan2\\|larm\\|nd\\)\\|" |
20323 | 5673 "b\\(in\\(d\\|mode\\)\\|less\\)\\|" |
5674 "c\\(h\\(r\\(\\|oot\\)\\|dir\\|mod\\|own\\)\\|aller\\|rypt\\|" | |
5675 "lose\\(\\|dir\\)\\|mp\\|o\\(s\\|n\\(tinue\\|nect\\)\\)\\)\\|" | |
5676 "CORE\\|d\\(ie\\|bm\\(close\\|open\\)\\|ump\\)\\|" | |
5677 "e\\(x\\(p\\|it\\|ec\\)\\|q\\|nd\\(p\\(rotoent\\|went\\)\\|" | |
5678 "hostent\\|servent\\|netent\\|grent\\)\\|of\\)\\|" | |
5679 "f\\(ileno\\|cntl\\|lock\\|or\\(k\\|mline\\)\\)\\|" | |
5680 "g\\(t\\|lob\\|mtime\\|e\\(\\|t\\(p\\(pid\\|r\\(iority\\|" | |
5681 "oto\\(byn\\(ame\\|umber\\)\\|ent\\)\\)\\|eername\\|w" | |
5682 "\\(uid\\|ent\\|nam\\)\\|grp\\)\\|host\\(by\\(addr\\|name\\)\\|" | |
5683 "ent\\)\\|s\\(erv\\(by\\(port\\|name\\)\\|ent\\)\\|" | |
5684 "ock\\(name\\|opt\\)\\)\\|c\\|login\\|net\\(by\\(addr\\|name\\)\\|" | |
5685 "ent\\)\\|gr\\(ent\\|nam\\|gid\\)\\)\\)\\)\\|" | |
5686 "hex\\|i\\(n\\(t\\|dex\\)\\|octl\\)\\|join\\|kill\\|" | |
5687 "l\\(i\\(sten\\|nk\\)\\|stat\\|c\\(\\|first\\)\\|t\\|e" | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5688 "\\(\\|ngth\\)\\|o\\(c\\(altime\\|k\\)\\|g\\)\\)\\|m\\(sg\\(rcv\\|snd\\|" |
20323 | 5689 "ctl\\|get\\)\\|kdir\\)\\|n\\(e\\|ot\\)\\|o\\(pen\\(\\|dir\\)\\|" |
5690 "r\\(\\|d\\)\\|ct\\)\\|p\\(ipe\\|ack\\)\\|quotemeta\\|" | |
5691 "r\\(index\\|and\\|mdir\\|e\\(quire\\|ad\\(pipe\\|\\|lin" | |
5692 "\\(k\\|e\\)\\|dir\\)\\|set\\|cv\\|verse\\|f\\|winddir\\|name" | |
5693 "\\)\\)\\|s\\(printf\\|qrt\\|rand\\|tat\\|ubstr\\|e\\(t\\(p\\(r" | |
5694 "\\(iority\\|otoent\\)\\|went\\|grp\\)\\|hostent\\|s\\(ervent\\|" | |
5695 "ockopt\\)\\|netent\\|grent\\)\\|ek\\(\\|dir\\)\\|lect\\|" | |
5696 "m\\(ctl\\|op\\|get\\)\\|nd\\)\\|h\\(utdown\\|m\\(read\\|ctl\\|" | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5697 "write\\|get\\)\\)\\|y\\(s\\(read\\|call\\|open\\|tem\\|write\\)\\|" |
20323 | 5698 "mlink\\)\\|in\\|leep\\|ocket\\(pair\\|\\)\\)\\|t\\(runcate\\|" |
5699 "ell\\(\\|dir\\)\\|ime\\(\\|s\\)\\)\\|u\\(c\\(\\|first\\)\\|" | |
5700 "time\\|mask\\|n\\(pack\\|link\\)\\)\\|v\\(alues\\|ec\\)\\|" | |
5701 "w\\(a\\(rn\\|it\\(pid\\|\\)\\|ntarray\\)\\|rite\\)\\|" | |
5702 "x\\(\\|or\\)\\|__\\(FILE__\\|LINE__\\|PACKAGE__\\)" | |
5703 "\\)\\>") 2 'font-lock-type-face) | |
5704 ;; In what follows we use `other' style | |
5705 ;; for nonoverwritable builtins | |
5706 ;; Somehow 's', 'm' are not auto-generated??? | |
5707 (list | |
5708 (concat | |
5709 "\\(^\\|[^$@%&\\]\\)\\<\\(" | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5710 ;; "AUTOLOAD" "BEGIN" "CHECK" "DESTROY" "END" "INIT" "__END__" "chomp" |
20323 | 5711 ;; "chop" "defined" "delete" "do" "each" "else" "elsif" |
5712 ;; "eval" "exists" "for" "foreach" "format" "goto" | |
5713 ;; "grep" "if" "keys" "last" "local" "map" "my" "next" | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5714 ;; "no" "our" "package" "pop" "pos" "print" "printf" "push" |
20323 | 5715 ;; "q" "qq" "qw" "qx" "redo" "return" "scalar" "shift" |
5716 ;; "sort" "splice" "split" "study" "sub" "tie" "tr" | |
5717 ;; "undef" "unless" "unshift" "untie" "until" "use" | |
5718 ;; "while" "y" | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5719 "AUTOLOAD\\|BEGIN\\|CHECK\\|cho\\(p\\|mp\\)\\|d\\(e\\(fined\\|lete\\)\\|" |
20323 | 5720 "o\\)\\|DESTROY\\|e\\(ach\\|val\\|xists\\|ls\\(e\\|if\\)\\)\\|" |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5721 "END\\|for\\(\\|each\\|mat\\)\\|g\\(rep\\|oto\\)\\|INIT\\|if\\|keys\\|" |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5722 "l\\(ast\\|ocal\\)\\|m\\(ap\\|y\\)\\|n\\(ext\\|o\\)\\|our\\|" |
20323 | 5723 "p\\(ackage\\|rint\\(\\|f\\)\\|ush\\|o\\(p\\|s\\)\\)\\|" |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5724 "q\\(\\|q\\|w\\|x\\|r\\)\\|re\\(turn\\|do\\)\\|s\\(pli\\(ce\\|t\\)\\|" |
20323 | 5725 "calar\\|tudy\\|ub\\|hift\\|ort\\)\\|t\\(r\\|ie\\)\\|" |
5726 "u\\(se\\|n\\(shift\\|ti\\(l\\|e\\)\\|def\\|less\\)\\)\\|" | |
5727 "while\\|y\\|__\\(END\\|DATA\\)__" ;__DATA__ added manually | |
5728 "\\|[sm]" ; Added manually | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5729 "\\)\\>") 2 'cperl-nonoverridable-face) |
20323 | 5730 ;; (mapconcat 'identity |
5731 ;; '("#endif" "#else" "#ifdef" "#ifndef" "#if" | |
5732 ;; "#include" "#define" "#undef") | |
5733 ;; "\\|") | |
5734 '("-[rwxoRWXOezsfdlpSbctugkTBMAC]\\>\\([ \t]+_\\>\\)?" 0 | |
5735 font-lock-function-name-face keep) ; Not very good, triggers at "[a-z]" | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5736 ;; This highlights declarations and definitions differenty. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5737 ;; We do not try to highlight in the case of attributes: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5738 ;; it is already done by `cperl-find-pods-heres' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5739 (list (concat "\\<sub" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5740 cperl-white-and-comment-rex ; whitespace/comments |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5741 "\\([^ \n\t{;()]+\\)" ; 2=name (assume non-anonymous) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5742 "\\(" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5743 cperl-maybe-white-and-comment-rex ;whitespace/comments? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5744 "([^()]*)\\)?" ; prototype |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5745 cperl-maybe-white-and-comment-rex ; whitespace/comments? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5746 "[{;]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5747 2 (if cperl-font-lock-multiline |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5748 '(if (eq (char-after (cperl-1- (match-end 0))) ?\{ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5749 'font-lock-function-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5750 'font-lock-variable-name-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5751 ;; need to manually set 'multiline' for older font-locks |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5752 '(progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5753 (if (< 1 (count-lines (match-beginning 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5754 (match-end 0))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5755 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5756 (+ 3 (match-beginning 0)) (match-end 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5757 'syntax-type 'multiline)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5758 (if (eq (char-after (cperl-1- (match-end 0))) ?\{ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5759 'font-lock-function-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5760 'font-lock-variable-name-face)))) |
20323 | 5761 '("\\<\\(package\\|require\\|use\\|import\\|no\\|bootstrap\\)[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t;]" ; require A if B; |
5762 2 font-lock-function-name-face) | |
5763 '("^[ \t]*format[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t]*=[ \t]*$" | |
5764 1 font-lock-function-name-face) | |
5765 (cond ((featurep 'font-lock-extra) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5766 '("\\([]}\\\\%@>*&]\\|\\$[a-zA-Z0-9_:]*\\)[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" |
20323 | 5767 (2 font-lock-string-face t) |
5768 (0 '(restart 2 t)))) ; To highlight $a{bc}{ef} | |
5769 (font-lock-anchored | |
5770 '("\\([]}\\\\%@>*&]\\|\\$[a-zA-Z0-9_:]*\\)[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" | |
5771 (2 font-lock-string-face t) | |
5772 ("\\=[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" | |
5773 nil nil | |
5774 (1 font-lock-string-face t)))) | |
5775 (t '("\\([]}\\\\%@>*&]\\|\\$[a-zA-Z0-9_:]*\\)[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" | |
5776 2 font-lock-string-face t))) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5777 '("[\[ \t{,(]\\(-?[a-zA-Z0-9_:]+\\)[ \t]*=>" 1 |
20323 | 5778 font-lock-string-face t) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5779 '("^[ \t]*\\([a-zA-Z0-9_]+[ \t]*:\\)[ \t]*\\($\\|{\\|\\<\\(until\\|while\\|for\\(each\\)?\\|do\\)\\>\\)" 1 |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5780 font-lock-constant-face) ; labels |
20323 | 5781 '("\\<\\(continue\\|next\\|last\\|redo\\|goto\\)\\>[ \t]+\\([a-zA-Z0-9_:]+\\)" ; labels as targets |
20953
f3f9df46d008
Changed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20323
diff
changeset
|
5782 2 font-lock-constant-face) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5783 ;; Uncomment to get perl-mode-like vars |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5784 ;;; '("[$*]{?\\(\\sw+\\)" 1 font-lock-variable-name-face) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5785 ;;; '("\\([@%]\\|\\$#\\)\\(\\sw+\\)" |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5786 ;;; (2 (cons font-lock-variable-name-face '(underline)))) |
20323 | 5787 (cond ((featurep 'font-lock-extra) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5788 '("^[ \t]*\\(my\\|local\\|our\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)\\([ \t]*,\\)?" |
20323 | 5789 (3 font-lock-variable-name-face) |
5790 (4 '(another 4 nil | |
5791 ("\\=[ \t]*,[ \t]*\\([$@%*][a-zA-Z0-9_:]+\\)\\([ \t]*,\\)?" | |
5792 (1 font-lock-variable-name-face) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5793 (2 '(restart 2 nil) nil t))) |
20323 | 5794 nil t))) ; local variables, multiple |
5795 (font-lock-anchored | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5796 ;; 1=my_etc, 2=white? 3=(+white? 4=white? 5=var |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
5797 `(,(concat "\\<\\(my\\|local\\|our\\)" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5798 cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5799 "\\((" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5800 cperl-maybe-white-and-comment-rex |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
5801 "\\)?\\([$@%*]\\([a-zA-Z0-9_:]+\\|[^a-zA-Z0-9_]\\)\\)") |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
5802 (5 ,(if cperl-font-lock-multiline |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5803 'font-lock-variable-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5804 '(progn (setq cperl-font-lock-multiline-start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5805 (match-beginning 0)) |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
5806 'font-lock-variable-name-face))) |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
5807 (,(concat "\\=" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5808 cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5809 "," |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5810 cperl-maybe-white-and-comment-rex |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
5811 "\\([$@%*]\\([a-zA-Z0-9_:]+\\|[^a-zA-Z0-9_]\\)\\)") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5812 ;; Bug in font-lock: limit is used not only to limit |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5813 ;; searches, but to set the "extend window for |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5814 ;; facification" property. Thus we need to minimize. |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
5815 ,(if cperl-font-lock-multiline |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5816 '(if (match-beginning 3) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5817 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5818 (goto-char (match-beginning 3)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5819 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5820 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5821 (error |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5822 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5823 (forward-char 200) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5824 (error nil)))) ; typeahead |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5825 (1- (point))) ; report limit |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5826 (forward-char -2)) ; disable continued expr |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5827 '(if (match-beginning 3) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5828 (point-max) ; No limit for continuation |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
5829 (forward-char -2))) ; disable continued expr |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
5830 ,(if cperl-font-lock-multiline |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5831 nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5832 '(progn ; Do at end |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5833 ;; "my" may be already fontified (POD), |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5834 ;; so cperl-font-lock-multiline-start is nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5835 (if (or (not cperl-font-lock-multiline-start) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5836 (> 2 (count-lines |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5837 cperl-font-lock-multiline-start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5838 (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5839 nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5840 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5841 (1+ cperl-font-lock-multiline-start) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5842 'syntax-type 'multiline)) |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
5843 (setq cperl-font-lock-multiline-start nil))) |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
5844 (3 font-lock-variable-name-face)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5845 (t '("^[ \t{}]*\\(my\\|local\\|our\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)" |
20323 | 5846 3 font-lock-variable-name-face))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5847 '("\\<for\\(each\\)?\\([ \t]+\\(my\\|local\\|our\\)\\)?[ \t]*\\(\\$[a-zA-Z_][a-zA-Z_0-9]*\\)[ \t]*(" |
62081
c186a2b77f86
(cperl-init-faces): Use font-lock-negation-char-face.
Daniel Pfeiffer <occitan@esperanto.org>
parents:
61892
diff
changeset
|
5848 4 font-lock-variable-name-face) |
62085
7dbe52d92117
Avoid $! for font-lock-negation-char-face.
Daniel Pfeiffer <occitan@esperanto.org>
parents:
62081
diff
changeset
|
5849 ;; Avoid $!, and s!!, qq!! etc. when not fontifying syntaxically |
7dbe52d92117
Avoid $! for font-lock-negation-char-face.
Daniel Pfeiffer <occitan@esperanto.org>
parents:
62081
diff
changeset
|
5850 '("\\(?:^\\|[^smywqrx$]\\)\\(!\\)" 1 font-lock-negation-char-face) |
62081
c186a2b77f86
(cperl-init-faces): Use font-lock-negation-char-face.
Daniel Pfeiffer <occitan@esperanto.org>
parents:
61892
diff
changeset
|
5851 '("\\[\\(\\^\\)" 1 font-lock-negation-char-face prepend))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
5852 (setq |
20323 | 5853 t-font-lock-keywords-1 |
5854 (and (fboundp 'turn-on-font-lock) ; Check for newer font-lock | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5855 ;; not yet as of XEmacs 19.12, works with 21.1.11 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5856 (or |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5857 (not cperl-xemacs-p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5858 (string< "21.1.9" emacs-version) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5859 (and (string< "21.1.10" emacs-version) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5860 (string< emacs-version "21.1.2"))) |
20323 | 5861 '( |
5862 ("\\(\\([@%]\\|\$#\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)" 1 | |
5863 (if (eq (char-after (match-beginning 2)) ?%) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5864 'cperl-hash-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5865 'cperl-array-face) |
20323 | 5866 t) ; arrays and hashes |
5867 ("\\(\\([$@]+\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)[ \t]*\\([[{]\\)" | |
5868 1 | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5869 (if (= (- (match-end 2) (match-beginning 2)) 1) |
20323 | 5870 (if (eq (char-after (match-beginning 3)) ?{) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5871 'cperl-hash-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5872 'cperl-array-face) ; arrays and hashes |
20323 | 5873 font-lock-variable-name-face) ; Just to put something |
5874 t) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5875 ("\\(@\\|\\$#\\)\\(\\$+\\([a-zA-Z_:][a-zA-Z0-9_:]*\\|[^ \t\n]\\)\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5876 (1 cperl-array-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5877 (2 font-lock-variable-name-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5878 ("\\(%\\)\\(\\$+\\([a-zA-Z_:][a-zA-Z0-9_:]*\\|[^ \t\n]\\)\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5879 (1 cperl-hash-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5880 (2 font-lock-variable-name-face)) |
20323 | 5881 ;;("\\([smy]\\|tr\\)\\([^a-z_A-Z0-9]\\)\\(\\([^\n\\]*||\\)\\)\\2") |
5882 ;;; Too much noise from \s* @s[ and friends | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5883 ;;("\\(\\<\\([msy]\\|tr\\)[ \t]*\\([^ \t\na-zA-Z0-9_]\\)\\|\\(/\\)\\)" |
20323 | 5884 ;;(3 font-lock-function-name-face t t) |
5885 ;;(4 | |
5886 ;; (if (cperl-slash-is-regexp) | |
5887 ;; font-lock-function-name-face 'default) nil t)) | |
5888 ))) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5889 (if cperl-highlight-variables-indiscriminately |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5890 (setq t-font-lock-keywords-1 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5891 (append t-font-lock-keywords-1 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5892 (list '("\\([$*]{?\\sw+\\)" 1 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5893 font-lock-variable-name-face))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
5894 (setq cperl-font-lock-keywords-1 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5895 (if cperl-syntaxify-by-font-lock |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5896 (cons 'cperl-fontify-update |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5897 t-font-lock-keywords) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5898 t-font-lock-keywords) |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5899 cperl-font-lock-keywords cperl-font-lock-keywords-1 |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5900 cperl-font-lock-keywords-2 (append |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5901 cperl-font-lock-keywords-1 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5902 t-font-lock-keywords-1))) |
20323 | 5903 (if (fboundp 'ps-print-buffer) (cperl-ps-print-init)) |
5904 (if (or (featurep 'choose-color) (featurep 'font-lock-extra)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5905 (eval ; Avoid a warning |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5906 '(font-lock-require-faces |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5907 (list |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5908 ;; Color-light Color-dark Gray-light Gray-dark Mono |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5909 (list 'font-lock-comment-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5910 ["Firebrick" "OrangeRed" "DimGray" "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5911 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5912 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5913 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5914 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5915 (list 'font-lock-string-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5916 ["RosyBrown" "LightSalmon" "Gray50" "LightGray"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5917 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5918 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5919 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5920 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5921 (list 'font-lock-function-name-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5922 (vector |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5923 "Blue" "LightSkyBlue" "Gray50" "LightGray" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5924 (cdr (assq 'background-color ; if mono |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5925 (frame-parameters)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5926 (vector |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5927 nil nil nil nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5928 (cdr (assq 'foreground-color ; if mono |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5929 (frame-parameters)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5930 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5931 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5932 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5933 (list 'font-lock-variable-name-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5934 ["DarkGoldenrod" "LightGoldenrod" "DimGray" "Gray90"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5935 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5936 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5937 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5938 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5939 (list 'font-lock-type-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5940 ["DarkOliveGreen" "PaleGreen" "DimGray" "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5941 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5942 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5943 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5944 [nil nil t t t]) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5945 (list 'font-lock-warning-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5946 ["Pink" "Red" "Gray50" "LightGray"] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5947 ["gray20" "gray90" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5948 "gray80" "gray20"] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5949 [nil nil t t t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5950 nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5951 [nil nil t t t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5952 ) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5953 (list 'font-lock-constant-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5954 ["CadetBlue" "Aquamarine" "Gray50" "LightGray"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5955 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5956 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5957 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5958 [nil nil t t t]) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5959 (list 'cperl-nonoverridable-face |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5960 ["chartreuse3" ("orchid1" "orange") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5961 nil "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5962 [nil nil "gray90"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5963 [nil nil nil t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5964 [nil nil t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5965 [nil nil t t t]) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5966 (list 'cperl-array-face |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5967 ["blue" "yellow" nil "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5968 ["lightyellow2" ("navy" "os2blue" "darkgreen") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5969 "gray90"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5970 t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5971 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5972 nil) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5973 (list 'cperl-hash-face |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5974 ["red" "red" nil "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5975 ["lightyellow2" ("navy" "os2blue" "darkgreen") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5976 "gray90"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5977 t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5978 t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5979 nil)))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5980 ;; Do it the dull way, without choose-color |
20323 | 5981 (defvar cperl-guessed-background nil |
5982 "Display characteristics as guessed by cperl.") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5983 ;; (or (fboundp 'x-color-defined-p) |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
5984 ;; (defalias 'x-color-defined-p |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5985 ;; (cond ((fboundp 'color-defined-p) 'color-defined-p) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5986 ;; ;; XEmacs >= 19.12 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5987 ;; ((fboundp 'valid-color-name-p) 'valid-color-name-p) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5988 ;; ;; XEmacs 19.11 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5989 ;; (t 'x-valid-color-name-p)))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5990 (cperl-force-face font-lock-constant-face |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5991 "Face for constant and label names") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5992 (cperl-force-face font-lock-variable-name-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5993 "Face for variable names") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5994 (cperl-force-face font-lock-type-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5995 "Face for data types") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5996 (cperl-force-face cperl-nonoverridable-face |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5997 "Face for data types from another group") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5998 (cperl-force-face font-lock-warning-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5999 "Face for things which should stand out") |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6000 (cperl-force-face font-lock-comment-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6001 "Face for comments") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6002 (cperl-force-face font-lock-function-name-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6003 "Face for function names") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6004 (cperl-force-face cperl-hash-face |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6005 "Face for hashes") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6006 (cperl-force-face cperl-array-face |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6007 "Face for arrays") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6008 ;;(defvar font-lock-constant-face 'font-lock-constant-face) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6009 ;;(defvar font-lock-variable-name-face 'font-lock-variable-name-face) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6010 ;;(or (boundp 'font-lock-type-face) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6011 ;; (defconst font-lock-type-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6012 ;; 'font-lock-type-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6013 ;; "Face to use for data types.")) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6014 ;;(or (boundp 'cperl-nonoverridable-face) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6015 ;; (defconst cperl-nonoverridable-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6016 ;; 'cperl-nonoverridable-face |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6017 ;; "Face to use for data types from another group.")) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6018 ;;(if (not cperl-xemacs-p) nil |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6019 ;; (or (boundp 'font-lock-comment-face) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6020 ;; (defconst font-lock-comment-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6021 ;; 'font-lock-comment-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6022 ;; "Face to use for comments.")) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6023 ;; (or (boundp 'font-lock-keyword-face) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6024 ;; (defconst font-lock-keyword-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6025 ;; 'font-lock-keyword-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6026 ;; "Face to use for keywords.")) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6027 ;; (or (boundp 'font-lock-function-name-face) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6028 ;; (defconst font-lock-function-name-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6029 ;; 'font-lock-function-name-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6030 ;; "Face to use for function names."))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6031 (if (and |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6032 (not (cperl-is-face 'cperl-array-face)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6033 (cperl-is-face 'font-lock-emphasized-face)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6034 (copy-face 'font-lock-emphasized-face 'cperl-array-face)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6035 (if (and |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6036 (not (cperl-is-face 'cperl-hash-face)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6037 (cperl-is-face 'font-lock-other-emphasized-face)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6038 (copy-face 'font-lock-other-emphasized-face 'cperl-hash-face)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6039 (if (and |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6040 (not (cperl-is-face 'cperl-nonoverridable-face)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6041 (cperl-is-face 'font-lock-other-type-face)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6042 (copy-face 'font-lock-other-type-face 'cperl-nonoverridable-face)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6043 ;;(or (boundp 'cperl-hash-face) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6044 ;; (defconst cperl-hash-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6045 ;; 'cperl-hash-face |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6046 ;; "Face to use for hashes.")) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6047 ;;(or (boundp 'cperl-array-face) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6048 ;; (defconst cperl-array-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6049 ;; 'cperl-array-face |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6050 ;; "Face to use for arrays.")) |
20323 | 6051 ;; Here we try to guess background |
6052 (let ((background | |
6053 (if (boundp 'font-lock-background-mode) | |
6054 font-lock-background-mode | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6055 'light)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6056 (face-list (and (fboundp 'face-list) (face-list)))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6057 ;;;; (fset 'cperl-is-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6058 ;;;; (cond ((fboundp 'find-face) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6059 ;;;; (symbol-function 'find-face)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6060 ;;;; (face-list |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6061 ;;;; (function (lambda (face) (member face face-list)))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6062 ;;;; (t |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6063 ;;;; (function (lambda (face) (boundp face)))))) |
20323 | 6064 (defvar cperl-guessed-background |
6065 (if (and (boundp 'font-lock-display-type) | |
6066 (eq font-lock-display-type 'grayscale)) | |
6067 'gray | |
6068 background) | |
6069 "Background as guessed by CPerl mode") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6070 (and (not (cperl-is-face 'font-lock-constant-face)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6071 (cperl-is-face 'font-lock-reference-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6072 (copy-face 'font-lock-reference-face 'font-lock-constant-face)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6073 (if (cperl-is-face 'font-lock-type-face) nil |
20323 | 6074 (copy-face 'default 'font-lock-type-face) |
6075 (cond | |
6076 ((eq background 'light) | |
6077 (set-face-foreground 'font-lock-type-face | |
6078 (if (x-color-defined-p "seagreen") | |
6079 "seagreen" | |
6080 "sea green"))) | |
6081 ((eq background 'dark) | |
6082 (set-face-foreground 'font-lock-type-face | |
6083 (if (x-color-defined-p "os2pink") | |
6084 "os2pink" | |
6085 "pink"))) | |
6086 (t | |
6087 (set-face-background 'font-lock-type-face "gray90")))) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6088 (if (cperl-is-face 'cperl-nonoverridable-face) |
20323 | 6089 nil |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6090 (copy-face 'font-lock-type-face 'cperl-nonoverridable-face) |
20323 | 6091 (cond |
6092 ((eq background 'light) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6093 (set-face-foreground 'cperl-nonoverridable-face |
20323 | 6094 (if (x-color-defined-p "chartreuse3") |
6095 "chartreuse3" | |
6096 "chartreuse"))) | |
6097 ((eq background 'dark) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6098 (set-face-foreground 'cperl-nonoverridable-face |
20323 | 6099 (if (x-color-defined-p "orchid1") |
6100 "orchid1" | |
6101 "orange"))))) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6102 ;;; (if (cperl-is-face 'font-lock-other-emphasized-face) nil |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6103 ;;; (copy-face 'bold-italic 'font-lock-other-emphasized-face) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6104 ;;; (cond |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6105 ;;; ((eq background 'light) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6106 ;;; (set-face-background 'font-lock-other-emphasized-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6107 ;;; (if (x-color-defined-p "lightyellow2") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6108 ;;; "lightyellow2" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6109 ;;; (if (x-color-defined-p "lightyellow") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6110 ;;; "lightyellow" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6111 ;;; "light yellow")))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6112 ;;; ((eq background 'dark) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6113 ;;; (set-face-background 'font-lock-other-emphasized-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6114 ;;; (if (x-color-defined-p "navy") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6115 ;;; "navy" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6116 ;;; (if (x-color-defined-p "darkgreen") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6117 ;;; "darkgreen" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6118 ;;; "dark green")))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6119 ;;; (t (set-face-background 'font-lock-other-emphasized-face "gray90")))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6120 ;;; (if (cperl-is-face 'font-lock-emphasized-face) nil |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6121 ;;; (copy-face 'bold 'font-lock-emphasized-face) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6122 ;;; (cond |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6123 ;;; ((eq background 'light) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6124 ;;; (set-face-background 'font-lock-emphasized-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6125 ;;; (if (x-color-defined-p "lightyellow2") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6126 ;;; "lightyellow2" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6127 ;;; "lightyellow"))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6128 ;;; ((eq background 'dark) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6129 ;;; (set-face-background 'font-lock-emphasized-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6130 ;;; (if (x-color-defined-p "navy") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6131 ;;; "navy" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6132 ;;; (if (x-color-defined-p "darkgreen") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6133 ;;; "darkgreen" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6134 ;;; "dark green")))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6135 ;;; (t (set-face-background 'font-lock-emphasized-face "gray90")))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6136 (if (cperl-is-face 'font-lock-variable-name-face) nil |
20323 | 6137 (copy-face 'italic 'font-lock-variable-name-face)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6138 (if (cperl-is-face 'font-lock-constant-face) nil |
20953
f3f9df46d008
Changed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20323
diff
changeset
|
6139 (copy-face 'italic 'font-lock-constant-face)))) |
20323 | 6140 (setq cperl-faces-init t)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6141 (error (message "cperl-init-faces (ignored): %s" errs)))) |
20323 | 6142 |
6143 | |
6144 (defun cperl-ps-print-init () | |
6145 "Initialization of `ps-print' components for faces used in CPerl." | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6146 (eval-after-load "ps-print" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6147 '(setq ps-bold-faces |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6148 ;; font-lock-variable-name-face |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6149 ;; font-lock-constant-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6150 (append '(cperl-array-face cperl-hash-face) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6151 ps-bold-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6152 ps-italic-faces |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6153 ;; font-lock-constant-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6154 (append '(cperl-nonoverridable-face cperl-hash-face) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6155 ps-italic-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6156 ps-underlined-faces |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6157 ;; font-lock-type-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6158 (append '(cperl-array-face cperl-hash-face underline cperl-nonoverridable-face) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6159 ps-underlined-faces)))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6160 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6161 (defvar ps-print-face-extension-alist) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6162 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6163 (defun cperl-ps-print (&optional file) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6164 "Pretty-print in CPerl style. |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6165 If optional argument FILE is an empty string, prints to printer, otherwise |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6166 to the file FILE. If FILE is nil, prompts for a file name. |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6167 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6168 Style of printout regulated by the variable `cperl-ps-print-face-properties'." |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6169 (interactive) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6170 (or file |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6171 (setq file (read-from-minibuffer |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6172 "Print to file (if empty - to printer): " |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6173 (concat (buffer-file-name) ".ps") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6174 nil nil 'file-name-history))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6175 (or (> (length file) 0) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6176 (setq file nil)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6177 (require 'ps-print) ; To get ps-print-face-extension-alist |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6178 (let ((ps-print-color-p t) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6179 (ps-print-face-extension-alist ps-print-face-extension-alist)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6180 (cperl-ps-extend-face-list cperl-ps-print-face-properties) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6181 (ps-print-buffer-with-faces file))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6182 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6183 ;;; (defun cperl-ps-print-init () |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6184 ;;; "Initialization of `ps-print' components for faces used in CPerl." |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6185 ;;; ;; Guard against old versions |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6186 ;;; (defvar ps-underlined-faces nil) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6187 ;;; (defvar ps-bold-faces nil) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6188 ;;; (defvar ps-italic-faces nil) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6189 ;;; (setq ps-bold-faces |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6190 ;;; (append '(font-lock-emphasized-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6191 ;;; cperl-array-face |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6192 ;;; font-lock-keyword-face |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6193 ;;; font-lock-variable-name-face |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6194 ;;; font-lock-constant-face |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6195 ;;; font-lock-reference-face |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6196 ;;; font-lock-other-emphasized-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6197 ;;; cperl-hash-face) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6198 ;;; ps-bold-faces)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6199 ;;; (setq ps-italic-faces |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6200 ;;; (append '(cperl-nonoverridable-face |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6201 ;;; font-lock-constant-face |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6202 ;;; font-lock-reference-face |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6203 ;;; font-lock-other-emphasized-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6204 ;;; cperl-hash-face) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6205 ;;; ps-italic-faces)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6206 ;;; (setq ps-underlined-faces |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6207 ;;; (append '(font-lock-emphasized-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6208 ;;; cperl-array-face |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6209 ;;; font-lock-other-emphasized-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6210 ;;; cperl-hash-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6211 ;;; cperl-nonoverridable-face font-lock-type-face) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6212 ;;; ps-underlined-faces)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6213 ;;; (cons 'font-lock-type-face ps-underlined-faces)) |
20323 | 6214 |
6215 | |
6216 (if (cperl-enable-font-lock) (cperl-windowed-init)) | |
6217 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6218 (defconst cperl-styles-entries |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6219 '(cperl-indent-level cperl-brace-offset cperl-continued-brace-offset |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6220 cperl-label-offset cperl-extra-newline-before-brace |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6221 cperl-extra-newline-before-brace-multiline |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
6222 cperl-merge-trailing-else |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6223 cperl-continued-statement-offset)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6224 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6225 (defconst cperl-style-examples |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6226 "##### Numbers etc are: cperl-indent-level cperl-brace-offset |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6227 ##### cperl-continued-brace-offset cperl-label-offset |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6228 ##### cperl-continued-statement-offset |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6229 ##### cperl-merge-trailing-else cperl-extra-newline-before-brace |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6230 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6231 ########### (Do not forget cperl-extra-newline-before-brace-multiline) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6232 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6233 ### CPerl (=GNU - extra-newline-before-brace + merge-trailing-else) 2/0/0/-2/2/t/nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6234 if (foo) { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6235 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6236 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6237 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6238 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6239 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6240 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6241 } else { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6242 stop; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6243 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6244 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6245 ### PerlStyle (=CPerl with 4 as indent) 4/0/0/-4/4/t/nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6246 if (foo) { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6247 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6248 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6249 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6250 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6251 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6252 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6253 } else { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6254 stop; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6255 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6256 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6257 ### GNU 2/0/0/-2/2/nil/t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6258 if (foo) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6259 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6260 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6261 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6262 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6263 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6264 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6265 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6266 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6267 else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6268 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6269 stop; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6270 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6271 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6272 ### C++ (=PerlStyle with braces aligned with control words) 4/0/-4/-4/4/nil/t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6273 if (foo) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6274 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6275 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6276 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6277 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6278 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6279 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6280 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6281 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6282 else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6283 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6284 stop; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6285 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6286 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6287 ### BSD (=C++, but will not change preexisting merge-trailing-else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6288 ### and extra-newline-before-brace ) 4/0/-4/-4/4 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6289 if (foo) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6290 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6291 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6292 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6293 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6294 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6295 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6296 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6297 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6298 else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6299 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6300 stop; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6301 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6302 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6303 ### K&R (=C++ with indent 5 - merge-trailing-else, but will not |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6304 ### change preexisting extra-newline-before-brace) 5/0/-5/-5/5/nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6305 if (foo) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6306 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6307 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6308 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6309 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6310 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6311 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6312 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6313 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6314 else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6315 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6316 stop; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6317 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6318 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6319 ### Whitesmith (=PerlStyle, but will not change preexisting |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6320 ### extra-newline-before-brace and merge-trailing-else) 4/0/0/-4/4 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6321 if (foo) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6322 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6323 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6324 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6325 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6326 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6327 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6328 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6329 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6330 else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6331 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6332 stop; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6333 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6334 " |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6335 "Examples of if/else with different indent styles (with v4.23).") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6336 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6337 (defconst cperl-style-alist |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6338 '(("CPerl" ;; =GNU - extra-newline-before-brace + cperl-merge-trailing-else |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6339 (cperl-indent-level . 2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6340 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6341 (cperl-continued-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6342 (cperl-label-offset . -2) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6343 (cperl-continued-statement-offset . 2) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6344 (cperl-extra-newline-before-brace . nil) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6345 (cperl-extra-newline-before-brace-multiline . nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6346 (cperl-merge-trailing-else . t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6347 |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6348 ("PerlStyle" ; CPerl with 4 as indent |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6349 (cperl-indent-level . 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6350 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6351 (cperl-continued-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6352 (cperl-label-offset . -4) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6353 (cperl-continued-statement-offset . 4) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6354 (cperl-extra-newline-before-brace . nil) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6355 (cperl-extra-newline-before-brace-multiline . nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6356 (cperl-merge-trailing-else . t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6357 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6358 ("GNU" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6359 (cperl-indent-level . 2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6360 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6361 (cperl-continued-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6362 (cperl-label-offset . -2) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6363 (cperl-continued-statement-offset . 2) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6364 (cperl-extra-newline-before-brace . t) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6365 (cperl-extra-newline-before-brace-multiline . t) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6366 (cperl-merge-trailing-else . nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6367 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6368 ("K&R" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6369 (cperl-indent-level . 5) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6370 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6371 (cperl-continued-brace-offset . -5) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6372 (cperl-label-offset . -5) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6373 (cperl-continued-statement-offset . 5) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6374 ;;(cperl-extra-newline-before-brace . nil) ; ??? |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6375 ;;(cperl-extra-newline-before-brace-multiline . nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6376 (cperl-merge-trailing-else . nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6377 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6378 ("BSD" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6379 (cperl-indent-level . 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6380 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6381 (cperl-continued-brace-offset . -4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6382 (cperl-label-offset . -4) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6383 (cperl-continued-statement-offset . 4) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6384 ;;(cperl-extra-newline-before-brace . nil) ; ??? |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6385 ;;(cperl-extra-newline-before-brace-multiline . nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6386 ;;(cperl-merge-trailing-else . nil) ; ??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6387 ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6388 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6389 ("C++" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6390 (cperl-indent-level . 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6391 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6392 (cperl-continued-brace-offset . -4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6393 (cperl-label-offset . -4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6394 (cperl-continued-statement-offset . 4) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6395 (cperl-extra-newline-before-brace . t) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6396 (cperl-extra-newline-before-brace-multiline . t) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6397 (cperl-merge-trailing-else . nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6398 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6399 ("Whitesmith" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6400 (cperl-indent-level . 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6401 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6402 (cperl-continued-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6403 (cperl-label-offset . -4) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6404 (cperl-continued-statement-offset . 4) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6405 ;;(cperl-extra-newline-before-brace . nil) ; ??? |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6406 ;;(cperl-extra-newline-before-brace-multiline . nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6407 ;;(cperl-merge-trailing-else . nil) ; ??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6408 ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6409 ("Current")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6410 "List of variables to set to get a particular indentation style. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6411 Should be used via `cperl-set-style' or via Perl menu. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6412 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6413 See examples in `cperl-style-examples'.") |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6414 |
20323 | 6415 (defun cperl-set-style (style) |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
6416 "Set CPerl mode variables to use one of several different indentation styles. |
20323 | 6417 The arguments are a string representing the desired style. |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6418 The list of styles is in `cperl-style-alist', available styles |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6419 are CPerl, PerlStyle, GNU, K&R, BSD, C++ and Whitesmith. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6420 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6421 The current value of style is memorized (unless there is a memorized |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6422 data already), may be restored by `cperl-set-style-back'. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6423 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6424 Chosing \"Current\" style will not change style, so this may be used for |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6425 side-effect of memorizing only. Examples in `cperl-style-examples'." |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6426 (interactive |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
6427 (let ((list (mapcar (function (lambda (elt) (list (car elt)))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6428 cperl-style-alist))) |
20323 | 6429 (list (completing-read "Enter style: " list nil 'insist)))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6430 (or cperl-old-style |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6431 (setq cperl-old-style |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6432 (mapcar (function |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6433 (lambda (name) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6434 (cons name (eval name)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6435 cperl-styles-entries))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6436 (let ((style (cdr (assoc style cperl-style-alist))) setting str sym) |
20323 | 6437 (while style |
6438 (setq setting (car style) style (cdr style)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6439 (set (car setting) (cdr setting))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6440 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6441 (defun cperl-set-style-back () |
63518
475955d58ad4
(cperl-set-style-back): Fix spelling in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
63460
diff
changeset
|
6442 "Restore a style memorized by `cperl-set-style'." |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6443 (interactive) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6444 (or cperl-old-style (error "The style was not changed")) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6445 (let (setting) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6446 (while cperl-old-style |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6447 (setq setting (car cperl-old-style) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6448 cperl-old-style (cdr cperl-old-style)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6449 (set (car setting) (cdr setting))))) |
20323 | 6450 |
6451 (defun cperl-check-syntax () | |
6452 (interactive) | |
6453 (require 'mode-compile) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6454 (let ((perl-dbg-flags (concat cperl-extra-perl-args " -wc"))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6455 (eval '(mode-compile)))) ; Avoid a warning |
20323 | 6456 |
6457 (defun cperl-info-buffer (type) | |
6458 ;; Returns buffer with documentation. Creates if missing. | |
6459 ;; If TYPE, this vars buffer. | |
6460 ;; Special care is taken to not stomp over an existing info buffer | |
6461 (let* ((bname (if type "*info-perl-var*" "*info-perl*")) | |
6462 (info (get-buffer bname)) | |
6463 (oldbuf (get-buffer "*info*"))) | |
6464 (if info info | |
6465 (save-window-excursion | |
6466 ;; Get Info running | |
6467 (require 'info) | |
6468 (cond (oldbuf | |
6469 (set-buffer oldbuf) | |
6470 (rename-buffer "*info-perl-tmp*"))) | |
6471 (save-window-excursion | |
6472 (info)) | |
6473 (Info-find-node cperl-info-page (if type "perlvar" "perlfunc")) | |
6474 (set-buffer "*info*") | |
6475 (rename-buffer bname) | |
6476 (cond (oldbuf | |
6477 (set-buffer "*info-perl-tmp*") | |
6478 (rename-buffer "*info*") | |
6479 (set-buffer bname))) | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
6480 (make-local-variable 'window-min-height) |
20323 | 6481 (setq window-min-height 2) |
6482 (current-buffer))))) | |
6483 | |
6484 (defun cperl-word-at-point (&optional p) | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
6485 "Return the word at point or at P." |
20323 | 6486 (save-excursion |
6487 (if p (goto-char p)) | |
6488 (or (cperl-word-at-point-hard) | |
6489 (progn | |
6490 (require 'etags) | |
6491 (funcall (or (and (boundp 'find-tag-default-function) | |
6492 find-tag-default-function) | |
6493 (get major-mode 'find-tag-default-function) | |
6494 ;; XEmacs 19.12 has `find-tag-default-hook'; it is | |
6495 ;; automatically used within `find-tag-default': | |
6496 'find-tag-default)))))) | |
6497 | |
6498 (defun cperl-info-on-command (command) | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
6499 "Show documentation for Perl command COMMAND in other window. |
20323 | 6500 If perl-info buffer is shown in some frame, uses this frame. |
6501 Customized by setting variables `cperl-shrink-wrap-info-frame', | |
6502 `cperl-max-help-size'." | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6503 (interactive |
20323 | 6504 (let* ((default (cperl-word-at-point)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6505 (read (read-string |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6506 (format "Find doc for Perl function (default %s): " |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6507 default)))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6508 (list (if (equal read "") |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6509 default |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6510 read)))) |
20323 | 6511 |
6512 (let ((buffer (current-buffer)) | |
6513 (cmd-desc (concat "^" (regexp-quote command) "[^a-zA-Z_0-9]")) ; "tr///" | |
6514 pos isvar height iniheight frheight buf win fr1 fr2 iniwin not-loner | |
6515 max-height char-height buf-list) | |
6516 (if (string-match "^-[a-zA-Z]$" command) | |
6517 (setq cmd-desc "^-X[ \t\n]")) | |
6518 (setq isvar (string-match "^[$@%]" command) | |
6519 buf (cperl-info-buffer isvar) | |
6520 iniwin (selected-window) | |
6521 fr1 (window-frame iniwin)) | |
6522 (set-buffer buf) | |
58003
e47d2626afd7
(cperl-info-on-command): Use goto-char instead of beginning-of-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
57823
diff
changeset
|
6523 (goto-char (point-min)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6524 (or isvar |
20323 | 6525 (progn (re-search-forward "^-X[ \t\n]") |
6526 (forward-line -1))) | |
6527 (if (re-search-forward cmd-desc nil t) | |
6528 (progn | |
6529 ;; Go back to beginning of the group (ex, for qq) | |
6530 (if (re-search-backward "^[ \t\n\f]") | |
6531 (forward-line 1)) | |
6532 (beginning-of-line) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6533 ;; Get some of |
20323 | 6534 (setq pos (point) |
6535 buf-list (list buf "*info-perl-var*" "*info-perl*")) | |
6536 (while (and (not win) buf-list) | |
6537 (setq win (get-buffer-window (car buf-list) t)) | |
6538 (setq buf-list (cdr buf-list))) | |
6539 (or (not win) | |
6540 (eq (window-buffer win) buf) | |
6541 (set-window-buffer win buf)) | |
6542 (and win (setq fr2 (window-frame win))) | |
6543 (if (or (not fr2) (eq fr1 fr2)) | |
6544 (pop-to-buffer buf) | |
6545 (special-display-popup-frame buf) ; Make it visible | |
6546 (select-window win)) | |
6547 (goto-char pos) ; Needed (?!). | |
6548 ;; Resize | |
6549 (setq iniheight (window-height) | |
6550 frheight (frame-height) | |
6551 not-loner (< iniheight (1- frheight))) ; Are not alone | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6552 (cond ((if not-loner cperl-max-help-size |
20323 | 6553 cperl-shrink-wrap-info-frame) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6554 (setq height |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6555 (+ 2 |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6556 (count-lines |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6557 pos |
20323 | 6558 (save-excursion |
6559 (if (re-search-forward | |
6560 "^[ \t][^\n]*\n+\\([^ \t\n\f]\\|\\'\\)" nil t) | |
6561 (match-beginning 0) (point-max))))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6562 max-height |
20323 | 6563 (if not-loner |
6564 (/ (* (- frheight 3) cperl-max-help-size) 100) | |
6565 (setq char-height (frame-char-height)) | |
6566 ;; Non-functioning under OS/2: | |
6567 (if (eq char-height 1) (setq char-height 18)) | |
6568 ;; Title, menubar, + 2 for slack | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6569 (- (/ (x-display-pixel-height) char-height) 4))) |
20323 | 6570 (if (> height max-height) (setq height max-height)) |
6571 ;;(message "was %s doing %s" iniheight height) | |
6572 (if not-loner | |
6573 (enlarge-window (- height iniheight)) | |
6574 (set-frame-height (window-frame win) (1+ height))))) | |
6575 (set-window-start (selected-window) pos)) | |
6576 (message "No entry for %s found." command)) | |
6577 ;;(pop-to-buffer buffer) | |
6578 (select-window iniwin))) | |
6579 | |
6580 (defun cperl-info-on-current-command () | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
6581 "Show documentation for Perl command at point in other window." |
20323 | 6582 (interactive) |
6583 (cperl-info-on-command (cperl-word-at-point))) | |
6584 | |
6585 (defun cperl-imenu-info-imenu-search () | |
6586 (if (looking-at "^-X[ \t\n]") nil | |
6587 (re-search-backward | |
6588 "^\n\\([-a-zA-Z_]+\\)[ \t\n]") | |
6589 (forward-line 1))) | |
6590 | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6591 (defun cperl-imenu-info-imenu-name () |
20323 | 6592 (buffer-substring |
6593 (match-beginning 1) (match-end 1))) | |
6594 | |
6595 (defun cperl-imenu-on-info () | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6596 "Shows imenu for Perl Info Buffer. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6597 Opens Perl Info buffer if needed." |
20323 | 6598 (interactive) |
6599 (let* ((buffer (current-buffer)) | |
6600 imenu-create-index-function | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6601 imenu-prev-index-position-function |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6602 imenu-extract-index-name-function |
20323 | 6603 (index-item (save-restriction |
6604 (save-window-excursion | |
6605 (set-buffer (cperl-info-buffer nil)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6606 (setq imenu-create-index-function |
20323 | 6607 'imenu-default-create-index-function |
6608 imenu-prev-index-position-function | |
6609 'cperl-imenu-info-imenu-search | |
6610 imenu-extract-index-name-function | |
6611 'cperl-imenu-info-imenu-name) | |
6612 (imenu-choose-buffer-index))))) | |
6613 (and index-item | |
6614 (progn | |
6615 (push-mark) | |
6616 (pop-to-buffer "*info-perl*") | |
6617 (cond | |
6618 ((markerp (cdr index-item)) | |
6619 (goto-char (marker-position (cdr index-item)))) | |
6620 (t | |
6621 (goto-char (cdr index-item)))) | |
6622 (set-window-start (selected-window) (point)) | |
6623 (pop-to-buffer buffer))))) | |
6624 | |
6625 (defun cperl-lineup (beg end &optional step minshift) | |
6626 "Lineup construction in a region. | |
6627 Beginning of region should be at the start of a construction. | |
6628 All first occurrences of this construction in the lines that are | |
6629 partially contained in the region are lined up at the same column. | |
6630 | |
6631 MINSHIFT is the minimal amount of space to insert before the construction. | |
6632 STEP is the tabwidth to position constructions. | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
6633 If STEP is nil, `cperl-lineup-step' will be used |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
6634 \(or `cperl-indent-level', if `cperl-lineup-step' is nil). |
20323 | 6635 Will not move the position at the start to the left." |
6636 (interactive "r") | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6637 (let (search col tcol seen b) |
20323 | 6638 (save-excursion |
6639 (goto-char end) | |
6640 (end-of-line) | |
6641 (setq end (point-marker)) | |
6642 (goto-char beg) | |
6643 (skip-chars-forward " \t\f") | |
6644 (setq beg (point-marker)) | |
6645 (indent-region beg end nil) | |
6646 (goto-char beg) | |
6647 (setq col (current-column)) | |
6648 (if (looking-at "[a-zA-Z0-9_]") | |
6649 (if (looking-at "\\<[a-zA-Z0-9_]+\\>") | |
6650 (setq search | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6651 (concat "\\<" |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6652 (regexp-quote |
20323 | 6653 (buffer-substring (match-beginning 0) |
6654 (match-end 0))) "\\>")) | |
6655 (error "Cannot line up in a middle of the word")) | |
6656 (if (looking-at "$") | |
6657 (error "Cannot line up end of line")) | |
6658 (setq search (regexp-quote (char-to-string (following-char))))) | |
6659 (setq step (or step cperl-lineup-step cperl-indent-level)) | |
6660 (or minshift (setq minshift 1)) | |
6661 (while (progn | |
6662 (beginning-of-line 2) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6663 (and (< (point) end) |
20323 | 6664 (re-search-forward search end t) |
6665 (goto-char (match-beginning 0)))) | |
6666 (setq tcol (current-column) seen t) | |
6667 (if (> tcol col) (setq col tcol))) | |
6668 (or seen | |
6669 (error "The construction to line up occurred only once")) | |
6670 (goto-char beg) | |
6671 (setq col (+ col minshift)) | |
6672 (if (/= (% col step) 0) (setq step (* step (1+ (/ col step))))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6673 (while |
20323 | 6674 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6675 (cperl-make-indent col) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6676 (beginning-of-line 2) |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6677 (and (< (point) end) |
20323 | 6678 (re-search-forward search end t) |
6679 (goto-char (match-beginning 0)))))))) ; No body | |
6680 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6681 (defun cperl-etags (&optional add all files) ;; NOT USED??? |
20323 | 6682 "Run etags with appropriate options for Perl files. |
6683 If optional argument ALL is `recursive', will process Perl files | |
6684 in subdirectories too." | |
6685 (interactive) | |
6686 (let ((cmd "etags") | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6687 (args '("-l" "none" "-r" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6688 ;; 1=fullname 2=package? 3=name 4=proto? 5=attrs? (VERY APPROX!) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6689 "/\\<sub[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)\\)[ \\t]*\\(([^()]*)[ \t]*\\)?\\([ \t]*:[^#{;]*\\)?\\([{#]\\|$\\)/\\3/" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6690 "-r" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6691 "/\\<package[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)\\)[ \\t]*\\([#;]\\|$\\)/\\1/" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6692 "-r" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6693 "/\\<\\(package\\)[ \\t]*;/\\1;/")) |
20323 | 6694 res) |
6695 (if add (setq args (cons "-a" args))) | |
6696 (or files (setq files (list buffer-file-name))) | |
6697 (cond | |
6698 ((eq all 'recursive) | |
6699 ;;(error "Not implemented: recursive") | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6700 (setq args (append (list "-e" |
20323 | 6701 "sub wanted {push @ARGV, $File::Find::name if /\\.[pP][Llm]$/} |
6702 use File::Find; | |
6703 find(\\&wanted, '.'); | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6704 exec @ARGV;" |
20323 | 6705 cmd) args) |
6706 cmd "perl")) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6707 (all |
20323 | 6708 ;;(error "Not implemented: all") |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6709 (setq args (append (list "-e" |
20323 | 6710 "push @ARGV, <*.PL *.pl *.pm>; |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6711 exec @ARGV;" |
20323 | 6712 cmd) args) |
6713 cmd "perl")) | |
6714 (t | |
6715 (setq args (append args files)))) | |
6716 (setq res (apply 'call-process cmd nil nil nil args)) | |
6717 (or (eq res 0) | |
6718 (message "etags returned \"%s\"" res)))) | |
6719 | |
6720 (defun cperl-toggle-auto-newline () | |
6721 "Toggle the state of `cperl-auto-newline'." | |
6722 (interactive) | |
6723 (setq cperl-auto-newline (not cperl-auto-newline)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6724 (message "Newlines will %sbe auto-inserted now." |
20323 | 6725 (if cperl-auto-newline "" "not "))) |
6726 | |
6727 (defun cperl-toggle-abbrev () | |
6728 "Toggle the state of automatic keyword expansion in CPerl mode." | |
6729 (interactive) | |
6730 (abbrev-mode (if abbrev-mode 0 1)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6731 (message "Perl control structure will %sbe auto-inserted now." |
20323 | 6732 (if abbrev-mode "" "not "))) |
6733 | |
6734 | |
6735 (defun cperl-toggle-electric () | |
6736 "Toggle the state of parentheses doubling in CPerl mode." | |
6737 (interactive) | |
6738 (setq cperl-electric-parens (if (cperl-val 'cperl-electric-parens) 'null t)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6739 (message "Parentheses will %sbe auto-doubled now." |
20323 | 6740 (if (cperl-val 'cperl-electric-parens) "" "not "))) |
6741 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6742 (defun cperl-toggle-autohelp () |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
6743 "Toggle the state of Auto-Help on Perl constructs (put in the message area). |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
6744 Delay of auto-help controlled by `cperl-lazy-help-time'." |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6745 (interactive) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6746 (if (fboundp 'run-with-idle-timer) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6747 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6748 (if cperl-lazy-installed |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
6749 (cperl-lazy-unstall) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6750 (cperl-lazy-install)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6751 (message "Perl help messages will %sbe automatically shown now." |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6752 (if cperl-lazy-installed "" "not "))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6753 (message "Cannot automatically show Perl help messages - run-with-idle-timer missing."))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6754 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6755 (defun cperl-toggle-construct-fix () |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6756 "Toggle whether `indent-region'/`indent-sexp' fix whitespace too." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6757 (interactive) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6758 (setq cperl-indent-region-fix-constructs |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6759 (if cperl-indent-region-fix-constructs |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6760 nil |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6761 1)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6762 (message "indent-region/indent-sexp will %sbe automatically fix whitespace." |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6763 (if cperl-indent-region-fix-constructs "" "not "))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6764 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6765 (defun cperl-toggle-set-debug-unwind (arg &optional backtrace) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6766 "Toggle (or, with numeric argument, set) debugging state of syntaxification. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6767 Nonpositive numeric argument disables debugging messages. The message |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6768 summarizes which regions it was decided to rescan for syntactic constructs. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6769 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6770 The message looks like this: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6771 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6772 Syxify req=123..138 actual=101..146 done-to: 112=>146 statepos: 73=>117 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6773 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6774 Numbers are character positions in the buffer. REQ provides the range to |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6775 rescan requested by `font-lock'. ACTUAL is the range actually resyntaxified; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6776 for correct operation it should start and end outside any special syntactic |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6777 construct. DONE-TO and STATEPOS indicate changes to internal caches maintained |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6778 by CPerl." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6779 (interactive "P") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6780 (or arg |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6781 (setq arg (if (eq cperl-syntaxify-by-font-lock |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6782 (if backtrace 'backtrace 'message)) 0 1))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6783 (setq arg (if (> arg 0) (if backtrace 'backtrace 'message) t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6784 (setq cperl-syntaxify-by-font-lock arg) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6785 (message "Debugging messages of syntax unwind %sabled." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6786 (if (eq arg t) "dis" "en"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6787 |
20323 | 6788 ;;;; Tags file creation. |
6789 | |
6790 (defvar cperl-tmp-buffer " *cperl-tmp*") | |
6791 | |
6792 (defun cperl-setup-tmp-buf () | |
6793 (set-buffer (get-buffer-create cperl-tmp-buffer)) | |
6794 (set-syntax-table cperl-mode-syntax-table) | |
6795 (buffer-disable-undo) | |
6796 (auto-fill-mode 0) | |
6797 (if cperl-use-syntax-table-text-property-for-tags | |
6798 (progn | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
6799 (make-local-variable 'parse-sexp-lookup-properties) |
20323 | 6800 ;; Do not introduce variable if not needed, we check it! |
6801 (set 'parse-sexp-lookup-properties t)))) | |
6802 | |
6803 (defun cperl-xsub-scan () | |
6804 (require 'imenu) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6805 (let ((index-alist '()) |
20323 | 6806 (prev-pos 0) index index1 name package prefix) |
6807 (goto-char (point-min)) | |
6808 ;; Search for the function | |
6809 (progn ;;save-match-data | |
6810 (while (re-search-forward | |
6811 "^\\([ \t]*MODULE\\>[^\n]*\\<PACKAGE[ \t]*=[ \t]*\\([a-zA-Z_][a-zA-Z_0-9:]*\\)\\>\\|\\([a-zA-Z_][a-zA-Z_0-9]*\\)(\\|[ \t]*BOOT:\\)" | |
6812 nil t) | |
6813 (cond | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6814 ((match-beginning 2) ; SECTION |
20323 | 6815 (setq package (buffer-substring (match-beginning 2) (match-end 2))) |
6816 (goto-char (match-beginning 0)) | |
6817 (skip-chars-forward " \t") | |
6818 (forward-char 1) | |
6819 (if (looking-at "[^\n]*\\<PREFIX[ \t]*=[ \t]*\\([a-zA-Z_][a-zA-Z_0-9]*\\)\\>") | |
6820 (setq prefix (buffer-substring (match-beginning 1) (match-end 1))) | |
6821 (setq prefix nil))) | |
6822 ((not package) nil) ; C language section | |
6823 ((match-beginning 3) ; XSUB | |
6824 (goto-char (1+ (match-beginning 3))) | |
6825 (setq index (imenu-example--name-and-position)) | |
6826 (setq name (buffer-substring (match-beginning 3) (match-end 3))) | |
6827 (if (and prefix (string-match (concat "^" prefix) name)) | |
6828 (setq name (substring name (length prefix)))) | |
6829 (cond ((string-match "::" name) nil) | |
6830 (t | |
6831 (setq index1 (cons (concat package "::" name) (cdr index))) | |
6832 (push index1 index-alist))) | |
6833 (setcar index name) | |
6834 (push index index-alist)) | |
6835 (t ; BOOT: section | |
6836 ;; (beginning-of-line) | |
6837 (setq index (imenu-example--name-and-position)) | |
6838 (setcar index (concat package "::BOOT:")) | |
6839 (push index index-alist))))) | |
6840 index-alist)) | |
6841 | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6842 (defvar cperl-unreadable-ok nil) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6843 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6844 (defun cperl-find-tags (ifile xs topdir) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6845 (let ((b (get-buffer cperl-tmp-buffer)) ind lst elt pos ret rel |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6846 (cperl-pod-here-fontify nil) f file) |
20323 | 6847 (save-excursion |
6848 (if b (set-buffer b) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6849 (cperl-setup-tmp-buf)) |
20323 | 6850 (erase-buffer) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6851 (condition-case err |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6852 (setq file (car (insert-file-contents ifile))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6853 (error (if cperl-unreadable-ok nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6854 (if (y-or-n-p |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6855 (format "File %s unreadable. Continue? " ifile)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6856 (setq cperl-unreadable-ok t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6857 (error "Aborting: unreadable file %s" ifile))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
6858 (if (not file) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6859 (message "Unreadable file %s" ifile) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6860 (message "Scanning file %s ..." file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6861 (if (and cperl-use-syntax-table-text-property-for-tags |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6862 (not xs)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6863 (condition-case err ; after __END__ may have garbage |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6864 (cperl-find-pods-heres nil nil noninteractive) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6865 (error (message "While scanning for syntax: %s" err)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6866 (if xs |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6867 (setq lst (cperl-xsub-scan)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6868 (setq ind (cperl-imenu--create-perl-index)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6869 (setq lst (cdr (assoc "+Unsorted List+..." ind)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6870 (setq lst |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6871 (mapcar |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6872 (function |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6873 (lambda (elt) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6874 (cond ((string-match "^[_a-zA-Z]" (car elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6875 (goto-char (cdr elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6876 (beginning-of-line) ; pos should be of the start of the line |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6877 (list (car elt) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6878 (point) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6879 (1+ (count-lines 1 (point))) ; 1+ since at beg-o-l |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6880 (buffer-substring (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6881 (goto-char (cdr elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6882 ;; After name now... |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6883 (or (eolp) (forward-char 1)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6884 (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6885 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6886 (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6887 (point)))))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6888 lst)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6889 (erase-buffer) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6890 (while lst |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6891 (setq elt (car lst) lst (cdr lst)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6892 (if elt |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6893 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6894 (insert (elt elt 3) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6895 127 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6896 (if (string-match "^package " (car elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6897 (substring (car elt) 8) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6898 (car elt) ) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6899 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6900 (number-to-string (elt elt 2)) ; Line |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6901 "," |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6902 (number-to-string (1- (elt elt 1))) ; Char pos 0-based |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6903 "\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6904 (if (and (string-match "^[_a-zA-Z]+::" (car elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6905 (string-match "^sub[ \t]+\\([_a-zA-Z]+\\)[^:_a-zA-Z]" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6906 (elt elt 3))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6907 ;; Need to insert the name without package as well |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
6908 (setq lst (cons (cons (substring (elt elt 3) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6909 (match-beginning 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6910 (match-end 1)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6911 (cdr elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6912 lst)))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6913 (setq pos (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6914 (goto-char 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6915 (setq rel file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6916 ;; On case-preserving filesystems (EMX on OS/2) case might be encoded in properties |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6917 (set-text-properties 0 (length rel) nil rel) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6918 (and (equal topdir (substring rel 0 (length topdir))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6919 (setq rel (substring file (length topdir)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6920 (insert "\f\n" rel "," (number-to-string (1- pos)) "\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6921 (setq ret (buffer-substring 1 (point-max))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6922 (erase-buffer) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6923 (or noninteractive |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6924 (message "Scanning file %s finished" file)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6925 ret)))) |
20323 | 6926 |
6927 (defun cperl-add-tags-recurse-noxs () | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6928 "Add to TAGS data for \"pure\" Perl files in the current directory and kids. |
20323 | 6929 Use as |
6930 emacs -batch -q -no-site-file -l emacs/cperl-mode.el \ | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6931 -f cperl-add-tags-recurse-noxs |
20323 | 6932 " |
6933 (cperl-write-tags nil nil t t nil t)) | |
6934 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6935 (defun cperl-add-tags-recurse-noxs-fullpath () |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6936 "Add to TAGS data for \"pure\" Perl in the current directory and kids. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6937 Writes down fullpath, so TAGS is relocatable (but if the build directory |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6938 is relocated, the file TAGS inside it breaks). Use as |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6939 emacs -batch -q -no-site-file -l emacs/cperl-mode.el \ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6940 -f cperl-add-tags-recurse-noxs-fullpath |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6941 " |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6942 (cperl-write-tags nil nil t t nil t "")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6943 |
20323 | 6944 (defun cperl-add-tags-recurse () |
6945 "Add to TAGS file data for Perl files in the current directory and kids. | |
6946 Use as | |
6947 emacs -batch -q -no-site-file -l emacs/cperl-mode.el \ | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6948 -f cperl-add-tags-recurse |
20323 | 6949 " |
6950 (cperl-write-tags nil nil t t)) | |
6951 | |
6952 (defun cperl-write-tags (&optional file erase recurse dir inbuffer noxs topdir) | |
6953 ;; If INBUFFER, do not select buffer, and do not save | |
6954 ;; If ERASE is `ignore', do not erase, and do not try to delete old info. | |
6955 (require 'etags) | |
6956 (if file nil | |
6957 (setq file (if dir default-directory (buffer-file-name))) | |
6958 (if (and (not dir) (buffer-modified-p)) (error "Save buffer first!"))) | |
6959 (or topdir | |
6960 (setq topdir default-directory)) | |
6961 (let ((tags-file-name "TAGS") | |
6962 (case-fold-search (eq system-type 'emx)) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6963 xs rel tm) |
20323 | 6964 (save-excursion |
6965 (cond (inbuffer nil) ; Already there | |
6966 ((file-exists-p tags-file-name) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6967 (if cperl-xemacs-p |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6968 (visit-tags-table-buffer) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6969 (visit-tags-table-buffer tags-file-name))) |
20323 | 6970 (t (set-buffer (find-file-noselect tags-file-name)))) |
6971 (cond | |
6972 (dir | |
6973 (cond ((eq erase 'ignore)) | |
6974 (erase | |
6975 (erase-buffer) | |
6976 (setq erase 'ignore))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
6977 (let ((files |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6978 (condition-case err |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
6979 (directory-files file t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6980 (if recurse nil cperl-scan-files-regexp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6981 t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6982 (error |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6983 (if cperl-unreadable-ok nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6984 (if (y-or-n-p |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6985 (format "Directory %s unreadable. Continue? " file)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
6986 (setq cperl-unreadable-ok t |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6987 tm nil) ; Return empty list |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6988 (error "Aborting: unreadable directory %s" file))))))) |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
6989 (mapcar (function |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6990 (lambda (file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6991 (cond |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6992 ((string-match cperl-noscan-files-regexp file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6993 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6994 ((not (file-directory-p file)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6995 (if (string-match cperl-scan-files-regexp file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6996 (cperl-write-tags file erase recurse nil t noxs topdir))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6997 ((not recurse) nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6998 (t (cperl-write-tags file erase recurse t t noxs topdir))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6999 files))) |
20323 | 7000 (t |
7001 (setq xs (string-match "\\.xs$" file)) | |
7002 (if (not (and xs noxs)) | |
7003 (progn | |
7004 (cond ((eq erase 'ignore) (goto-char (point-max))) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7005 (erase (erase-buffer)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7006 (t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7007 (goto-char 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7008 (setq rel file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7009 ;; On case-preserving filesystems (EMX on OS/2) case might be encoded in properties |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7010 (set-text-properties 0 (length rel) nil rel) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7011 (and (equal topdir (substring rel 0 (length topdir))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7012 (setq rel (substring file (length topdir)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7013 (if (search-forward (concat "\f\n" rel ",") nil t) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7014 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7015 (search-backward "\f\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7016 (delete-region (point) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7017 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7018 (forward-char 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7019 (if (search-forward "\f\n" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7020 nil 'toend) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7021 (- (point) 2) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7022 (point-max))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7023 (goto-char (point-max))))) |
20323 | 7024 (insert (cperl-find-tags file xs topdir)))))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7025 (if inbuffer nil ; Delegate to the caller |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7026 (save-buffer 0) ; No backup |
20323 | 7027 (if (fboundp 'initialize-new-tags-table) ; Do we need something special in XEmacs? |
7028 (initialize-new-tags-table)))))) | |
7029 | |
7030 (defvar cperl-tags-hier-regexp-list | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7031 (concat |
20323 | 7032 "^\\(" |
7033 "\\(package\\)\\>" | |
7034 "\\|" | |
7035 "sub\\>[^\n]+::" | |
7036 "\\|" | |
7037 "[a-zA-Z_][a-zA-Z_0-9:]*(\C-?[^\n]+::" ; XSUB? | |
7038 "\\|" | |
7039 "[ \t]*BOOT:\C-?[^\n]+::" ; BOOT section | |
7040 "\\)")) | |
7041 | |
7042 (defvar cperl-hierarchy '(() ()) | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
7043 "Global hierarchy of classes.") |
20323 | 7044 |
7045 (defun cperl-tags-hier-fill () | |
7046 ;; Suppose we are in a tag table cooked by cperl. | |
7047 (goto-char 1) | |
7048 (let (type pack name pos line chunk ord cons1 file str info fileind) | |
7049 (while (re-search-forward cperl-tags-hier-regexp-list nil t) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7050 (setq pos (match-beginning 0) |
20323 | 7051 pack (match-beginning 2)) |
7052 (beginning-of-line) | |
7053 (if (looking-at (concat | |
7054 "\\([^\n]+\\)" | |
7055 "\C-?" | |
7056 "\\([^\n]+\\)" | |
7057 "\C-a" | |
7058 "\\([0-9]+\\)" | |
7059 "," | |
7060 "\\([0-9]+\\)")) | |
7061 (progn | |
7062 (setq ;;str (buffer-substring (match-beginning 1) (match-end 1)) | |
7063 name (buffer-substring (match-beginning 2) (match-end 2)) | |
7064 ;;pos (buffer-substring (match-beginning 3) (match-end 3)) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7065 line (buffer-substring (match-beginning 3) (match-end 3)) |
20323 | 7066 ord (if pack 1 0) |
7067 file (file-of-tag) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7068 fileind (format "%s:%s" file line) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7069 ;; Moves to beginning of the next line: |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7070 info (cperl-etags-snarf-tag file line)) |
20323 | 7071 ;; Move back |
7072 (forward-char -1) | |
7073 ;; Make new member of hierarchy name ==> file ==> pos if needed | |
7074 (if (setq cons1 (assoc name (nth ord cperl-hierarchy))) | |
7075 ;; Name known | |
7076 (setcdr cons1 (cons (cons fileind (vector file info)) | |
7077 (cdr cons1))) | |
7078 ;; First occurrence of the name, start alist | |
7079 (setq cons1 (cons name (list (cons fileind (vector file info))))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7080 (if pack |
20323 | 7081 (setcar (cdr cperl-hierarchy) |
7082 (cons cons1 (nth 1 cperl-hierarchy))) | |
7083 (setcar cperl-hierarchy | |
7084 (cons cons1 (car cperl-hierarchy))))))) | |
7085 (end-of-line)))) | |
7086 | |
7087 (defun cperl-tags-hier-init (&optional update) | |
7088 "Show hierarchical menu of classes and methods. | |
7089 Finds info about classes by a scan of loaded TAGS files. | |
7090 Supposes that the TAGS files contain fully qualified function names. | |
7091 One may build such TAGS files from CPerl mode menu." | |
7092 (interactive) | |
7093 (require 'etags) | |
7094 (require 'imenu) | |
7095 (if (or update (null (nth 2 cperl-hierarchy))) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7096 (let ((remover (function (lambda (elt) ; (name (file1...) (file2..)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7097 (or (nthcdr 2 elt) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7098 ;; Only in one file |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7099 (setcdr elt (cdr (nth 1 elt))))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7100 pack name cons1 to l1 l2 l3 l4 b) |
20323 | 7101 ;; (setq cperl-hierarchy '(() () ())) ; Would write into '() later! |
7102 (setq cperl-hierarchy (list l1 l2 l3)) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7103 (if cperl-xemacs-p ; Not checked |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7104 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7105 (or tags-file-name |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7106 ;; Does this work in XEmacs? |
20323 | 7107 (call-interactively 'visit-tags-table)) |
7108 (message "Updating list of classes...") | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7109 (set-buffer (get-file-buffer tags-file-name)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7110 (cperl-tags-hier-fill)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7111 (or tags-table-list |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7112 (call-interactively 'visit-tags-table)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7113 (mapcar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7114 (function |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7115 (lambda (tagsfile) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7116 (message "Updating list of classes... %s" tagsfile) |
20323 | 7117 (set-buffer (get-file-buffer tagsfile)) |
7118 (cperl-tags-hier-fill))) | |
7119 tags-table-list) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7120 (message "Updating list of classes... postprocessing...")) |
20323 | 7121 (mapcar remover (car cperl-hierarchy)) |
7122 (mapcar remover (nth 1 cperl-hierarchy)) | |
7123 (setq to (list nil (cons "Packages: " (nth 1 cperl-hierarchy)) | |
7124 (cons "Methods: " (car cperl-hierarchy)))) | |
7125 (cperl-tags-treeify to 1) | |
7126 (setcar (nthcdr 2 cperl-hierarchy) | |
7127 (cperl-menu-to-keymap (cons '("+++UPDATE+++" . -999) (cdr to)))) | |
7128 (message "Updating list of classes: done, requesting display...") | |
7129 ;;(cperl-imenu-addback (nth 2 cperl-hierarchy)) | |
7130 )) | |
7131 (or (nth 2 cperl-hierarchy) | |
7132 (error "No items found")) | |
7133 (setq update | |
7134 ;;; (imenu-choose-buffer-index "Packages: " (nth 2 cperl-hierarchy)) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7135 (if (if (fboundp 'display-popup-menus-p) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7136 (let ((f 'display-popup-menus-p)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7137 (funcall f)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7138 window-system) |
20323 | 7139 (x-popup-menu t (nth 2 cperl-hierarchy)) |
7140 (require 'tmm) | |
7141 (tmm-prompt (nth 2 cperl-hierarchy)))) | |
7142 (if (and update (listp update)) | |
7143 (progn (while (cdr update) (setq update (cdr update))) | |
7144 (setq update (car update)))) ; Get the last from the list | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7145 (if (vectorp update) |
20323 | 7146 (progn |
7147 (find-file (elt update 0)) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7148 (cperl-etags-goto-tag-location (elt update 1)))) |
20323 | 7149 (if (eq update -999) (cperl-tags-hier-init t))) |
7150 | |
7151 (defun cperl-tags-treeify (to level) | |
7152 ;; cadr of `to' is read-write. On start it is a cons | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7153 (let* ((regexp (concat "^\\(" (mapconcat |
20323 | 7154 'identity |
7155 (make-list level "[_a-zA-Z0-9]+") | |
7156 "::") | |
7157 "\\)\\(::\\)?")) | |
7158 (packages (cdr (nth 1 to))) | |
7159 (methods (cdr (nth 2 to))) | |
7160 l1 head tail cons1 cons2 ord writeto packs recurse | |
7161 root-packages root-functions ms many_ms same_name ps | |
7162 (move-deeper | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7163 (function |
20323 | 7164 (lambda (elt) |
7165 (cond ((and (string-match regexp (car elt)) | |
7166 (or (eq ord 1) (match-end 2))) | |
7167 (setq head (substring (car elt) 0 (match-end 1)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7168 tail (if (match-end 2) (substring (car elt) |
20323 | 7169 (match-end 2))) |
7170 recurse t) | |
7171 (if (setq cons1 (assoc head writeto)) nil | |
7172 ;; Need to init new head | |
7173 (setcdr writeto (cons (list head (list "Packages: ") | |
7174 (list "Methods: ")) | |
7175 (cdr writeto))) | |
7176 (setq cons1 (nth 1 writeto))) | |
7177 (setq cons2 (nth ord cons1)) ; Either packs or meths | |
7178 (setcdr cons2 (cons elt (cdr cons2)))) | |
7179 ((eq ord 2) | |
7180 (setq root-functions (cons elt root-functions))) | |
7181 (t | |
7182 (setq root-packages (cons elt root-packages)))))))) | |
7183 (setcdr to l1) ; Init to dynamic space | |
7184 (setq writeto to) | |
7185 (setq ord 1) | |
7186 (mapcar move-deeper packages) | |
7187 (setq ord 2) | |
7188 (mapcar move-deeper methods) | |
7189 (if recurse | |
7190 (mapcar (function (lambda (elt) | |
7191 (cperl-tags-treeify elt (1+ level)))) | |
7192 (cdr to))) | |
7193 ;;Now clean up leaders with one child only | |
7194 (mapcar (function (lambda (elt) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7195 (if (not (and (listp (cdr elt)) |
20323 | 7196 (eq (length elt) 2))) nil |
7197 (setcar elt (car (nth 1 elt))) | |
7198 (setcdr elt (cdr (nth 1 elt)))))) | |
7199 (cdr to)) | |
7200 ;; Sort the roots of subtrees | |
7201 (if (default-value 'imenu-sort-function) | |
7202 (setcdr to | |
7203 (sort (cdr to) (default-value 'imenu-sort-function)))) | |
7204 ;; Now add back functions removed from display | |
7205 (mapcar (function (lambda (elt) | |
7206 (setcdr to (cons elt (cdr to))))) | |
7207 (if (default-value 'imenu-sort-function) | |
7208 (nreverse | |
7209 (sort root-functions (default-value 'imenu-sort-function))) | |
7210 root-functions)) | |
7211 ;; Now add back packages removed from display | |
7212 (mapcar (function (lambda (elt) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7213 (setcdr to (cons (cons (concat "package " (car elt)) |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7214 (cdr elt)) |
20323 | 7215 (cdr to))))) |
7216 (if (default-value 'imenu-sort-function) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7217 (nreverse |
20323 | 7218 (sort root-packages (default-value 'imenu-sort-function))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7219 root-packages)))) |
20323 | 7220 |
7221 ;;;(x-popup-menu t | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7222 ;;; '(keymap "Name1" |
20323 | 7223 ;;; ("Ret1" "aa") |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7224 ;;; ("Head1" "ab" |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7225 ;;; keymap "Name2" |
20323 | 7226 ;;; ("Tail1" "x") ("Tail2" "y")))) |
7227 | |
7228 (defun cperl-list-fold (list name limit) | |
7229 (let (list1 list2 elt1 (num 0)) | |
7230 (if (<= (length list) limit) list | |
7231 (setq list1 nil list2 nil) | |
7232 (while list | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7233 (setq num (1+ num) |
20323 | 7234 elt1 (car list) |
7235 list (cdr list)) | |
7236 (if (<= num imenu-max-items) | |
7237 (setq list2 (cons elt1 list2)) | |
7238 (setq list1 (cons (cons name | |
7239 (nreverse list2)) | |
7240 list1) | |
7241 list2 (list elt1) | |
7242 num 1))) | |
7243 (nreverse (cons (cons name | |
7244 (nreverse list2)) | |
7245 list1))))) | |
7246 | |
7247 (defun cperl-menu-to-keymap (menu &optional name) | |
7248 (let (list) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7249 (cons 'keymap |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7250 (mapcar |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7251 (function |
20323 | 7252 (lambda (elt) |
7253 (cond ((listp (cdr elt)) | |
7254 (setq list (cperl-list-fold | |
7255 (cdr elt) (car elt) imenu-max-items)) | |
7256 (cons nil | |
7257 (cons (car elt) | |
7258 (cperl-menu-to-keymap list)))) | |
7259 (t | |
7260 (list (cdr elt) (car elt) t))))) ; t is needed in 19.34 | |
7261 (cperl-list-fold menu "Root" imenu-max-items))))) | |
7262 | |
7263 | |
7264 (defvar cperl-bad-style-regexp | |
7265 (mapconcat 'identity | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7266 '("[^-\n\t <>=+!.&|(*/'`\"#^][-=+<>!|&^]" ; char sign |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
7267 "[-<>=+^&|]+[^- \t\n=+<>~]") ; sign+ char |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7268 "\\|") |
20323 | 7269 "Finds places such that insertion of a whitespace may help a lot.") |
7270 | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7271 (defvar cperl-not-bad-style-regexp |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
7272 (mapconcat |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7273 'identity |
20323 | 7274 '("[^-\t <>=+]\\(--\\|\\+\\+\\)" ; var-- var++ |
7275 "[a-zA-Z0-9_][|&][a-zA-Z0-9_$]" ; abc|def abc&def are often used. | |
7276 "&[(a-zA-Z0-9_$]" ; &subroutine &(var->field) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7277 "<\\$?\\sw+\\(\\.\\(\\sw\\|_\\)+\\)?>" ; <IN> <stdin.h> |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7278 "-[a-zA-Z][ \t]+[_$\"'`a-zA-Z]" ; -f file, -t STDIN |
20323 | 7279 "-[0-9]" ; -5 |
7280 "\\+\\+" ; ++var | |
7281 "--" ; --var | |
7282 ".->" ; a->b | |
7283 "->" ; a SPACE ->b | |
7284 "\\[-" ; a[-1] | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7285 "\\\\[&$@*\\\\]" ; \&func |
20323 | 7286 "^=" ; =head |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7287 "\\$." ; $| |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7288 "<<[a-zA-Z_'\"`]" ; <<FOO, <<'FOO' |
20323 | 7289 "||" |
7290 "&&" | |
7291 "[CBIXSLFZ]<\\(\\sw\\|\\s \\|\\s_\\|[\n]\\)*>" ; C<code like text> | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7292 "-[a-zA-Z_0-9]+[ \t]*=>" ; -option => value |
20323 | 7293 ;; Unaddressed trouble spots: = -abc, f(56, -abc) --- specialcased below |
7294 ;;"[*/+-|&<.]+=" | |
7295 ) | |
7296 "\\|") | |
7297 "If matches at the start of match found by `my-bad-c-style-regexp', | |
7298 insertion of a whitespace will not help.") | |
7299 | |
7300 (defvar found-bad) | |
7301 | |
7302 (defun cperl-find-bad-style () | |
7303 "Find places in the buffer where insertion of a whitespace may help. | |
7304 Prompts user for insertion of spaces. | |
7305 Currently it is tuned to C and Perl syntax." | |
7306 (interactive) | |
7307 (let (found-bad (p (point))) | |
7308 (setq last-nonmenu-event 13) ; To disable popup | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7309 (goto-char (point-min)) |
20323 | 7310 (map-y-or-n-p "Insert space here? " |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7311 (lambda (arg) (insert " ")) |
20323 | 7312 'cperl-next-bad-style |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7313 '("location" "locations" "insert a space into") |
20323 | 7314 '((?\C-r (lambda (arg) |
7315 (let ((buffer-quit-function | |
7316 'exit-recursive-edit)) | |
7317 (message "Exit with Esc Esc") | |
7318 (recursive-edit) | |
7319 t)) ; Consider acted upon | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7320 "edit, exit with Esc Esc") |
20323 | 7321 (?e (lambda (arg) |
7322 (let ((buffer-quit-function | |
7323 'exit-recursive-edit)) | |
7324 (message "Exit with Esc Esc") | |
7325 (recursive-edit) | |
7326 t)) ; Consider acted upon | |
7327 "edit, exit with Esc Esc")) | |
7328 t) | |
7329 (if found-bad (goto-char found-bad) | |
7330 (goto-char p) | |
7331 (message "No appropriate place found")))) | |
7332 | |
7333 (defun cperl-next-bad-style () | |
7334 (let (p (not-found t) (point (point)) found) | |
7335 (while (and not-found | |
7336 (re-search-forward cperl-bad-style-regexp nil 'to-end)) | |
7337 (setq p (point)) | |
7338 (goto-char (match-beginning 0)) | |
7339 (if (or | |
7340 (looking-at cperl-not-bad-style-regexp) | |
7341 ;; Check for a < -b and friends | |
7342 (and (eq (following-char) ?\-) | |
7343 (save-excursion | |
7344 (skip-chars-backward " \t\n") | |
49789
aca582e2f94c
(cperl-next-bad-style): Fix use of character constant.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
7345 (memq (preceding-char) '(?\= ?\> ?\< ?\, ?\( ?\[ ?\{)))) |
20323 | 7346 ;; Now check for syntax type |
7347 (save-match-data | |
7348 (setq found (point)) | |
7349 (beginning-of-defun) | |
7350 (let ((pps (parse-partial-sexp (point) found))) | |
7351 (or (nth 3 pps) (nth 4 pps) (nth 5 pps))))) | |
7352 (goto-char (match-end 0)) | |
7353 (goto-char (1- p)) | |
7354 (setq not-found nil | |
7355 found-bad found))) | |
7356 (not not-found))) | |
7357 | |
27248 | 7358 |
20323 | 7359 ;;; Getting help |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7360 (defvar cperl-have-help-regexp |
20323 | 7361 ;;(concat "\\(" |
7362 (mapconcat | |
7363 'identity | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7364 '("[$@%*&][0-9a-zA-Z_:]+\\([ \t]*[[{]\\)?" ; Usual variable |
20323 | 7365 "[$@]\\^[a-zA-Z]" ; Special variable |
7366 "[$@][^ \n\t]" ; Special variable | |
7367 "-[a-zA-Z]" ; File test | |
7368 "\\\\[a-zA-Z0]" ; Special chars | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7369 "^=[a-z][a-zA-Z0-9_]*" ; POD sections |
20323 | 7370 "[-!&*+,-./<=>?\\\\^|~]+" ; Operator |
7371 "[a-zA-Z_0-9:]+" ; symbol or number | |
7372 "x=" | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7373 "#!") |
20323 | 7374 ;;"\\)\\|\\(" |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7375 "\\|") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7376 ;;"\\)" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7377 ;;) |
20323 | 7378 "Matches places in the buffer we can find help for.") |
7379 | |
7380 (defvar cperl-message-on-help-error t) | |
7381 (defvar cperl-help-from-timer nil) | |
7382 | |
7383 (defun cperl-word-at-point-hard () | |
7384 ;; Does not save-excursion | |
7385 ;; Get to the something meaningful | |
7386 (or (eobp) (eolp) (forward-char 1)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7387 (re-search-backward "[-a-zA-Z0-9_:!&*+,-./<=>?\\\\^|~$%@]" |
20323 | 7388 (save-excursion (beginning-of-line) (point)) |
7389 'to-beg) | |
7390 ;; (cond | |
7391 ;; ((or (eobp) (looking-at "[][ \t\n{}();,]")) ; Not at a symbol | |
7392 ;; (skip-chars-backward " \n\t\r({[]});,") | |
7393 ;; (or (bobp) (backward-char 1)))) | |
7394 ;; Try to backtrace | |
7395 (cond | |
7396 ((looking-at "[a-zA-Z0-9_:]") ; symbol | |
7397 (skip-chars-backward "a-zA-Z0-9_:") | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7398 (cond |
20323 | 7399 ((and (eq (preceding-char) ?^) ; $^I |
7400 (eq (char-after (- (point) 2)) ?\$)) | |
7401 (forward-char -2)) | |
7402 ((memq (preceding-char) (append "*$@%&\\" nil)) ; *glob | |
7403 (forward-char -1)) | |
7404 ((and (eq (preceding-char) ?\=) | |
7405 (eq (current-column) 1)) | |
7406 (forward-char -1))) ; =head1 | |
7407 (if (and (eq (preceding-char) ?\<) | |
7408 (looking-at "\\$?[a-zA-Z0-9_:]+>")) ; <FH> | |
7409 (forward-char -1))) | |
7410 ((and (looking-at "=") (eq (preceding-char) ?x)) ; x= | |
7411 (forward-char -1)) | |
7412 ((and (looking-at "\\^") (eq (preceding-char) ?\$)) ; $^I | |
7413 (forward-char -1)) | |
7414 ((looking-at "[-!&*+,-./<=>?\\\\^|~]") | |
7415 (skip-chars-backward "-!&*+,-./<=>?\\\\^|~") | |
7416 (cond | |
7417 ((and (eq (preceding-char) ?\$) | |
7418 (not (eq (char-after (- (point) 2)) ?\$))) ; $- | |
7419 (forward-char -1)) | |
7420 ((and (eq (following-char) ?\>) | |
7421 (string-match "[a-zA-Z0-9_]" (char-to-string (preceding-char))) | |
7422 (save-excursion | |
7423 (forward-sexp -1) | |
7424 (and (eq (preceding-char) ?\<) | |
7425 (looking-at "\\$?[a-zA-Z0-9_:]+>")))) ; <FH> | |
7426 (search-backward "<")))) | |
7427 ((and (eq (following-char) ?\$) | |
7428 (eq (preceding-char) ?\<) | |
7429 (looking-at "\\$?[a-zA-Z0-9_:]+>")) ; <$fh> | |
7430 (forward-char -1))) | |
7431 (if (looking-at cperl-have-help-regexp) | |
7432 (buffer-substring (match-beginning 0) (match-end 0)))) | |
7433 | |
7434 (defun cperl-get-help () | |
7435 "Get one-line docs on the symbol at the point. | |
7436 The data for these docs is a little bit obsolete and may be in fact longer | |
7437 than a line. Your contribution to update/shorten it is appreciated." | |
7438 (interactive) | |
7439 (save-match-data ; May be called "inside" query-replace | |
7440 (save-excursion | |
7441 (let ((word (cperl-word-at-point-hard))) | |
7442 (if word | |
7443 (if (and cperl-help-from-timer ; Bail out if not in mainland | |
7444 (not (string-match "^#!\\|\\\\\\|^=" word)) ; Show help even in comments/strings. | |
7445 (or (memq (get-text-property (point) 'face) | |
7446 '(font-lock-comment-face font-lock-string-face)) | |
7447 (memq (get-text-property (point) 'syntax-type) | |
7448 '(pod here-doc format)))) | |
7449 nil | |
7450 (cperl-describe-perl-symbol word)) | |
7451 (if cperl-message-on-help-error | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7452 (message "Nothing found for %s..." |
20323 | 7453 (buffer-substring (point) (min (+ 5 (point)) (point-max)))))))))) |
7454 | |
7455 ;;; Stolen from perl-descr.el by Johan Vromans: | |
7456 | |
7457 (defvar cperl-doc-buffer " *perl-doc*" | |
7458 "Where the documentation can be found.") | |
7459 | |
7460 (defun cperl-describe-perl-symbol (val) | |
7461 "Display the documentation of symbol at point, a Perl operator." | |
7462 (let ((enable-recursive-minibuffers t) | |
7463 args-file regexp) | |
7464 (cond | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7465 ((string-match "^[&*][a-zA-Z_]" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7466 (setq val (concat (substring val 0 1) "NAME"))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7467 ((string-match "^[$@]\\([a-zA-Z_:0-9]+\\)[ \t]*\\[" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7468 (setq val (concat "@" (substring val 1 (match-end 1))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7469 ((string-match "^[$@]\\([a-zA-Z_:0-9]+\\)[ \t]*{" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7470 (setq val (concat "%" (substring val 1 (match-end 1))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7471 ((and (string= val "x") (string-match "^x=" val)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7472 (setq val "x=")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7473 ((string-match "^\\$[\C-a-\C-z]" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7474 (setq val (concat "$^" (char-to-string (+ ?A -1 (aref val 1)))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7475 ((string-match "^CORE::" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7476 (setq val "CORE::")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7477 ((string-match "^SUPER::" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7478 (setq val "SUPER::")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7479 ((and (string= "<" val) (string-match "^<\\$?[a-zA-Z0-9_:]+>" val)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7480 (setq val "<NAME>"))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7481 (setq regexp (concat "^" |
20323 | 7482 "\\([^a-zA-Z0-9_:]+[ \t]+\\)?" |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7483 (regexp-quote val) |
20323 | 7484 "\\([ \t([/]\\|$\\)")) |
7485 | |
7486 ;; get the buffer with the documentation text | |
7487 (cperl-switch-to-doc-buffer) | |
7488 | |
7489 ;; lookup in the doc | |
7490 (goto-char (point-min)) | |
7491 (let ((case-fold-search nil)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7492 (list |
20323 | 7493 (if (re-search-forward regexp (point-max) t) |
7494 (save-excursion | |
7495 (beginning-of-line 1) | |
7496 (let ((lnstart (point))) | |
7497 (end-of-line) | |
7498 (message "%s" (buffer-substring lnstart (point))))) | |
7499 (if cperl-message-on-help-error | |
7500 (message "No definition for %s" val))))))) | |
7501 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7502 (defvar cperl-short-docs 'please-ignore-this-line |
20323 | 7503 ;; Perl4 version was written by Johan Vromans (jvromans@squirrel.nl) |
7504 "# based on '@(#)@ perl-descr.el 1.9 - describe-perl-symbol' [Perl 5] | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7505 ... Range (list context); flip/flop [no flop when flip] (scalar context). |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7506 ! ... Logical negation. |
20323 | 7507 ... != ... Numeric inequality. |
7508 ... !~ ... Search pattern, substitution, or translation (negated). | |
7509 $! In numeric context: errno. In a string context: error string. | |
7510 $\" The separator which joins elements of arrays interpolated in strings. | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7511 $# The output format for printed numbers. Default is %.15g or close. |
20323 | 7512 $$ Process number of this script. Changes in the fork()ed child process. |
7513 $% The current page number of the currently selected output channel. | |
7514 | |
7515 The following variables are always local to the current block: | |
7516 | |
7517 $1 Match of the 1st set of parentheses in the last match (auto-local). | |
7518 $2 Match of the 2nd set of parentheses in the last match (auto-local). | |
7519 $3 Match of the 3rd set of parentheses in the last match (auto-local). | |
7520 $4 Match of the 4th set of parentheses in the last match (auto-local). | |
7521 $5 Match of the 5th set of parentheses in the last match (auto-local). | |
7522 $6 Match of the 6th set of parentheses in the last match (auto-local). | |
7523 $7 Match of the 7th set of parentheses in the last match (auto-local). | |
7524 $8 Match of the 8th set of parentheses in the last match (auto-local). | |
7525 $9 Match of the 9th set of parentheses in the last match (auto-local). | |
7526 $& The string matched by the last pattern match (auto-local). | |
7527 $' The string after what was matched by the last match (auto-local). | |
7528 $` The string before what was matched by the last match (auto-local). | |
7529 | |
7530 $( The real gid of this process. | |
7531 $) The effective gid of this process. | |
7532 $* Deprecated: Set to 1 to do multiline matching within a string. | |
7533 $+ The last bracket matched by the last search pattern. | |
7534 $, The output field separator for the print operator. | |
7535 $- The number of lines left on the page. | |
7536 $. The current input line number of the last filehandle that was read. | |
7537 $/ The input record separator, newline by default. | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7538 $0 Name of the file containing the current perl script (read/write). |
20323 | 7539 $: String may be broken after these characters to fill ^-lines in a format. |
7540 $; Subscript separator for multi-dim array emulation. Default \"\\034\". | |
7541 $< The real uid of this process. | |
7542 $= The page length of the current output channel. Default is 60 lines. | |
7543 $> The effective uid of this process. | |
7544 $? The status returned by the last ``, pipe close or `system'. | |
7545 $@ The perl error message from the last eval or do @var{EXPR} command. | |
7546 $ARGV The name of the current file used with <> . | |
7547 $[ Deprecated: The index of the first element/char in an array/string. | |
7548 $\\ The output record separator for the print operator. | |
7549 $] The perl version string as displayed with perl -v. | |
7550 $^ The name of the current top-of-page format. | |
7551 $^A The current value of the write() accumulator for format() lines. | |
7552 $^D The value of the perl debug (-D) flags. | |
7553 $^E Information about the last system error other than that provided by $!. | |
7554 $^F The highest system file descriptor, ordinarily 2. | |
7555 $^H The current set of syntax checks enabled by `use strict'. | |
7556 $^I The value of the in-place edit extension (perl -i option). | |
71304
7293b63aa3ba
(cperl-short-docs): Fix quoting
Andreas Schwab <schwab@suse.de>
parents:
68773
diff
changeset
|
7557 $^L What formats output to perform a formfeed. Default is \\f. |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7558 $^M A buffer for emergency memory allocation when running out of memory. |
20323 | 7559 $^O The operating system name under which this copy of Perl was built. |
7560 $^P Internal debugging flag. | |
7561 $^T The time the script was started. Used by -A/-M/-C file tests. | |
7562 $^W True if warnings are requested (perl -w flag). | |
7563 $^X The name under which perl was invoked (argv[0] in C-speech). | |
7564 $_ The default input and pattern-searching space. | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7565 $| Auto-flush after write/print on current output channel? Default 0. |
20323 | 7566 $~ The name of the current report format. |
7567 ... % ... Modulo division. | |
7568 ... %= ... Modulo division assignment. | |
7569 %ENV Contains the current environment. | |
7570 %INC List of files that have been require-d or do-ne. | |
7571 %SIG Used to set signal handlers for various signals. | |
7572 ... & ... Bitwise and. | |
7573 ... && ... Logical and. | |
7574 ... &&= ... Logical and assignment. | |
7575 ... &= ... Bitwise and assignment. | |
7576 ... * ... Multiplication. | |
7577 ... ** ... Exponentiation. | |
7578 *NAME Glob: all objects refered by NAME. *NAM1 = *NAM2 aliases NAM1 to NAM2. | |
7579 &NAME(arg0, ...) Subroutine call. Arguments go to @_. | |
7580 ... + ... Addition. +EXPR Makes EXPR into scalar context. | |
7581 ++ Auto-increment (magical on strings). ++EXPR EXPR++ | |
7582 ... += ... Addition assignment. | |
7583 , Comma operator. | |
7584 ... - ... Subtraction. | |
7585 -- Auto-decrement (NOT magical on strings). --EXPR EXPR-- | |
7586 ... -= ... Subtraction assignment. | |
7587 -A Access time in days since script started. | |
7588 -B File is a non-text (binary) file. | |
7589 -C Inode change time in days since script started. | |
7590 -M Age in days since script started. | |
7591 -O File is owned by real uid. | |
7592 -R File is readable by real uid. | |
7593 -S File is a socket . | |
7594 -T File is a text file. | |
7595 -W File is writable by real uid. | |
7596 -X File is executable by real uid. | |
7597 -b File is a block special file. | |
7598 -c File is a character special file. | |
7599 -d File is a directory. | |
7600 -e File exists . | |
7601 -f File is a plain file. | |
7602 -g File has setgid bit set. | |
7603 -k File has sticky bit set. | |
7604 -l File is a symbolic link. | |
7605 -o File is owned by effective uid. | |
7606 -p File is a named pipe (FIFO). | |
7607 -r File is readable by effective uid. | |
7608 -s File has non-zero size. | |
7609 -t Tests if filehandle (STDIN by default) is opened to a tty. | |
7610 -u File has setuid bit set. | |
7611 -w File is writable by effective uid. | |
7612 -x File is executable by effective uid. | |
7613 -z File has zero size. | |
7614 . Concatenate strings. | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7615 .. Range (list context); flip/flop (scalar context) operator. |
20323 | 7616 .= Concatenate assignment strings |
7617 ... / ... Division. /PATTERN/ioxsmg Pattern match | |
7618 ... /= ... Division assignment. | |
7619 /PATTERN/ioxsmg Pattern match. | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7620 ... < ... Numeric less than. <pattern> Glob. See <NAME>, <> as well. |
20323 | 7621 <NAME> Reads line from filehandle NAME (a bareword or dollar-bareword). |
7622 <pattern> Glob (Unless pattern is bareword/dollar-bareword - see <NAME>). | |
7623 <> Reads line from union of files in @ARGV (= command line) and STDIN. | |
7624 ... << ... Bitwise shift left. << start of HERE-DOCUMENT. | |
7625 ... <= ... Numeric less than or equal to. | |
7626 ... <=> ... Numeric compare. | |
7627 ... = ... Assignment. | |
7628 ... == ... Numeric equality. | |
7629 ... =~ ... Search pattern, substitution, or translation | |
7630 ... > ... Numeric greater than. | |
7631 ... >= ... Numeric greater than or equal to. | |
7632 ... >> ... Bitwise shift right. | |
7633 ... >>= ... Bitwise shift right assignment. | |
7634 ... ? ... : ... Condition=if-then-else operator. ?PAT? One-time pattern match. | |
7635 ?PATTERN? One-time pattern match. | |
7636 @ARGV Command line arguments (not including the command name - see $0). | |
7637 @INC List of places to look for perl scripts during do/include/use. | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7638 @_ Parameter array for subroutines; result of split() unless in list context. |
71304
7293b63aa3ba
(cperl-short-docs): Fix quoting
Andreas Schwab <schwab@suse.de>
parents:
68773
diff
changeset
|
7639 \\ Creates reference to what follows, like \\$var, or quotes non-\\w in strings. |
20323 | 7640 \\0 Octal char, e.g. \\033. |
7641 \\E Case modification terminator. See \\Q, \\L, and \\U. | |
71304
7293b63aa3ba
(cperl-short-docs): Fix quoting
Andreas Schwab <schwab@suse.de>
parents:
68773
diff
changeset
|
7642 \\L Lowercase until \\E . See also \\l, lc. |
7293b63aa3ba
(cperl-short-docs): Fix quoting
Andreas Schwab <schwab@suse.de>
parents:
68773
diff
changeset
|
7643 \\U Upcase until \\E . See also \\u, uc. |
20323 | 7644 \\Q Quote metacharacters until \\E . See also quotemeta. |
7645 \\a Alarm character (octal 007). | |
7646 \\b Backspace character (octal 010). | |
7647 \\c Control character, e.g. \\c[ . | |
7648 \\e Escape character (octal 033). | |
7649 \\f Formfeed character (octal 014). | |
7650 \\l Lowercase the next character. See also \\L and \\u, lcfirst. | |
7651 \\n Newline character (octal 012 on most systems). | |
7652 \\r Return character (octal 015 on most systems). | |
7653 \\t Tab character (octal 011). | |
7654 \\u Upcase the next character. See also \\U and \\l, ucfirst. | |
7655 \\x Hex character, e.g. \\x1b. | |
7656 ... ^ ... Bitwise exclusive or. | |
7657 __END__ Ends program source. | |
7658 __DATA__ Ends program source. | |
7659 __FILE__ Current (source) filename. | |
7660 __LINE__ Current line in current source. | |
7661 __PACKAGE__ Current package. | |
7662 ARGV Default multi-file input filehandle. <ARGV> is a synonym for <>. | |
7663 ARGVOUT Output filehandle with -i flag. | |
7664 BEGIN { ... } Immediately executed (during compilation) piece of code. | |
7665 END { ... } Pseudo-subroutine executed after the script finishes. | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7666 CHECK { ... } Pseudo-subroutine executed after the script is compiled. |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7667 INIT { ... } Pseudo-subroutine executed before the script starts running. |
20323 | 7668 DATA Input filehandle for what follows after __END__ or __DATA__. |
7669 accept(NEWSOCKET,GENERICSOCKET) | |
7670 alarm(SECONDS) | |
7671 atan2(X,Y) | |
7672 bind(SOCKET,NAME) | |
7673 binmode(FILEHANDLE) | |
7674 caller[(LEVEL)] | |
7675 chdir(EXPR) | |
7676 chmod(LIST) | |
7677 chop[(LIST|VAR)] | |
7678 chown(LIST) | |
7679 chroot(FILENAME) | |
7680 close(FILEHANDLE) | |
7681 closedir(DIRHANDLE) | |
7682 ... cmp ... String compare. | |
7683 connect(SOCKET,NAME) | |
7684 continue of { block } continue { block }. Is executed after `next' or at end. | |
7685 cos(EXPR) | |
7686 crypt(PLAINTEXT,SALT) | |
7687 dbmclose(%HASH) | |
7688 dbmopen(%HASH,DBNAME,MODE) | |
7689 defined(EXPR) | |
7690 delete($HASH{KEY}) | |
7691 die(LIST) | |
7692 do { ... }|SUBR while|until EXPR executes at least once | |
7693 do(EXPR|SUBR([LIST])) (with while|until executes at least once) | |
7694 dump LABEL | |
7695 each(%HASH) | |
7696 endgrent | |
7697 endhostent | |
7698 endnetent | |
7699 endprotoent | |
7700 endpwent | |
7701 endservent | |
7702 eof[([FILEHANDLE])] | |
7703 ... eq ... String equality. | |
7704 eval(EXPR) or eval { BLOCK } | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7705 exec([TRUENAME] ARGV0, ARGVs) or exec(SHELL_COMMAND_LINE) |
20323 | 7706 exit(EXPR) |
7707 exp(EXPR) | |
7708 fcntl(FILEHANDLE,FUNCTION,SCALAR) | |
7709 fileno(FILEHANDLE) | |
7710 flock(FILEHANDLE,OPERATION) | |
7711 for (EXPR;EXPR;EXPR) { ... } | |
7712 foreach [VAR] (@ARRAY) { ... } | |
7713 fork | |
7714 ... ge ... String greater than or equal. | |
7715 getc[(FILEHANDLE)] | |
7716 getgrent | |
7717 getgrgid(GID) | |
7718 getgrnam(NAME) | |
7719 gethostbyaddr(ADDR,ADDRTYPE) | |
7720 gethostbyname(NAME) | |
7721 gethostent | |
7722 getlogin | |
7723 getnetbyaddr(ADDR,ADDRTYPE) | |
7724 getnetbyname(NAME) | |
7725 getnetent | |
7726 getpeername(SOCKET) | |
7727 getpgrp(PID) | |
7728 getppid | |
7729 getpriority(WHICH,WHO) | |
7730 getprotobyname(NAME) | |
7731 getprotobynumber(NUMBER) | |
7732 getprotoent | |
7733 getpwent | |
7734 getpwnam(NAME) | |
7735 getpwuid(UID) | |
7736 getservbyname(NAME,PROTO) | |
7737 getservbyport(PORT,PROTO) | |
7738 getservent | |
7739 getsockname(SOCKET) | |
7740 getsockopt(SOCKET,LEVEL,OPTNAME) | |
7741 gmtime(EXPR) | |
7742 goto LABEL | |
7743 ... gt ... String greater than. | |
7744 hex(EXPR) | |
7745 if (EXPR) { ... } [ elsif (EXPR) { ... } ... ] [ else { ... } ] or EXPR if EXPR | |
7746 index(STR,SUBSTR[,OFFSET]) | |
7747 int(EXPR) | |
7748 ioctl(FILEHANDLE,FUNCTION,SCALAR) | |
7749 join(EXPR,LIST) | |
7750 keys(%HASH) | |
7751 kill(LIST) | |
7752 last [LABEL] | |
7753 ... le ... String less than or equal. | |
7754 length(EXPR) | |
7755 link(OLDFILE,NEWFILE) | |
7756 listen(SOCKET,QUEUESIZE) | |
7757 local(LIST) | |
7758 localtime(EXPR) | |
7759 log(EXPR) | |
7760 lstat(EXPR|FILEHANDLE|VAR) | |
7761 ... lt ... String less than. | |
7762 m/PATTERN/iogsmx | |
7763 mkdir(FILENAME,MODE) | |
7764 msgctl(ID,CMD,ARG) | |
7765 msgget(KEY,FLAGS) | |
7766 msgrcv(ID,VAR,SIZE,TYPE.FLAGS) | |
7767 msgsnd(ID,MSG,FLAGS) | |
7768 my VAR or my (VAR1,...) Introduces a lexical variable ($VAR, @ARR, or %HASH). | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7769 our VAR or our (VAR1,...) Lexically enable a global variable ($V, @A, or %H). |
20323 | 7770 ... ne ... String inequality. |
7771 next [LABEL] | |
7772 oct(EXPR) | |
7773 open(FILEHANDLE[,EXPR]) | |
7774 opendir(DIRHANDLE,EXPR) | |
7775 ord(EXPR) ASCII value of the first char of the string. | |
7776 pack(TEMPLATE,LIST) | |
7777 package NAME Introduces package context. | |
7778 pipe(READHANDLE,WRITEHANDLE) Create a pair of filehandles on ends of a pipe. | |
7779 pop(ARRAY) | |
7780 print [FILEHANDLE] [(LIST)] | |
7781 printf [FILEHANDLE] (FORMAT,LIST) | |
7782 push(ARRAY,LIST) | |
7783 q/STRING/ Synonym for 'STRING' | |
7784 qq/STRING/ Synonym for \"STRING\" | |
7785 qx/STRING/ Synonym for `STRING` | |
7786 rand[(EXPR)] | |
7787 read(FILEHANDLE,SCALAR,LENGTH[,OFFSET]) | |
7788 readdir(DIRHANDLE) | |
7789 readlink(EXPR) | |
7790 recv(SOCKET,SCALAR,LEN,FLAGS) | |
7791 redo [LABEL] | |
7792 rename(OLDNAME,NEWNAME) | |
7793 require [FILENAME | PERL_VERSION] | |
7794 reset[(EXPR)] | |
7795 return(LIST) | |
7796 reverse(LIST) | |
7797 rewinddir(DIRHANDLE) | |
7798 rindex(STR,SUBSTR[,OFFSET]) | |
7799 rmdir(FILENAME) | |
7800 s/PATTERN/REPLACEMENT/gieoxsm | |
7801 scalar(EXPR) | |
7802 seek(FILEHANDLE,POSITION,WHENCE) | |
7803 seekdir(DIRHANDLE,POS) | |
7804 select(FILEHANDLE | RBITS,WBITS,EBITS,TIMEOUT) | |
7805 semctl(ID,SEMNUM,CMD,ARG) | |
7806 semget(KEY,NSEMS,SIZE,FLAGS) | |
7807 semop(KEY,...) | |
7808 send(SOCKET,MSG,FLAGS[,TO]) | |
7809 setgrent | |
7810 sethostent(STAYOPEN) | |
7811 setnetent(STAYOPEN) | |
7812 setpgrp(PID,PGRP) | |
7813 setpriority(WHICH,WHO,PRIORITY) | |
7814 setprotoent(STAYOPEN) | |
7815 setpwent | |
7816 setservent(STAYOPEN) | |
7817 setsockopt(SOCKET,LEVEL,OPTNAME,OPTVAL) | |
7818 shift[(ARRAY)] | |
7819 shmctl(ID,CMD,ARG) | |
7820 shmget(KEY,SIZE,FLAGS) | |
7821 shmread(ID,VAR,POS,SIZE) | |
7822 shmwrite(ID,STRING,POS,SIZE) | |
7823 shutdown(SOCKET,HOW) | |
7824 sin(EXPR) | |
7825 sleep[(EXPR)] | |
7826 socket(SOCKET,DOMAIN,TYPE,PROTOCOL) | |
7827 socketpair(SOCKET1,SOCKET2,DOMAIN,TYPE,PROTOCOL) | |
7828 sort [SUBROUTINE] (LIST) | |
7829 splice(ARRAY,OFFSET[,LENGTH[,LIST]]) | |
7830 split[(/PATTERN/[,EXPR[,LIMIT]])] | |
7831 sprintf(FORMAT,LIST) | |
7832 sqrt(EXPR) | |
7833 srand(EXPR) | |
7834 stat(EXPR|FILEHANDLE|VAR) | |
7835 study[(SCALAR)] | |
7836 sub [NAME [(format)]] { BODY } sub NAME [(format)]; sub [(format)] {...} | |
7837 substr(EXPR,OFFSET[,LEN]) | |
7838 symlink(OLDFILE,NEWFILE) | |
7839 syscall(LIST) | |
7840 sysread(FILEHANDLE,SCALAR,LENGTH[,OFFSET]) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7841 system([TRUENAME] ARGV0 [,ARGV]) or system(SHELL_COMMAND_LINE) |
20323 | 7842 syswrite(FILEHANDLE,SCALAR,LENGTH[,OFFSET]) |
7843 tell[(FILEHANDLE)] | |
7844 telldir(DIRHANDLE) | |
7845 time | |
7846 times | |
7847 tr/SEARCHLIST/REPLACEMENTLIST/cds | |
7848 truncate(FILE|EXPR,LENGTH) | |
7849 umask[(EXPR)] | |
7850 undef[(EXPR)] | |
7851 unless (EXPR) { ... } [ else { ... } ] or EXPR unless EXPR | |
7852 unlink(LIST) | |
7853 unpack(TEMPLATE,EXPR) | |
7854 unshift(ARRAY,LIST) | |
7855 until (EXPR) { ... } EXPR until EXPR | |
7856 utime(LIST) | |
7857 values(%HASH) | |
7858 vec(EXPR,OFFSET,BITS) | |
7859 wait | |
7860 waitpid(PID,FLAGS) | |
7861 wantarray Returns true if the sub/eval is called in list context. | |
7862 warn(LIST) | |
7863 while (EXPR) { ... } EXPR while EXPR | |
7864 write[(EXPR|FILEHANDLE)] | |
7865 ... x ... Repeat string or array. | |
7866 x= ... Repetition assignment. | |
7867 y/SEARCHLIST/REPLACEMENTLIST/ | |
7868 ... | ... Bitwise or. | |
7869 ... || ... Logical or. | |
7870 ~ ... Unary bitwise complement. | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7871 #! OS interpreter indicator. If contains `perl', used for options, and -x. |
20323 | 7872 AUTOLOAD {...} Shorthand for `sub AUTOLOAD {...}'. |
7873 CORE:: Prefix to access builtin function if imported sub obscures it. | |
7874 SUPER:: Prefix to lookup for a method in @ISA classes. | |
7875 DESTROY Shorthand for `sub DESTROY {...}'. | |
7876 ... EQ ... Obsolete synonym of `eq'. | |
7877 ... GE ... Obsolete synonym of `ge'. | |
7878 ... GT ... Obsolete synonym of `gt'. | |
7879 ... LE ... Obsolete synonym of `le'. | |
7880 ... LT ... Obsolete synonym of `lt'. | |
7881 ... NE ... Obsolete synonym of `ne'. | |
7882 abs [ EXPR ] absolute value | |
7883 ... and ... Low-precedence synonym for &&. | |
7884 bless REFERENCE [, PACKAGE] Makes reference into an object of a package. | |
7885 chomp [LIST] Strips $/ off LIST/$_. Returns count. Special if $/ eq ''! | |
7886 chr Converts a number to char with the same ordinal. | |
7887 else Part of if/unless {BLOCK} elsif {BLOCK} else {BLOCK}. | |
7888 elsif Part of if/unless {BLOCK} elsif {BLOCK} else {BLOCK}. | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7889 exists $HASH{KEY} True if the key exists. |
20323 | 7890 format [NAME] = Start of output format. Ended by a single dot (.) on a line. |
7891 formline PICTURE, LIST Backdoor into \"format\" processing. | |
7892 glob EXPR Synonym of <EXPR>. | |
7893 lc [ EXPR ] Returns lowercased EXPR. | |
7894 lcfirst [ EXPR ] Returns EXPR with lower-cased first letter. | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7895 grep EXPR,LIST or grep {BLOCK} LIST Filters LIST via EXPR/BLOCK. |
20323 | 7896 map EXPR, LIST or map {BLOCK} LIST Applies EXPR/BLOCK to elts of LIST. |
7897 no PACKAGE [SYMBOL1, ...] Partial reverse for `use'. Runs `unimport' method. | |
7898 not ... Low-precedence synonym for ! - negation. | |
7899 ... or ... Low-precedence synonym for ||. | |
7900 pos STRING Set/Get end-position of the last match over this string, see \\G. | |
7901 quotemeta [ EXPR ] Quote regexp metacharacters. | |
7902 qw/WORD1 .../ Synonym of split('', 'WORD1 ...') | |
7903 readline FH Synonym of <FH>. | |
7904 readpipe CMD Synonym of `CMD`. | |
7905 ref [ EXPR ] Type of EXPR when dereferenced. | |
7906 sysopen FH, FILENAME, MODE [, PERM] (MODE is numeric, see Fcntl.) | |
7907 tie VAR, PACKAGE, LIST Hide an object behind a simple Perl variable. | |
7908 tied Returns internal object for a tied data. | |
7909 uc [ EXPR ] Returns upcased EXPR. | |
7910 ucfirst [ EXPR ] Returns EXPR with upcased first letter. | |
7911 untie VAR Unlink an object from a simple Perl variable. | |
7912 use PACKAGE [SYMBOL1, ...] Compile-time `require' with consequent `import'. | |
7913 ... xor ... Low-precedence synonym for exclusive or. | |
71304
7293b63aa3ba
(cperl-short-docs): Fix quoting
Andreas Schwab <schwab@suse.de>
parents:
68773
diff
changeset
|
7914 prototype \\&SUB Returns prototype of the function given a reference. |
20323 | 7915 =head1 Top-level heading. |
7916 =head2 Second-level heading. | |
7917 =head3 Third-level heading (is there such?). | |
7918 =over [ NUMBER ] Start list. | |
7919 =item [ TITLE ] Start new item in the list. | |
7920 =back End list. | |
7921 =cut Switch from POD to Perl. | |
7922 =pod Switch from Perl to POD. | |
7923 ") | |
7924 | |
57823
d77a1264b555
(cperl-switch-to-doc-buffer): Don't use interactive-p.
Richard M. Stallman <rms@gnu.org>
parents:
56377
diff
changeset
|
7925 (defun cperl-switch-to-doc-buffer (&optional interactive) |
20323 | 7926 "Go to the perl documentation buffer and insert the documentation." |
57823
d77a1264b555
(cperl-switch-to-doc-buffer): Don't use interactive-p.
Richard M. Stallman <rms@gnu.org>
parents:
56377
diff
changeset
|
7927 (interactive "p") |
20323 | 7928 (let ((buf (get-buffer-create cperl-doc-buffer))) |
57823
d77a1264b555
(cperl-switch-to-doc-buffer): Don't use interactive-p.
Richard M. Stallman <rms@gnu.org>
parents:
56377
diff
changeset
|
7929 (if interactive |
20323 | 7930 (switch-to-buffer-other-window buf) |
7931 (set-buffer buf)) | |
7932 (if (= (buffer-size) 0) | |
7933 (progn | |
7934 (insert (documentation-property 'cperl-short-docs | |
7935 'variable-documentation)) | |
7936 (setq buffer-read-only t))))) | |
7937 | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7938 (defun cperl-beautify-regexp-piece (b e embed level) |
20323 | 7939 ;; b is before the starting delimiter, e before the ending |
7940 ;; e should be a marker, may be changed, but remains "correct". | |
78487
419c5c316b51
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78407
diff
changeset
|
7941 ;; EMBED is nil if we process the whole REx. |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7942 ;; The REx is guaranteed to have //x |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7943 ;; LEVEL shows how many levels deep to go |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7944 ;; position at enter and at leave is not defined |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7945 (let (s c tmp (m (make-marker)) (m1 (make-marker)) c1 spaces inline code pos) |
20323 | 7946 (if (not embed) |
7947 (goto-char (1+ b)) | |
7948 (goto-char b) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7949 (cond ((looking-at "(\\?\\\\#") ; (?#) wrongly commented when //x-ing |
20323 | 7950 (forward-char 2) |
7951 (delete-char 1) | |
7952 (forward-char 1)) | |
7953 ((looking-at "(\\?[^a-zA-Z]") | |
7954 (forward-char 3)) | |
7955 ((looking-at "(\\?") ; (?i) | |
7956 (forward-char 2)) | |
7957 (t | |
7958 (forward-char 1)))) | |
7959 (setq c (if embed (current-indentation) (1- (current-column))) | |
7960 c1 (+ c (or cperl-regexp-indent-step cperl-indent-level))) | |
7961 (or (looking-at "[ \t]*[\n#]") | |
7962 (progn | |
7963 (insert "\n"))) | |
7964 (goto-char e) | |
7965 (beginning-of-line) | |
7966 (if (re-search-forward "[^ \t]" e t) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7967 (progn ; Something before the ending delimiter |
20323 | 7968 (goto-char e) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7969 (delete-horizontal-space) |
20323 | 7970 (insert "\n") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7971 (cperl-make-indent c) |
20323 | 7972 (set-marker e (point)))) |
7973 (goto-char b) | |
7974 (end-of-line 2) | |
7975 (while (< (point) (marker-position e)) | |
7976 (beginning-of-line) | |
7977 (setq s (point) | |
7978 inline t) | |
7979 (skip-chars-forward " \t") | |
7980 (delete-region s (point)) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7981 (cperl-make-indent c1) |
20323 | 7982 (while (and |
7983 inline | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7984 (looking-at |
20323 | 7985 (concat "\\([a-zA-Z0-9]+[^*+{?]\\)" ; 1 word |
7986 "\\|" ; Embedded variable | |
7987 "\\$\\([a-zA-Z0-9_]+\\([[{]\\)?\\|[^\n \t)|]\\)" ; 2 3 | |
7988 "\\|" ; $ ^ | |
7989 "[$^]" | |
7990 "\\|" ; simple-code simple-code*? | |
7991 "\\(\\\\.\\|[^][()#|*+?\n]\\)\\([*+{?]\\??\\)?" ; 4 5 | |
7992 "\\|" ; Class | |
7993 "\\(\\[\\)" ; 6 | |
7994 "\\|" ; Grouping | |
7995 "\\((\\(\\?\\)?\\)" ; 7 8 | |
7996 "\\|" ; | | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7997 "\\(|\\)"))) ; 9 |
20323 | 7998 (goto-char (match-end 0)) |
7999 (setq spaces t) | |
8000 (cond ((match-beginning 1) ; Alphanum word + junk | |
8001 (forward-char -1)) | |
8002 ((or (match-beginning 3) ; $ab[12] | |
8003 (and (match-beginning 5) ; X* X+ X{2,3} | |
8004 (eq (preceding-char) ?\{))) | |
8005 (forward-char -1) | |
8006 (forward-sexp 1)) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8007 ((and ; [], already syntaxified |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8008 (match-beginning 6) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8009 cperl-regexp-scan |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8010 cperl-use-syntax-table-text-property) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8011 (forward-char -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8012 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8013 (or (eq (preceding-char) ?\]) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8014 (error "[]-group not terminated")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8015 (re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8016 "\\=\\([*+?]\\|{[0-9]+\\(,[0-9]*\\)?}\\)\\??" e t)) |
20323 | 8017 ((match-beginning 6) ; [] |
8018 (setq tmp (point)) | |
8019 (if (looking-at "\\^?\\]") | |
8020 (goto-char (match-end 0))) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8021 ;; XXXX POSIX classes?! |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8022 (while (and (not pos) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8023 (re-search-forward "\\[:\\|\\]" e t)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8024 (if (eq (preceding-char) ?:) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8025 (or (re-search-forward ":\\]" e t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8026 (error "[:POSIX:]-group in []-group not terminated")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8027 (setq pos t))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8028 (or (eq (preceding-char) ?\]) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8029 (error "[]-group not terminated")) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8030 (re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8031 "\\=\\([*+?]\\|{[0-9]+\\(,[0-9]*\\)?}\\)\\??" e t)) |
20323 | 8032 ((match-beginning 7) ; () |
8033 (goto-char (match-beginning 0)) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8034 (setq pos (current-column)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8035 (or (eq pos c1) |
20323 | 8036 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8037 (delete-horizontal-space) |
20323 | 8038 (insert "\n") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8039 (cperl-make-indent c1))) |
20323 | 8040 (setq tmp (point)) |
8041 (forward-sexp 1) | |
8042 ;; (or (forward-sexp 1) | |
8043 ;; (progn | |
8044 ;; (goto-char tmp) | |
8045 ;; (error "()-group not terminated"))) | |
8046 (set-marker m (1- (point))) | |
8047 (set-marker m1 (point)) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8048 (if (= level 1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8049 (if (progn ; indent rigidly if multiline |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
8050 ;; In fact does not make a lot of sense, since |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8051 ;; the starting position can be already lost due |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8052 ;; to insertion of "\n" and " " |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8053 (goto-char tmp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8054 (search-forward "\n" m1 t)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8055 (indent-rigidly (point) m1 (- c1 pos))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8056 (setq level (1- level)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8057 (cond |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8058 ((not (match-beginning 8)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8059 (cperl-beautify-regexp-piece tmp m t level)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8060 ((eq (char-after (+ 2 tmp)) ?\{) ; Code |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8061 t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8062 ((eq (char-after (+ 2 tmp)) ?\() ; Conditional |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8063 (goto-char (+ 2 tmp)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8064 (forward-sexp 1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8065 (cperl-beautify-regexp-piece (point) m t level)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8066 ((eq (char-after (+ 2 tmp)) ?<) ; Lookbehind |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8067 (goto-char (+ 3 tmp)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8068 (cperl-beautify-regexp-piece (point) m t level)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8069 (t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8070 (cperl-beautify-regexp-piece tmp m t level)))) |
20323 | 8071 (goto-char m1) |
8072 (cond ((looking-at "[*+?]\\??") | |
8073 (goto-char (match-end 0))) | |
8074 ((eq (following-char) ?\{) | |
8075 (forward-sexp 1) | |
8076 (if (eq (following-char) ?\?) | |
8077 (forward-char)))) | |
8078 (skip-chars-forward " \t") | |
8079 (setq spaces nil) | |
8080 (if (looking-at "[#\n]") | |
8081 (progn | |
8082 (or (eolp) (indent-for-comment)) | |
8083 (beginning-of-line 2)) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8084 (delete-horizontal-space) |
20323 | 8085 (insert "\n")) |
8086 (end-of-line) | |
8087 (setq inline nil)) | |
8088 ((match-beginning 9) ; | | |
8089 (forward-char -1) | |
8090 (setq tmp (point)) | |
8091 (beginning-of-line) | |
8092 (if (re-search-forward "[^ \t]" tmp t) | |
8093 (progn | |
8094 (goto-char tmp) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8095 (delete-horizontal-space) |
20323 | 8096 (insert "\n")) |
8097 ;; first at line | |
8098 (delete-region (point) tmp)) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8099 (cperl-make-indent c) |
20323 | 8100 (forward-char 1) |
8101 (skip-chars-forward " \t") | |
8102 (setq spaces nil) | |
8103 (if (looking-at "[#\n]") | |
8104 (beginning-of-line 2) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8105 (delete-horizontal-space) |
20323 | 8106 (insert "\n")) |
8107 (end-of-line) | |
8108 (setq inline nil))) | |
8109 (or (looking-at "[ \t\n]") | |
8110 (not spaces) | |
8111 (insert " ")) | |
8112 (skip-chars-forward " \t")) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8113 (or (looking-at "[#\n]") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8114 (error "Unknown code `%s' in a regexp" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8115 (buffer-substring (point) (1+ (point))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8116 (and inline (end-of-line 2))) |
20323 | 8117 ;; Special-case the last line of group |
8118 (if (and (>= (point) (marker-position e)) | |
8119 (/= (current-indentation) c)) | |
8120 (progn | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8121 (beginning-of-line) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8122 (cperl-make-indent c))))) |
20323 | 8123 |
8124 (defun cperl-make-regexp-x () | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8125 ;; Returns position of the start |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8126 ;; XXX this is called too often! Need to cache the result! |
20323 | 8127 (save-excursion |
8128 (or cperl-use-syntax-table-text-property | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8129 (error "I need to have a regexp marked!")) |
20323 | 8130 ;; Find the start |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8131 (if (looking-at "\\s|") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8132 nil ; good already |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8133 (if (looking-at "\\([smy]\\|qr\\)\\s|") |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8134 (forward-char 1) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8135 (re-search-backward "\\s|"))) ; Assume it is scanned already. |
20323 | 8136 ;;(forward-char 1) |
8137 (let ((b (point)) (e (make-marker)) have-x delim (c (current-column)) | |
8138 (sub-p (eq (preceding-char) ?s)) s) | |
8139 (forward-sexp 1) | |
8140 (set-marker e (1- (point))) | |
8141 (setq delim (preceding-char)) | |
8142 (if (and sub-p (eq delim (char-after (- (point) 2)))) | |
8143 (error "Possible s/blah// - do not know how to deal with")) | |
8144 (if sub-p (forward-sexp 1)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8145 (if (looking-at "\\sw*x") |
20323 | 8146 (setq have-x t) |
8147 (insert "x")) | |
8148 ;; Protect fragile " ", "#" | |
8149 (if have-x nil | |
8150 (goto-char (1+ b)) | |
8151 (while (re-search-forward "\\(\\=\\|[^\\\\]\\)\\(\\\\\\\\\\)*[ \t\n#]" e t) ; Need to include (?#) too? | |
8152 (forward-char -1) | |
8153 (insert "\\") | |
8154 (forward-char 1))) | |
8155 b))) | |
8156 | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8157 (defun cperl-beautify-regexp (&optional deep) |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
8158 "Do it. (Experimental, may change semantics, recheck the result.) |
20323 | 8159 We suppose that the regexp is scanned already." |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8160 (interactive "P") |
49516
774eed0b5c78
(cperl-beautify-level, cperl-beautify-regexp): Fix use of
Juanma Barranquero <lekktu@gmail.com>
parents:
49304
diff
changeset
|
8161 (setq deep (if deep (prefix-numeric-value deep) -1)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8162 (save-excursion |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8163 (goto-char (cperl-make-regexp-x)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8164 (let ((b (point)) (e (make-marker))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8165 (forward-sexp 1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8166 (set-marker e (1- (point))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8167 (cperl-beautify-regexp-piece b e nil deep)))) |
20323 | 8168 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8169 (defun cperl-regext-to-level-start () |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8170 "Goto start of an enclosing group in regexp. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8171 We suppose that the regexp is scanned already." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8172 (interactive) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8173 (let ((limit (cperl-make-regexp-x)) done) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8174 (while (not done) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8175 (or (eq (following-char) ?\() |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8176 (search-backward "(" (1+ limit) t) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8177 (error "Cannot find `(' which starts a group")) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8178 (setq done |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8179 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8180 (skip-chars-backward "\\") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8181 (looking-at "\\(\\\\\\\\\\)*("))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8182 (or done (forward-char -1))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8183 |
20323 | 8184 (defun cperl-contract-level () |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8185 "Find an enclosing group in regexp and contract it. |
20323 | 8186 \(Experimental, may change semantics, recheck the result.) |
8187 We suppose that the regexp is scanned already." | |
8188 (interactive) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8189 ;; (save-excursion ; Can't, breaks `cperl-contract-levels' |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8190 (cperl-regext-to-level-start) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8191 (let ((b (point)) (e (make-marker)) c) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8192 (forward-sexp 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8193 (set-marker e (1- (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8194 (goto-char b) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8195 (while (re-search-forward "\\(#\\)\\|\n" e 'to-end) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8196 (cond |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8197 ((match-beginning 1) ; #-comment |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8198 (or c (setq c (current-indentation))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8199 (beginning-of-line 2) ; Skip |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8200 (cperl-make-indent c)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8201 (t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8202 (delete-char -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8203 (just-one-space)))))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8204 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8205 (defun cperl-contract-levels () |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8206 "Find an enclosing group in regexp and contract all the kids. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8207 \(Experimental, may change semantics, recheck the result.) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8208 We suppose that the regexp is scanned already." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8209 (interactive) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8210 (save-excursion |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8211 (condition-case nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8212 (cperl-regext-to-level-start) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8213 (error ; We are outside outermost group |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8214 (goto-char (cperl-make-regexp-x)))) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8215 (let ((b (point)) (e (make-marker)) s c) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8216 (forward-sexp 1) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8217 (set-marker e (1- (point))) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8218 (goto-char (1+ b)) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8219 (while (re-search-forward "\\(\\\\\\\\\\)\\|(" e t) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
8220 (cond |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8221 ((match-beginning 1) ; Skip |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8222 nil) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8223 (t ; Group |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8224 (cperl-contract-level))))))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8225 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8226 (defun cperl-beautify-level (&optional deep) |
20323 | 8227 "Find an enclosing group in regexp and beautify it. |
8228 \(Experimental, may change semantics, recheck the result.) | |
8229 We suppose that the regexp is scanned already." | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8230 (interactive "P") |
49516
774eed0b5c78
(cperl-beautify-level, cperl-beautify-regexp): Fix use of
Juanma Barranquero <lekktu@gmail.com>
parents:
49304
diff
changeset
|
8231 (setq deep (if deep (prefix-numeric-value deep) -1)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8232 (save-excursion |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8233 (cperl-regext-to-level-start) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8234 (let ((b (point)) (e (make-marker))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8235 (forward-sexp 1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8236 (set-marker e (1- (point))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8237 (cperl-beautify-regexp-piece b e nil deep)))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8238 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8239 (defun cperl-invert-if-unless-modifiers () |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8240 "Change `B if A;' into `if (A) {B}' etc if possible. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8241 \(Unfinished.)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8242 (interactive) ; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8243 (let (A B pre-B post-B pre-if post-if pre-A post-A if-string |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8244 (w-rex "\\<\\(if\\|unless\\|while\\|until\\|for\\|foreach\\)\\>")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8245 (and (= (char-syntax (preceding-char)) ?w) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8246 (forward-sexp -1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8247 (setq pre-if (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8248 (cperl-backward-to-start-of-expr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8249 (setq pre-B (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8250 (forward-sexp 1) ; otherwise forward-to-end-of-expr is NOP |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8251 (cperl-forward-to-end-of-expr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8252 (setq post-A (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8253 (goto-char pre-if) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8254 (or (looking-at w-rex) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8255 ;; Find the position |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8256 (progn (goto-char post-A) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8257 (while (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8258 (not (looking-at w-rex)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8259 (> (point) pre-B)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8260 (forward-sexp -1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8261 (setq pre-if (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8262 (or (looking-at w-rex) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8263 (error "Can't find `if', `unless', `while', `until', `for' or `foreach'")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8264 ;; 1 B 2 ... 3 B-com ... 4 if 5 ... if-com 6 ... 7 A 8 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8265 (setq if-string (buffer-substring (match-beginning 0) (match-end 0))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8266 ;; First, simple part: find code boundaries |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8267 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8268 (setq post-if (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8269 (forward-sexp -2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8270 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8271 (setq post-B (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8272 (cperl-backward-to-start-of-expr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8273 (setq pre-B (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8274 (setq B (buffer-substring pre-B post-B)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8275 (goto-char pre-if) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8276 (forward-sexp 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8277 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8278 ;; May be after $, @, $# etc of a variable |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8279 (skip-chars-backward "$@%#") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8280 (setq pre-A (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8281 (cperl-forward-to-end-of-expr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8282 (setq post-A (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8283 (setq A (buffer-substring pre-A post-A)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8284 ;; Now modify (from end, to not break the stuff) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8285 (skip-chars-forward " \t;") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8286 (delete-region pre-A (point)) ; we move to pre-A |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8287 (insert "\n" B ";\n}") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8288 (and (looking-at "[ \t]*#") (cperl-indent-for-comment)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8289 (delete-region pre-if post-if) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8290 (delete-region pre-B post-B) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8291 (goto-char pre-B) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8292 (insert if-string " (" A ") {") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8293 (setq post-B (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8294 (if (looking-at "[ \t]+$") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8295 (delete-horizontal-space) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8296 (if (looking-at "[ \t]*#") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8297 (cperl-indent-for-comment) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8298 (just-one-space))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8299 (forward-line 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8300 (if (looking-at "[ \t]*$") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8301 (progn ; delete line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8302 (delete-horizontal-space) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8303 (delete-region (point) (1+ (point))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8304 (cperl-indent-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8305 (goto-char (1- post-B)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8306 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8307 (cperl-indent-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8308 (goto-char pre-B))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8309 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8310 (defun cperl-invert-if-unless () |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8311 "Change `if (A) {B}' into `B if A;' etc (or visa versa) if possible. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8312 If the cursor is not on the leading keyword of the BLOCK flavor of |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8313 construct, will assume it is the STATEMENT flavor, so will try to find |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8314 the appropriate statement modifier." |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8315 (interactive) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8316 (and (= (char-syntax (preceding-char)) ?w) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8317 (forward-sexp -1)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8318 (if (looking-at "\\<\\(if\\|unless\\|while\\|until\\|for\\|foreach\\)\\>") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8319 (let ((pre-if (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8320 pre-A post-A pre-B post-B A B state p end-B-code is-block B-comment |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8321 (if-string (buffer-substring (match-beginning 0) (match-end 0)))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8322 (forward-sexp 2) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8323 (setq post-A (point)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8324 (forward-sexp -1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8325 (setq pre-A (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8326 (setq is-block (and (eq (following-char) ?\( ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8327 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8328 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8329 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8330 (forward-sexp 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8331 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8332 (eq (following-char) ?\{ )) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8333 (error nil))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8334 (if is-block |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8335 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8336 (goto-char post-A) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8337 (forward-sexp 1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8338 (setq post-B (point)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8339 (forward-sexp -1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8340 (setq pre-B (point)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8341 (if (and (eq (following-char) ?\{ ) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8342 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8343 (cperl-backward-to-noncomment post-A) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8344 (eq (preceding-char) ?\) ))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8345 (if (condition-case nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8346 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8347 (goto-char post-B) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8348 (forward-sexp 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8349 (forward-sexp -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8350 (looking-at "\\<els\\(e\\|if\\)\\>")) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8351 (error nil)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8352 (error |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8353 "`%s' (EXPR) {BLOCK} with `else'/`elsif'" if-string) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8354 (goto-char (1- post-B)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8355 (cperl-backward-to-noncomment pre-B) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8356 (if (eq (preceding-char) ?\;) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8357 (forward-char -1)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8358 (setq end-B-code (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8359 (goto-char pre-B) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8360 (while (re-search-forward "\\<\\(for\\|foreach\\|if\\|unless\\|while\\|until\\)\\>\\|;" end-B-code t) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8361 (setq p (match-beginning 0) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8362 A (buffer-substring p (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8363 state (parse-partial-sexp pre-B p)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8364 (or (nth 3 state) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8365 (nth 4 state) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8366 (nth 5 state) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8367 (error "`%s' inside `%s' BLOCK" A if-string)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8368 (goto-char (match-end 0))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8369 ;; Finally got it |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8370 (goto-char (1+ pre-B)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8371 (skip-chars-forward " \t\n") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8372 (setq B (buffer-substring (point) end-B-code)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8373 (goto-char end-B-code) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8374 (or (looking-at ";?[ \t\n]*}") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8375 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8376 (skip-chars-forward "; \t\n") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8377 (setq B-comment |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8378 (buffer-substring (point) (1- post-B))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8379 (and (equal B "") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8380 (setq B "1")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8381 (goto-char (1- post-A)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8382 (cperl-backward-to-noncomment pre-A) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8383 (or (looking-at "[ \t\n]*)") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8384 (goto-char (1- post-A))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8385 (setq p (point)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8386 (goto-char (1+ pre-A)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8387 (skip-chars-forward " \t\n") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8388 (setq A (buffer-substring (point) p)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8389 (delete-region pre-B post-B) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8390 (delete-region pre-A post-A) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8391 (goto-char pre-if) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8392 (insert B " ") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8393 (and B-comment (insert B-comment " ")) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8394 (just-one-space) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8395 (forward-word 1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8396 (setq pre-A (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8397 (insert " " A ";") |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8398 (delete-horizontal-space) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8399 (setq post-B (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8400 (if (looking-at "#") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8401 (indent-for-comment)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8402 (goto-char post-B) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8403 (forward-char -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8404 (delete-horizontal-space) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8405 (goto-char pre-A) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8406 (just-one-space) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8407 (goto-char pre-if) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8408 (setq pre-A (set-marker (make-marker) pre-A)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8409 (while (<= (point) (marker-position pre-A)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8410 (cperl-indent-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8411 (forward-line 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8412 (goto-char (marker-position pre-A)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8413 (if B-comment |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8414 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8415 (forward-line -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8416 (indent-for-comment) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8417 (goto-char (marker-position pre-A))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8418 (error "`%s' (EXPR) not with an {BLOCK}" if-string))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8419 ;; (error "`%s' not with an (EXPR)" if-string) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8420 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8421 (cperl-invert-if-unless-modifiers))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8422 ;;(error "Not at `if', `unless', `while', `until', `for' or `foreach'") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8423 (cperl-invert-if-unless-modifiers))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8424 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8425 ;;; By Anthony Foiani <afoiani@uswest.com> |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8426 ;;; Getting help on modules in C-h f ? |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8427 ;;; This is a modified version of `man'. |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8428 ;;; Need to teach it how to lookup functions |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8429 ;;;###autoload |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8430 (defun cperl-perldoc (word) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8431 "Run `perldoc' on WORD." |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8432 (interactive |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8433 (list (let* ((default-entry (cperl-word-at-point)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8434 (input (read-string |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8435 (format "perldoc entry%s: " |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8436 (if (string= default-entry "") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8437 "" |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8438 (format " (default %s)" default-entry)))))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8439 (if (string= input "") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8440 (if (string= default-entry "") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8441 (error "No perldoc args given") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8442 default-entry) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8443 input)))) |
41309
8c4c4027c7bd
(cperl-perldoc): Require man before binding `manual-program'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39836
diff
changeset
|
8444 (require 'man) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8445 (let* ((case-fold-search nil) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8446 (is-func (and |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8447 (string-match "^[a-z]+$" word) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8448 (string-match (concat "^" word "\\>") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8449 (documentation-property |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8450 'cperl-short-docs |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8451 'variable-documentation)))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8452 (manual-program (if is-func "perldoc -f" "perldoc"))) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8453 (cond |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8454 (cperl-xemacs-p |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8455 (let ((Manual-program "perldoc") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8456 (Manual-switches (if is-func (list "-f")))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8457 (manual-entry word))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8458 (t |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8459 (Man-getpage-in-background word))))) |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8460 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8461 ;;;###autoload |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8462 (defun cperl-perldoc-at-point () |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8463 "Run a `perldoc' on the word around point." |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8464 (interactive) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8465 (cperl-perldoc (cperl-word-at-point))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8466 |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8467 (defcustom pod2man-program "pod2man" |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8468 "*File name for `pod2man'." |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8469 :type 'file |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8470 :group 'cperl) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8471 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8472 ;;; By Nick Roberts <Nick.Roberts@src.bae.co.uk> (with changes) |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8473 (defun cperl-pod-to-manpage () |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8474 "Create a virtual manpage in Emacs from the Perl Online Documentation." |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8475 (interactive) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8476 (require 'man) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8477 (let* ((pod2man-args (concat buffer-file-name " | nroff -man ")) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8478 (bufname (concat "Man " buffer-file-name)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8479 (buffer (generate-new-buffer bufname))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8480 (save-excursion |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8481 (set-buffer buffer) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8482 (let ((process-environment (copy-sequence process-environment))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8483 ;; Prevent any attempt to use display terminal fanciness. |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8484 (setenv "TERM" "dumb") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8485 (set-process-sentinel |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8486 (start-process pod2man-program buffer "sh" "-c" |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8487 (format (cperl-pod2man-build-command) pod2man-args)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8488 'Man-bgproc-sentinel))))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8489 |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8490 ;;; Updated version by him too |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8491 (defun cperl-build-manpage () |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8492 "Create a virtual manpage in Emacs from the POD in the file." |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8493 (interactive) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8494 (require 'man) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8495 (cond |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8496 (cperl-xemacs-p |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8497 (let ((Manual-program "perldoc")) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8498 (manual-entry buffer-file-name))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8499 (t |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8500 (let* ((manual-program "perldoc")) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8501 (Man-getpage-in-background buffer-file-name))))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8502 |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8503 (defun cperl-pod2man-build-command () |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8504 "Builds the entire background manpage and cleaning command." |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8505 (let ((command (concat pod2man-program " %s 2>/dev/null")) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8506 (flist (and (boundp 'Man-filter-list) Man-filter-list))) |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8507 (while (and flist (car flist)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8508 (let ((pcom (car (car flist))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8509 (pargs (cdr (car flist)))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8510 (setq command |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8511 (concat command " | " pcom " " |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8512 (mapconcat '(lambda (phrase) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8513 (if (not (stringp phrase)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8514 (error "Malformed Man-filter-list")) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8515 phrase) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8516 pargs " "))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8517 (setq flist (cdr flist)))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8518 command)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8519 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8520 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8521 (defun cperl-next-interpolated-REx-1 () |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8522 "Move point to next REx which has interpolated parts without //o. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8523 Skips RExes consisting of one interpolated variable. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8524 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8525 Note that skipped RExen are not performance hits." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8526 (interactive "") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8527 (cperl-next-interpolated-REx 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8528 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8529 (defun cperl-next-interpolated-REx-0 () |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8530 "Move point to next REx which has interpolated parts without //o." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8531 (interactive "") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8532 (cperl-next-interpolated-REx 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8533 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8534 (defun cperl-next-interpolated-REx (&optional skip beg limit) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8535 "Move point to next REx which has interpolated parts. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8536 SKIP is a list of possible types to skip, BEG and LIMIT are the starting |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8537 point and the limit of search (default to point and end of buffer). |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8538 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8539 SKIP may be a number, then it behaves as list of numbers up to SKIP; this |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8540 semantic may be used as a numeric argument. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8541 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8542 Types are 0 for / $rex /o (interpolated once), 1 for /$rex/ (if $rex is |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8543 a result of qr//, this is not a performance hit), t for the rest." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8544 (interactive "P") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8545 (if (numberp skip) (setq skip (list 0 skip))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8546 (or beg (setq beg (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8547 (or limit (setq limit (point-max))) ; needed for n-s-p-c |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8548 (let (pp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8549 (and (eq (get-text-property beg 'syntax-type) 'string) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8550 (setq beg (next-single-property-change beg 'syntax-type nil limit))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8551 (cperl-map-pods-heres |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8552 (function (lambda (s e p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8553 (if (memq (get-text-property s 'REx-interpolated) skip) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8554 t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8555 (setq pp s) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8556 nil))) ; nil stops |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8557 'REx-interpolated beg limit) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8558 (if pp (goto-char pp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8559 (message "No more interpolated REx")))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8560 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8561 ;;; Initial version contributed by Trey Belew |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8562 (defun cperl-here-doc-spell (&optional beg end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8563 "Spell-check HERE-documents in the Perl buffer. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8564 If a region is highlighted, restricts to the region." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8565 (interactive "") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8566 (cperl-pod-spell t beg end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8567 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8568 (defun cperl-pod-spell (&optional do-heres beg end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8569 "Spell-check POD documentation. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8570 If invoked with prefix argument, will do HERE-DOCs instead. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8571 If a region is highlighted, restricts to the region." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8572 (interactive "P") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8573 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8574 (let (beg end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8575 (if (cperl-mark-active) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8576 (setq beg (min (mark) (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8577 end (max (mark) (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8578 (setq beg (point-min) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8579 end (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8580 (cperl-map-pods-heres (function |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8581 (lambda (s e p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8582 (if do-heres |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8583 (setq e (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8584 (goto-char e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8585 (forward-line -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8586 (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8587 (ispell-region s e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8588 t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8589 (if do-heres 'here-doc-group 'in-pod) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8590 beg end)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8591 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8592 (defun cperl-map-pods-heres (func &optional prop s end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8593 "Executes a function over regions of pods or here-documents. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8594 PROP is the text-property to search for; default to `in-pod'. Stop when |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8595 function returns nil." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8596 (let (pos posend has-prop (cont t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8597 (or prop (setq prop 'in-pod)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8598 (or s (setq s (point-min))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8599 (or end (setq end (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8600 (cperl-update-syntaxification end end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8601 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8602 (goto-char (setq pos s)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8603 (while (and cont (< pos end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8604 (setq has-prop (get-text-property pos prop)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8605 (setq posend (next-single-property-change pos prop nil end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8606 (and has-prop |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8607 (setq cont (funcall func pos posend prop))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8608 (setq pos posend))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8609 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8610 ;;; Based on code by Masatake YAMATO: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8611 (defun cperl-get-here-doc-region (&optional pos pod) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8612 "Return HERE document region around the point. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8613 Return nil if the point is not in a HERE document region. If POD is non-nil, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8614 will return a POD section if point is in a POD section." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8615 (or pos (setq pos (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8616 (cperl-update-syntaxification pos pos) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8617 (if (or (eq 'here-doc (get-text-property pos 'syntax-type)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8618 (and pod |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8619 (eq 'pod (get-text-property pos 'syntax-type)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8620 (let ((b (cperl-beginning-of-property pos 'syntax-type)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8621 (e (next-single-property-change pos 'syntax-type))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8622 (cons b (or e (point-max)))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8623 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8624 (defun cperl-narrow-to-here-doc (&optional pos) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8625 "Narrows editing region to the HERE-DOC at POS. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8626 POS defaults to the point." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8627 (interactive "d") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8628 (or pos (setq pos (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8629 (let ((p (cperl-get-here-doc-region pos))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8630 (or p (error "Not inside a HERE document")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8631 (narrow-to-region (car p) (cdr p)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8632 (message |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8633 "When you are finished with narrow editing, type C-x n w"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8634 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8635 (defun cperl-select-this-pod-or-here-doc (&optional pos) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8636 "Select the HERE-DOC (or POD section) at POS. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8637 POS defaults to the point." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8638 (interactive "d") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8639 (let ((p (cperl-get-here-doc-region pos t))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8640 (if p |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8641 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8642 (goto-char (car p)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8643 (push-mark (cdr p) nil t)) ; Message, activate in transient-mode |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8644 (message "I do not think POS is in POD or a HERE-doc...")))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8645 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8646 (defun cperl-facemenu-add-face-function (face end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8647 "A callback to process user-initiated font-change requests. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8648 Translates `bold', `italic', and `bold-italic' requests to insertion of |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8649 corresponding POD directives, and `underline' to C<> POD directive. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8650 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8651 Such requests are usually bound to M-o LETTER." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8652 (or (get-text-property (point) 'in-pod) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8653 (error "Faces can only be set within POD")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8654 (setq facemenu-end-add-face (if (eq face 'bold-italic) ">>" ">")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8655 (cdr (or (assq face '((bold . "B<") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8656 (italic . "I<") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8657 (bold-italic . "B<I<") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8658 (underline . "C<"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8659 (error "Face %s not configured for cperl-mode" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8660 face)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8661 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8662 (defun cperl-time-fontification (&optional l step lim) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8663 "Times how long it takes to do incremental fontification in a region. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8664 L is the line to start at, STEP is the number of lines to skip when |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8665 doing next incremental fontification, LIM is the maximal number of |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8666 incremental fontification to perform. Messages are accumulated in |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8667 *Messages* buffer. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8668 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8669 May be used for pinpointing which construct slows down buffer fontification: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8670 start with default arguments, then refine the slowdown regions." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8671 (interactive "nLine to start at: \nnStep to do incremental fontification: ") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8672 (or l (setq l 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8673 (or step (setq step 500)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8674 (or lim (setq lim 40)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8675 (let* ((timems (function (lambda () |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8676 (let ((tt (current-time))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8677 (+ (* 1000 (nth 1 tt)) (/ (nth 2 tt) 1000)))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8678 (tt (funcall timems)) (c 0) delta tot) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8679 (goto-line l) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8680 (cperl-mode) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8681 (setq tot (- (- tt (setq tt (funcall timems))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8682 (message "cperl-mode at %s: %s" l tot) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8683 (while (and (< c lim) (not (eobp))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8684 (forward-line step) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8685 (setq l (+ l step)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8686 (setq c (1+ c)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8687 (cperl-update-syntaxification (point) (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8688 (setq delta (- (- tt (setq tt (funcall timems)))) tot (+ tot delta)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8689 (message "to %s:%6s,%7s" l delta tot)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8690 tot)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8691 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8692 (defun cperl-emulate-lazy-lock (&optional window-size) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8693 "Emulate `lazy-lock' without `condition-case', so `debug-on-error' works. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8694 Start fontifying the buffer from the start (or end) using the given |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8695 WINDOW-SIZE (units is lines). Negative WINDOW-SIZE starts at end, and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8696 goes backwards; default is -50. This function is not CPerl-specific; it |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8697 may be used to debug problems with delayed incremental fontification." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8698 (interactive |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8699 "nSize of window for incremental fontification, negative goes backwards: ") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8700 (or window-size (setq window-size -50)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8701 (let ((pos (if (> window-size 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8702 (point-min) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8703 (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8704 p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8705 (goto-char pos) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8706 (normal-mode) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8707 ;; Why needed??? With older font-locks??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8708 (set (make-local-variable 'font-lock-cache-position) (make-marker)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8709 (while (if (> window-size 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8710 (< pos (point-max)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8711 (> pos (point-min))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8712 (setq p (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8713 (forward-line window-size) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8714 (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8715 (font-lock-fontify-region (min p pos) (max p pos)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8716 (setq pos p)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8717 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8718 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8719 (defun cperl-lazy-install ()) ; Avoid a warning |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8720 (defun cperl-lazy-unstall ()) ; Avoid a warning |
20323 | 8721 |
8722 (if (fboundp 'run-with-idle-timer) | |
8723 (progn | |
8724 (defvar cperl-help-shown nil | |
8725 "Non-nil means that the help was already shown now.") | |
8726 | |
8727 (defvar cperl-lazy-installed nil | |
8728 "Non-nil means that the lazy-help handlers are installed now.") | |
8729 | |
8730 (defun cperl-lazy-install () | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8731 "Switches on Auto-Help on Perl constructs (put in the message area). |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8732 Delay of auto-help controlled by `cperl-lazy-help-time'." |
20323 | 8733 (interactive) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8734 (make-local-variable 'cperl-help-shown) |
20323 | 8735 (if (and (cperl-val 'cperl-lazy-help-time) |
8736 (not cperl-lazy-installed)) | |
8737 (progn | |
8738 (add-hook 'post-command-hook 'cperl-lazy-hook) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8739 (run-with-idle-timer |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8740 (cperl-val 'cperl-lazy-help-time 1000000 5) |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8741 t |
20323 | 8742 'cperl-get-help-defer) |
8743 (setq cperl-lazy-installed t)))) | |
8744 | |
8745 (defun cperl-lazy-unstall () | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8746 "Switches off Auto-Help on Perl constructs (put in the message area). |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8747 Delay of auto-help controlled by `cperl-lazy-help-time'." |
20323 | 8748 (interactive) |
8749 (remove-hook 'post-command-hook 'cperl-lazy-hook) | |
8750 (cancel-function-timers 'cperl-get-help-defer) | |
8751 (setq cperl-lazy-installed nil)) | |
8752 | |
8753 (defun cperl-lazy-hook () | |
8754 (setq cperl-help-shown nil)) | |
8755 | |
8756 (defun cperl-get-help-defer () | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8757 (if (not (memq major-mode '(perl-mode cperl-mode))) nil |
20323 | 8758 (let ((cperl-message-on-help-error nil) (cperl-help-from-timer t)) |
8759 (cperl-get-help) | |
8760 (setq cperl-help-shown t)))) | |
8761 (cperl-lazy-install))) | |
8762 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8763 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8764 ;;; Plug for wrong font-lock: |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8765 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8766 (defun cperl-font-lock-unfontify-region-function (beg end) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8767 (let* ((modified (buffer-modified-p)) (buffer-undo-list t) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8768 (inhibit-read-only t) (inhibit-point-motion-hooks t) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8769 before-change-functions after-change-functions |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8770 deactivate-mark buffer-file-name buffer-file-truename) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8771 (remove-text-properties beg end '(face nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8772 (if (and (not modified) (buffer-modified-p)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8773 (set-buffer-modified-p nil)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8774 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8775 (defun cperl-font-lock-fontify-region-function (beg end loudly) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8776 "Extends the region to safe positions, then calls the default function. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8777 Newer `font-lock's can do it themselves. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8778 We unwind only as far as needed for fontification. Syntaxification may |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8779 do extra unwind via `cperl-unwind-to-safe'." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8780 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8781 (goto-char beg) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8782 (while (and beg |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8783 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8784 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8785 (eq (get-text-property (setq beg (point)) 'syntax-type) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8786 'multiline))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8787 (if (setq beg (cperl-beginning-of-property beg 'syntax-type)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8788 (goto-char beg))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8789 (setq beg (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8790 (goto-char end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8791 (while (and end |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8792 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8793 (or (bolp) (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8794 (forward-line 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8795 (error nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8796 (eq (get-text-property (setq end (point)) 'syntax-type) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8797 'multiline))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8798 (setq end (next-single-property-change end 'syntax-type nil (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8799 (goto-char end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8800 (setq end (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8801 (font-lock-default-fontify-region beg end loudly)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8802 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8803 (defvar cperl-d-l nil) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8804 (defun cperl-fontify-syntaxically (end) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8805 ;; Some vars for debugging only |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8806 ;; (message "Syntaxifying...") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8807 (let ((dbg (point)) (iend end) (idone cperl-syntax-done-to) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8808 (istate (car cperl-syntax-state)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8809 start from-start edebug-backtrace-buffer) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8810 (if (eq cperl-syntaxify-by-font-lock 'backtrace) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8811 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8812 (require 'edebug) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8813 (let ((f 'edebug-backtrace)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8814 (funcall f)))) ; Avoid compile-time warning |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8815 (or cperl-syntax-done-to |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8816 (setq cperl-syntax-done-to (point-min) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8817 from-start t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8818 (setq start (if (and cperl-hook-after-change |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8819 (not from-start)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8820 cperl-syntax-done-to ; Fontify without change; ignore start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8821 ;; Need to forget what is after `start' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8822 (min cperl-syntax-done-to (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8823 (goto-char start) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8824 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8825 (setq start (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8826 (and cperl-syntaxify-unwind |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8827 (setq end (cperl-unwind-to-safe t end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8828 start (point))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8829 (and (> end start) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8830 (setq cperl-syntax-done-to start) ; In case what follows fails |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8831 (cperl-find-pods-heres start end t nil t)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8832 (if (memq cperl-syntaxify-by-font-lock '(backtrace message)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8833 (message "Syxify req=%s..%s actual=%s..%s done-to: %s=>%s statepos: %s=>%s" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8834 dbg iend start end idone cperl-syntax-done-to |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8835 istate (car cperl-syntax-state))) ; For debugging |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8836 nil)) ; Do not iterate |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8837 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8838 (defun cperl-fontify-update (end) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8839 (let ((pos (point-min)) prop posend) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8840 (setq end (point-max)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8841 (while (< pos end) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8842 (setq prop (get-text-property pos 'cperl-postpone) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8843 posend (next-single-property-change pos 'cperl-postpone nil end)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8844 (and prop (put-text-property pos posend (car prop) (cdr prop))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8845 (setq pos posend))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8846 nil) ; Do not iterate |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8847 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8848 (defun cperl-fontify-update-bad (end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8849 ;; Since fontification happens with different region than syntaxification, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8850 ;; do to the end of buffer, not to END;;; likewise, start earlier if needed |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8851 (let* ((pos (point)) (prop (get-text-property pos 'cperl-postpone)) posend) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8852 (if prop |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8853 (setq pos (or (cperl-beginning-of-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8854 (cperl-1+ pos) 'cperl-postpone) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8855 (point-min)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8856 (while (< pos end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8857 (setq posend (next-single-property-change pos 'cperl-postpone)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8858 (and prop (put-text-property pos posend (car prop) (cdr prop))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8859 (setq pos posend) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8860 (setq prop (get-text-property pos 'cperl-postpone)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8861 nil) ; Do not iterate |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8862 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8863 ;; Called when any modification is made to buffer text. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8864 (defun cperl-after-change-function (beg end old-len) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8865 ;; We should have been informed about changes by `font-lock'. Since it |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8866 ;; does not inform as which calls are defered, do it ourselves |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8867 (if cperl-syntax-done-to |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8868 (setq cperl-syntax-done-to (min cperl-syntax-done-to beg)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8869 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8870 (defun cperl-update-syntaxification (from to) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8871 (if (and cperl-use-syntax-table-text-property |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8872 cperl-syntaxify-by-font-lock |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8873 (or (null cperl-syntax-done-to) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8874 (< cperl-syntax-done-to to))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8875 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8876 (save-excursion |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8877 (goto-char from) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8878 (cperl-fontify-syntaxically to))))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8879 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8880 (defvar cperl-version |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
8881 (let ((v "Revision: 5.23")) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8882 (string-match ":\\s *\\([0-9.]+\\)" v) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8883 (substring v (match-beginning 1) (match-end 1))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8884 "Version of IZ-supported CPerl package this file is based on.") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8885 |
20323 | 8886 (provide 'cperl-mode) |
8887 | |
52401 | 8888 ;;; arch-tag: 42e5b19b-e187-4537-929f-1a7408980ce6 |
20323 | 8889 ;;; cperl-mode.el ends here |