Mercurial > emacs
annotate lisp/progmodes/cperl-mode.el @ 108357:fb410336248f
Remove --- and +++ lines from NEWS file.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sun, 25 Apr 2010 18:09:52 -0400 |
parents | 1d1d5d9bd884 |
children | d951d5810160 376148b31b5e |
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, |
106815 | 4 ;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
20323 | 5 ;; Free Software Foundation, Inc. |
6 | |
101112
0685234e527d
Comment (minor header format fixes).
Glenn Morris <rgm@gnu.org>
parents:
101002
diff
changeset
|
7 ;; Author: Ilya Zakharevich |
0685234e527d
Comment (minor header format fixes).
Glenn Morris <rgm@gnu.org>
parents:
101002
diff
changeset
|
8 ;; Bob Olson |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
9 ;; Maintainer: Ilya Zakharevich <ilyaz@cpan.org> |
20323 | 10 ;; Keywords: languages, Perl |
11 | |
12 ;; This file is part of GNU Emacs. | |
13 | |
94673
52b7a8c22af5
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
14 ;; GNU Emacs is free software: you can redistribute it and/or modify |
20323 | 15 ;; it under the terms of the GNU General Public License as published by |
94673
52b7a8c22af5
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
16 ;; the Free Software Foundation, either version 3 of the License, or |
52b7a8c22af5
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
17 ;; (at your option) any later version. |
20323 | 18 |
19 ;; GNU Emacs is distributed in the hope that it will be useful, | |
20 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
22 ;; GNU General Public License for more details. | |
23 | |
24 ;; You should have received a copy of the GNU General Public License | |
94673
52b7a8c22af5
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
25 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
20323 | 26 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
27 ;;; Corrections made by Ilya Zakharevich ilyaz@cpan.org |
20323 | 28 |
29 ;;; Commentary: | |
30 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
31 ;; 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
|
32 ;; bulk enable them by putting |
20323 | 33 |
34 ;; (setq cperl-hairy t) | |
35 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
36 ;; 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
|
37 ;; correct to make whistles enabled by default.) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
38 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
39 ;; 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
|
40 ;; 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
|
41 ;; `cperl-praise', `cperl-speed'. <<<<<< |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
42 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
43 ;; 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
|
44 ;; 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
|
45 ;; 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
|
46 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
47 ;; 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
|
48 ;; 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
|
49 ;; 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
|
50 ;; 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
|
51 ;; 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
|
52 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
53 ;; 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
|
54 ;; 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
|
55 ;; 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
|
56 ;; 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
|
57 ;; to bind it like that: |
20323 | 58 |
59 ;; (define-key global-map [M-S-down-mouse-3] 'imenu) | |
60 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
61 ;;; Font lock bugs as of v4.32: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
62 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
63 ;; 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
|
64 ;; \$` \$' \$" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
65 ;; $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
|
66 ;; 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
|
67 |
20323 | 68 ;;; Code: |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
69 |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
70 (defvar vc-rcs-header) |
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
71 (defvar vc-sccs-header) |
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
72 |
31821 | 73 (eval-when-compile |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
74 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
75 (require 'custom) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
76 (error nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
77 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
78 (require 'man) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
79 (error nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
80 (defvar cperl-can-font-lock |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
81 (or (featurep 'xemacs) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
82 (and (boundp 'emacs-major-version) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
83 (or window-system |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
84 (> emacs-major-version 20))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
85 (if cperl-can-font-lock |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
86 (require 'font-lock)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
87 (defvar msb-menu-cond) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
88 (defvar gud-perldb-history) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
89 (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
|
90 (defvar font-lock-display-type) ; ditto |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
91 (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
|
92 (or (fboundp 'defgroup) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
93 (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
|
94 nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
95 (or (fboundp 'custom-declare-variable) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
96 (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
|
97 `(defvar ,name ,val ,doc))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
98 (or (and (fboundp 'custom-declare-variable) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
99 (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
|
100 (defmacro defface (&rest arr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
101 nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
102 ;; Avoid warning (tmp definitions) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
103 (or (fboundp 'x-color-defined-p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
104 (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
|
105 (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
|
106 ;; XEmacs >= 19.12 |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
107 ((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
|
108 ;; XEmacs 19.11 |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
109 ((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
|
110 (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
|
111 (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
|
112 (cond ((fboundp 'find-face) |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
113 `(find-face ,arg)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
114 (;;(and (fboundp 'face-list) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
115 ;; (face-list)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
116 (fboundp 'face-list) |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
117 `(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
|
118 (face-list)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
119 (t |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
120 `(boundp ,arg)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
121 (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
|
122 (cond ((fboundp 'make-face) |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
123 `(make-face (quote ,arg))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
124 (t |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
125 `(defvar ,arg (quote ,arg) ,descr)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
126 (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
|
127 `(progn |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
128 (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
|
129 (cperl-make-face ,arg ,descr)) |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
130 (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
|
131 (defvar ,arg (quote ,arg) ,descr)))) |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
132 (if (featurep 'xemacs) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
133 (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
|
134 `(progn |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
135 (beginning-of-line 2) |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
136 (list ,file ,line))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
137 (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
|
138 `(etags-snarf-tag))) |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
139 (if (featurep 'xemacs) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
140 (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
|
141 ;;(progn |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
142 ;; (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
|
143 ;; (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
|
144 ;; 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
|
145 ;; Or save-file-position? |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
146 ;; (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
|
147 `(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
|
148 ;;) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
149 (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
|
150 `(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
|
151 |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
152 (defvar cperl-can-font-lock |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
153 (or (featurep 'xemacs) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
154 (and (boundp 'emacs-major-version) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
155 (or window-system |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
156 (> emacs-major-version 20))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
157 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
158 (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
|
159 (let (answer) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
160 (while list |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
161 (or answer |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
162 (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
|
163 (null (cdr list))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
164 (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
|
165 (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
|
166 answer)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
167 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
168 (defgroup cperl nil |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
169 "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
|
170 :prefix "cperl-" |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
171 :group 'languages |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
172 :version "20.3") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
173 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
174 (defgroup cperl-indentation-details nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
175 "Indentation." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
176 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
177 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
178 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
179 (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
|
180 "Variables affected by `cperl-hairy'." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
181 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
182 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
183 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
184 (defgroup cperl-autoinsert-details nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
185 "Auto-insert tuneup." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
186 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
187 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
188 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
189 (defgroup cperl-faces nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
190 "Fontification colors." |
66963
a11fdee52c05
Add :link (custom-group-link font-lock-faces) to defgroup.
Juri Linkov <juri@jurta.org>
parents:
65229
diff
changeset
|
191 :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
|
192 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
193 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
194 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
195 (defgroup cperl-speed nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
196 "Speed vs. validity tuneup." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
197 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
198 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
199 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
200 (defgroup cperl-help-system nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
201 "Help system tuneup." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
202 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
203 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
204 |
20323 | 205 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
206 (defcustom cperl-extra-newline-before-brace nil |
20323 | 207 "*Non-nil means that if, elsif, while, until, else, for, foreach |
208 and do constructs look like: | |
209 | |
210 if () | |
211 { | |
212 } | |
213 | |
214 instead of: | |
215 | |
216 if () { | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
217 }" |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
218 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
219 :group 'cperl-autoinsert-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
220 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
221 (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
|
222 cperl-extra-newline-before-brace |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
223 "*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
|
224 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
|
225 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
226 :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
|
227 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
228 (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
|
229 "*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
|
230 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
231 :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
|
232 |
79553
f81c00b9c0ff
* progmodes/perl-mode.el (perl-continued-statement-offset)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78750
diff
changeset
|
233 ;; Is is not unusual to put both things like perl-indent-level and |
78660
ccfc1f1f4817
* progmodes/cperl-mode.el (cperl-indent-level): Autoload the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78643
diff
changeset
|
234 ;; 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
|
235 ;; one of perl-mode and cperl-mode is in use, a warning will be issued |
79553
f81c00b9c0ff
* progmodes/perl-mode.el (perl-continued-statement-offset)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78750
diff
changeset
|
236 ;; about the variable. Autoload these here, so that no warning is |
78660
ccfc1f1f4817
* progmodes/cperl-mode.el (cperl-indent-level): Autoload the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78643
diff
changeset
|
237 ;; 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
|
238 ;;;###autoload(put 'cperl-indent-level 'safe-local-variable 'integerp) |
79553
f81c00b9c0ff
* progmodes/perl-mode.el (perl-continued-statement-offset)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78750
diff
changeset
|
239 ;;;###autoload(put 'cperl-brace-offset 'safe-local-variable 'integerp) |
f81c00b9c0ff
* progmodes/perl-mode.el (perl-continued-statement-offset)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78750
diff
changeset
|
240 ;;;###autoload(put 'cperl-continued-brace-offset 'safe-local-variable 'integerp) |
f81c00b9c0ff
* progmodes/perl-mode.el (perl-continued-statement-offset)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78750
diff
changeset
|
241 ;;;###autoload(put 'cperl-label-offset 'safe-local-variable 'integerp) |
f81c00b9c0ff
* progmodes/perl-mode.el (perl-continued-statement-offset)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78750
diff
changeset
|
242 ;;;###autoload(put 'cperl-continued-statement-offset 'safe-local-variable 'integerp) |
f81c00b9c0ff
* progmodes/perl-mode.el (perl-continued-statement-offset)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78750
diff
changeset
|
243 ;;;###autoload(put 'cperl-extra-newline-before-brace 'safe-local-variable 'booleanp) |
f81c00b9c0ff
* progmodes/perl-mode.el (perl-continued-statement-offset)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78750
diff
changeset
|
244 ;;;###autoload(put 'cperl-merge-trailing-else 'safe-local-variable 'booleanp) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
245 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
246 (defcustom cperl-lineup-step nil |
20323 | 247 "*`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
|
248 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
|
249 :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
|
250 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
251 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
252 (defcustom cperl-brace-imaginary-offset 0 |
20323 | 253 "*Imagined indentation of a Perl open brace that actually follows a statement. |
254 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
|
255 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
|
256 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
257 :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
|
258 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
259 (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
|
260 "*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
|
261 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
262 :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
|
263 (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
|
264 "*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
|
265 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
266 :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
|
267 (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
|
268 "*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
|
269 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
270 :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
|
271 (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
|
272 "*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
|
273 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
274 :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
|
275 (defcustom cperl-continued-brace-offset 0 |
20323 | 276 "*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
|
277 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
|
278 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
279 :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
|
280 (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
|
281 "*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
|
282 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
283 :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
|
284 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
285 (defcustom cperl-indent-wrt-brace t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
286 "*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
|
287 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
|
288 :type 'boolean |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
289 :group 'cperl-indentation-details) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
290 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
291 (defcustom cperl-auto-newline nil |
20323 | 292 "*Non-nil means automatically newline before and after braces, |
293 and after colons and semicolons, inserted in CPerl code. The following | |
294 \\[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
|
295 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
|
296 `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
|
297 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
298 :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
|
299 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
300 (defcustom cperl-autoindent-on-semi nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
301 "*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
|
302 Active if `cperl-auto-newline' is false." |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
303 :type 'boolean |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
304 :group 'cperl-autoinsert-details) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
305 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
306 (defcustom cperl-auto-newline-after-colon nil |
20323 | 307 "*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
|
308 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
|
309 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
310 :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
|
311 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
312 (defcustom cperl-tab-always-indent t |
20323 | 313 "*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
|
314 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
|
315 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
316 :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
|
317 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
318 (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
|
319 "*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
|
320 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
|
321 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
322 :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
|
323 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
324 (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
|
325 "*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
|
326 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
|
327 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
328 :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
|
329 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
330 (defcustom cperl-electric-parens-string "({[]})<" |
20323 | 331 "*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
|
332 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
|
333 :type 'string |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
334 :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
|
335 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
336 (defcustom cperl-electric-parens nil |
20323 | 337 "*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
|
338 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
|
339 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
340 :group 'cperl-affected-by-hairy) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
341 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
342 (defvar zmacs-regions) ; Avoid warning |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
343 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
344 (defcustom cperl-electric-parens-mark |
20323 | 345 (and window-system |
346 (or (and (boundp 'transient-mark-mode) ; For Emacs | |
347 transient-mark-mode) | |
348 (and (boundp 'zmacs-regions) ; For XEmacs | |
349 zmacs-regions))) | |
350 "*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
|
351 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
|
352 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
353 :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
|
354 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
355 (defcustom cperl-electric-linefeed nil |
20323 | 356 "*If true, LFD should be hairy in CPerl, otherwise C-c LFD is hairy. |
357 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
|
358 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
|
359 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
360 :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
|
361 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
362 (defcustom cperl-electric-keywords nil |
20323 | 363 "*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
|
364 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
|
365 |
c8f5a9de4a5e
(cperl-electric-keywords): Document in the doc string how to use personal
Eli Zaretskii <eliz@gnu.org>
parents:
74429
diff
changeset
|
366 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
|
367 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
|
368 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
|
369 \\[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
|
370 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
|
371 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
|
372 " |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
373 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
374 :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
|
375 |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
376 (defcustom cperl-electric-backspace-untabify t |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
377 "*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
|
378 :type 'boolean |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
379 :group 'cperl-autoinsert-details) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
380 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
381 (defcustom cperl-hairy nil |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
382 "*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
|
383 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
|
384 `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
|
385 `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
|
386 `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
|
387 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
388 :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
|
389 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
390 (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
|
391 "*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
|
392 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
393 :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
|
394 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
395 (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
|
396 "*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
|
397 :type 'boolean |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
398 :group 'cperl-indentation-details) |
62686
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
399 |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
400 (defcustom cperl-vc-sccs-header '("($sccs) = ('%W\%' =~ /(\\d+(\\.\\d+)+)/) ;") |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
401 "*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
|
402 :type '(repeat string) |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
403 :group 'cperl) |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
404 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
405 (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
|
406 "*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
|
407 :type '(repeat string) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
408 :group 'cperl) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
409 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
410 ;; This became obsolete... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
411 (defvar cperl-vc-header-alist nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
412 (make-obsolete-variable |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
413 'cperl-vc-header-alist |
104396
e667f4aad5f2
* textmodes/remember.el (remember-buffer):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104311
diff
changeset
|
414 "use cperl-vc-rcs-header or cperl-vc-sccs-header instead." |
e667f4aad5f2
* textmodes/remember.el (remember-buffer):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104311
diff
changeset
|
415 "22.1") |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
416 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
417 (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
|
418 (not |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
419 (and |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
420 (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
|
421 (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
|
422 (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
|
423 "*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
|
424 :type 'boolean |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
425 :group 'cperl) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
426 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
427 (defcustom cperl-info-on-command-no-prompt nil |
20323 | 428 "*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
|
429 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
|
430 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
|
431 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
432 :group 'cperl-affected-by-hairy) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
433 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
434 (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
|
435 "*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
|
436 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
|
437 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
|
438 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
439 :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
|
440 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
441 (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
|
442 "*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
|
443 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
|
444 :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
|
445 :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
|
446 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
447 (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
|
448 "*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
|
449 :type 'face |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
450 :group 'cperl-faces) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
451 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
452 (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
|
453 "*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
|
454 Font for POD headers." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
455 :type 'face |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
456 :group 'cperl-faces) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
457 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
458 (defcustom cperl-here-face 'font-lock-string-face |
31821 | 459 "*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
|
460 :type 'face |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
461 :group 'cperl-faces) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
462 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
463 ;;; Some double-evaluation happened with font-locks... Needed with 21.2... |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
464 (defvar cperl-singly-quote-face (featurep 'xemacs)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
465 |
73461
c09fdf139d4a
* progmodes/cperl-mode.el (cperl-invalid-face): Fix defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
73457
diff
changeset
|
466 (defcustom cperl-invalid-face 'underline |
c09fdf139d4a
* progmodes/cperl-mode.el (cperl-invalid-face): Fix defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
73457
diff
changeset
|
467 "*Face for highlighting trailing whitespace." |
31821 | 468 :type 'face |
35013
587807c5e8e6
(cperl-invalid-face): Don't double-quote
Dave Love <fx@gnu.org>
parents:
32880
diff
changeset
|
469 :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
|
470 :group 'cperl-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
471 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
472 (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
|
473 "*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
|
474 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
475 :group 'cperl-faces) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
476 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
477 (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
|
478 "*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
|
479 :type 'boolean |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
480 :group 'cperl-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
481 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
482 (defcustom cperl-highlight-variables-indiscriminately nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
483 "*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
|
484 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
|
485 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
|
486 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
|
487 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
|
488 :type 'boolean |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
489 :group 'cperl) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
490 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
491 (defcustom cperl-pod-here-scan t |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
492 "*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
|
493 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
|
494 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
495 :group 'cperl-speed) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
496 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
497 (defcustom cperl-regexp-scan t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
498 "*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
|
499 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
|
500 :type 'boolean |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
501 :group 'cperl-speed) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
502 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
503 (defcustom cperl-hook-after-change t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
504 "*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
|
505 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
|
506 after reload." |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
507 :type 'boolean |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
508 :group 'cperl-speed) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
509 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
510 (defcustom cperl-imenu-addback nil |
20323 | 511 "*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
|
512 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
|
513 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
514 :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
|
515 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
516 (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
|
517 "*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
|
518 :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
|
519 :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
|
520 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
521 (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
|
522 "*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
|
523 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
524 :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
|
525 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
526 (defcustom cperl-info-page "perl" |
20323 | 527 "*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
|
528 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
|
529 :type 'string |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
530 :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
|
531 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
532 (defcustom cperl-use-syntax-table-text-property |
20323 | 533 (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
|
534 "*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
|
535 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
536 :group 'cperl-speed) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
537 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
538 (defcustom cperl-use-syntax-table-text-property-for-tags |
20323 | 539 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
|
540 "*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
|
541 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
542 :group 'cperl-speed) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
543 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
544 (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
|
545 "*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
|
546 :type 'regexp |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
547 :group 'cperl) |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
548 |
47334
e3cfc5df817a
(cperl-noscan-files-regexp): In addition to RCS, exclude CVS directories.
Richard M. Stallman <rms@gnu.org>
parents:
46132
diff
changeset
|
549 (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
|
550 "/\\(\\.\\.?\\|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
|
551 "*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
|
552 :type 'regexp |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
553 :group 'cperl) |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
554 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
555 (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
|
556 "*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
|
557 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
|
558 :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
|
559 :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
|
560 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
561 (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
|
562 "*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
|
563 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
564 :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
|
565 |
26667
a11929b241ab
(cperl-under-as-char): Make nil the default value.
Richard M. Stallman <rms@gnu.org>
parents:
26455
diff
changeset
|
566 (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
|
567 "*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
|
568 :type 'boolean |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
569 :group 'cperl) |
20323 | 570 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
571 (defcustom cperl-extra-perl-args "" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
572 "*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
|
573 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
|
574 :type 'string |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
575 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
576 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
577 (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
|
578 "*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
|
579 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
580 :group 'cperl-help-system) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
581 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
582 (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
|
583 "*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
|
584 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
|
585 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
|
586 :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
|
587 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
588 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
589 (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
|
590 "*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
|
591 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
|
592 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
593 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
594 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
595 (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
|
596 "*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
|
597 when indenting a region. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
598 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
|
599 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
600 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
601 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
602 (defcustom cperl-merge-trailing-else t |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
603 "*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
|
604 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
|
605 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
606 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
607 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
608 (defcustom cperl-indent-parens-as-block nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
609 "*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
|
610 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
|
611 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
|
612 :type 'boolean |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
613 :group 'cperl-indentation-details) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
614 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
615 (defcustom cperl-syntaxify-by-font-lock |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
616 (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
|
617 (boundp 'parse-sexp-lookup-properties)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
618 "*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
|
619 :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
|
620 :group 'cperl-speed) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
621 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
622 (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
|
623 t |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
624 "*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
|
625 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
|
626 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
627 :group 'cperl-speed) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
628 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
629 (defcustom cperl-syntaxify-for-menu |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
630 t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
631 "*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
|
632 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
|
633 :type 'boolean |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
634 :group 'cperl-speed) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
635 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
636 (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
|
637 '((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
|
638 (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
|
639 (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
|
640 (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
|
641 (cperl-array-face nil "LightGray" bold underline) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
642 (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
|
643 (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
|
644 (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
|
645 (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
|
646 (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
|
647 (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
|
648 (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
|
649 "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
|
650 :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
|
651 (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
|
652 (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
|
653 (repeat symbol))))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
654 :group 'cperl-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
655 |
49304
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
656 (defvar cperl-dark-background |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
657 (cperl-choose-color "navy" "os2blue" "darkgreen")) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
658 (defvar cperl-dark-foreground |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
659 (cperl-choose-color "orchid1" "orange")) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
660 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
661 (defface cperl-nonoverridable-face |
49304
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
662 `((((class grayscale) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
663 (:background "Gray90" :slant italic :underline t)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
664 (((class grayscale) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
665 (: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
|
666 (((class color) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
667 (:foreground "chartreuse3")) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
668 (((class color) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
669 (:foreground ,cperl-dark-foreground)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
670 (t (:weight bold :underline t))) |
50788
2a3bf1afbe82
(cperl-nonoverridable-face): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
50255
diff
changeset
|
671 "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
|
672 :group 'cperl-faces) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
673 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
674 (defface cperl-array-face |
49304
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
675 `((((class grayscale) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
676 (:background "Gray90" :weight bold)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
677 (((class grayscale) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
678 (:foreground "Gray80" :weight bold)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
679 (((class color) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
680 (:foreground "Blue" :background "lightyellow2" :weight bold)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
681 (((class color) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
682 (: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
|
683 (t (:weight bold))) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
684 "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
|
685 :group 'cperl-faces) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
686 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
687 (defface cperl-hash-face |
49304
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
688 `((((class grayscale) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
689 (:background "Gray90" :weight bold :slant italic)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
690 (((class grayscale) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
691 (:foreground "Gray80" :weight bold :slant italic)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
692 (((class color) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
693 (: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
|
694 (((class color) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
695 (: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
|
696 (t (:weight bold :slant italic))) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
697 "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
|
698 :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
|
699 |
20323 | 700 |
701 | |
702 ;;; Short extra-docs. | |
703 | |
704 (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
|
705 "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
|
706 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
|
707 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
|
708 patches to related files. |
20323 | 709 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
710 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
|
711 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
|
712 \(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
|
713 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
|
714 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
|
715 |
20323 | 716 Get support packages choose-color.el (or font-lock-extra.el before |
717 19.30), imenu-go.el from the same place. \(Look for other files there | |
718 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
|
719 later you should use choose-color.el *instead* of font-lock-extra.el |
20323 | 720 \(and you will not get smart highlighting in C :-(). |
721 | |
722 Note that to enable Compile choices in the menu you need to install | |
723 mode-compile.el. | |
724 | |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
725 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
|
726 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
|
727 |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
728 (defalias 'perl-mode 'cperl-mode) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
729 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
730 Get perl5-info from |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
731 $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
|
732 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
|
733 $CPAN/doc/manual/info/perl5/pod2texi-0.1.tar.gz |
20323 | 734 |
735 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
|
736 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
|
737 Tools/Tags submenu in Perl menu. |
20323 | 738 |
739 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
|
740 from Perl menu, or hierarchic view of imenu. The second one uses the |
20323 | 741 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
|
742 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
|
743 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
744 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
|
745 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
746 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
|
747 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
748 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
|
749 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
|
750 |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
751 \\[normal-mode] |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
752 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
753 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
|
754 |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
755 \\[load-library] cperl-mode RET |
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
756 \\[normal-mode] |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
757 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
758 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
|
759 micro-docs on what I know about CPerl problems.") |
20323 | 760 |
761 (defvar cperl-problems 'please-ignore-this-line | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
762 "Description of problems in CPerl mode. |
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
763 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
|
764 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
|
765 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
|
766 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
767 `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
|
768 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
|
769 to detect it and bulk out). |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
770 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
771 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
|
772 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
|
773 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
|
774 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
775 (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
|
776 "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
|
777 |
41351
d103d22e5b4f
(cperl-problems, cperl-tips, cperl-non-problems, cperl-praise): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
41309
diff
changeset
|
778 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
|
779 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
|
780 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
|
781 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
|
782 this respect (until 2003). |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
783 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
784 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
|
785 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
|
786 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
|
787 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
|
788 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
|
789 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
790 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
|
791 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
|
792 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
|
793 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
|
794 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
|
795 braces. |
20323 | 796 |
797 This may be confusing, since the regexp s#//#/#\; may be highlighted | |
798 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
|
799 code. Or the opposite case, when a POD section is highlighted, but |
20323 | 800 may break the indentation of the following code (though indentation |
801 should work if the balance of delimiters is not broken by POD). | |
802 | |
803 The main trick (to make $ a \"backslash\") makes constructions like | |
804 ${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
|
805 to insert it as $ {aaa} (valid in perl5, not in perl4). |
20323 | 806 |
807 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
|
808 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
|
809 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
810 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
|
811 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
|
812 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
|
813 and on CPAN. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
814 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
815 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
|
816 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
|
817 via `cperl-use-syntax-table-text-property'.") |
20323 | 818 |
819 (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
|
820 "Advantages of CPerl mode. |
20323 | 821 |
822 0) It uses the newest `syntax-table' property ;-); | |
823 | |
824 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
|
825 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
|
826 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
|
827 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
828 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
|
829 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
|
830 updates syntax assist hints when you edit your script. |
20323 | 831 |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
832 2) It is generally believed to be \"the most user-friendly Emacs |
20323 | 833 package\" whatever it may mean (I doubt that the people who say similar |
834 things tried _all_ the rest of Emacs ;-), but this was not a lonely | |
835 voice); | |
836 | |
837 3) Everything is customizable, one-by-one or in a big sweep; | |
838 | |
96459 | 839 4) It has many easily-accessible \"tools\": |
20323 | 840 a) Can run program, check syntax, start debugger; |
841 b) Can lineup vertically \"middles\" of rows, like `=' in | |
842 a = b; | |
843 cc = d; | |
844 c) Can insert spaces where this impoves readability (in one | |
845 interactive sweep over the buffer); | |
846 d) Has support for imenu, including: | |
847 1) Separate unordered list of \"interesting places\"; | |
848 2) Separate TOC of POD sections; | |
849 3) Separate list of packages; | |
850 4) Hierarchical view of methods in (sub)packages; | |
851 5) and functions (by the full name - with package); | |
852 e) Has an interface to INFO docs for Perl; The interface is | |
853 very flexible, including shrink-wrapping of | |
854 documentation buffer/frame; | |
855 f) Has a builtin list of one-line explanations for perl constructs. | |
856 g) Can show these explanations if you stay long enough at the | |
857 corresponding place (or on demand); | |
858 h) Has an enhanced fontification (using 3 or 4 additional faces | |
859 comparing to font-lock - basically, different | |
860 namespaces in Perl have different colors); | |
861 i) Can construct TAGS basing on its knowledge of Perl syntax, | |
862 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
|
863 TAGS (if \"by directory\", .xs files - with C-language |
20323 | 864 bindings - are included in the scan); |
865 j) Can build a hierarchical view of classes (via imenu) basing | |
866 on generated TAGS file; | |
867 k) Has electric parentheses, electric newlines, uses Abbrev | |
868 for electric logical constructs | |
869 while () {} | |
870 with different styles of expansion (context sensitive | |
871 to be not so bothering). Electric parentheses behave | |
872 \"as they should\" in a presence of a visible region. | |
873 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
|
874 m) Can convert from |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
875 if (A) { B } |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
876 to |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
877 B if A; |
20323 | 878 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
879 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
|
880 (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
|
881 o) Highlights trailing whitespace; |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
882 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
|
883 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
|
884 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
|
885 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
|
886 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
|
887 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
|
888 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
|
889 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
|
890 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
|
891 |
20323 | 892 5) The indentation engine was very smart, but most of tricks may be |
893 not needed anymore with the support for `syntax-table' property. Has | |
894 progress indicator for indentation (with `imenu' loaded). | |
895 | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
896 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
|
897 whitespace *inside* the conditional/loop constructs. |
20323 | 898 |
899 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
|
900 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
901 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
|
902 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
|
903 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
904 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
|
905 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
|
906 |
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
907 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
|
908 capable syntax engines). |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
909 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
910 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
|
911 ") |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
912 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
913 (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
|
914 "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
|
915 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
|
916 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
917 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
|
918 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
|
919 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
920 *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
|
921 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
|
922 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
|
923 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
|
924 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
|
925 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
926 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
|
927 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
|
928 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
|
929 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
930 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
|
931 PODs and HERE-documents), or |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
932 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
|
933 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
|
934 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
935 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
|
936 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
937 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
|
938 `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
|
939 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
|
940 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
941 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
|
942 `cperl-pod-here-scan' |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
943 to nil. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
944 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
945 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
|
946 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
947 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
|
948 `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
|
949 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
|
950 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
|
951 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
|
952 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
|
953 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
954 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
|
955 of, say, long POD sections.") |
20323 | 956 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
957 (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
|
958 "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
|
959 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
960 `cperl-array-face' Array names |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
961 `cperl-hash-face' Hash names |
32422 | 962 `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
|
963 syntaxically to be not code |
32422 | 964 `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
|
965 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
|
966 `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
|
967 `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
|
968 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
|
969 (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
|
970 package names (when recognized), format names |
32422 | 971 `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
|
972 `cperl-nonoverridable-face' Non-overridable keywords, modifiers of RExen |
32422 | 973 `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
|
974 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
|
975 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
|
976 as string literals |
32422 | 977 `font-lock-type-face' Overridable keywords |
978 `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
|
979 hash names, POD headers/item names |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
980 `cperl-invalid-face' Trailing whitespace |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
981 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
982 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
|
983 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
|
984 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
|
985 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
|
986 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
987 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
|
988 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
|
989 |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
990 In regular expressions (including character classes): |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
991 `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
|
992 `font-lock-constant-face': Delimiters |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
993 `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
|
994 Mismatched closing delimiters, parens |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
995 we couldn't match, misplaced quantifiers, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
996 unrecognized escape sequences |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
997 `cperl-nonoverridable-face' Modifiers, as gism in m/REx/gism |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
998 `font-lock-type-face' escape sequences with arguments (\\x \\23 \\p \\N) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
999 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
|
1000 `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
|
1001 `font-lock-function-name-face' Special symbols: $ ^ . [ ] [^ ] (?{ }) (??{ }) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1002 \"Range -\" in character classes |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1003 `font-lock-builtin-face' \"Remaining\" 0-length constructs, multipliers |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1004 ?+*{}, not-capturing parens, leading |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1005 backslashes of escape sequences |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1006 `font-lock-variable-name-face' Interpolated constructs, embedded code, |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1007 POSIX classes (inside charclasses) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1008 `font-lock-comment-face' Embedded comments |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1009 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1010 ") |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1011 |
20323 | 1012 |
1013 | |
1014 ;;; Portability stuff: | |
1015 | |
1016 (defmacro cperl-define-key (emacs-key definition &optional xemacs-key) | |
26455 | 1017 `(define-key cperl-mode-map |
1018 ,(if xemacs-key | |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
1019 `(if (featurep 'xemacs) ,xemacs-key ,emacs-key) |
26455 | 1020 emacs-key) |
1021 ,definition)) | |
20323 | 1022 |
1023 (defvar cperl-del-back-ch | |
1024 (car (append (where-is-internal 'delete-backward-char) | |
1025 (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
|
1026 "Character generated by key bound to `delete-backward-char'.") |
20323 | 1027 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1028 (and (vectorp cperl-del-back-ch) (= (length cperl-del-back-ch) 1) |
20323 | 1029 (setq cperl-del-back-ch (aref cperl-del-back-ch 0))) |
1030 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1031 (defun cperl-mark-active () (mark)) ; Avoid undefined warning |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
1032 (if (featurep 'xemacs) |
20323 | 1033 (progn |
1034 ;; "Active regions" are on: use region only if active | |
1035 ;; "Active regions" are off: use region unconditionally | |
1036 (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
|
1037 (if zmacs-regions (mark) t))) |
20323 | 1038 (defun cperl-use-region-p () |
1039 (if transient-mark-mode mark-active t)) | |
1040 (defun cperl-mark-active () mark-active)) | |
1041 | |
1042 (defsubst cperl-enable-font-lock () | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1043 cperl-can-font-lock) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1044 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1045 (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
|
1046 (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
|
1047 |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
1048 (if (featurep 'xemacs) |
55049
20627b978043
(cperl-putback-char): Delete Emacs 18 definition.
Richard M. Stallman <rms@gnu.org>
parents:
54556
diff
changeset
|
1049 (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
|
1050 (setq unread-command-events (list (eval '(character-to-event c)))))) |
20323 | 1051 |
1052 (or (fboundp 'uncomment-region) | |
1053 (defun uncomment-region (beg end) | |
1054 (interactive "r") | |
1055 (comment-region beg end -1))) | |
1056 | |
1057 (defvar cperl-do-not-fontify | |
1058 (if (string< emacs-version "19.30") | |
1059 'fontified | |
1060 'lazy-lock) | |
1061 "Text property which inhibits refontification.") | |
1062 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1063 (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
|
1064 ;; 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
|
1065 (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
|
1066 nil |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1067 (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
|
1068 to cperl-do-not-fontify t))) |
20323 | 1069 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
1070 (defcustom cperl-mode-hook nil |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
1071 "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
|
1072 :type 'hook |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
1073 :group 'cperl) |
20323 | 1074 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1075 (defvar cperl-syntax-state nil) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1076 (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
|
1077 (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
|
1078 (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
|
1079 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1080 ;; Make customization possible "in reverse" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1081 (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
|
1082 (cond |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1083 ((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
|
1084 (cperl-hairy (or hairy t)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1085 (t (symbol-value symbol)))) |
20323 | 1086 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1087 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1088 (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
|
1089 "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
|
1090 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
|
1091 versions of Emacs." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1092 (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
|
1093 (or keep |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1094 (delete-horizontal-space)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1095 (indent-to column minimum) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1096 ;; 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
|
1097 (and prop |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1098 (> (current-column) 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1099 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1100 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1101 (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
|
1102 (and (looking-at "\\=[ \t]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1103 (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
|
1104 'syntax-type prop))))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1105 |
20323 | 1106 ;;; Probably it is too late to set these guys already, but it can help later: |
1107 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1108 ;;;(and cperl-clobber-mode-lists |
20323 | 1109 ;;;(setq auto-mode-alist |
1110 ;;; (append '(("\\.\\([pP][Llm]\\|al\\)$" . perl-mode)) auto-mode-alist )) | |
1111 ;;;(and (boundp 'interpreter-mode-alist) | |
1112 ;;; (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
|
1113 ;;; '(("miniperl" . perl-mode)))))) |
31821 | 1114 (eval-when-compile |
85223
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
1115 (mapc (lambda (p) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
1116 (condition-case nil |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
1117 (require p) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
1118 (error nil))) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
1119 '(imenu easymenu etags timer man info)) |
31821 | 1120 (if (fboundp 'ps-extend-face-list) |
1121 (defmacro cperl-ps-extend-face-list (arg) | |
1122 `(ps-extend-face-list ,arg)) | |
1123 (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
|
1124 `(error "This version of Emacs has no `ps-extend-face-list'"))) |
31821 | 1125 ;; Calling `cperl-enable-font-lock' below doesn't compile on XEmacs, |
1126 ;; macros instead of defsubsts don't work on Emacs, so we do the | |
1127 ;; expansion manually. Any other suggestions? | |
1128 (require 'cl)) | |
20323 | 1129 |
1130 (defvar cperl-mode-abbrev-table nil | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
1131 "Abbrev table in use in CPerl mode buffers.") |
20323 | 1132 |
1133 (add-hook 'edit-var-mode-alist '(perl-mode (regexp . "^cperl-"))) | |
1134 | |
1135 (defvar cperl-mode-map () "Keymap used in CPerl mode.") | |
1136 | |
1137 (if cperl-mode-map nil | |
1138 (setq cperl-mode-map (make-sparse-keymap)) | |
1139 (cperl-define-key "{" 'cperl-electric-lbrace) | |
1140 (cperl-define-key "[" 'cperl-electric-paren) | |
1141 (cperl-define-key "(" 'cperl-electric-paren) | |
1142 (cperl-define-key "<" 'cperl-electric-paren) | |
1143 (cperl-define-key "}" 'cperl-electric-brace) | |
1144 (cperl-define-key "]" 'cperl-electric-rparen) | |
1145 (cperl-define-key ")" 'cperl-electric-rparen) | |
1146 (cperl-define-key ";" 'cperl-electric-semi) | |
1147 (cperl-define-key ":" 'cperl-electric-terminator) | |
1148 (cperl-define-key "\C-j" 'newline-and-indent) | |
1149 (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
|
1150 (cperl-define-key "\C-c\C-t" 'cperl-invert-if-unless) |
20323 | 1151 (cperl-define-key "\C-c\C-a" 'cperl-toggle-auto-newline) |
1152 (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
|
1153 (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
|
1154 (cperl-define-key "\C-c\C-f" 'auto-fill-mode) |
20323 | 1155 (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
|
1156 (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
|
1157 (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
|
1158 (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
|
1159 (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
|
1160 (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
|
1161 (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
|
1162 (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
|
1163 (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
|
1164 (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
|
1165 (cperl-define-key "\C-c\C-hP" 'cperl-perldoc-at-point) |
20323 | 1166 (cperl-define-key "\e\C-q" 'cperl-indent-exp) ; Usually not bound |
1167 (cperl-define-key [?\C-\M-\|] 'cperl-lineup | |
1168 [(control meta |)]) | |
1169 ;;(cperl-define-key "\M-q" 'cperl-fill-paragraph) | |
1170 ;;(cperl-define-key "\e;" 'cperl-indent-for-comment) | |
1171 (cperl-define-key "\177" 'cperl-electric-backspace) | |
1172 (cperl-define-key "\t" 'cperl-indent-command) | |
1173 ;; 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
|
1174 (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
|
1175 [(control c) (control h) F]) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1176 (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
|
1177 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1178 (cperl-define-key "\C-hf" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1179 ;;(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
|
1180 'cperl-info-on-command |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1181 [(control h) f]) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1182 (cperl-define-key "\C-hv" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1183 ;;(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
|
1184 '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
|
1185 [(control h) v]) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1186 (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
|
1187 ;;(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
|
1188 (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
|
1189 [(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
|
1190 (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
|
1191 ;;(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
|
1192 (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
|
1193 [(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
|
1194 (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
|
1195 [(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
|
1196 (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
|
1197 ;;(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
|
1198 'cperl-get-help |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1199 [(control c) (control h) v])) |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
1200 (if (and (featurep 'xemacs) |
20323 | 1201 (<= emacs-minor-version 11) (<= emacs-major-version 19)) |
1202 (progn | |
1203 ;; 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
|
1204 ;;;;;(cperl-define-key "\M-q" 'cperl-fill-paragraph) |
20323 | 1205 (cperl-define-key "\e;" 'cperl-indent-for-comment) |
1206 (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
|
1207 (or (boundp 'fill-paragraph-function) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1208 (substitute-key-definition |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1209 'fill-paragraph 'cperl-fill-paragraph |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1210 cperl-mode-map global-map)) |
20323 | 1211 (substitute-key-definition |
1212 'indent-sexp 'cperl-indent-exp | |
1213 cperl-mode-map global-map) | |
1214 (substitute-key-definition | |
1215 'indent-region 'cperl-indent-region | |
1216 cperl-mode-map global-map) | |
1217 (substitute-key-definition | |
1218 'indent-for-comment 'cperl-indent-for-comment | |
1219 cperl-mode-map global-map))) | |
1220 | |
1221 (defvar cperl-menu) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1222 (defvar cperl-lazy-installed) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1223 (defvar cperl-old-style nil) |
20323 | 1224 (condition-case nil |
1225 (progn | |
1226 (require 'easymenu) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1227 (easy-menu-define |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1228 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
|
1229 '("Perl" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1230 ["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
|
1231 ["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
|
1232 ["Mark function" mark-defun t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1233 ["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
|
1234 ["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
|
1235 "----" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1236 ["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
|
1237 ["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
|
1238 ("Regexp" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1239 ["Beautify" cperl-beautify-regexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1240 cperl-use-syntax-table-text-property] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1241 ["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
|
1242 cperl-use-syntax-table-text-property] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1243 ["Beautify a group" cperl-beautify-level |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1244 cperl-use-syntax-table-text-property] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1245 ["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
|
1246 cperl-use-syntax-table-text-property] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1247 ["Contract a group" cperl-contract-level |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1248 cperl-use-syntax-table-text-property] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1249 ["Contract groups" cperl-contract-levels |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1250 cperl-use-syntax-table-text-property] |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1251 "----" |
80057
1db7c78912f4
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
79717
diff
changeset
|
1252 ["Find next interpolated" cperl-next-interpolated-REx |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1253 (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
|
1254 ["Find next interpolated (no //o)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1255 cperl-next-interpolated-REx-0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1256 (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
|
1257 (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
|
1258 ["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
|
1259 cperl-next-interpolated-REx-1 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1260 (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
|
1261 ["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
|
1262 ["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
|
1263 "----" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1264 ["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
|
1265 ["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
|
1266 ["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
|
1267 "----" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1268 ["Run" mode-compile (fboundp 'mode-compile)] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1269 ["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
|
1270 (get-buffer "*compilation*"))] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1271 ["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
|
1272 ["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
|
1273 "----" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1274 ["Debugger" cperl-db t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1275 "----" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1276 ("Tools" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1277 ["Imenu" imenu (fboundp 'imenu)] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1278 ["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
|
1279 "----" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1280 ["Ispell PODs" cperl-pod-spell |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1281 ;; Better not to update syntaxification here: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1282 ;; 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
|
1283 (or |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1284 (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
|
1285 (< (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1286 (and cperl-syntaxify-for-menu |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1287 (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
|
1288 (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
|
1289 (point-max)))] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1290 ["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
|
1291 (< (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1292 (and cperl-syntaxify-for-menu |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1293 (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
|
1294 (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
|
1295 (point-max))] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1296 ["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
|
1297 (eq 'here-doc (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1298 (and cperl-syntaxify-for-menu |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1299 (cperl-update-syntaxification (point) (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1300 (get-text-property (point) 'syntax-type)))] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1301 ["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
|
1302 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
|
1303 (memq (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1304 (and cperl-syntaxify-for-menu |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1305 (cperl-update-syntaxification (point) (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1306 (get-text-property (point) 'syntax-type)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1307 '(here-doc pod))] |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1308 "----" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1309 ["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
|
1310 (fboundp 'ps-extend-face-list)] |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1311 "----" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1312 ["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
|
1313 (cperl-use-region-p)] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1314 ["Profile syntaxification" cperl-time-fontification t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1315 ["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
|
1316 ["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
|
1317 ["Debug backtrace on syntactic scan (BEWARE!!!)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1318 (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
|
1319 "----" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1320 ["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
|
1321 ;;["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
|
1322 ("Tags" |
20323 | 1323 ;;; ["Create tags for current file" cperl-etags t] |
1324 ;;; ["Add tags for current file" (cperl-etags t) t] | |
1325 ;;; ["Create tags for Perl files in directory" (cperl-etags nil t) t] | |
1326 ;;; ["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
|
1327 ;;; ["Create tags for Perl files in (sub)directories" |
20323 | 1328 ;;; (cperl-etags nil 'recursive) t] |
1329 ;;; ["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
|
1330 ;;; (cperl-etags t 'recursive) t]) |
20323 | 1331 ;;;; 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
|
1332 ["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
|
1333 ["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
|
1334 ["Create tags for Perl files in directory" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1335 (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
|
1336 ["Add tags for Perl files in directory" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1337 (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
|
1338 ["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
|
1339 (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
|
1340 ["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
|
1341 (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
|
1342 ("Perl docs" |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
1343 ["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
|
1344 (fboundp 'imenu-go-find-at-position)] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1345 ["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
|
1346 ["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
|
1347 ["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
|
1348 ["Perldoc" cperl-perldoc t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1349 ["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
|
1350 ["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
|
1351 ["Auto-help on" cperl-lazy-install |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1352 (and (fboundp 'run-with-idle-timer) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1353 (not cperl-lazy-installed))] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1354 ["Auto-help off" cperl-lazy-unstall |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1355 (and (fboundp 'run-with-idle-timer) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1356 cperl-lazy-installed)]) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1357 ("Toggle..." |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1358 ["Auto newline" cperl-toggle-auto-newline t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1359 ["Electric parens" cperl-toggle-electric t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1360 ["Electric keywords" cperl-toggle-abbrev t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1361 ["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
|
1362 ["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
|
1363 ["Auto fill" auto-fill-mode t]) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1364 ("Indent styles..." |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1365 ["CPerl" (cperl-set-style "CPerl") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1366 ["PerlStyle" (cperl-set-style "PerlStyle") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1367 ["GNU" (cperl-set-style "GNU") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1368 ["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
|
1369 ["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
|
1370 ["BSD" (cperl-set-style "BSD") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1371 ["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
|
1372 ["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
|
1373 ["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
|
1374 ("Micro-docs" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1375 ["Tips" (describe-variable 'cperl-tips) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1376 ["Problems" (describe-variable 'cperl-problems) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1377 ["Speed" (describe-variable 'cperl-speed) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1378 ["Praise" (describe-variable 'cperl-praise) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1379 ["Faces" (describe-variable 'cperl-tips-faces) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1380 ["CPerl mode" (describe-function 'cperl-mode) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1381 ["CPerl version" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1382 (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
|
1383 cperl-version) t])))) |
20323 | 1384 (error nil)) |
1385 | |
1386 (autoload 'c-macro-expand "cmacexp" | |
1387 "Display the result of expanding all C macros occurring in the region. | |
1388 The expansion is entirely correct because it uses the C preprocessor." | |
1389 t) | |
1390 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1391 ;;; 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
|
1392 (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
|
1393 "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
|
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 ;;; 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
|
1397 (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
|
1398 "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
|
1399 Should contain exactly one group.") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1400 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1401 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1402 ;;; 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
|
1403 ;;; `cperl-outline-regexp', `defun-prompt-regexp'. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1404 ;;; 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
|
1405 ;;; near mentioned above variable(s)... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1406 ;;; sub($$):lvalue{} sub:lvalue{} Both allowed... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1407 (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
|
1408 "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
|
1409 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
|
1410 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
|
1411 the last)." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1412 (concat ; Assume n groups before this... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1413 "\\(" ; n+1=name-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1414 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
|
1415 "\\(::[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
|
1416 "\\)" ; END n+1=name-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1417 (if named "" "?") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1418 "\\(" ; n+4=proto-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1419 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
|
1420 "\\(([^()]*)\\)" ; n+6=prototype |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1421 "\\)?" ; END n+4=proto-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1422 "\\(" ; n+7=attr-group |
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 ; n+8=pre-attr |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1424 "\\(" ; n+9=start-attr |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1425 ":" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1426 (if attr (concat |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1427 "\\(" |
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 "\\(\\sw\\|_\\)+" ; attr-name |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1430 ;; 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
|
1431 "\\((\\(\\\\.\\|[^\\\\()]\\|([^\\\\()]*)\\)*)\\)?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1432 "\\(" ; optional : (XXX allows trailing???) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1433 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
|
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 "[^:]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1437 "\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1438 "\\)?" ; END n+6=proto-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1439 )) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1440 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1441 ;;; 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
|
1442 ;;; and `cperl-outline-level'. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1443 ;;;; 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
|
1444 (defvar cperl-imenu--function-name-regexp-perl |
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1445 (concat |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1446 "^\\(" ; 1 = all |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1447 "\\([ \t]*package" ; 2 = package-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1448 "\\(" ; 3 = package-name-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1449 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
|
1450 "\\([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
|
1451 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1452 "[ \t]*sub" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1453 (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
|
1454 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
|
1455 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1456 "=head\\([1-4]\\)[ \t]+" ; 16=level |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1457 "\\([^\n]+\\)$" ; 17=text |
43943
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1458 "\\)")) |
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1459 |
43899
2b9c79cd9ecb
(cperl-outline-regexp): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
43688
diff
changeset
|
1460 (defvar cperl-outline-regexp |
2b9c79cd9ecb
(cperl-outline-regexp): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
43688
diff
changeset
|
1461 (concat cperl-imenu--function-name-regexp-perl "\\|" "\\`")) |
2b9c79cd9ecb
(cperl-outline-regexp): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
43688
diff
changeset
|
1462 |
20323 | 1463 (defvar cperl-mode-syntax-table nil |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
1464 "Syntax table in use in CPerl mode buffers.") |
20323 | 1465 |
1466 (defvar cperl-string-syntax-table nil | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
1467 "Syntax table in use in CPerl mode string-like chunks.") |
20323 | 1468 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1469 (defsubst cperl-1- (p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1470 (max (point-min) (1- p))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1471 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1472 (defsubst cperl-1+ (p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1473 (min (point-max) (1+ p))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1474 |
20323 | 1475 (if cperl-mode-syntax-table |
1476 () | |
1477 (setq cperl-mode-syntax-table (make-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 ?% "." 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 (modify-syntax-entry ?$ "\\" cperl-mode-syntax-table) | |
1489 (modify-syntax-entry ?\n ">" cperl-mode-syntax-table) | |
1490 (modify-syntax-entry ?# "<" cperl-mode-syntax-table) | |
1491 (modify-syntax-entry ?' "\"" cperl-mode-syntax-table) | |
1492 (modify-syntax-entry ?` "\"" cperl-mode-syntax-table) | |
1493 (if cperl-under-as-char | |
1494 (modify-syntax-entry ?_ "w" cperl-mode-syntax-table)) | |
1495 (modify-syntax-entry ?: "_" cperl-mode-syntax-table) | |
1496 (modify-syntax-entry ?| "." cperl-mode-syntax-table) | |
1497 (setq cperl-string-syntax-table (copy-syntax-table cperl-mode-syntax-table)) | |
1498 (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
|
1499 (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
|
1500 (modify-syntax-entry ?\} "." cperl-string-syntax-table) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1501 (modify-syntax-entry ?\" "." cperl-string-syntax-table) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1502 (modify-syntax-entry ?' "." cperl-string-syntax-table) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1503 (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
|
1504 (modify-syntax-entry ?# "." cperl-string-syntax-table)) ; (?# comment ) |
20323 | 1505 |
1506 | |
1507 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1508 (defvar cperl-faces-init nil) |
20323 | 1509 ;; Fix for msb.el |
1510 (defvar cperl-msb-fixed nil) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1511 (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
|
1512 (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
|
1513 (defvar cperl-font-lock-multiline nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1514 (defvar cperl-font-locking nil) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1515 |
78407
377800d78812
(cperl-compilation-error-regexp-alist): Remove duplicate defvar
Glenn Morris <rgm@gnu.org>
parents:
78234
diff
changeset
|
1516 ;; 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
|
1517 ;; 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
|
1518 (defvar cperl-compilation-error-regexp-alist |
377800d78812
(cperl-compilation-error-regexp-alist): Remove duplicate defvar
Glenn Morris <rgm@gnu.org>
parents:
78234
diff
changeset
|
1519 ;; 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
|
1520 '(("^[^\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
|
1521 2 3)) |
377800d78812
(cperl-compilation-error-regexp-alist): Remove duplicate defvar
Glenn Morris <rgm@gnu.org>
parents:
78234
diff
changeset
|
1522 "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
|
1523 |
86503
2c08ad76fc1f
* progmodes/cperl-mode.el (compilation-error-regexp-alist): Pacify
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85762
diff
changeset
|
1524 (defvar compilation-error-regexp-alist) |
2c08ad76fc1f
* progmodes/cperl-mode.el (compilation-error-regexp-alist): Pacify
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85762
diff
changeset
|
1525 |
20323 | 1526 ;;;###autoload |
1527 (defun cperl-mode () | |
1528 "Major mode for editing Perl code. | |
1529 Expression and list commands understand all C brackets. | |
1530 Tab indents for Perl code. | |
1531 Paragraphs are separated by blank lines only. | |
1532 Delete converts tabs to spaces as it moves back. | |
1533 | |
1534 Various characters in Perl almost always come in pairs: {}, (), [], | |
1535 sometimes <>. When the user types the first, she gets the second as | |
1536 well, with optional special formatting done on {}. (Disabled by | |
1537 default.) You can always quote (with \\[quoted-insert]) the left | |
1538 \"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
|
1539 since most the time you mean \"less\". CPerl mode tries to guess |
20323 | 1540 whether you want to type pair <>, and inserts is if it |
1541 appropriate. You can set `cperl-electric-parens-string' to the string that | |
1542 contains the parenths from the above list you want to be electrical. | |
1543 Electricity of parenths is controlled by `cperl-electric-parens'. | |
1544 You may also set `cperl-electric-parens-mark' to have electric parens | |
1545 look for active mark and \"embrace\" a region if possible.' | |
1546 | |
1547 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
|
1548 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1549 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
|
1550 for, foreach, formy and foreachmy. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1551 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1552 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
|
1553 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1554 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
|
1555 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
|
1556 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
|
1557 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
|
1558 } { } 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
|
1559 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
|
1560 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
|
1561 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
|
1562 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
|
1563 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1564 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
|
1565 |
20323 | 1566 bite if angry; |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1567 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1568 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
|
1569 `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
|
1570 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
|
1571 to nil.) |
20323 | 1572 |
1573 \\[cperl-linefeed] is a convenience replacement for typing carriage | |
1574 return. It places you in the next line with proper indentation, or if | |
1575 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
|
1576 |
20323 | 1577 foreach (@lines) {print; print} |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1578 |
20323 | 1579 and you are on a boundary of a statement inside braces, it will |
1580 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
|
1581 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
|
1582 `newline-and-indent' behavior, it is on \\[newline-and-indent], |
20323 | 1583 see documentation on `cperl-electric-linefeed'. |
1584 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1585 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
|
1586 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1587 if (A) { B } |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1588 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1589 into |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1590 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1591 B if A; |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1592 |
20323 | 1593 \\{cperl-mode-map} |
1594 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1595 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
|
1596 \(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
|
1597 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
|
1598 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
|
1599 \(see also `cperl-electric-parens-mark' and `cperl-electric-parens'), |
20323 | 1600 setting `cperl-electric-keywords' enables electric expansion of |
1601 control structures in CPerl. `cperl-electric-linefeed' governs which | |
1602 one of two linefeed behavior is preferable. You can enable all these | |
1603 options simultaneously (recommended mode of use) by setting | |
1604 `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
|
1605 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
|
1606 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
|
1607 consequent \\[cperl-electric-backspace]. |
20323 | 1608 |
1609 If your site has perl5 documentation in info format, you can use commands | |
1610 \\[cperl-info-on-current-command] and \\[cperl-info-on-command] to access it. | |
1611 These keys run commands `cperl-info-on-current-command' and | |
1612 `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
|
1613 `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
|
1614 \(in turn affected by `cperl-hairy'). |
20323 | 1615 |
1616 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
|
1617 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
|
1618 man via menu. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1619 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1620 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
|
1621 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
|
1622 `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
|
1623 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
|
1624 menu, or via \\[cperl-toggle-autohelp]. Requires `run-with-idle-timer'. |
20323 | 1625 |
1626 Use \\[cperl-lineup] to vertically lineup some construction - put the | |
1627 beginning of the region at the start of construction, and make region | |
1628 span the needed amount of lines. | |
1629 | |
1630 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
|
1631 `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
|
1632 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
|
1633 for indentation too, otherwise they are used for highlighting only. |
20323 | 1634 |
1635 Variables controlling indentation style: | |
1636 `cperl-tab-always-indent' | |
1637 Non-nil means TAB in CPerl mode should always reindent the current line, | |
1638 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
|
1639 `cperl-indent-left-aligned-comments' |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1640 Non-nil means that the comment starting in leftmost column should indent. |
20323 | 1641 `cperl-auto-newline' |
1642 Non-nil means automatically newline before and after braces, | |
1643 and after colons and semicolons, inserted in Perl code. The following | |
1644 \\[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
|
1645 Insertion after colons requires both this variable and |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1646 `cperl-auto-newline-after-colon' set. |
20323 | 1647 `cperl-auto-newline-after-colon' |
1648 Non-nil means automatically newline even after colons. | |
1649 Subject to `cperl-auto-newline' setting. | |
1650 `cperl-indent-level' | |
1651 Indentation of Perl statements within surrounding block. | |
1652 The surrounding block's indentation is the indentation | |
1653 of the line on which the open-brace appears. | |
1654 `cperl-continued-statement-offset' | |
1655 Extra indentation given to a substatement, such as the | |
1656 then-clause of an if, or body of a while, or just a statement continuation. | |
1657 `cperl-continued-brace-offset' | |
1658 Extra indentation given to a brace that starts a substatement. | |
1659 This is in addition to `cperl-continued-statement-offset'. | |
1660 `cperl-brace-offset' | |
1661 Extra indentation for line if it starts with an open brace. | |
1662 `cperl-brace-imaginary-offset' | |
1663 An open brace following other text is treated as if it the line started | |
1664 this far to the right of the actual line indentation. | |
1665 `cperl-label-offset' | |
1666 Extra indentation for line that is a label. | |
1667 `cperl-min-label-indent' | |
1668 Minimal indentation for line that is a label. | |
1669 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1670 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
|
1671 `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
|
1672 `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
|
1673 `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
|
1674 `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
|
1675 `cperl-continued-statement-offset' 5 4 2 4 |
20323 | 1676 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1677 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
|
1678 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
|
1679 \\[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
|
1680 \(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
|
1681 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1682 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
|
1683 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
|
1684 templates for these constructs are created (controlled by |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1685 `cperl-extra-newline-before-brace'), and how reflow-logic should treat |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1686 \"continuation\" blocks of else/elsif/continue, controlled by the same |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1687 variable, and by `cperl-extra-newline-before-brace-multiline', |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1688 `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
|
1689 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1690 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
|
1691 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
|
1692 `cperl-brace-offset'+`cperl-continued-statement-offset'. |
20323 | 1693 |
1694 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
|
1695 with no args. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1696 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1697 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
|
1698 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
|
1699 `cperl-praise', `cperl-speed'." |
20323 | 1700 (interactive) |
1701 (kill-all-local-variables) | |
1702 (use-local-map cperl-mode-map) | |
1703 (if (cperl-val 'cperl-electric-linefeed) | |
1704 (progn | |
1705 (local-set-key "\C-J" 'cperl-linefeed) | |
1706 (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
|
1707 (if (and |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1708 (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
|
1709 (cperl-val 'cperl-info-on-command-no-prompt)) |
20323 | 1710 (progn |
1711 ;; don't clobber the backspace binding: | |
1712 (cperl-define-key "\C-hf" 'cperl-info-on-current-command [(control h) f]) | |
1713 (cperl-define-key "\C-c\C-hf" 'cperl-info-on-command | |
1714 [(control c) (control h) f]))) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1715 (setq major-mode cperl-use-major-mode) |
20323 | 1716 (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
|
1717 (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
|
1718 (define-abbrev-table 'cperl-mode-abbrev-table '( |
20323 | 1719 ("if" "if" cperl-electric-keyword 0) |
1720 ("elsif" "elsif" cperl-electric-keyword 0) | |
1721 ("while" "while" cperl-electric-keyword 0) | |
1722 ("until" "until" cperl-electric-keyword 0) | |
1723 ("unless" "unless" cperl-electric-keyword 0) | |
1724 ("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
|
1725 ("continue" "continue" cperl-electric-else 0) |
20323 | 1726 ("for" "for" cperl-electric-keyword 0) |
1727 ("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
|
1728 ("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
|
1729 ("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
|
1730 ("do" "do" cperl-electric-keyword 0) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1731 ("=pod" "=pod" cperl-electric-pod 0) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1732 ("=over" "=over" cperl-electric-pod 0) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1733 ("=head1" "=head1" cperl-electric-pod 0) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1734 ("=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
|
1735 ("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
|
1736 ("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
|
1737 ("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
|
1738 ("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
|
1739 (setq abbrevs-changed prev-a-c)) |
20323 | 1740 (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
|
1741 (if (cperl-val 'cperl-electric-keywords) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1742 (abbrev-mode 1)) |
20323 | 1743 (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
|
1744 ;; 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
|
1745 (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
|
1746 (make-local-variable 'cperl-font-locking) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1747 (make-local-variable 'outline-regexp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1748 ;; (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
|
1749 (setq outline-regexp cperl-outline-regexp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1750 (make-local-variable 'outline-level) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1751 (setq outline-level 'cperl-outline-level) |
20323 | 1752 (make-local-variable 'paragraph-start) |
1753 (setq paragraph-start (concat "^$\\|" page-delimiter)) | |
1754 (make-local-variable 'paragraph-separate) | |
1755 (setq paragraph-separate paragraph-start) | |
1756 (make-local-variable 'paragraph-ignore-fill-prefix) | |
1757 (setq paragraph-ignore-fill-prefix t) | |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
1758 (if (featurep 'xemacs) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1759 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1760 (make-local-variable 'paren-backwards-message) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1761 (set 'paren-backwards-message t))) |
20323 | 1762 (make-local-variable 'indent-line-function) |
1763 (setq indent-line-function 'cperl-indent-line) | |
1764 (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
|
1765 (setq require-final-newline mode-require-final-newline) |
20323 | 1766 (make-local-variable 'comment-start) |
1767 (setq comment-start "# ") | |
1768 (make-local-variable 'comment-end) | |
1769 (setq comment-end "") | |
1770 (make-local-variable 'comment-column) | |
1771 (setq comment-column cperl-comment-column) | |
1772 (make-local-variable 'comment-start-skip) | |
1773 (setq comment-start-skip "#+ *") | |
1774 (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
|
1775 ;;; "[ \t]*sub" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1776 ;;; (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
|
1777 ;;; 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
|
1778 (setq defun-prompt-regexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1779 (concat "^[ \t]*\\(sub" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1780 (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
|
1781 "\\|" ; per toke.c |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1782 "\\(BEGIN\\|CHECK\\|INIT\\|END\\|AUTOLOAD\\|DESTROY\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1783 "\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1784 cperl-maybe-white-and-comment-rex)) |
20323 | 1785 (make-local-variable 'comment-indent-function) |
1786 (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
|
1787 (and (boundp 'fill-paragraph-function) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1788 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1789 (make-local-variable 'fill-paragraph-function) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1790 (set 'fill-paragraph-function 'cperl-fill-paragraph))) |
20323 | 1791 (make-local-variable 'parse-sexp-ignore-comments) |
1792 (setq parse-sexp-ignore-comments t) | |
1793 (make-local-variable 'indent-region-function) | |
1794 (setq indent-region-function 'cperl-indent-region) | |
1795 ;;(setq auto-fill-function 'cperl-do-auto-fill) ; Need to switch on and off! | |
1796 (make-local-variable 'imenu-create-index-function) | |
1797 (setq imenu-create-index-function | |
31821 | 1798 (function cperl-imenu--create-perl-index)) |
20323 | 1799 (make-local-variable 'imenu-sort-function) |
1800 (setq imenu-sort-function nil) | |
62686
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
1801 (make-local-variable 'vc-rcs-header) |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
1802 (set 'vc-rcs-header cperl-vc-rcs-header) |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
1803 (make-local-variable 'vc-sccs-header) |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
1804 (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
|
1805 ;; This one is obsolete... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1806 (make-local-variable 'vc-header-alist) |
86503
2c08ad76fc1f
* progmodes/cperl-mode.el (compilation-error-regexp-alist): Pacify
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85762
diff
changeset
|
1807 (with-no-warnings |
2c08ad76fc1f
* progmodes/cperl-mode.el (compilation-error-regexp-alist): Pacify
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85762
diff
changeset
|
1808 (set 'vc-header-alist (or cperl-vc-header-alist ; Avoid warning |
2c08ad76fc1f
* progmodes/cperl-mode.el (compilation-error-regexp-alist): Pacify
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85762
diff
changeset
|
1809 `((SCCS ,(car cperl-vc-sccs-header)) |
2c08ad76fc1f
* progmodes/cperl-mode.el (compilation-error-regexp-alist): Pacify
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85762
diff
changeset
|
1810 (RCS ,(car cperl-vc-rcs-header))))) |
2c08ad76fc1f
* progmodes/cperl-mode.el (compilation-error-regexp-alist): Pacify
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85762
diff
changeset
|
1811 ) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1812 (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
|
1813 (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
|
1814 (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
|
1815 (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
|
1816 (symbol-value 'compilation-error-regexp-alist-alist))) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1817 (if (fboundp 'compilation-build-compilation-error-regexp-alist) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1818 (let ((f 'compilation-build-compilation-error-regexp-alist)) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1819 (funcall f)) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1820 (make-local-variable 'compilation-error-regexp-alist) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
1821 (push 'cperl compilation-error-regexp-alist))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1822 ((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
|
1823 (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
|
1824 (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
|
1825 (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
|
1826 (symbol-value 'compilation-error-regexp-alist))))) |
20323 | 1827 (make-local-variable 'font-lock-defaults) |
1828 (setq font-lock-defaults | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1829 (cond |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1830 ((string< emacs-version "19.30") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1831 '(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
|
1832 ((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
|
1833 '((cperl-font-lock-keywords |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
1834 cperl-font-lock-keywords-1 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1835 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
|
1836 (t |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1837 '((cperl-load-font-lock-keywords |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1838 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
|
1839 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
|
1840 (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
|
1841 (setq cperl-syntax-state nil) ; reset syntaxification cache |
20323 | 1842 (if cperl-use-syntax-table-text-property |
1843 (progn | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
1844 (make-local-variable 'parse-sexp-lookup-properties) |
20323 | 1845 ;; 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
|
1846 (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
|
1847 ;; Fix broken font-lock: |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1848 (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
|
1849 (set 'font-lock-unfontify-region-function |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1850 'font-lock-default-unfontify-region)) |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
1851 (unless (featurep 'xemacs) ; Our: just a plug for wrong font-lock |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1852 (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
|
1853 (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
|
1854 '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
|
1855 (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
|
1856 (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
|
1857 (make-local-variable 'font-lock-syntactic-keywords) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1858 (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
|
1859 (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
|
1860 '((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
|
1861 ;; 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
|
1862 ;; 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
|
1863 ;; 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
|
1864 ;; are defined. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1865 '(t))))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1866 (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
|
1867 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1868 (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
|
1869 (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
|
1870 (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
|
1871 (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
|
1872 'cperl-font-lock-fontify-region-function)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1873 (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
|
1874 (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
|
1875 '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
|
1876 (make-local-variable 'cperl-old-style) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1877 (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
|
1878 (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
|
1879 'cperl-do-auto-fill) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1880 (or (fboundp 'cperl-old-auto-fill-mode) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1881 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1882 (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
|
1883 (defun auto-fill-mode (&optional arg) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1884 (interactive "P") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1885 (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
|
1886 (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
|
1887 (setq auto-fill-function 'cperl-do-auto-fill)))))) |
20323 | 1888 (if (cperl-enable-font-lock) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1889 (if (cperl-val 'cperl-font-lock) |
20323 | 1890 (progn (or cperl-faces-init (cperl-init-faces)) |
1891 (font-lock-mode 1)))) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1892 (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
|
1893 'cperl-facemenu-add-face-function) ; XXXX What this guy is for??? |
20323 | 1894 (and (boundp 'msb-menu-cond) |
1895 (not cperl-msb-fixed) | |
1896 (cperl-msb-fix)) | |
1897 (if (featurep 'easymenu) | |
22392
7300e6ab99d2
(cperl-problems): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
22391
diff
changeset
|
1898 (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
|
1899 (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
|
1900 (if cperl-hook-after-change |
77103
5e661f4001f4
(cperl-mode): Remove unnecessary call to obsolete function
Glenn Morris <rgm@gnu.org>
parents:
76299
diff
changeset
|
1901 (add-hook 'after-change-functions 'cperl-after-change-function nil t)) |
20323 | 1902 ;; After hooks since fontification will break this |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1903 (if cperl-pod-here-scan |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1904 (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
|
1905 (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
|
1906 (cperl-find-pods-heres))))) |
20323 | 1907 |
1908 ;; Fix for perldb - make default reasonable | |
1909 (defun cperl-db () | |
1910 (interactive) | |
1911 (require 'gud) | |
1912 (perldb (read-from-minibuffer "Run perldb (like this): " | |
1913 (if (consp gud-perldb-history) | |
1914 (car gud-perldb-history) | |
1915 (concat "perl " ;;(file-name-nondirectory | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1916 ;; I have problems |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1917 ;; in OS/2 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1918 ;; otherwise |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1919 (buffer-file-name))) |
20323 | 1920 nil nil |
1921 '(gud-perldb-history . 1)))) | |
1922 | |
1923 (defun cperl-msb-fix () | |
1924 ;; Adds perl files to msb menu, supposes that msb is already loaded | |
1925 (setq cperl-msb-fixed t) | |
1926 (let* ((l (length msb-menu-cond)) | |
1927 (last (nth (1- l) msb-menu-cond)) | |
1928 (precdr (nthcdr (- l 2) msb-menu-cond)) ; cdr of this is last | |
1929 (handle (1- (nth 1 last)))) | |
1930 (setcdr precdr (list | |
1931 (list | |
36602
4bcc2745d610
(cperl-msb-fix, cperl-get-help-defer):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36601
diff
changeset
|
1932 '(memq major-mode '(cperl-mode perl-mode)) |
20323 | 1933 handle |
1934 "Perl Files (%d)") | |
1935 last)))) | |
1936 | |
1937 ;; This is used by indent-for-comment | |
1938 ;; to decide how much to indent a comment in CPerl code | |
1939 ;; based on its context. Do fallback if comment is found wrong. | |
1940 | |
1941 (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
|
1942 (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
|
1943 (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
|
1944 (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
|
1945 (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
|
1946 (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
|
1947 (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
|
1948 |
20323 | 1949 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1950 (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
|
1951 (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
|
1952 (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
|
1953 (looking-at "^#")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1954 0 ; Existing comment at bol stays there. |
20323 | 1955 ;; Wrong comment found |
1956 (save-excursion | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1957 (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
|
1958 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
|
1959 cperl-st-cfence)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1960 (if phony |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1961 (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
|
1962 (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
|
1963 (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
|
1964 (forward-char -1)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1965 (setq was nil))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1966 (if (= (point) p) ; Our caller found a correct place |
20323 | 1967 (progn |
1968 (skip-chars-backward " \t") | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1969 (setq was (current-column)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1970 (if (eq was 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1971 comment-column |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1972 (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
|
1973 comment-column))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1974 ;; No, the caller found a random place; we need to edit ourselves |
20323 | 1975 (if was nil |
1976 (insert comment-start) | |
1977 (backward-char (length comment-start))) | |
1978 (setq cperl-wrong-comment t) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1979 (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
|
1980 c))))) |
20323 | 1981 |
1982 ;;;(defun cperl-comment-indent-fallback () | |
1983 ;;; "Is called if the standard comment-search procedure fails. | |
1984 ;;;Point is at start of real comment." | |
1985 ;;; (let ((c (current-column)) target cnt prevc) | |
1986 ;;; (if (= c comment-column) nil | |
1987 ;;; (setq cnt (skip-chars-backward "[ \t]")) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1988 ;;; (setq target (max (1+ (setq prevc |
20323 | 1989 ;;; (current-column))) ; Else indent at comment column |
1990 ;;; comment-column)) | |
1991 ;;; (if (= c comment-column) nil | |
1992 ;;; (delete-backward-char cnt) | |
1993 ;;; (while (< prevc target) | |
1994 ;;; (insert "\t") | |
1995 ;;; (setq prevc (current-column))) | |
1996 ;;; (if (> prevc target) (progn (delete-char -1) (setq prevc (current-column)))) | |
1997 ;;; (while (< prevc target) | |
1998 ;;; (insert " ") | |
1999 ;;; (setq prevc (current-column))))))) | |
2000 | |
2001 (defun cperl-indent-for-comment () | |
2002 "Substitute for `indent-for-comment' in CPerl." | |
2003 (interactive) | |
2004 (let (cperl-wrong-comment) | |
2005 (indent-for-comment) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2006 (if cperl-wrong-comment ; set by `cperl-comment-indent' |
20323 | 2007 (progn (cperl-to-comment-or-eol) |
2008 (forward-char (length comment-start)))))) | |
2009 | |
2010 (defun cperl-comment-region (b e arg) | |
2011 "Comment or uncomment each line in the region in CPerl mode. | |
2012 See `comment-region'." | |
2013 (interactive "r\np") | |
2014 (let ((comment-start "#")) | |
2015 (comment-region b e arg))) | |
2016 | |
2017 (defun cperl-uncomment-region (b e arg) | |
2018 "Uncomment or comment each line in the region in CPerl mode. | |
2019 See `comment-region'." | |
2020 (interactive "r\np") | |
2021 (let ((comment-start "#")) | |
2022 (comment-region b e (- arg)))) | |
2023 | |
2024 (defvar cperl-brace-recursing nil) | |
2025 | |
2026 (defun cperl-electric-brace (arg &optional only-before) | |
2027 "Insert character and correct line's indentation. | |
2028 If ONLY-BEFORE and `cperl-auto-newline', will insert newline before the | |
2029 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
|
2030 char is \"{\", insert extra newline before only if |
20323 | 2031 `cperl-extra-newline-before-brace'." |
2032 (interactive "P") | |
2033 (let (insertpos | |
2034 (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
|
2035 (cperl-mark-active) |
20323 | 2036 (< (mark) (point))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2037 (mark) |
20323 | 2038 nil))) |
2039 (if (and other-end | |
2040 (not cperl-brace-recursing) | |
2041 (cperl-val 'cperl-electric-parens) | |
2042 (>= (save-excursion (cperl-to-comment-or-eol) (point)) (point))) | |
2043 ;; Need to insert a matching pair | |
2044 (progn | |
2045 (save-excursion | |
2046 (setq insertpos (point-marker)) | |
2047 (goto-char other-end) | |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2048 (setq last-command-event ?\{) |
20323 | 2049 (cperl-electric-lbrace arg insertpos)) |
2050 (forward-char 1)) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2051 ;; Check whether we close something "usual" with `}' |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2052 (if (and (eq last-command-event ?\}) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2053 (not |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2054 (condition-case nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2055 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2056 (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
|
2057 ;;(cperl-after-block-p (point-min)) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2058 (or (cperl-after-expr-p nil "{;)") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2059 ;; after sub, else, continue |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2060 (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
|
2061 (error nil)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2062 ;; Just insert the guy |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2063 (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
|
2064 (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
|
2065 (eolp) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2066 (or (and (null only-before) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2067 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2068 (skip-chars-backward " \t") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2069 (bolp))) |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2070 (and (eq last-command-event ?\{) ; Do not insert newline |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2071 ;; 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
|
2072 ;; 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
|
2073 (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
|
2074 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2075 (skip-chars-backward " \t") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2076 (eq (preceding-char) ?\)))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2077 (if cperl-auto-newline |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2078 (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
|
2079 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2080 (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
|
2081 (cperl-indent-line) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2082 (if cperl-auto-newline |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2083 (setq insertpos (1- (point)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2084 (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
|
2085 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2086 (newline) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2087 (cperl-indent-line))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2088 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2089 (if insertpos (progn (goto-char insertpos) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2090 (search-forward (make-string |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2091 1 last-command-event)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2092 (setq insertpos (1- (point))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2093 (delete-char -1)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2094 (if insertpos |
20323 | 2095 (save-excursion |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2096 (goto-char insertpos) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2097 (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
|
2098 (self-insert-command (prefix-numeric-value arg))))))) |
20323 | 2099 |
2100 (defun cperl-electric-lbrace (arg &optional end) | |
2101 "Insert character, correct line's indentation, correct quoting by space." | |
2102 (interactive "P") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2103 (let ((cperl-brace-recursing t) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2104 (cperl-auto-newline cperl-auto-newline) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2105 (other-end (or end |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2106 (if (and cperl-electric-parens-mark |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2107 (cperl-mark-active) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2108 (> (mark) (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2109 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2110 (goto-char (mark)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2111 (point-marker)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2112 nil))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2113 pos after) |
20323 | 2114 (and (cperl-val 'cperl-electric-lbrace-space) |
2115 (eq (preceding-char) ?$) | |
2116 (save-excursion | |
2117 (skip-chars-backward "$") | |
2118 (looking-at "\\(\\$\\$\\)*\\$\\([^\\$]\\|$\\)")) | |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
2119 (insert ?\s)) |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2120 ;; Check whether we are in comment |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2121 (if (and |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2122 (save-excursion |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2123 (beginning-of-line) |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2124 (not (looking-at "[ \t]*#"))) |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2125 (cperl-after-expr-p nil "{;)")) |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2126 nil |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2127 (setq cperl-auto-newline nil)) |
20323 | 2128 (cperl-electric-brace arg) |
2129 (and (cperl-val 'cperl-electric-parens) | |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2130 (eq last-command-event ?{) |
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2131 (memq last-command-event |
20323 | 2132 (append cperl-electric-parens-string nil)) |
2133 (or (if other-end (goto-char (marker-position other-end))) | |
2134 t) | |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2135 (setq last-command-event ?} pos (point)) |
20323 | 2136 (progn (cperl-electric-brace arg t) |
2137 (goto-char pos))))) | |
2138 | |
2139 (defun cperl-electric-paren (arg) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2140 "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
|
2141 See `cperl-electric-parens'." |
20323 | 2142 (interactive "P") |
2143 (let ((beg (save-excursion (beginning-of-line) (point))) | |
2144 (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
|
2145 (cperl-mark-active) |
20323 | 2146 (> (mark) (point))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2147 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2148 (goto-char (mark)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2149 (point-marker)) |
20323 | 2150 nil))) |
2151 (if (and (cperl-val 'cperl-electric-parens) | |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2152 (memq last-command-event |
20323 | 2153 (append cperl-electric-parens-string nil)) |
2154 (>= (save-excursion (cperl-to-comment-or-eol) (point)) (point)) | |
2155 ;;(not (save-excursion (search-backward "#" beg t))) | |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2156 (if (eq last-command-event ?<) |
20323 | 2157 (progn |
104311
bf7a2419d30f
* progmodes/cperl-mode.el (cperl-electric-paren): Don't expand
Chong Yidong <cyd@stupidchicken.com>
parents:
104310
diff
changeset
|
2158 ;; This code is too electric, see Bug#3943. |
bf7a2419d30f
* progmodes/cperl-mode.el (cperl-electric-paren): Don't expand
Chong Yidong <cyd@stupidchicken.com>
parents:
104310
diff
changeset
|
2159 ;; (and abbrev-mode ; later it is too late, may be after `for' |
bf7a2419d30f
* progmodes/cperl-mode.el (cperl-electric-paren): Don't expand
Chong Yidong <cyd@stupidchicken.com>
parents:
104310
diff
changeset
|
2160 ;; (expand-abbrev)) |
20323 | 2161 (cperl-after-expr-p nil "{;(,:=")) |
2162 1)) | |
2163 (progn | |
2164 (self-insert-command (prefix-numeric-value arg)) | |
2165 (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
|
2166 (insert (make-string |
20323 | 2167 (prefix-numeric-value arg) |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2168 (cdr (assoc last-command-event '((?{ .?}) |
20323 | 2169 (?[ . ?]) |
2170 (?( . ?)) | |
2171 (?< . ?>)))))) | |
2172 (forward-char (- (prefix-numeric-value arg)))) | |
2173 (self-insert-command (prefix-numeric-value arg))))) | |
2174 | |
2175 (defun cperl-electric-rparen (arg) | |
2176 "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
|
2177 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
|
2178 Affected by `cperl-electric-parens'." |
20323 | 2179 (interactive "P") |
2180 (let ((beg (save-excursion (beginning-of-line) (point))) | |
2181 (other-end (if (and cperl-electric-parens-mark | |
2182 (cperl-val 'cperl-electric-parens) | |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2183 (memq last-command-event |
20323 | 2184 (append cperl-electric-parens-string nil)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2185 (cperl-mark-active) |
20323 | 2186 (< (mark) (point))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2187 (mark) |
20323 | 2188 nil)) |
2189 p) | |
2190 (if (and other-end | |
2191 (cperl-val 'cperl-electric-parens) | |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2192 (memq last-command-event '( ?\) ?\] ?\} ?\> )) |
20323 | 2193 (>= (save-excursion (cperl-to-comment-or-eol) (point)) (point)) |
2194 ;;(not (save-excursion (search-backward "#" beg t))) | |
2195 ) | |
2196 (progn | |
2197 (self-insert-command (prefix-numeric-value arg)) | |
2198 (setq p (point)) | |
2199 (if other-end (goto-char other-end)) | |
2200 (insert (make-string | |
2201 (prefix-numeric-value arg) | |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2202 (cdr (assoc last-command-event '((?\} . ?\{) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2203 (?\] . ?\[) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2204 (?\) . ?\() |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2205 (?\> . ?\<)))))) |
20323 | 2206 (goto-char (1+ p))) |
2207 (self-insert-command (prefix-numeric-value arg))))) | |
2208 | |
2209 (defun cperl-electric-keyword () | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2210 "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
|
2211 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
|
2212 to nil." |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2213 (let ((beg (save-excursion (beginning-of-line) (point))) |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2214 (dollar (and (eq last-command-event ?$) |
20323 | 2215 (eq this-command 'self-insert-command))) |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2216 (delete (and (memq last-command-event '(?\s ?\n ?\t ?\f)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2217 (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
|
2218 my do) |
20323 | 2219 (and (save-excursion |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2220 (condition-case nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2221 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2222 (backward-sexp 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2223 (setq do (looking-at "do\\>"))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2224 (error nil)) |
20323 | 2225 (cperl-after-expr-p nil "{;:")) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2226 (save-excursion |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2227 (not |
20323 | 2228 (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
|
2229 "[#\"'`]\\|\\<q\\(\\|[wqxr]\\)\\>" |
20323 | 2230 beg t))) |
2231 (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
|
2232 (or |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2233 (looking-at "=cut") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2234 (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
|
2235 (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
|
2236 'syntax-type) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2237 'pod)))))) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2238 (save-excursion (forward-sexp -1) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2239 (not (memq (following-char) (append "$@%&*" nil)))) |
20323 | 2240 (progn |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2241 (and (eq (preceding-char) ?y) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2242 (progn ; "foreachmy" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2243 (forward-char -2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2244 (insert " ") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2245 (forward-char 2) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2246 (setq my t dollar t |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2247 delete |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2248 (memq this-command '(self-insert-command newline))))) |
20323 | 2249 (and dollar (insert " $")) |
2250 (cperl-indent-line) | |
2251 ;;(insert " () {\n}") | |
2252 (cond | |
2253 (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
|
2254 (insert (if do "\n" " ()\n")) |
20323 | 2255 (insert "{") |
2256 (cperl-indent-line) | |
2257 (insert "\n") | |
2258 (cperl-indent-line) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2259 (insert "\n}") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2260 (and do (insert " while ();"))) |
20323 | 2261 (t |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2262 (insert (if do " {\n} while ();" " () {\n}")))) |
20323 | 2263 (or (looking-at "[ \t]\\|$") (insert " ")) |
2264 (cperl-indent-line) | |
2265 (if dollar (progn (search-backward "$") | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2266 (if my |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2267 (forward-char 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2268 (delete-char 1))) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2269 (search-backward ")") |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2270 (if (eq last-command-event ?\() |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2271 (progn ; Avoid "if (())" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2272 (delete-backward-char 1) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2273 (delete-backward-char -1)))) |
20323 | 2274 (if delete |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2275 (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
|
2276 (if cperl-message-electric-keyword |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2277 (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
|
2278 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2279 (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
|
2280 "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
|
2281 (or pos (setq pos (point))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2282 (if (looking-at "\n") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2283 (forward-char 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2284 (insert "\n")) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2285 (if (> n 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2286 (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
|
2287 (goto-char pos))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2288 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2289 (defun cperl-electric-pod () |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2290 "Insert a POD chunk appropriate after a =POD directive." |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2291 (let ((delete (and (memq last-command-event '(?\s ?\n ?\t ?\f)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2292 (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
|
2293 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
|
2294 (and (save-excursion |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2295 (forward-word -1) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
2296 (and |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2297 (eq (preceding-char) ?=) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2298 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2299 (setq head1 (looking-at "head1\\>[ \t]*$")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2300 (setq over (and (looking-at "over\\>[ \t]*$") |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2301 (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
|
2302 (forward-char -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2303 (bolp)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2304 (or |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2305 (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
|
2306 (cperl-after-expr-p nil "{;:") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2307 (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
|
2308 (not (looking-at "\n*=cut")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2309 (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
|
2310 (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
|
2311 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2312 (save-excursion |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2313 (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
|
2314 (or notlast |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2315 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2316 (insert "\n\n=cut") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2317 (cperl-ensure-newlines 2) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2318 (forward-word -2) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
2319 (if (and head1 |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
2320 (not |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2321 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2322 (forward-char -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2323 (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
|
2324 nil t)))) ; Only one |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
2325 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2326 (forward-word 1) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2327 (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
|
2328 (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
|
2329 p (point)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2330 (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
|
2331 " - \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
|
2332 "=head1 DESCRIPTION") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2333 (cperl-ensure-newlines 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2334 (goto-char p) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2335 (forward-word 2) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2336 (end-of-line) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2337 (setq really-delete t)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2338 (forward-word 1)))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2339 (if over |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2340 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2341 (setq p (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2342 (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
|
2343 "=back") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2344 (cperl-ensure-newlines 2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2345 (goto-char p) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2346 (forward-word 1) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2347 (end-of-line) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2348 (setq really-delete t))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2349 (if (and delete really-delete) |
20323 | 2350 (cperl-putback-char cperl-del-back-ch)))))) |
2351 | |
2352 (defun cperl-electric-else () | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2353 "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
|
2354 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
|
2355 to nil." |
20323 | 2356 (let ((beg (save-excursion (beginning-of-line) (point)))) |
2357 (and (save-excursion | |
2358 (backward-sexp 1) | |
2359 (cperl-after-expr-p nil "{;:")) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2360 (save-excursion |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2361 (not |
20323 | 2362 (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
|
2363 "[#\"'`]\\|\\<q\\(\\|[wqxr]\\)\\>" |
20323 | 2364 beg t))) |
2365 (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
|
2366 (looking-at "=cut") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2367 (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
|
2368 (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
|
2369 'syntax-type) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2370 'pod))))) |
20323 | 2371 (progn |
2372 (cperl-indent-line) | |
2373 ;;(insert " {\n\n}") | |
2374 (cond | |
2375 (cperl-extra-newline-before-brace | |
2376 (insert "\n") | |
2377 (insert "{") | |
2378 (cperl-indent-line) | |
2379 (insert "\n\n}")) | |
2380 (t | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2381 (insert " {\n\n}"))) |
20323 | 2382 (or (looking-at "[ \t]\\|$") (insert " ")) |
2383 (cperl-indent-line) | |
2384 (forward-line -1) | |
2385 (cperl-indent-line) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2386 (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
|
2387 (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
|
2388 (if cperl-message-electric-keyword |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2389 (message "Precede char by C-q to avoid expansion")))))) |
20323 | 2390 |
2391 (defun cperl-linefeed () | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2392 "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
|
2393 If in POD, insert appropriate lines." |
20323 | 2394 (interactive) |
2395 (let ((beg (save-excursion (beginning-of-line) (point))) | |
2396 (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
|
2397 (pos (point)) start over cut res) |
20323 | 2398 (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
|
2399 ; i.e., on a boundary and inside "{...}" |
20323 | 2400 (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
|
2401 (>= (point) pos)) ; Not in a comment |
20323 | 2402 (or (save-excursion |
2403 (skip-chars-backward " \t" beg) | |
2404 (forward-char -1) | |
2405 (looking-at "[;{]")) ; After { or ; + spaces | |
2406 (looking-at "[ \t]*}") ; Before } | |
2407 (re-search-forward "\\=[ \t]*;" end t)) ; Before spaces + ; | |
2408 (save-excursion | |
2409 (and | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2410 (eq (car (parse-partial-sexp pos end -1)) -1) |
20323 | 2411 ; Leave the level of parens |
2412 (looking-at "[,; \t]*\\($\\|#\\)") ; Comma to allow anon subr | |
2413 ; Are at end | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2414 (cperl-after-block-p (point-min)) |
20323 | 2415 (progn |
2416 (backward-sexp 1) | |
2417 (setq start (point-marker)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2418 (<= start pos))))) ; Redundant? Are after the |
20323 | 2419 ; start of parens group. |
2420 (progn | |
2421 (skip-chars-backward " \t") | |
2422 (or (memq (preceding-char) (append ";{" nil)) | |
2423 (insert ";")) | |
2424 (insert "\n") | |
2425 (forward-line -1) | |
2426 (cperl-indent-line) | |
2427 (goto-char start) | |
2428 (or (looking-at "{[ \t]*$") ; If there is a statement | |
2429 ; before, move it to separate line | |
2430 (progn | |
2431 (forward-char 1) | |
2432 (insert "\n") | |
2433 (cperl-indent-line))) | |
2434 (forward-line 1) ; We are on the target line | |
2435 (cperl-indent-line) | |
2436 (beginning-of-line) | |
2437 (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
|
2438 ; after, move it to separate line |
20323 | 2439 (progn |
2440 (end-of-line) | |
2441 (search-backward "}" beg) | |
2442 (skip-chars-backward " \t") | |
2443 (or (memq (preceding-char) (append ";{" nil)) | |
2444 (insert ";")) | |
2445 (insert "\n") | |
2446 (cperl-indent-line) | |
2447 (forward-line -1))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2448 (forward-line -1) ; We are on the line before target |
20323 | 2449 (end-of-line) |
2450 (newline-and-indent)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2451 (end-of-line) ; else - no splitting |
20323 | 2452 (cond |
2453 ((and (looking-at "\n[ \t]*{$") | |
2454 (save-excursion | |
2455 (skip-chars-backward " \t") | |
2456 (eq (preceding-char) ?\)))) ; Probably if () {} group | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2457 ; with an extra newline. |
20323 | 2458 (forward-line 2) |
2459 (cperl-indent-line)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2460 ((save-excursion ; In POD header |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2461 (forward-paragraph -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2462 ;; (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
|
2463 ;; 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
|
2464 (if (looking-at "\\(\\`\n?\\|\n\\)=\\sw+") |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2465 (progn |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2466 (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
|
2467 (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
|
2468 t))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2469 (if (and over |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2470 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2471 (forward-paragraph -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2472 (forward-word 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2473 (setq pos (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2474 (setq cut (buffer-substring (point) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2475 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2476 (end-of-line) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2477 (point)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2478 (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
|
2479 (point))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2480 (setq res (expand-abbrev)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2481 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2482 (goto-char pos) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2483 (insert cut)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2484 res)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2485 nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2486 (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
|
2487 (forward-line 2))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2488 ((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
|
2489 (cperl-ensure-newlines 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2490 (forward-line 2)) |
20323 | 2491 ((looking-at "\n[ \t]*$") ; Next line is empty - use it. |
2492 (forward-line 1) | |
2493 (cperl-indent-line)) | |
2494 (t | |
2495 (newline-and-indent)))))) | |
2496 | |
2497 (defun cperl-electric-semi (arg) | |
2498 "Insert character and correct line's indentation." | |
2499 (interactive "P") | |
2500 (if cperl-auto-newline | |
2501 (cperl-electric-terminator arg) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2502 (self-insert-command (prefix-numeric-value arg)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2503 (if cperl-autoindent-on-semi |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2504 (cperl-indent-line)))) |
20323 | 2505 |
2506 (defun cperl-electric-terminator (arg) | |
2507 "Insert character and correct line's indentation." | |
2508 (interactive "P") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2509 (let ((end (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2510 (auto (and cperl-auto-newline |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2511 (or (not (eq last-command-event ?:)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2512 cperl-auto-newline-after-colon))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2513 insertpos) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2514 (if (and ;;(not arg) |
20323 | 2515 (eolp) |
2516 (not (save-excursion | |
2517 (beginning-of-line) | |
2518 (skip-chars-forward " \t") | |
2519 (or | |
2520 ;; Ignore in comment lines | |
2521 (= (following-char) ?#) | |
2522 ;; Colon is special only after a label | |
2523 ;; So quickly rule out most other uses of colon | |
2524 ;; and do no indentation for them. | |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2525 (and (eq last-command-event ?:) |
20323 | 2526 (save-excursion |
2527 (forward-word 1) | |
2528 (skip-chars-forward " \t") | |
2529 (and (< (point) end) | |
2530 (progn (goto-char (- end 1)) | |
2531 (not (looking-at ":")))))) | |
2532 (progn | |
2533 (beginning-of-defun) | |
2534 (let ((pps (parse-partial-sexp (point) end))) | |
2535 (or (nth 3 pps) (nth 4 pps) (nth 5 pps)))))))) | |
2536 (progn | |
2537 (self-insert-command (prefix-numeric-value arg)) | |
2538 ;;(forward-char -1) | |
2539 (if auto (setq insertpos (point-marker))) | |
2540 ;;(forward-char 1) | |
2541 (cperl-indent-line) | |
2542 (if auto | |
2543 (progn | |
2544 (newline) | |
2545 (cperl-indent-line))) | |
2546 (save-excursion | |
2547 (if insertpos (goto-char (1- (marker-position insertpos))) | |
2548 (forward-char -1)) | |
2549 (delete-char 1)))) | |
2550 (if insertpos | |
2551 (save-excursion | |
2552 (goto-char insertpos) | |
2553 (self-insert-command (prefix-numeric-value arg))) | |
2554 (self-insert-command (prefix-numeric-value arg))))) | |
2555 | |
2556 (defun cperl-electric-backspace (arg) | |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
2557 "Backspace, or remove whitespace around the point inserted by an electric key. |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
2558 Will untabify if `cperl-electric-backspace-untabify' is non-nil." |
20323 | 2559 (interactive "p") |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2560 (if (and cperl-auto-newline |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2561 (memq last-command '(cperl-electric-semi |
20323 | 2562 cperl-electric-terminator |
2563 cperl-electric-lbrace)) | |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
2564 (memq (preceding-char) '(?\s ?\t ?\n))) |
20323 | 2565 (let (p) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2566 (if (eq last-command 'cperl-electric-lbrace) |
20323 | 2567 (skip-chars-forward " \t\n")) |
2568 (setq p (point)) | |
2569 (skip-chars-backward " \t\n") | |
2570 (delete-region (point) p)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2571 (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
|
2572 ;; 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
|
2573 (setq this-command 'cperl-electric-else-really)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2574 (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
|
2575 (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
|
2576 (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
|
2577 (let (p) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2578 (skip-chars-forward " \t\n") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2579 (setq p (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2580 (skip-chars-backward " \t\n") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2581 (delete-region (point) p)) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2582 (if cperl-electric-backspace-untabify |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2583 (backward-delete-char-untabify arg) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2584 (delete-backward-char arg))))) |
20323 | 2585 |
50255
a716a67fdf9d
(cperl-electric-backspace): Add delete-selection property.
Kim F. Storm <storm@cua.dk>
parents:
49919
diff
changeset
|
2586 (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
|
2587 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2588 (defun cperl-inside-parens-p () ;; NOT USED???? |
20323 | 2589 (condition-case () |
2590 (save-excursion | |
2591 (save-restriction | |
2592 (narrow-to-region (point) | |
2593 (progn (beginning-of-defun) (point))) | |
2594 (goto-char (point-max)) | |
2595 (= (char-after (or (scan-lists (point) -1 1) (point-min))) ?\())) | |
2596 (error nil))) | |
2597 | |
2598 (defun cperl-indent-command (&optional whole-exp) | |
2599 "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
|
2600 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
|
2601 line. Otherwise, indent the current line only if point is at the left margin |
20323 | 2602 or in the line's indentation; otherwise insert a tab. |
2603 | |
2604 A numeric argument, regardless of its value, | |
2605 means indent rigidly all the lines of the expression starting after point | |
2606 so that this line becomes properly indented. | |
2607 The relative indentation among the lines of the expression are preserved." | |
2608 (interactive "P") | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2609 (cperl-update-syntaxification (point) (point)) |
20323 | 2610 (if whole-exp |
2611 ;; If arg, always indent this line as Perl | |
2612 ;; and shift remaining lines of expression the same amount. | |
2613 (let ((shift-amt (cperl-indent-line)) | |
2614 beg end) | |
2615 (save-excursion | |
2616 (if cperl-tab-always-indent | |
2617 (beginning-of-line)) | |
2618 (setq beg (point)) | |
2619 (forward-sexp 1) | |
2620 (setq end (point)) | |
2621 (goto-char beg) | |
2622 (forward-line 1) | |
2623 (setq beg (point))) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2624 (if (and shift-amt (> end beg)) |
20323 | 2625 (indent-code-rigidly beg end shift-amt "#"))) |
2626 (if (and (not cperl-tab-always-indent) | |
2627 (save-excursion | |
2628 (skip-chars-backward " \t") | |
2629 (not (bolp)))) | |
2630 (insert-tab) | |
2631 (cperl-indent-line)))) | |
2632 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2633 (defun cperl-indent-line (&optional parse-data) |
20323 | 2634 "Indent current line as Perl code. |
2635 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
|
2636 (let ((case-fold-search nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2637 (pos (- (point-max) (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2638 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
|
2639 (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
|
2640 i indent) |
20323 | 2641 (beginning-of-line) |
2642 (setq beg (point)) | |
2643 (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
|
2644 (setq indent (current-indentation) i nil)) |
20323 | 2645 ;;((eq indent t) ; Never? |
2646 ;; (setq indent (cperl-calculate-indent-within-comment))) | |
2647 ;;((looking-at "[ \t]*#") | |
2648 ;; (setq indent 0)) | |
2649 (t | |
2650 (skip-chars-forward " \t") | |
2651 (if (listp indent) (setq indent (car indent))) | |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
2652 (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
|
2653 (not (looking-at "[smy]:\\|tr:"))) |
20323 | 2654 (and (> indent 0) |
2655 (setq indent (max cperl-min-label-indent | |
2656 (+ indent cperl-label-offset))))) | |
2657 ((= (following-char) ?}) | |
2658 (setq indent (- indent cperl-indent-level))) | |
2659 ((memq (following-char) '(?\) ?\])) ; To line up with opening paren. | |
2660 (setq indent (+ indent cperl-close-paren-offset))) | |
2661 ((= (following-char) ?{) | |
2662 (setq indent (+ indent cperl-brace-offset)))))) | |
2663 (skip-chars-forward " \t") | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2664 (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
|
2665 (if (or (not shift-amt) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2666 (zerop shift-amt)) |
20323 | 2667 (if (> (- (point-max) pos) (point)) |
2668 (goto-char (- (point-max) pos))) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2669 ;;;(delete-region beg (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2670 ;;;(indent-to indent) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2671 (cperl-make-indent indent) |
20323 | 2672 ;; If initial point was within line's indentation, |
2673 ;; position after the indentation. Else stay at same point in text. | |
2674 (if (> (- (point-max) pos) (point)) | |
2675 (goto-char (- (point-max) pos)))) | |
2676 shift-amt)) | |
2677 | |
2678 (defun cperl-after-label () | |
2679 ;; Returns true if the point is after label. Does not do save-excursion. | |
2680 (and (eq (preceding-char) ?:) | |
2681 (memq (char-syntax (char-after (- (point) 2))) | |
2682 '(?w ?_)) | |
2683 (progn | |
2684 (backward-sexp) | |
2685 (looking-at "[a-zA-Z_][a-zA-Z0-9_]*:[^:]")))) | |
2686 | |
2687 (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
|
2688 ;; 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
|
2689 ;; 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
|
2690 ;; 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
|
2691 ;; 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
|
2692 ;; 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
|
2693 ;; which contains START. |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2694 ;; PRESTART is the position basing on which START was found. |
20323 | 2695 (save-excursion |
2696 (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
|
2697 (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
|
2698 (<= parse-start start-point)) |
20323 | 2699 (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
|
2700 (beginning-of-defun) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2701 (setq start-state nil)) |
20323 | 2702 (setq prestart (point)) |
2703 (if start-state nil | |
2704 ;; Try to go out, if sub is not on the outermost level | |
2705 (while (< (point) start-point) | |
2706 (setq start (point) parse-start start depth nil | |
2707 state (parse-partial-sexp start start-point -1)) | |
2708 (if (> (car state) -1) nil | |
2709 ;; The current line could start like }}}, so the indentation | |
2710 ;; corresponds to a different level than what we reached | |
2711 (setq depth t) | |
2712 (beginning-of-line 2))) ; Go to the next line. | |
2713 (if start (goto-char start))) ; Not at the start of file | |
2714 (setq start (point)) | |
2715 (or state (setq state (parse-partial-sexp start start-point -1 nil start-state))) | |
2716 (list start state depth prestart)))) | |
2717 | |
2718 (defvar cperl-look-for-prop '((pod in-pod) (here-doc-delim here-doc-group))) | |
2719 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2720 (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
|
2721 "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
|
2722 Will not look before LIM." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2723 ;;; 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
|
2724 (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
|
2725 (point-min)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2726 ;;; (cond ((eq p (point-min)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2727 ;;; p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2728 ;;; ((and lim (<= p lim)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2729 ;;; p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2730 ;;; ((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
|
2731 ;;; p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2732 ;;; (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
|
2733 ;;; (point-min)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2734 ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2735 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2736 (defun cperl-sniff-for-indent (&optional parse-data) ; was parse-start |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
2737 ;; the sniffer logic to understand what the current line MEANS. |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2738 (cperl-update-syntaxification (point) (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2739 (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
|
2740 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2741 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2742 ((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
|
2743 (not (get-text-property (point) 'indentable))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2744 (vector res)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2745 ;; 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
|
2746 ((looking-at "[ \t]*\n=") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2747 (error "Spaces before POD section!")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2748 ((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
|
2749 (looking-at "^#")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2750 [comment-special:at-beginning-of-line]) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2751 ((get-text-property (point) 'in-pod) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2752 [in-pod]) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2753 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2754 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2755 (let* ((indent-point (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2756 (char-after-pos (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2757 (skip-chars-forward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2758 (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2759 (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
|
2760 (pre-indent-point (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2761 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
|
2762 (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
|
2763 (cperl-backward-to-noncomment nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2764 (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
|
2765 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
|
2766 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
|
2767 'syntax-type)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2768 (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
|
2769 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2770 (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
|
2771 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2772 (setq pre-indent-point (point))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2773 (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
|
2774 (let* ((case-fold-search nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2775 (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
|
2776 (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
|
2777 (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
|
2778 (state (nth 1 s-s)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2779 (containing-sexp (car (cdr state))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2780 old-indent) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2781 (if (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2782 ;;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
|
2783 parse-data) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2784 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2785 (setcar parse-data pre-indent-point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2786 (setcar (cdr parse-data) state) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2787 (or (nth 2 parse-data) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2788 (setcar (cddr parse-data) start)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2789 ;; Before this point: end of statement |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2790 (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
|
2791 (cond ((get-text-property (point) 'indentable) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2792 ;; indent to "after" the surrounding open |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2793 ;; (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
|
2794 ;; 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
|
2795 (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
|
2796 (get-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2797 (cperl-1+ char-after-pos) 'indentable) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2798 p (1+ (cperl-beginning-of-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2799 (point) 'indentable)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2800 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
|
2801 (save-excursion ; Find preceeding line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2802 (cperl-backward-to-noncomment p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2803 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2804 (if (<= (point) p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2805 (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
|
2806 (goto-char p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2807 (skip-chars-forward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2808 (if (memq (char-after (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2809 (append "#\n" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2810 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
|
2811 (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2812 (skip-chars-forward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2813 (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2814 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
|
2815 (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
|
2816 (vector 'indentable 'terminator p is-block)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2817 (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
|
2818 (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
|
2819 is-block char-after p)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2820 (t ; No preceeding line... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2821 (vector 'indentable 'first-line p)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2822 ((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
|
2823 (vector 'REx-part2 (point))) |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
2824 ((nth 4 state) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2825 [comment]) |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
2826 ((nth 3 state) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2827 [string]) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2828 ;; 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
|
2829 ((null containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2830 ;; 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
|
2831 ;; or may be function argument declaration. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2832 ;; 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
|
2833 ;; 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
|
2834 ;; 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
|
2835 (skip-chars-forward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2836 (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
|
2837 (setq state |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2838 (or (bobp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2839 (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
|
2840 (eq (preceding-char) ?\;) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2841 ;; Had ?\) too |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2842 (and (eq (preceding-char) ?\}) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2843 (cperl-after-block-and-statement-beg |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2844 (point-min))) ; Was start - too close |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2845 (memq char-after (append ")]}" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2846 (and (eq (preceding-char) ?\:) ; label |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2847 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2848 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2849 (skip-chars-backward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2850 (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
|
2851 (get-text-property (point) 'first-format-line))) |
80057
1db7c78912f4
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
79717
diff
changeset
|
2852 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2853 ;; 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
|
2854 ;; 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
|
2855 ;; 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
|
2856 ;; 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
|
2857 (and state |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2858 parse-data |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2859 (not (eq char-after ?\C-j)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2860 (setcdr (cddr parse-data) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2861 (list pre-indent-point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2862 (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
|
2863 ((not |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2864 (or (setq is-block |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2865 (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
|
2866 (save-excursion ; Is it a hash? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2867 (goto-char containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2868 (cperl-block-p)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2869 cperl-indent-parens-as-block)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2870 ;; 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
|
2871 ;; 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
|
2872 ;; 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
|
2873 (goto-char (1+ containing-sexp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2874 (or (memq char-after |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2875 (append (if delim "}" ")]}") nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2876 (looking-at "[ \t]*\\(#\\|$\\)") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2877 (skip-chars-forward " \t")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2878 (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
|
2879 (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
|
2880 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2881 ;; 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
|
2882 ;; Find previous non-comment character. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2883 (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
|
2884 (cperl-backward-to-noncomment containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2885 ;; 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
|
2886 ;; 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
|
2887 ;; (Had \, too) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2888 (while;;(or (eq (preceding-char) ?\,) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2889 (and (eq (preceding-char) ?:) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2890 (or;;(eq (char-after (- (point) 2)) ?\') ; ???? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2891 (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
|
2892 '(?w ?_)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2893 ;;) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2894 ;; This is always FALSE? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2895 (if (eq (preceding-char) ?\,) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2896 ;; 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
|
2897 ;; Will ignore embedded sexpr XXXX. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2898 (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
|
2899 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2900 (cperl-backward-to-noncomment containing-sexp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2901 ;; 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
|
2902 (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
|
2903 (memq (preceding-char) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2904 (append (if is-block " ;{" " ,;{") '(nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2905 (and (eq (preceding-char) ?\}) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2906 (cperl-after-block-and-statement-beg |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2907 containing-sexp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2908 (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
|
2909 ;; 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
|
2910 ;; 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
|
2911 ;; previous line of the statement. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2912 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2913 ;; 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
|
2914 ;; 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
|
2915 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2916 (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
|
2917 (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
|
2918 ;; This line starts a new statement. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2919 ;; Position following last unclosed open brace |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2920 (goto-char containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2921 ;; 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
|
2922 (or |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2923 ;; 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
|
2924 ;; 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
|
2925 ;; 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
|
2926 ;; small. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2927 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2928 (forward-char 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2929 (let ((colon-line-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2930 (while |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2931 (progn (skip-chars-forward " \t\n") |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
2932 ;; s: foo : bar :x is NOT label |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
2933 (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
|
2934 (not (looking-at "[sym]:\\|tr:")))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2935 ;; 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
|
2936 (cond ((= (following-char) ?\#) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2937 (forward-line 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2938 ((= (following-char) ?\=) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2939 (goto-char |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2940 (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
|
2941 (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
|
2942 ;; label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2943 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2944 (save-excursion (end-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2945 (setq colon-line-end (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2946 (search-forward ":")))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2947 ;; 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
|
2948 ;; First, the following code counts |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2949 ;; 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
|
2950 (and (< (point) indent-point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2951 (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
|
2952 containing-sexp)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2953 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2954 ;; If no previous statement, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2955 ;; 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
|
2956 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2957 ;; 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
|
2958 ;; add in cperl-brace-imaginary-offset. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2959 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2960 ;; If first thing on a line: ????? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2961 ;; 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
|
2962 (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
|
2963 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
|
2964 ;; 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
|
2965 ;; 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
|
2966 (or cperl-indent-wrt-brace |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2967 (cperl-backward-to-noncomment (point-min))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2968 ;; 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
|
2969 ;; move to the beginning of that; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2970 (if (eq (preceding-char) ?\)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2971 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2972 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2973 (cperl-backward-to-noncomment (point-min)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2974 ;; 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
|
2975 ;; 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
|
2976 ;; 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
|
2977 ;; anonymous sub in a hash. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2978 (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
|
2979 (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
|
2980 (goto-char (cperl-beginning-of-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2981 (point) 'attrib-group))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2982 ((eq (preceding-char) ?b) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2983 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2984 (looking-at "sub\\>"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2985 (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
|
2986 (parse-partial-sexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2987 (save-excursion (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2988 (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2989 (point))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2990 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2991 (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
|
2992 (skip-chars-forward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2993 (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
|
2994 (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
|
2995 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
|
2996 t (point) ; have something before... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2997 ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2998 ;;(current-column) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2999 ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3000 ;; 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
|
3001 ;; 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
|
3002 (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
|
3003 (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
|
3004 old-indent ; brace first thing on a line |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
3005 nil (point))))))))))))))) ; nothing interesting before |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3006 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3007 (defvar cperl-indent-rules-alist |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3008 '((pod nil) ; via `syntax-type' property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3009 (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
|
3010 (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
|
3011 (format nil) ; via `syntax-type' property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3012 (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
|
3013 (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
|
3014 (string t) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3015 (comment nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3016 "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
|
3017 The values mean: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3018 nil: do not indent; |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
3019 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
|
3020 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3021 (defun cperl-calculate-indent (&optional parse-data) ; was parse-start |
20323 | 3022 "Return appropriate indentation for current line as Perl code. |
3023 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
|
3024 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
|
3025 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3026 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
|
3027 and closing parentheses and brackets." |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3028 ;; 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
|
3029 ;; compensate for some modifications which `cperl-indent-line' will add later |
20323 | 3030 (save-excursion |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3031 (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
|
3032 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3033 ;;((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
|
3034 ;; i) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3035 ((vectorp i) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3036 (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
|
3037 (cond |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3038 (what (cadr what)) ; Load from table |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3039 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3040 ;; 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
|
3041 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3042 ((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
|
3043 (goto-char (elt i 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3044 (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
|
3045 (forward-sexp -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 '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
|
3048 (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
|
3049 ((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
|
3050 (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
|
3051 (1- (current-column))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3052 ((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
|
3053 (goto-char (elt i 2)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3054 (+ (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
|
3055 -1 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3056 (current-column))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3057 ((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
|
3058 ;; 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
|
3059 (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
|
3060 (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
|
3061 (setq p (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3062 (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
|
3063 (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
|
3064 ;; Number of parens in between: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3065 (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
|
3066 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
|
3067 (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
|
3068 (+ (* 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
|
3069 (cond ((eq what ?\) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3070 (- cperl-close-paren-offset)) ; compensate |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3071 ((eq what ?\| ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3072 (- (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
|
3073 (t 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3074 (if (eq (following-char) ?\| ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3075 (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
|
3076 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3077 (current-column))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3078 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3079 (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
|
3080 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3081 ;; Indenter for stuff at toplevel |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3082 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3083 ((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
|
3084 (+ (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
|
3085 (goto-char (elt i 1)) ; start = Good place to start parsing |
80057
1db7c78912f4
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
79717
diff
changeset
|
3086 (- (current-indentation) ; |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3087 (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
|
3088 (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
|
3089 ;; 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
|
3090 ;; 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
|
3091 ;; 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
|
3092 ;; 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
|
3093 (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
|
3094 0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3095 cperl-continued-statement-offset))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3096 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3097 ;; 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
|
3098 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3099 ((eq 'in-parens (elt i 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3100 ;; 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
|
3101 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3102 ;; 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
|
3103 ;; 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
|
3104 ;; 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
|
3105 (+ (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3106 (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
|
3107 (current-column)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3108 (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
|
3109 (eq (elt i 1) ?\})) ; char-after |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3110 ;; Correct indentation of trailing ?\} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3111 (+ 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
|
3112 0))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3113 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3114 ;; Indenter for continuation lines |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3115 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3116 ((eq 'continuation (elt i 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3117 ;; [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
|
3118 (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
|
3119 (+ (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
|
3120 0 ; Closing parenth |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3121 cperl-continued-statement-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3122 (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
|
3123 (not (elt i 4)) ; is-brace |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3124 (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
|
3125 0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3126 ;; Now it is a hash reference |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3127 (+ 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
|
3128 ;; Labels do not take :: ... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3129 (if (looking-at "\\(\\w\\|_\\)+[ \t]*:") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3130 (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
|
3131 (- (current-indentation) cperl-label-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3132 ;; 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
|
3133 ;; be quick anyway (this comment comes |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3134 ;; from different location): |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3135 (cperl-calculate-indent)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3136 (current-column)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3137 (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
|
3138 cperl-continued-brace-offset 0))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3139 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3140 ;; 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
|
3141 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3142 ((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
|
3143 ;; [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
|
3144 (goto-char (elt i 1)) ; sibling-beg |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
3145 (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
|
3146 (if (> (current-indentation) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3147 cperl-min-label-indent) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3148 (- (current-indentation) cperl-label-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3149 ;; 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
|
3150 (+ cperl-indent-level |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3151 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3152 (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
|
3153 (current-indentation)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3154 (current-column))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3155 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3156 ;; 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
|
3157 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3158 ((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
|
3159 ;;[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
|
3160 ;; 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
|
3161 ;; 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
|
3162 (goto-char (elt i 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3163 ;; 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
|
3164 ;; 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
|
3165 ;; 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
|
3166 (+ (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
|
3167 (+ 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
|
3168 cperl-indent-level) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3169 (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
|
3170 (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
|
3171 (+ 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
|
3172 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3173 ;; 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
|
3174 ;; add the cperl-brace-imaginary-offset. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3175 (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
|
3176 cperl-brace-imaginary-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3177 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3178 (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
|
3179 (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
|
3180 (current-column) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3181 ;; 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
|
3182 ;; 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
|
3183 (if (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3184 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3185 (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
|
3186 (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
|
3187 (- (current-indentation) cperl-label-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3188 ;; 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
|
3189 ;; be quick anyway: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3190 (cperl-calculate-indent)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3191 (current-indentation)))))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3192 (t |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3193 (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
|
3194 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3195 (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
|
3196 |
20323 | 3197 (defun cperl-calculate-indent-within-comment () |
3198 "Return the indentation amount for line, assuming that | |
3199 the current line is to be regarded as part of a block comment." | |
3200 (let (end star-start) | |
3201 (save-excursion | |
3202 (beginning-of-line) | |
3203 (skip-chars-forward " \t") | |
3204 (setq end (point)) | |
3205 (and (= (following-char) ?#) | |
3206 (forward-line -1) | |
3207 (cperl-to-comment-or-eol) | |
3208 (setq end (point))) | |
3209 (goto-char end) | |
3210 (current-column)))) | |
3211 | |
3212 | |
3213 (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
|
3214 "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
|
3215 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
|
3216 ;; 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
|
3217 ;; 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
|
3218 (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
|
3219 (or cperl-font-locking |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3220 (cperl-update-syntaxification lim lim)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3221 (beginning-of-line) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3222 (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
|
3223 (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
|
3224 (if (or (eq pr 'pod) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3225 (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
|
3226 (re-search-forward "\\=[ \t]*\\(#\\|$\\)" lim t))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3227 (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
|
3228 ;; 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
|
3229 (and (and e (<= e lim)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3230 (goto-char e)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3231 (while (not stop-in) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3232 (setq state (parse-partial-sexp (point) lim nil nil nil t)) |
20323 | 3233 ; stop at comment |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3234 ;; 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
|
3235 (if (nth 4 state) ; After `#'; |
20323 | 3236 ; (nth 2 state) can be |
3237 ; beginning of m,s,qq and so | |
3238 ; on | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3239 (if (nth 2 state) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3240 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3241 (setq cpoint (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3242 (goto-char (nth 2 state)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3243 (cond |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3244 ((looking-at "\\(s\\|tr\\)\\>") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3245 (or (re-search-forward |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3246 "\\=\\w+[ \t]*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3247 lim 'move) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3248 (setq stop-in t))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3249 ((looking-at "\\(m\\|q\\([qxwr]\\)?\\)\\>") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3250 (or (re-search-forward |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3251 "\\=\\w+[ \t]*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*#" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3252 lim 'move) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3253 (setq stop-in t))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3254 (t ; It was fair comment |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3255 (setq stop-in t) ; Finish |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3256 (goto-char (1- cpoint))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3257 (setq stop-in t) ; Finish |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3258 (forward-char -1)) |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
3259 (setq stop-in t))) ; Finish |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3260 (nth 4 state)))) |
20323 | 3261 |
3262 (defsubst cperl-modify-syntax-type (at how) | |
3263 (if (< at (point-max)) | |
3264 (progn | |
3265 (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
|
3266 (put-text-property at (1+ at) 'rear-nonsticky '(syntax-table))))) |
20323 | 3267 |
3268 (defun cperl-protect-defun-start (s e) | |
3269 ;; C code looks for "^\\s(" to skip comment backward in "hard" situations | |
3270 (save-excursion | |
3271 (goto-char s) | |
3272 (while (re-search-forward "^\\s(" e 'to-end) | |
3273 (put-text-property (1- (point)) (point) 'syntax-table cperl-st-punct)))) | |
3274 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3275 (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
|
3276 (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
|
3277 (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
|
3278 nil |
20323 | 3279 ;; We suppose that e is _after_ the end of construction, as after eol. |
3280 (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
|
3281 (if (> bb (- e 2)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3282 ;; one-char string/comment?! |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3283 (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
|
3284 (cperl-modify-syntax-type bb string) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3285 (cperl-modify-syntax-type (1- e) string)) |
20323 | 3286 (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
|
3287 (put-text-property (1+ bb) (1- e) |
20323 | 3288 '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
|
3289 (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
|
3290 ;; Fontify |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3291 (or noface |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3292 (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
|
3293 (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
|
3294 'font-lock-comment-face))))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3295 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3296 (defvar cperl-starters '(( ?\( . ?\) ) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3297 ( ?\[ . ?\] ) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3298 ( ?\{ . ?\} ) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3299 ( ?\< . ?\> ))) |
20323 | 3300 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3301 (defun cperl-cached-syntax-table (st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3302 "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
|
3303 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
|
3304 is quoting." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3305 (if (car-safe st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3306 (car st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3307 (setcar st (make-syntax-table)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3308 (setq st (car st)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3309 (let ((i 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3310 (while (< i 256) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3311 (modify-syntax-entry i "." st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3312 (setq i (1+ i)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3313 (modify-syntax-entry ?\\ "\\" st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3314 st)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3315 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3316 (defun cperl-forward-re (lim end is-2arg st-l err-l argument |
20323 | 3317 &optional ostart oend) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3318 "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
|
3319 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
|
3320 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3321 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
|
3322 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
|
3323 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
|
3324 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
|
3325 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
|
3326 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
|
3327 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
|
3328 the second argument of 2ARG construct. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3329 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3330 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
|
3331 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
|
3332 (let (b starter ender st i i2 go-forward reset-st set-st) |
20323 | 3333 (skip-chars-forward " \t") |
3334 ;; ender means matching-char matcher. | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3335 (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
|
3336 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
|
3337 ender (cdr (assoc starter cperl-starters))) |
20323 | 3338 ;; What if starter == ?\\ ???? |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3339 (setq st (cperl-cached-syntax-table st-l)) |
20323 | 3340 (setq set-st t) |
3341 ;; Whether we have an intermediate point | |
3342 (setq i nil) | |
3343 ;; Prepare the syntax table: | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3344 (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
|
3345 (modify-syntax-entry starter "$" st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3346 (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
|
3347 (modify-syntax-entry ender (concat ")" (list starter)) st)) |
20323 | 3348 (condition-case bb |
3349 (progn | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3350 ;; 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
|
3351 ;; is recognized the same as $, so we need to check this manually. |
20323 | 3352 (if (and (eq starter (char-after (cperl-1+ b))) |
3353 (not ender)) | |
3354 ;; $ has TeXish matching rules, so $$ equiv $... | |
3355 (forward-char 2) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3356 (setq reset-st (syntax-table)) |
20323 | 3357 (set-syntax-table st) |
3358 (forward-sexp 1) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3359 (if (<= (point) (1+ b)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3360 (error "Unfinished regular expression")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3361 (set-syntax-table reset-st) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3362 (setq reset-st nil) |
20323 | 3363 ;; Now the problem is with m;blah;; |
3364 (and (not ender) | |
3365 (eq (preceding-char) | |
3366 (char-after (- (point) 2))) | |
3367 (save-excursion | |
3368 (forward-char -2) | |
3369 (= 0 (% (skip-chars-backward "\\\\") 2))) | |
3370 (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
|
3371 ;; Now we are after the first part. |
20323 | 3372 (and is-2arg ; Have trailing part |
3373 (not ender) | |
3374 (eq (following-char) starter) ; Empty trailing part | |
3375 (progn | |
3376 (or (eq (char-syntax (following-char)) ?.) | |
3377 ;; Make trailing letter into punctuation | |
3378 (cperl-modify-syntax-type (point) cperl-st-punct)) | |
3379 (setq is-2arg nil go-forward t))) ; Ignore the tail | |
3380 (if is-2arg ; Not number => have second part | |
3381 (progn | |
3382 (setq i (point) i2 i) | |
3383 (if ender | |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
3384 (if (memq (following-char) '(?\s ?\t ?\n ?\f)) |
20323 | 3385 (progn |
3386 (if (looking-at "[ \t\n\f]+\\(#[^\n]*\n[ \t\n\f]*\\)+") | |
3387 (goto-char (match-end 0)) | |
3388 (skip-chars-forward " \t\n\f")) | |
3389 (setq i2 (point)))) | |
3390 (forward-char -1)) | |
3391 (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
|
3392 (if ender (modify-syntax-entry ender "." st)) |
20323 | 3393 (setq set-st nil) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3394 (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
|
3395 argument starter ender) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3396 ender (nth 2 ender))))) |
20323 | 3397 (error (goto-char lim) |
3398 (setq set-st nil) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3399 (if reset-st |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3400 (set-syntax-table reset-st)) |
20323 | 3401 (or end |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3402 (and cperl-brace-recursing |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3403 (or (eq ostart ?\{) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3404 (eq starter ?\{))) |
20323 | 3405 (message |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3406 "End of `%s%s%c ... %c' string/RE not found: %s" |
20323 | 3407 argument |
3408 (if ostart (format "%c ... %c" ostart (or oend ostart)) "") | |
3409 starter (or ender starter) bb) | |
3410 (or (car err-l) (setcar err-l b))))) | |
3411 (if set-st | |
3412 (progn | |
3413 (modify-syntax-entry starter (if (eq starter ?\\) "\\" ".") st) | |
3414 (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
|
3415 ;; 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
|
3416 ;; 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
|
3417 ;; 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
|
3418 ;; starter: the starting delimiter of the first arg |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3419 ;; go-forward: has 2 args, and the second part is empty |
20323 | 3420 (list i i2 ender starter go-forward))) |
3421 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3422 (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
|
3423 "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
|
3424 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
|
3425 Works before syntax recognition is done." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3426 ;; Works *before* syntax recognition is done |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3427 (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
|
3428 (let (st b reset-st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3429 (condition-case b |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3430 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3431 (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
|
3432 (modify-syntax-entry ?\( "()" st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3433 (modify-syntax-entry ?\) ")(" st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3434 (setq reset-st (syntax-table)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3435 (set-syntax-table st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3436 (forward-sexp 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3437 (error (message |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3438 "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
|
3439 ;; now restore the initial state |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3440 (if st |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3441 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3442 (modify-syntax-entry ?\( "." st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3443 (modify-syntax-entry ?\) "." st))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3444 (if reset-st |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3445 (set-syntax-table reset-st)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3446 b)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3447 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3448 |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3449 (defvar font-lock-string-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3450 ;;(defvar font-lock-reference-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3451 (defvar font-lock-constant-face) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3452 (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
|
3453 ;; 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
|
3454 (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
|
3455 (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
|
3456 (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
|
3457 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3458 ;;; 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
|
3459 ;;; recognized locally) are marked: |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3460 ;; a) PODs: |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3461 ;; 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
|
3462 ;; 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
|
3463 ;; 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
|
3464 ;; b) HEREs: |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3465 ;; 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
|
3466 ;; 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
|
3467 ;; 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
|
3468 ;; c) FORMATs: |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3469 ;; 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
|
3470 ;; 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
|
3471 ;; 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
|
3472 ;; 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
|
3473 ;; 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
|
3474 ;; 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
|
3475 ;; 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
|
3476 ;; (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
|
3477 ;; 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
|
3478 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3479 ;;; 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
|
3480 ;;; (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
|
3481 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3482 (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
|
3483 ;; 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
|
3484 (let ((pos (point)) opos) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3485 (while (and pos (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3486 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3487 (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
|
3488 (setq opos pos |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3489 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
|
3490 (if (eq pos (point-min)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3491 (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
|
3492 (if pos |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3493 (if before |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3494 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3495 (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
|
3496 (beginning-of-line) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3497 (setq pos (point))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3498 (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
|
3499 ;; 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
|
3500 (goto-char (point-min)))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3501 ;; Skip empty lines |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3502 (and (looking-at "\n*=") |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3503 (/= 0 (skip-chars-backward "\n")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3504 (forward-char)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3505 (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
|
3506 (if end |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3507 ;; 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
|
3508 (save-excursion |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3509 (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
|
3510 (setq pos end |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3511 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
|
3512 (if end (progn (goto-char end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3513 (or (bolp) (forward-line 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3514 (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
|
3515 (or end pos))))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3516 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3517 ;;; 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
|
3518 (defvar cperl-nonoverridable-face) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3519 (defvar font-lock-variable-name-face) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3520 (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
|
3521 (defvar font-lock-keyword-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3522 (defvar font-lock-builtin-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3523 (defvar font-lock-type-face) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3524 (defvar font-lock-comment-face) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3525 (defvar font-lock-warning-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3526 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3527 (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
|
3528 "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
|
3529 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
|
3530 ;; Works *before* syntax recognition is done |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3531 (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
|
3532 (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
|
3533 (condition-case b |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3534 (while (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3535 (concat |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3536 "\\(" ; 1=optional? colon |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3537 ":" 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
|
3538 "\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3539 (if after-first "?" "") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3540 ;; 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
|
3541 "\\(\\sw+\\)" ; 3=name |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3542 "\\((\\)?")) ; 4=optional paren |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3543 (and (match-beginning 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3544 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3545 (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
|
3546 'face font-lock-constant-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3547 (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
|
3548 (cperl-postpone-fontification start1 end1 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3549 'face font-lock-constant-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3550 (goto-char end1) ; end or before `(' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3551 (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
|
3552 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3553 (if st nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3554 (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
|
3555 (modify-syntax-entry ?\( "()" st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3556 (modify-syntax-entry ?\) ")(" st)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3557 (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
|
3558 (set-syntax-table st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3559 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3560 (set-syntax-table reset-st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3561 (setq reset-st nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3562 (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
|
3563 (forward-comment (buffer-size)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3564 (setq after-first t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3565 (error (message |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3566 "L%d: attribute `%s': %s" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3567 (count-lines (point-min) (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3568 (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
|
3569 (setq start nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3570 (and start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3571 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3572 (put-text-property start (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3573 '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
|
3574 (and pos |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3575 (< 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
|
3576 ;; 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
|
3577 (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
|
3578 'syntax-type 'sub-decl)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3579 (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
|
3580 (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
|
3581 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
|
3582 (if (looking-at "{") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3583 font-lock-function-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3584 font-lock-variable-name-face))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3585 ;; now restore the initial state |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3586 (if st |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3587 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3588 (modify-syntax-entry ?\( "." st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3589 (modify-syntax-entry ?\) "." st))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3590 (if reset-st |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3591 (set-syntax-table reset-st)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3592 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3593 (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
|
3594 (if (and |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
3595 (< (point) e) |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
3596 (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
|
3597 (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
|
3598 (if (eq ?\{ (preceding-char)) nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3599 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3600 (1- (point)) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3601 'face font-lock-warning-face)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3602 |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3603 ;; Do some smarter-highlighting |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3604 ;; XXXX Currently ignores alphanum/dash delims, |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3605 (defsubst cperl-highlight-charclass (endbracket dashface bsface onec-space) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3606 (let ((l '(1 5 7)) ll lle lll |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3607 ;; 2 groups, the first takes the whole match (include \[trnfabe]) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3608 (singleChar (concat "\\(" "[^\\\\]" "\\|" "\\\\[^cdg-mo-qsu-zA-Z0-9_]" "\\|" "\\\\c." "\\|" "\\\\x" "\\([0-9a-fA-F][0-9a-fA-F]?\\|\\={[0-9a-fA-F]+}\\)" "\\|" "\\\\0?[0-7][0-7]?[0-7]?" "\\|" "\\\\N{[^{}]*}" "\\)"))) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3609 (while ; look for unescaped - between non-classes |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3610 (re-search-forward |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3611 ;; On 19.33, certain simplifications lead |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3612 ;; to bugs (as in [^a-z] \\| [trnfabe] ) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3613 (concat ; 1: SingleChar (include \[trnfabe]) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3614 singleChar |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3615 ;;"\\(" "[^\\\\]" "\\|" "\\\\[^cdg-mo-qsu-zA-Z0-9_]" "\\|" "\\\\c." "\\|" "\\\\x" "\\([0-9a-fA-F][0-9a-fA-F]?\\|\\={[0-9a-fA-F]+}\\)" "\\|" "\\\\0?[0-7][0-7]?[0-7]?" "\\|" "\\\\N{[^{}]*}" "\\)" |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3616 "\\(" ; 3: DASH SingleChar (match optionally) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3617 "\\(-\\)" ; 4: DASH |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3618 singleChar ; 5: SingleChar |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3619 ;;"\\(" "[^\\\\]" "\\|" "\\\\[^cdg-mo-qsu-zA-Z0-9_]" "\\|" "\\\\c." "\\|" "\\\\x" "\\([0-9a-fA-F][0-9a-fA-F]?\\|\\={[0-9a-fA-F]+}\\)" "\\|" "\\\\0?[0-7][0-7]?[0-7]?" "\\|" "\\\\N{[^{}]*}" "\\)" |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3620 "\\)?" |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3621 "\\|" |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3622 "\\(" ; 7: other escapes |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3623 "\\\\[pP]" "\\([^{]\\|{[^{}]*}\\)" |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3624 "\\|" "\\\\[^pP]" "\\)" |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3625 ) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3626 endbracket 'toend) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3627 (if (match-beginning 4) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3628 (cperl-postpone-fontification |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3629 (match-beginning 4) (match-end 4) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3630 'face dashface)) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3631 ;; save match data (for looking-at) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3632 (setq lll (mapcar (function (lambda (elt) (cons (match-beginning elt) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3633 (match-end elt)))) l)) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3634 (while lll |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3635 (setq ll (car lll)) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3636 (setq lle (cdr ll) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3637 ll (car ll)) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3638 ;; (message "Got %s of %s" ll l) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3639 (if (and ll (eq (char-after ll) ?\\ )) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3640 (save-excursion |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3641 (goto-char ll) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3642 (cperl-postpone-fontification ll (1+ ll) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3643 'face bsface) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3644 (if (looking-at "\\\\[a-zA-Z0-9]") |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3645 (cperl-postpone-fontification (1+ ll) lle |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3646 'face onec-space)))) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3647 (setq lll (cdr lll)))) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3648 (goto-char endbracket) ; just in case something misbehaves??? |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3649 t)) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
3650 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3651 ;;; 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
|
3652 (defun cperl-find-pods-heres (&optional min max non-inter end ignore-max end-of-here-doc) |
20323 | 3653 "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
|
3654 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
|
3655 the sections using `cperl-pod-head-face', `cperl-pod-face', |
20323 | 3656 `cperl-here-face'." |
3657 (interactive) | |
78582
d168a4166b80
Fix s{a}{b} parsing
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
78487
diff
changeset
|
3658 (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
|
3659 cperl-syntax-state nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3660 cperl-syntax-done-to min)) |
20323 | 3661 (or max (setq max (point-max))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3662 (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
|
3663 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
|
3664 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
|
3665 (case-fold-search nil) (inhibit-read-only t) (buffer-undo-list t) |
102228
f51bb75d96dc
(cperl-find-pods-heres): Don't globally bind `name'.
Glenn Morris <rgm@gnu.org>
parents:
101112
diff
changeset
|
3666 (modified (buffer-modified-p)) overshoot is-o-REx name |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3667 (after-change-functions nil) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3668 (cperl-font-locking t) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3669 (use-syntax-state (and cperl-syntax-state |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3670 (>= min (car cperl-syntax-state)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3671 (state-point (if use-syntax-state |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3672 (car cperl-syntax-state) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3673 (point-min))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3674 (state (if use-syntax-state |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3675 (cdr cperl-syntax-state))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3676 ;; (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
|
3677 (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
|
3678 ;; 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
|
3679 ;; (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
|
3680 (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
|
3681 font-lock-string-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3682 'font-lock-string-face)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3683 (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
|
3684 font-lock-constant-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3685 'font-lock-constant-face)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3686 (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
|
3687 (if (boundp 'font-lock-function-name-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3688 font-lock-function-name-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3689 'font-lock-function-name-face)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3690 (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
|
3691 (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
|
3692 font-lock-variable-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3693 'font-lock-variable-name-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3694 (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
|
3695 (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
|
3696 font-lock-function-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3697 'font-lock-function-name-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3698 (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
|
3699 (if (boundp 'font-lock-constant-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3700 font-lock-constant-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3701 'font-lock-constant-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3702 (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
|
3703 (if (boundp 'font-lock-builtin-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3704 font-lock-builtin-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3705 'font-lock-builtin-face)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3706 (font-lock-comment-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3707 (if (boundp 'font-lock-comment-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3708 font-lock-comment-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3709 'font-lock-comment-face)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3710 (font-lock-warning-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3711 (if (boundp 'font-lock-warning-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3712 font-lock-warning-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3713 'font-lock-warning-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3714 (my-cperl-REx-ctl-face ; (|) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3715 (if (boundp 'font-lock-keyword-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3716 font-lock-keyword-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3717 'font-lock-keyword-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3718 (my-cperl-REx-modifiers-face ; //gims |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3719 (if (boundp 'cperl-nonoverridable-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3720 cperl-nonoverridable-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3721 'cperl-nonoverridable-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3722 (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
|
3723 (if (boundp 'font-lock-type-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3724 font-lock-type-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3725 'font-lock-type-face)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3726 (stop-point (if ignore-max |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3727 (point-max) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3728 max)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3729 (search |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3730 (concat |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3731 "\\(\\`\n?\\|^\n\\)=" ; POD |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3732 "\\|" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3733 ;; One extra () before this: |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3734 "<<" ; HERE-DOC |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3735 "\\(" ; 1 + 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3736 ;; First variant "BLAH" or just ``. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3737 "[ \t]*" ; Yes, whitespace is allowed! |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3738 "\\([\"'`]\\)" ; 2 + 1 = 3 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3739 "\\([^\"'`\n]*\\)" ; 3 + 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3740 "\\3" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3741 "\\|" |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3742 ;; 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
|
3743 "\\\\?\\(\\([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
|
3744 ;; 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
|
3745 ;; "\\([^= \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
|
3746 "\\(\\)" ; To preserve count of pars :-( 6 + 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3747 "\\)" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3748 "\\|" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3749 ;; 1+6 extra () before this: |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3750 "^[ \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
|
3751 (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
|
3752 (concat |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3753 "\\|" |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3754 ;; 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
|
3755 "\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>" ; QUOTED CONSTRUCT |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3756 "\\|" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3757 ;; 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
|
3758 "\\([?/<]\\)" ; /blah/ or ?blah? or <file*glob> |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3759 "\\|" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3760 ;; 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
|
3761 "\\<sub\\>" ; sub with proto/attr |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3762 "\\(" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3763 cperl-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3764 "\\(::[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
|
3765 "\\(" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3766 cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3767 "\\(([^()]*)\\|:[^:]\\)\\)" ; prototype or attribute start |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3768 "\\|" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3769 ;; 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
|
3770 "\\$\\(['{]\\)" ; $' or ${foo} |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3771 "\\|" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3772 ;; 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
|
3773 ;; we do not support intervening comments...): |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3774 "\\(\\<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
|
3775 ;; 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
|
3776 "\\|" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3777 "__\\(END\\|DATA\\)__" ; __END__ or __DATA__ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3778 ;; 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
|
3779 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3780 "\\\\\\(['`\"($]\\)") ; BACKWACKED something-hairy |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3781 "")))) |
20323 | 3782 (unwind-protect |
3783 (progn | |
3784 (save-excursion | |
3785 (or non-inter | |
3786 (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
|
3787 ;;(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
|
3788 (and cperl-pod-here-fontify |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3789 ;; 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
|
3790 (setq face cperl-pod-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3791 head-face cperl-pod-head-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3792 here-face cperl-here-face)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3793 (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
|
3794 '(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
|
3795 attrib-group t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3796 REx-interpolated t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3797 cperl-postpone t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3798 syntax-subtype t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3799 rear-nonsticky t |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3800 front-sticky t |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3801 here-doc-group t |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3802 first-format-line t |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3803 REx-part2 t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3804 indentable t)) |
20323 | 3805 ;; Need to remove face as well... |
3806 (goto-char min) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3807 (and (eq system-type 'emx) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3808 (eq (point) 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3809 (let ((case-fold-search t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3810 (looking-at "extproc[ \t]")) ; Analogue of #! |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3811 (cperl-commentify min |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3812 (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
|
3813 nil)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3814 (while (and |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3815 (< (point) max) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3816 (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
|
3817 (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
|
3818 (setq b (match-beginning 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3819 state (save-excursion (parse-partial-sexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3820 state-point b nil nil state)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3821 state-point b) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3822 (cond |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3823 ;; 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
|
3824 ;; "\\$\\(['{]\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3825 ((match-beginning 18) ; $' or ${foo} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3826 (if (eq (preceding-char) ?\') ; $' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3827 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3828 (setq b (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3829 state (parse-partial-sexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3830 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
|
3831 state-point (1- b)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3832 (if (nth 3 state) ; in string |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3833 (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
|
3834 (goto-char (1+ b))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3835 ;; else: ${ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3836 (setq bb (match-beginning 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3837 (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
|
3838 ;; 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
|
3839 ((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
|
3840 t) ; Do nothing in comment/string |
20323 | 3841 ((match-beginning 1) ; POD section |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3842 ;; "\\(\\`\n?\\|^\n\\)=" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3843 (setq b (match-beginning 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3844 state (parse-partial-sexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3845 state-point b nil nil state) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3846 state-point b) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3847 (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
|
3848 (looking-at "cut\\>")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3849 (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
|
3850 nil ; Doing a chunk only |
20323 | 3851 (message "=cut is not preceded by a POD section") |
3852 (or (car err-l) (setcar err-l (point)))) | |
3853 (beginning-of-line) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3854 |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3855 (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
|
3856 bb b |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3857 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
|
3858 b1 nil) ; error condition |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3859 ;; 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
|
3860 ;; 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
|
3861 (or (re-search-forward "^\n=cut\\>" stop-point 'toend) |
20323 | 3862 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3863 (goto-char b) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3864 (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
|
3865 (progn |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3866 (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
|
3867 (setq b1 t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3868 (or (car err-l) (setcar err-l b)))))) |
20323 | 3869 (beginning-of-line 2) ; An empty line after =cut is not POD! |
3870 (setq e (point)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3871 (and (> e max) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3872 (progn |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3873 (remove-text-properties |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3874 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
|
3875 attrib-group t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3876 REx-interpolated t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3877 cperl-postpone t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3878 syntax-subtype t |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3879 here-doc-group t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3880 rear-nonsticky t |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3881 front-sticky t |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3882 first-format-line t |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3883 REx-part2 t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3884 indentable t)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3885 (setq tmpend tb))) |
20323 | 3886 (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
|
3887 (put-text-property b e 'syntax-type 'in-pod) |
20323 | 3888 (goto-char b) |
3889 (while (re-search-forward "\n\n[ \t]" e t) | |
3890 ;; We start 'pod 1 char earlier to include the preceding line | |
3891 (beginning-of-line) | |
3892 (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
|
3893 (cperl-put-do-not-fontify b (point) t) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3894 ;; mark the non-literal parts as PODs |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3895 (if cperl-pod-here-fontify |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3896 (cperl-postpone-fontification b (point) 'face face t)) |
20323 | 3897 (re-search-forward "\n\n[^ \t\f\n]" e 'toend) |
3898 (beginning-of-line) | |
3899 (setq b (point))) | |
3900 (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
|
3901 (cperl-put-do-not-fontify (point) e t) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3902 (if cperl-pod-here-fontify |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3903 (progn |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3904 ;; mark the non-literal parts as PODs |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3905 (cperl-postpone-fontification (point) e 'face face t) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3906 (goto-char bb) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3907 (if (looking-at |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3908 "=[a-zA-Z0-9_]+\\>[ \t]*\\(\\(\n?[^\n]\\)+\\)$") |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3909 ;; mark the headers |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3910 (cperl-postpone-fontification |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3911 (match-beginning 1) (match-end 1) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3912 'face head-face)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3913 (while (re-search-forward |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3914 ;; One paragraph |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3915 "^\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
|
3916 e 'toend) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3917 ;; mark the headers |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3918 (cperl-postpone-fontification |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3919 (match-beginning 1) (match-end 1) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3920 'face head-face)))) |
20323 | 3921 (cperl-commentify bb e nil) |
3922 (goto-char e) | |
3923 (or (eq e (point-max)) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3924 (forward-char -1)))) ; Prepare for immediate POD start. |
20323 | 3925 ;; Here document |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3926 ;; 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
|
3927 ;; 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
|
3928 ;; ;; One extra () before this: |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3929 ;;"<<" |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3930 ;; "\\(" ; 1 + 1 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3931 ;; ;; First variant "BLAH" or just ``. |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3932 ;; "[ \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
|
3933 ;; "\\([\"'`]\\)" ; 2 + 1 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3934 ;; "\\([^\"'`\n]*\\)" ; 3 + 1 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3935 ;; "\\3" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3936 ;; "\\|" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3937 ;; ;; 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
|
3938 ;; "\\\\?\\(\\([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
|
3939 ;; ;; 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
|
3940 ;; ;; "\\([^= \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
|
3941 ;; "\\(\\)" ; 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
|
3942 ;; "\\)" |
20323 | 3943 ((match-beginning 2) ; 1 + 1 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3944 (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
|
3945 tb (match-beginning 0) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3946 c (and ; not HERE-DOC |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3947 (match-beginning 5) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3948 (save-match-data |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3949 (or (looking-at "[ \t]*(") ; << function_call() |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3950 (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
|
3951 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3952 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3953 (goto-char tb) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3954 ;;; XXX What to do: foo <<bar ??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3955 ;;; 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
|
3956 (forward-sexp -1) |
80057
1db7c78912f4
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
79717
diff
changeset
|
3957 (save-match-data |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3958 ; $foo << b; $f .= <<B; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3959 ; ($f+1) << b; a($f) . <<B; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3960 ; foo 1, <<B; $x{a} <<b; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3961 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3962 ((looking-at "[0-9$({]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3963 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3964 (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3965 (looking-at "[ \t]*<<") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3966 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3967 ;; print $foo <<EOF |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3968 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3969 (forward-sexp -2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3970 (not |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3971 (looking-at "\\(printf?\\|system\\|exec\\|sort\\)\\>"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3972 (error t))))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3973 (error nil))) ; func(<<EOF) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3974 (and (not (match-beginning 6)) ; Empty |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3975 (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3976 "[ \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
|
3977 (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
|
3978 nil ; Skip it. |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3979 (setq c (match-end 2)) ; 1 + 1 |
20323 | 3980 (if (match-beginning 5) ;4 + 1 |
3981 (setq b1 (match-beginning 5) ; 4 + 1 | |
3982 e1 (match-end 5)) ; 4 + 1 | |
3983 (setq b1 (match-beginning 4) ; 3 + 1 | |
3984 e1 (match-end 4))) ; 3 + 1 | |
3985 (setq tag (buffer-substring b1 e1) | |
3986 qtag (regexp-quote tag)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3987 (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
|
3988 ;; Highlight the starting delimiter |
80057
1db7c78912f4
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
79717
diff
changeset
|
3989 (cperl-postpone-fontification |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3990 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
|
3991 (cperl-put-do-not-fontify b1 e1 t))) |
20323 | 3992 (forward-line) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3993 (setq i (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3994 (if end-of-here-doc |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3995 (goto-char end-of-here-doc)) |
20323 | 3996 (setq b (point)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3997 ;; 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
|
3998 ;; 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
|
3999 (or (and (re-search-forward (concat "^" qtag "$") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4000 stop-point 'toend) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4001 ;;;(eq (following-char) ?\n) ; XXXX WHY??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4002 ) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4003 (progn ; Pretend we matched at the end |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4004 (goto-char (point-max)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4005 (re-search-forward "\\'") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4006 (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
|
4007 (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
|
4008 (if cperl-pod-here-fontify |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4009 (progn |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4010 ;; Highlight the ending delimiter |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4011 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4012 (match-beginning 0) (match-end 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4013 'face my-cperl-delimiters-face) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4014 (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
|
4015 ;; Highlight the HERE-DOC |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4016 (cperl-postpone-fontification b (match-beginning 0) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4017 'face here-face))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4018 (setq e1 (cperl-1+ (match-end 0))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4019 (put-text-property b (match-beginning 0) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4020 'syntax-type 'here-doc) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4021 (put-text-property (match-beginning 0) e1 |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4022 'syntax-type 'here-doc-delim) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4023 (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
|
4024 ;; 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
|
4025 ;; the whole construct: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4026 (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
|
4027 (cperl-commentify b e1 nil) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4028 (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
|
4029 ;; Cache the syntax info... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4030 (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
|
4031 ;; ... 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
|
4032 (setq overshoot |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4033 (elt ; non-inter ignore-max |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4034 (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
|
4035 (if (and overshoot (> overshoot (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4036 (goto-char overshoot) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4037 (setq overshoot e1)) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4038 (if (> e1 max) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4039 (setq tmpend tb)))) |
20323 | 4040 ;; format |
4041 ((match-beginning 8) | |
4042 ;; 1+6=7 extra () before this: | |
4043 ;;"^[ \t]*\\(format\\)[ \t]*\\([a-zA-Z0-9_]+\\)?[ \t]*=[ \t]*$" | |
4044 (setq b (point) | |
4045 name (if (match-beginning 8) ; 7 + 1 | |
4046 (buffer-substring (match-beginning 8) ; 7 + 1 | |
4047 (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
|
4048 "") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4049 tb (match-beginning 0)) |
20323 | 4050 (setq argument nil) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4051 (put-text-property (save-excursion |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4052 (beginning-of-line) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4053 (point)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4054 b 'first-format-line 't) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4055 (if cperl-pod-here-fontify |
20323 | 4056 (while (and (eq (forward-line) 0) |
4057 (not (looking-at "^[.;]$"))) | |
4058 (cond | |
4059 ((looking-at "^#")) ; Skip comments | |
4060 ((and argument ; Skip argument multi-lines | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4061 (looking-at "^[ \t]*{")) |
20323 | 4062 (forward-sexp 1) |
4063 (setq argument nil)) | |
4064 (argument ; Skip argument lines | |
4065 (setq argument nil)) | |
4066 (t ; Format line | |
4067 (setq b1 (point)) | |
4068 (setq argument (looking-at "^[^\n]*[@^]")) | |
4069 (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
|
4070 ;; Highlight the format line |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4071 (cperl-postpone-fontification b1 (point) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4072 'face font-lock-string-face) |
20323 | 4073 (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
|
4074 (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
|
4075 ;; 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
|
4076 ;; 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
|
4077 (re-search-forward "^[.;]$" stop-point 'toend)) |
20323 | 4078 (beginning-of-line) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4079 (if (looking-at "^\\.$") ; ";" is not supported yet |
20323 | 4080 (progn |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4081 ;; 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
|
4082 (cperl-postpone-fontification (point) (+ (point) 2) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4083 'face font-lock-string-face) |
20323 | 4084 (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
|
4085 (cperl-put-do-not-fontify (point) (+ (point) 2) t)) |
20323 | 4086 (message "End of format `%s' not found." name) |
4087 (or (car err-l) (setcar err-l b))) | |
4088 (forward-line) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4089 (if (> (point) max) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4090 (setq tmpend tb)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4091 (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
|
4092 ;; qq-like String or Regexp: |
20323 | 4093 ((or (match-beginning 10) (match-beginning 11)) |
4094 ;; 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
|
4095 ;; "\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>" |
20323 | 4096 ;; "\\|" |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4097 ;; "\\([?/<]\\)" ; /blah/ or ?blah? or <file*glob> |
20323 | 4098 (setq b1 (if (match-beginning 10) 10 11) |
4099 argument (buffer-substring | |
4100 (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
|
4101 b (point) ; end of qq etc |
20323 | 4102 i b |
4103 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
|
4104 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
|
4105 ;; 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
|
4106 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
|
4107 (and (memq bb (append "$@%*#_:-&>" nil)) ; $#y) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4108 (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
|
4109 ((eq bb ?\:) ; $opt::s |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4110 (eq (char-after |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4111 (- (match-beginning b1) 2)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4112 ?\:)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4113 ((eq bb ?\>) ; $foo->s |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4114 (eq (char-after |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4115 (- (match-beginning b1) 2)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4116 ?\-)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4117 ((eq bb ?\&) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4118 (not (eq (char-after ; &&m/blah/ |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4119 (- (match-beginning b1) 2)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4120 ?\&))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4121 (t t))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4122 ;; <file> or <$file> |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4123 (and (eq c ?\<) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4124 ;; 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
|
4125 (save-match-data |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4126 (looking-at |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4127 "\\$?\\([_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
|
4128 tb (match-beginning 0)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4129 (goto-char (match-beginning b1)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4130 (cperl-backward-to-noncomment (point-min)) |
20323 | 4131 (or bb |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4132 (if (eq b1 11) ; bare /blah/ or ?blah? or <foo> |
20323 | 4133 (setq argument "" |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4134 b1 nil |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4135 bb ; Not a regexp? |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4136 (not |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4137 ;; What is below: regexp-p? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4138 (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4139 (or (memq (preceding-char) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4140 (append (if (memq c '(?\? ?\<)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4141 ;; $a++ ? 1 : 2 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4142 "~{(=|&*!,;:[" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4143 "~{(=|&+-*!,;:[") nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4144 (and (eq (preceding-char) ?\}) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4145 (cperl-after-block-p (point-min))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4146 (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
|
4147 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4148 (forward-sexp -1) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4149 ;; 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
|
4150 ;; 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
|
4151 (if (eq (preceding-char) ?-) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4152 ;; -d ?foo? is a RE |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4153 (looking-at "[a-zA-Z]\\>") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4154 (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4155 (not (memq (preceding-char) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4156 '(?$ ?@ ?& ?%))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4157 (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4158 "\\(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
|
4159 (and (eq (preceding-char) ?.) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4160 (eq (char-after (- (point) 2)) ?.)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4161 (bobp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4162 ;; m|blah| ? foo : bar; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4163 (not |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4164 (and (eq c ?\?) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4165 cperl-use-syntax-table-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4166 (not (bobp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4167 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4168 (forward-char -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4169 (looking-at "\\s|")))))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4170 b (1- b)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4171 ;; s y tr m |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4172 ;; Check for $a -> y |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4173 (setq b1 (preceding-char) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4174 go (point)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4175 (if (and (eq b1 ?>) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4176 (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
|
4177 ;; Not a regexp |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4178 (setq bb t)))) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4179 (or bb |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4180 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4181 (goto-char b) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4182 (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
|
4183 (goto-char (match-end 0)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4184 (skip-chars-forward " \t\n\f")) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4185 (cond ((and (eq (following-char) ?\}) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4186 (eq b1 ?\{)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4187 ;; 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
|
4188 (goto-char (1- go)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4189 (skip-chars-backward " \t\n\f") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4190 (if (memq (preceding-char) (append "$@%&*" nil)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4191 (setq bb t) ; @{y} |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4192 (condition-case nil |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4193 (forward-sexp -1) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4194 (error nil))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4195 (if (or bb |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4196 (looking-at ; $foo -> {s} |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4197 "[$@]\\$*\\([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
|
4198 (and ; $foo[12] -> {s} |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4199 (memq (following-char) '(?\{ ?\[)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4200 (progn |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4201 (forward-sexp 1) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4202 (looking-at "\\([ \t\n]*->\\)?[ \t\n]*{")))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4203 (setq bb t) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4204 (goto-char b))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4205 ((and (eq (following-char) ?=) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4206 (eq (char-after (1+ (point))) ?\>)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4207 ;; Check for { foo => 1, s => 2 } |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4208 ;; Apparently s=> is never a substitution... |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4209 (setq bb t)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4210 ((and (eq (following-char) ?:) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4211 (eq b1 ?\{) ; Check for $ { s::bar } |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4212 (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
|
4213 (progn |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4214 (goto-char (1- go)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4215 (skip-chars-backward " \t\n\f") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4216 (memq (preceding-char) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4217 (append "$@%&*" nil)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4218 (setq bb t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4219 ((eobp) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4220 (setq bb t))))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4221 (if bb |
20323 | 4222 (goto-char i) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4223 ;; Skip whitespace and comments... |
20323 | 4224 (if (looking-at "[ \t\n\f]+\\(#[^\n]*\n[ \t\n\f]*\\)+") |
4225 (goto-char (match-end 0)) | |
4226 (skip-chars-forward " \t\n\f")) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4227 (if (> (point) b) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4228 (put-text-property b (point) 'syntax-type 'prestring)) |
20323 | 4229 ;; qtag means two-arg matcher, may be reset to |
4230 ;; 2 or 3 later if some special quoting is needed. | |
4231 ;; e1 means matching-char matcher. | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4232 (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
|
4233 ;; has 2 args |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4234 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
|
4235 ;; 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
|
4236 ;; 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
|
4237 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
|
4238 i2 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4239 st-l err-l argument) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4240 ;; 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
|
4241 ;; 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
|
4242 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
|
4243 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
|
4244 ; is with matching chars [] |
20323 | 4245 go (nth 4 i) ; There is a 1-char part after the end |
4246 i (car i) ; intermediate point | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4247 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
|
4248 ;; 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
|
4249 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
|
4250 (1- e1)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4251 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
|
4252 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
|
4253 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
|
4254 ;; If s{} (), then b/b1 are at "{", "(", e1/i after ")", "}" |
20323 | 4255 ;; Commenting \\ is dangerous, what about ( ? |
4256 (and i tail | |
4257 (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
|
4258 (setq qtag t)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4259 (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
|
4260 (looking-at "\\sw*x")) ; qr//x |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4261 (setq is-x-REx t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4262 (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
|
4263 (looking-at "\\sw*o")) ; //o |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4264 (setq is-o-REx t)) |
20323 | 4265 (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
|
4266 ;; Considered as 1arg form |
20323 | 4267 (progn |
4268 (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
|
4269 (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
|
4270 (if (or is-x-REx |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4271 ;; ignore other text properties: |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4272 (string-match "^qw$" argument)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4273 (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
|
4274 (and go |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4275 (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
|
4276 (or (eobp) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4277 (forward-char 1)))) |
20323 | 4278 (cperl-commentify b i t) |
4279 (if (looking-at "\\sw*e") ; s///e | |
4280 (progn | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4281 ;; Cache the syntax info... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4282 (setq cperl-syntax-state (cons state-point state)) |
20323 | 4283 (and |
4284 ;; silent: | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4285 (car (cperl-find-pods-heres b1 (1- (point)) t end)) |
20323 | 4286 ;; Error |
4287 (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
|
4288 (if (and tag (eq (preceding-char) ?\>)) |
20323 | 4289 (progn |
4290 (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
|
4291 (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
|
4292 (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
|
4293 (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
|
4294 (if is-x-REx |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4295 (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
|
4296 (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
|
4297 (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
|
4298 (if is-x-REx |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4299 (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
|
4300 (if qtag |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4301 (cperl-modify-syntax-type (1+ i) cperl-st-punct)) |
20323 | 4302 (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
|
4303 ;; Now: tail: if the second part is non-matching without ///e |
20323 | 4304 (if (eq (char-syntax (following-char)) ?w) |
4305 (progn | |
4306 (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
|
4307 (if tail (cperl-commentify tail (point) t)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4308 (cperl-postpone-fontification |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4309 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
|
4310 ;; 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
|
4311 ;; and highlight differently |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4312 (setq is-REx |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4313 (and (string-match "^\\([sm]?\\|qr\\)$" argument) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4314 (or (not (= (length argument) 0)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4315 (not (eq c ?\<))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4316 (if (and is-REx |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4317 (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
|
4318 ;; 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
|
4319 (save-excursion |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4320 (condition-case nil |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4321 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4322 (goto-char tb) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4323 (forward-sexp -1) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4324 (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
|
4325 (error t)))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4326 (cperl-postpone-fontification |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4327 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
|
4328 (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
|
4329 (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
|
4330 (or |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4331 (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
|
4332 (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
|
4333 (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
|
4334 (progn |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4335 (cperl-postpone-fontification |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4336 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
|
4337 (cperl-postpone-fontification |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4338 (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
|
4339 (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
|
4340 ;; Process RExen: embedded comments, charclasses and ] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4341 ;;;/\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
|
4342 ;;;/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
|
4343 ;;;/(?<=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
|
4344 ;;;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
|
4345 ;;;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
|
4346 ;;;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
|
4347 (save-excursion |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4348 (goto-char (1+ b)) |
80057
1db7c78912f4
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
79717
diff
changeset
|
4349 ;; First |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4350 (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
|
4351 (setq hairy-RE |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4352 (concat |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4353 (if is-x-REx |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4354 (if (eq (char-after b) ?\#) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4355 "\\((\\?\\\\#\\)\\|\\(\\\\#\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4356 "\\((\\?#\\)\\|\\(#\\)") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4357 ;; 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
|
4358 (if (eq (char-after b) ?\#) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4359 "\\((\\?\\\\#\\)\\(\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4360 "\\((\\?#\\)\\(\\)")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4361 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4362 "\\(\\[\\)" ; 3=[ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4363 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4364 "\\(]\\)" ; 4=] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4365 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4366 ;; 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
|
4367 (if (eq (char-after b) ?\) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4368 "\\())))\\)" ; Will never match |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4369 (if (eq (char-after b) ?? ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4370 ;;"\\((\\\\\\?\\(\\\\\\?\\)?{\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4371 "\\((\\\\\\?\\\\\\?{\\|()\\\\\\?{\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4372 "\\((\\?\\??{\\)")) ; 5= (??{ (?{ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4373 "\\|" ; 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
|
4374 "\\(" ;; XXXX 1-char variables, exc. |()\s |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4375 "[$@]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4376 "\\(" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4377 "[_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
|
4378 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4379 "{[^{}]*}" ; only one-level allowed |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4380 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4381 "[^{(|) \t\r\n\f]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4382 "\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4383 "\\(" ;;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
|
4384 "\\(" "->" "\\)?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4385 "\\[[^][]*\\]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4386 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4387 "{[^{}]*}" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4388 "\\)*" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4389 ;; XXXX: what if u is delim? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4390 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4391 "[)^|$.*?+]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4392 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4393 "{[0-9]+}" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4394 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4395 "{[0-9]+,[0-9]*}" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4396 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4397 "\\\\[luLUEQbBAzZG]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4398 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4399 "(" ; Group opener |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4400 "\\(" ; 10 group opener follower |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4401 "\\?\\((\\?\\)" ; 11: in (?(?=C)A|B) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4402 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4403 "\\?[:=!>?{]" ; "?" something |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4404 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4405 "\\?[-imsx]+[:)]" ; (?i) (?-s:.) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4406 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4407 "\\?([0-9]+)" ; (?(1)foo|bar) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4408 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4409 "\\?<[=!]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4410 ;;;"\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4411 ;;; "\\?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4412 "\\)?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4413 "\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4414 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4415 "\\\\\\(.\\)" ; 12=\SYMBOL |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4416 )) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4417 (while |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4418 (and (< (point) (1- e)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4419 (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
|
4420 (goto-char (match-beginning 0)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4421 (setq REx-subgr-start (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4422 was-subgr (following-char)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4423 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4424 ((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
|
4425 (goto-char (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4426 (if (match-beginning 11) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4427 (goto-char (match-beginning 11))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4428 (if (>= (point) e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4429 (goto-char (1- e))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4430 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4431 (match-beginning 0) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4432 'face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4433 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4434 ((eq was-subgr ?\) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4435 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4436 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4437 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4438 (if (> (point) b) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4439 (if (if (eq (char-after b) ?? ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4440 (looking-at "(\\\\\\?") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4441 (eq (char-after (1+ (point))) ?\?)) |
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 font-lock-warning-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4445 (error font-lock-warning-face))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4446 ((eq was-subgr ?\| ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4447 my-cperl-REx-ctl-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4448 ((eq was-subgr ?\$ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4449 (if (> (point) (1+ REx-subgr-start)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4450 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4451 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4452 (match-beginning 0) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4453 'REx-interpolated |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4454 (if is-o-REx 0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4455 (if (and (eq (match-beginning 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4456 (1+ b)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4457 (eq (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4458 (1- e))) 1 t))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4459 font-lock-variable-name-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4460 my-cperl-REx-spec-char-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4461 ((memq was-subgr (append "^." nil) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4462 my-cperl-REx-spec-char-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4463 ((eq was-subgr ?\( ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4464 (if (not (match-beginning 10)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4465 my-cperl-REx-ctl-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4466 my-cperl-REx-0length-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4467 (t my-cperl-REx-0length-face))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4468 (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
|
4469 (not (string-match "(\\?[-imsx]+)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4470 (match-string 0)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4471 (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
|
4472 (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
|
4473 ((match-beginning 12) ; \SYMBOL |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4474 (forward-char 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4475 (if (>= (point) e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4476 (goto-char (1- e)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4477 ;; How many chars to not highlight: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4478 ;; 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
|
4479 ;; 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
|
4480 ;; 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
|
4481 (setq REx-subgr-start (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4482 qtag (preceding-char)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4483 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4484 (- (point) 2) (- (point) 1) 'face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4485 (if (memq qtag |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4486 (append "ghijkmoqvFHIJKMORTVY" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4487 font-lock-warning-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4488 my-cperl-REx-0length-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4489 (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
|
4490 (memq qtag (append ".])^$|*?+" nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4491 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4492 (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
|
4493 (eq qtag ?\) )) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4494 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4495 REx-subgr-start (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4496 'syntax-table cperl-st-punct)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4497 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4498 (1- (point)) (point) 'face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4499 ; \] can't appear below |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4500 (if (memq qtag (append ".]^$" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4501 'my-cperl-REx-spec-char-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4502 (if (memq qtag (append "*?+" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4503 'my-cperl-REx-0length-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4504 'my-cperl-REx-ctl-face))))) ; )| |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4505 ;; Test for arguments: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4506 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4507 ;; 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
|
4508 ;; \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
|
4509 ;; \DIGIT -> backref unless \0 |
80057
1db7c78912f4
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
79717
diff
changeset
|
4510 ;; \DIGITs -> backref if valid |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4511 ;; otherwise up to 3 -> octal |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4512 ;; 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
|
4513 ((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
|
4514 (re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4515 "\\=[01234567]?[01234567]?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4516 (1- e) 'to-end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4517 (and (memq qtag (append "89" nil)) |
80057
1db7c78912f4
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
79717
diff
changeset
|
4518 (re-search-forward |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4519 "\\=[0123456789]*" (1- e) 'to-end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4520 (and (eq qtag ?x) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4521 (re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4522 "\\=[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
|
4523 (1- e) 'to-end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4524 (and (memq qtag (append "pPN" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4525 (re-search-forward "\\={[^{}]+}\\|." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4526 (1- e) 'to-end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4527 (eq (char-syntax qtag) ?w)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4528 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4529 (1- REx-subgr-start) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4530 'face my-cperl-REx-length1-face)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4531 (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
|
4532 ((match-beginning 3) ; [charclass] |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4533 ;; Highlight leader, trailer, POSIX classes |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4534 (forward-char 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4535 (if (eq (char-after b) ?^ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4536 (and (eq (following-char) ?\\ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4537 (eq (char-after (cperl-1+ (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4538 ?^ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4539 (forward-char 2)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4540 (and (eq (following-char) ?^ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4541 (forward-char 1))) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4542 (setq argument b ; continue? & end of last POSIX |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4543 tag nil ; list of POSIX classes |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4544 qtag (point)) ; after leading ^ if present |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4545 (if (eq (char-after b) ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4546 (and (eq (following-char) ?\\ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4547 (eq (char-after (cperl-1+ (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4548 ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4549 (setq qtag (1+ qtag)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4550 (forward-char 2)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4551 (and (eq (following-char) ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4552 (forward-char 1))) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4553 (setq REx-subgr-end qtag) ;EndOf smart-highlighed |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4554 ;; 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
|
4555 ;; in m]]: m][\\\]\]] produces [\\]] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4556 ;;; POSIX? [:word:] [:^word:] only inside [] |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4557 ;;; "\\=\\(\\\\.\\|[^][\\\\]\\|\\[:\\^?\sw+:]\\|\\[[^:]\\)*]") |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4558 (while ; look for unescaped ] |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4559 (and argument |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4560 (re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4561 (if (eq (char-after b) ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4562 "\\=\\(\\\\[^]]\\|[^]\\\\]\\)*\\\\]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4563 "\\=\\(\\\\.\\|[^]\\\\]\\)*]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4564 (1- e) 'toend)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4565 ;; 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
|
4566 (if (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4567 (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4568 (search-backward "[" argument t) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4569 (< REx-subgr-start (point)) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4570 (setq argument (point)) ; POSIX-start |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4571 (or ; Should work with delim = \ |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4572 (not (eq (preceding-char) ?\\ )) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4573 ;; XXXX Double \\ is needed with 19.33 |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4574 (= (% (skip-chars-backward "\\\\") 2) 0)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4575 (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4576 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4577 ((eq (char-after b) ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4578 "\\\\*\\[:\\^?\\sw+:\\\\\\]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4579 ((eq (char-after b) ?\: ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4580 "\\\\*\\[\\\\:\\^?\\sw+\\\\:]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4581 ((eq (char-after b) ?^ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4582 "\\\\*\\[:\\(\\\\\\^\\)?\\sw+:\]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4583 ((eq (char-syntax (char-after b)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4584 ?w) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4585 (concat |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4586 "\\\\*\\[:\\(\\\\\\^\\)?\\(\\\\" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4587 (char-to-string (char-after b)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4588 "\\|\\sw\\)+:\]")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4589 (t "\\\\*\\[:\\^?\\sw*:]"))) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4590 (goto-char REx-subgr-end) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4591 (cperl-highlight-charclass |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4592 argument my-cperl-REx-spec-char-face |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4593 my-cperl-REx-0length-face my-cperl-REx-length1-face))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4594 (setq tag (cons (cons argument (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4595 tag) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4596 argument (point) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4597 REx-subgr-end argument) ; continue |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4598 (setq argument nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4599 (and argument |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4600 (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
|
4601 REx-subgr-start)) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4602 (setq argument (1- (point))) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4603 (goto-char REx-subgr-end) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4604 (cperl-highlight-charclass |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4605 argument my-cperl-REx-spec-char-face |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4606 my-cperl-REx-0length-face my-cperl-REx-length1-face) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4607 (forward-char 1) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4608 ;; Highlight starter, trailer, POSIX |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4609 (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
|
4610 (> (- (point) 2) REx-subgr-start)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4611 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4612 (1+ REx-subgr-start) (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4613 'syntax-table cperl-st-punct)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4614 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4615 REx-subgr-start qtag |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4616 '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
|
4617 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4618 (1- (point)) (point) 'face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4619 my-cperl-REx-spec-char-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4620 (if (eq (char-after b) ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4621 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4622 (- (point) 2) (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4623 'face my-cperl-REx-0length-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4624 (while tag |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4625 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4626 (car (car tag)) (cdr (car tag)) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4627 'face font-lock-variable-name-face) ;my-cperl-REx-length1-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4628 (setq tag (cdr tag))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4629 (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
|
4630 ;; Now rare stuff: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4631 ((and (match-beginning 2) ; #-comment |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4632 (/= (match-beginning 2) (match-end 2))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4633 (beginning-of-line 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4634 (if (> (point) e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4635 (goto-char (1- e)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4636 ((match-beginning 4) ; character "]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4637 (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
|
4638 (goto-char (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4639 (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
|
4640 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4641 (1- (point)) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4642 'syntax-table cperl-st-punct)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4643 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4644 (1- (point)) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4645 'face font-lock-warning-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4646 ((match-beginning 5) ; before (?{}) (??{}) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4647 (setq tag (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4648 (if (or (setq qtag |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4649 (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
|
4650 (and (>= (point) e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4651 (setq qtag "no matching `)' found")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4652 (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
|
4653 ?\} )) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4654 (setq qtag "Can't find })"))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4655 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4656 (goto-char (1- e)) |
87170
e50a2e215441
* erc-stamp.el (erc-echo-timestamp):
David Kastrup <dak@gnu.org>
parents:
86503
diff
changeset
|
4657 (message "%s" qtag)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4658 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4659 (1- tag) (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4660 'face font-lock-variable-name-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4661 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4662 REx-subgr-start (1- tag) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4663 '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
|
4664 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4665 (1- (point)) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4666 '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
|
4667 (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
|
4668 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4669 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4670 (- (point) 2) (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4671 'syntax-table cperl-st-cfence) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4672 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4673 (+ REx-subgr-start 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4674 (+ REx-subgr-start 3) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4675 'syntax-table cperl-st-cfence)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4676 (setq was-subgr nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4677 (t ; (?#)-comment |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4678 ;; 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
|
4679 ;; 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
|
4680 (or;;(if (eq (char-after b) ?\) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4681 ;;(re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4682 ;; "[^\\\\]\\(\\\\\\\\\\)*\\\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4683 ;; (1- e) 'toend) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4684 (search-forward ")" (1- e) 'toend) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4685 ;;) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4686 (message |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4687 "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
|
4688 REx-subgr-start)))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4689 (if (>= (point) e) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4690 (goto-char (1- e))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4691 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4692 (was-subgr |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4693 (setq REx-subgr-end (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4694 (cperl-commentify |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4695 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
|
4696 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4697 REx-subgr-start REx-subgr-end |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4698 'face font-lock-comment-face)))))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4699 (if (and is-REx is-x-REx) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4700 (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
|
4701 'syntax-subtype 'x-REx))) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
4702 (if (and i2 e1 (or (not b1) (> e1 b1))) |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4703 (progn ; No errors finding the second part... |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4704 (cperl-postpone-fontification |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4705 (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
|
4706 (if (and (not (eobp)) |
d168a4166b80
Fix s{a}{b} parsing
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
78487
diff
changeset
|
4707 (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
|
4708 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4709 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4710 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
|
4711 (put-text-property b1 (1+ b1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4712 '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
|
4713 (if (> (point) max) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4714 (setq tmpend tb)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4715 ((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
|
4716 ;; 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
|
4717 ;;"\\<sub\\>\\(" ;12 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4718 ;; cperl-white-and-comment-rex ;13 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4719 ;; "\\([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
|
4720 ;;"\\(" 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
|
4721 ;; "\\(([^()]*)\\|:[^:]\\)\\)" ; 17:proto or attribute start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4722 (setq b1 (match-beginning 14) e1 (match-end 14)) |
20323 | 4723 (if (memq (char-after (1- b)) |
4724 '(?\$ ?\@ ?\% ?\& ?\*)) | |
4725 nil | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4726 (goto-char b) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4727 (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
|
4728 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4729 (cperl-commentify ; Prototypes; mark as string |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4730 (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
|
4731 (goto-char (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4732 ;; Now look for attributes after prototype: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4733 (forward-comment (buffer-size)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4734 (and (looking-at ":[^:]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4735 (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
|
4736 ;; treat attributes without prototype |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4737 (goto-char (match-beginning 17)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4738 (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
|
4739 ;; 1+6+2+1+1+6+1=18 extra () before this: |
20323 | 4740 ;; "\\(\\<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
|
4741 ((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
|
4742 (setq bb (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4743 ;;;(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
|
4744 (put-text-property (1- bb) bb 'syntax-table cperl-st-word) |
20323 | 4745 (goto-char bb)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4746 ;; 1+6+2+1+1+6+1+1=19 extra () before this: |
20323 | 4747 ;; "__\\(END\\|DATA\\)__" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4748 ((match-beginning 20) ; __END__, __DATA__ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4749 (setq bb (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4750 ;; (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
|
4751 (cperl-commentify b bb nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4752 (setq end t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4753 ;; "\\\\\\(['`\"($]\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4754 ((match-beginning 21) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4755 ;; 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
|
4756 (setq bb (match-end 0)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4757 (goto-char b) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4758 (skip-chars-backward "\\\\") |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4759 ;;;(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
|
4760 (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
|
4761 (goto-char bb)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4762 (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
|
4763 (if (> (point) stop-point) |
20323 | 4764 (progn |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4765 (if end |
20323 | 4766 (message "Garbage after __END__/__DATA__ ignored") |
4767 (message "Unbalanced syntax found while scanning") | |
4768 (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
|
4769 (goto-char stop-point)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4770 (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
|
4771 ;; 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
|
4772 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
|
4773 ;;(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
|
4774 ) |
20323 | 4775 (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
|
4776 (or non-inter |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4777 (message "Scanning for \"hard\" Perl constructions... done")))) |
20323 | 4778 (and (buffer-modified-p) |
4779 (not modified) | |
4780 (set-buffer-modified-p nil)) | |
63836
e6973993a720
(cperl-find-pods-heres): Don't gratuitously
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63518
diff
changeset
|
4781 ;; 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
|
4782 ;; 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
|
4783 ;; cperl-mode-syntax-table. |
e6973993a720
(cperl-find-pods-heres): Don't gratuitously
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63518
diff
changeset
|
4784 ;; (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
|
4785 ) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4786 (list (car err-l) overshoot))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4787 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4788 (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
|
4789 (interactive "r") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4790 (cperl-find-pods-heres min max)) |
20323 | 4791 |
4792 (defun cperl-backward-to-noncomment (lim) | |
4793 ;; 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
|
4794 ;; 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
|
4795 (let (stop p pr) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4796 (while (and (not stop) (> (point) (or lim (point-min)))) |
20323 | 4797 (skip-chars-backward " \t\n\f" lim) |
4798 (setq p (point)) | |
4799 (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
|
4800 (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
|
4801 '(pod here-doc here-doc-delim)) |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4802 (progn |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4803 (cperl-unwind-to-safe nil) |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4804 (setq pr (get-text-property (point) 'syntax-type)))) |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4805 (or (and (looking-at "^[ \t]*\\(#\\|$\\)") |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4806 (not (memq pr '(string prestring)))) |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4807 (progn (cperl-to-comment-or-eol) (bolp)) |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4808 (progn |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4809 (skip-chars-backward " \t") |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4810 (if (< p (point)) (goto-char p)) |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
4811 (setq stop t)))))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4812 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4813 ;; Used only in `cperl-calculate-indent'... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4814 (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
|
4815 ;; 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
|
4816 ;; 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
|
4817 (cperl-backward-to-noncomment (point-min)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4818 (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
|
4819 ; 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
|
4820 (save-excursion (cperl-after-label)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4821 (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
|
4822 (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
|
4823 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4824 (backward-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4825 ;; 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
|
4826 (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
|
4827 (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
|
4828 ;; sub bless::foo {} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4829 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4830 (cperl-backward-to-noncomment (point-min)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4831 (and (eq (preceding-char) ?b) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4832 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4833 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4834 (looking-at "sub[ \t\n\f#]"))))))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4835 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4836 ;;; 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
|
4837 ;;; 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
|
4838 ;;; 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
|
4839 ;;; ${something()}, print {FH} $data. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4840 ;;; 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
|
4841 ;;; 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
|
4842 (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
|
4843 "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
|
4844 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
|
4845 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
|
4846 statement would start; thus the block in ${func()} does not count." |
20323 | 4847 (save-excursion |
4848 (condition-case nil | |
4849 (progn | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4850 (or pre-block (forward-sexp -1)) |
20323 | 4851 (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
|
4852 (or (eq (point) lim) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4853 ;; if () {} // sub f () {} // sub f :a(') {} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4854 (eq (preceding-char) ?\) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4855 ;; label: {} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4856 (save-excursion (cperl-after-label)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4857 ;; sub :attr {} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4858 (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
|
4859 (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
|
4860 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4861 (forward-sexp -1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4862 ;; else {} but not else::func {} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4863 (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
|
4864 (not (looking-at "\\(\\sw\\|_\\)+::"))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4865 ;; sub f {} |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4866 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4867 (cperl-backward-to-noncomment lim) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4868 (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
|
4869 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4870 (forward-sexp -1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4871 (looking-at "sub[ \t\n\f#]")))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4872 ;; 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
|
4873 (cperl-after-expr-p lim)))) |
20323 | 4874 (error nil)))) |
4875 | |
4876 (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
|
4877 "Return true if the position is good for start of expression. |
20323 | 4878 TEST is the expression to evaluate at the found position. If absent, |
4879 CHARS is a string that contains good characters to have before us (however, | |
4880 `}' 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
|
4881 (let ((lim (or lim (point-min))) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4882 stop p pr) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4883 (cperl-update-syntaxification (point) (point)) |
20323 | 4884 (save-excursion |
4885 (while (and (not stop) (> (point) lim)) | |
4886 (skip-chars-backward " \t\n\f" lim) | |
4887 (setq p (point)) | |
4888 (beginning-of-line) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4889 ;;(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
|
4890 ;; '(pod here-doc here-doc-delim)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4891 (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
|
4892 (progn |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4893 (goto-char |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4894 (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
|
4895 (beginning-of-line 0))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4896 (if (get-text-property (point) 'in-pod) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4897 (progn |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4898 (goto-char |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4899 (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
|
4900 (beginning-of-line 0))) |
20323 | 4901 (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
|
4902 ;; Else: last iteration, or a label |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4903 (cperl-to-comment-or-eol) ; Will not move past "." after a format |
20323 | 4904 (skip-chars-backward " \t") |
4905 (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
|
4906 (setq p (point)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4907 (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
|
4908 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4909 (forward-char -1) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4910 (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
|
4911 (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
|
4912 (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
|
4913 (goto-char p) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4914 (setq stop t)))) |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
4915 (or (bobp) ; ???? Needed |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
4916 (eq (point) lim) |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
4917 (looking-at "[ \t]*__\\(END\\|DATA\\)__") ; After this anything goes |
20323 | 4918 (progn |
4919 (if test (eval test) | |
4920 (or (memq (preceding-char) (append (or chars "{;") nil)) | |
4921 (and (eq (preceding-char) ?\}) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4922 (cperl-after-block-p lim)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4923 (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
|
4924 (eq (get-text-property (point) 'syntax-type) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4925 'format))))))))) |
20323 | 4926 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4927 (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
|
4928 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4929 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4930 (while (and (or (not lim) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4931 (> (point) lim)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4932 (not (cperl-after-expr-p lim))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4933 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4934 ;; 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
|
4935 (skip-chars-backward "$@%#"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4936 (error nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4937 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4938 (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
|
4939 ;; 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
|
4940 (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
|
4941 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4942 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4943 ;; 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
|
4944 ;; 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
|
4945 ;; 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
|
4946 ;; 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
|
4947 (let ((p (point))) |
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 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4950 (while (memq (preceding-char) (append "%&@$*" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4951 (forward-char -1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4952 (or (< (point) p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4953 (cperl-after-expr-p lim)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4954 (error t)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4955 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4956 (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
|
4957 (let ((p (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4958 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4959 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4960 (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
|
4961 (not (cperl-at-end-of-expr))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4962 (forward-sexp 1))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4963 (error nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4964 |
20323 | 4965 (defun cperl-backward-to-start-of-continued-exp (lim) |
4966 (if (memq (preceding-char) (append ")]}\"'`" nil)) | |
4967 (forward-sexp -1)) | |
4968 (beginning-of-line) | |
4969 (if (<= (point) lim) | |
4970 (goto-char (1+ lim))) | |
4971 (skip-chars-forward " \t")) | |
4972 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4973 (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
|
4974 ;; We assume that we are after ?\} |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4975 (and |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4976 (cperl-after-block-p lim) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4977 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4978 (forward-sexp -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4979 (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
|
4980 (or (bobp) |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
4981 (eq (point) lim) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4982 (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
|
4983 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4984 (forward-sexp -1) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4985 (not |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4986 (looking-at |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4987 "\\(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
|
4988 |
20323 | 4989 |
4990 (defun cperl-indent-exp () | |
4991 "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
|
4992 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4993 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
|
4994 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
|
4995 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4996 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
|
4997 conditional/loop constructs." |
20323 | 4998 (interactive) |
4999 (save-excursion | |
5000 (let ((tmp-end (progn (end-of-line) (point))) top done) | |
5001 (save-excursion | |
5002 (beginning-of-line) | |
5003 (while (null done) | |
5004 (setq top (point)) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5005 ;; 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
|
5006 (while (= -1 (nth 0 (parse-partial-sexp (point) tmp-end -1))) |
20323 | 5007 (setq top (point))) ; Get the outermost parenths in line |
5008 (goto-char top) | |
5009 (while (< (point) tmp-end) | |
5010 (parse-partial-sexp (point) tmp-end nil t) ; To start-sexp or eol | |
5011 (or (eolp) (forward-sexp 1))) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5012 (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
|
5013 nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5014 (if (eq ?\) (preceding-char)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5015 (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
|
5016 (setq top (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5017 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5018 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5019 (forward-sexp -2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5020 (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
|
5021 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5022 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5023 (if (looking-at "\\(my\\|local\\|our\\)\\>") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5024 (forward-sexp -1)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5025 (if (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5026 (concat "\\(\\elsif\\|if\\|unless\\|while\\|until" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5027 "\\|for\\(each\\)?\\>\\(\\(" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5028 cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5029 "\\(my\\|local\\|our\\)\\)?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5030 cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5031 "\\$[_a-zA-Z0-9]+\\)?\\)\\>")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5032 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5033 (goto-char top) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5034 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5035 (setq top (point))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5036 (error (setq done t))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5037 (goto-char top)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5038 (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
|
5039 (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
|
5040 "\\<\\(else\\|elsif\|continue\\)\\>")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5041 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5042 (goto-char (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5043 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5044 (end-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5045 (setq tmp-end (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5046 (setq done t)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5047 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5048 (end-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5049 (setq tmp-end (point)))) |
20323 | 5050 (goto-char tmp-end) |
5051 (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
|
5052 (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
|
5053 (cperl-fix-line-spacing tmp-end)) |
20323 | 5054 (cperl-indent-region (point) tmp-end)))) |
5055 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5056 (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
|
5057 "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
|
5058 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
|
5059 (interactive) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5060 (or end |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5061 (setq end (point-max))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5062 (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
|
5063 (cperl-indent-region-fix-constructs |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5064 (or cperl-indent-region-fix-constructs 1)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5065 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
|
5066 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5067 (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
|
5068 (setq ret (point)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5069 ;; }? continue |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5070 ;; blah; } |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5071 (if (not |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5072 (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
|
5073 (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
|
5074 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
|
5075 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5076 ;; } |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5077 ;; else |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5078 (if cperl-merge-trailing-else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5079 (if (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5080 "[ \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
|
5081 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5082 (search-forward "}") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5083 (setq p (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5084 (skip-chars-forward " \t\n") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5085 (delete-region p (point)) |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5086 (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
|
5087 (beginning-of-line))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5088 (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
|
5089 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5090 (search-forward "}") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5091 (delete-horizontal-space) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5092 (insert "\n") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5093 (setq ret (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5094 (if (cperl-indent-line parse-data) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5095 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5096 (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
|
5097 (setq ret (point))))))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5098 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5099 ;; } else |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5100 (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
|
5101 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5102 (search-forward "}") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5103 (delete-horizontal-space) |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5104 (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
|
5105 (beginning-of-line))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5106 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5107 ;; else { |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5108 (if (looking-at |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5109 "[ \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
|
5110 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5111 (forward-word 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5112 (delete-horizontal-space) |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5113 (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
|
5114 (beginning-of-line))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5115 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5116 ;; foreach my $var |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5117 (if (looking-at |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5118 "[ \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
|
5119 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5120 (forward-word 2) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5121 (delete-horizontal-space) |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5122 (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
|
5123 (beginning-of-line))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5124 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5125 ;; foreach my $var ( |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5126 (if (looking-at |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5127 "[ \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
|
5128 (progn |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
5129 (forward-sexp 3) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5130 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5131 (insert |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5132 (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
|
5133 (beginning-of-line))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5134 ;; 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
|
5135 ;; } foreach my $var () OR { |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5136 (if (looking-at |
44446
9b08deb1030e
(cperl-make-face, cperl-force-face):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43943
diff
changeset
|
5137 "[ \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
|
5138 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5139 (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
|
5140 (re-search-forward "[({]") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5141 (forward-char -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5142 (setq p (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5143 (if (eq (following-char) ?\( ) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5144 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5145 (forward-sexp 1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5146 (setq pp (point))) ; past parenth-group |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5147 ;; after `else' or nothing |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5148 (if ml ; after `else' |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5149 (skip-chars-backward " \t\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5150 (beginning-of-line)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5151 (setq pp nil)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5152 ;; Now after the sexp before the brace |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5153 ;; Multiline expr should be special |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5154 (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
|
5155 (search-forward "\n" pp t)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5156 (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
|
5157 (looking-at "[ \t\n]*{")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5158 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5159 (cond |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5160 ((bolp) ; Were before `{', no if/else/etc |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5161 nil) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5162 ((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
|
5163 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5164 (if (if ml |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5165 cperl-extra-newline-before-brace-multiline |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5166 cperl-extra-newline-before-brace) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5167 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5168 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5169 (insert "\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5170 (setq ret (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5171 (if (cperl-indent-line parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5172 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5173 (cperl-fix-line-spacing end parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5174 (setq ret (point))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5175 (insert |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5176 (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
|
5177 ((and (looking-at "[ \t]*\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5178 (not (if ml |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5179 cperl-extra-newline-before-brace-multiline |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5180 cperl-extra-newline-before-brace))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5181 (setq pp (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5182 (skip-chars-forward " \t\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5183 (delete-region pp (point)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5184 (insert |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5185 (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
|
5186 ((and (looking-at "[\t ]*{") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5187 (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
|
5188 cperl-extra-newline-before-brace)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5189 (delete-horizontal-space) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5190 (insert "\n") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5191 (setq ret (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5192 (if (cperl-indent-line parse-data) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5193 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5194 (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
|
5195 (setq ret (point)))))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5196 ;; Now we are before `{' |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5197 (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
|
5198 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5199 (skip-chars-forward " \t\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5200 (setq pp (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5201 (forward-sexp 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5202 (setq p (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5203 (goto-char pp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5204 (setq ml (search-forward "\n" p t)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5205 (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
|
5206 ;; not good: multi-line BLOCK |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5207 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5208 (goto-char (1+ pp)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5209 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5210 (insert "\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5211 (setq ret (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5212 (if (cperl-indent-line parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5213 (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
|
5214 (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5215 (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
|
5216 ;; Now check whether there is a hanging `}' |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5217 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5218 ;; } blah |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5219 (if (and |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5220 cperl-fix-hanging-brace-when-indent |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5221 have-brace |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5222 (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
|
5223 (condition-case nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5224 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5225 (up-list 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5226 (if (and (<= (point) pp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5227 (eq (preceding-char) ?\} ) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5228 (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
|
5229 t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5230 (goto-char p) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5231 nil)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5232 (error nil))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5233 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5234 (forward-char -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5235 (skip-chars-backward " \t") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5236 (if (bolp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5237 ;; `}' 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
|
5238 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5239 (cperl-indent-line parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5240 (search-forward "}") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5241 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5242 (insert "\n")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5243 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5244 (or (eq (preceding-char) ?\;) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5245 (bolp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5246 (and (eq (preceding-char) ?\} ) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5247 (cperl-after-block-p (point-min))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5248 (insert ";")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5249 (insert "\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5250 (setq ret (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5251 (if (cperl-indent-line parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5252 (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
|
5253 (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
|
5254 ret)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5255 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5256 (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
|
5257 (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
|
5258 (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
|
5259 (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
|
5260 (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
|
5261 |
20323 | 5262 (defun cperl-indent-region (start end) |
5263 "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
|
5264 Should be slow. Will not indent comment if it starts at `comment-indent' |
20323 | 5265 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
|
5266 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
|
5267 inclusive. |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5268 |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5269 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
|
5270 conditional/loop constructs." |
20323 | 5271 (interactive "r") |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5272 (cperl-update-syntaxification end end) |
20323 | 5273 (save-excursion |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5274 (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
|
5275 (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
|
5276 (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
|
5277 nil)) |
58356
4ca1b78a471f
(cperl-indent-region): Don't mind imenu-scanning-message.
Richard M. Stallman <rms@gnu.org>
parents:
58190
diff
changeset
|
5278 (pm 0) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5279 after-change-functions ; Speed it up! |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5280 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
|
5281 (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
|
5282 (goto-char start) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5283 (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
|
5284 (current-column)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5285 new-comm-indent old-comm-indent) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5286 (goto-char start) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5287 (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
|
5288 (or (bolp) (beginning-of-line 2)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5289 (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
|
5290 (setq st (point)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5291 (if (or |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5292 (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
|
5293 (and (setq comm (looking-at "[ \t]*#")) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5294 (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
|
5295 comment-column)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5296 (setq old-comm-indent nil)))) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5297 (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
|
5298 (not empty) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5299 (= (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
|
5300 (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
|
5301 (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
|
5302 cperl-st-cfence))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5303 (let ((comment-column new-comm-indent)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5304 (indent-for-comment))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5305 (progn |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5306 (setq i (cperl-indent-line indent-info)) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5307 (or comm |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5308 (not i) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5309 (progn |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5310 (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
|
5311 (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
|
5312 (if (setq old-comm-indent |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5313 (and (cperl-to-comment-or-eol) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5314 (not (memq (get-text-property (point) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5315 'syntax-type) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5316 '(pod here-doc))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5317 (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
|
5318 'syntax-table) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5319 cperl-st-cfence)) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5320 (current-column))) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5321 (progn (indent-for-comment) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5322 (skip-chars-backward " \t") |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5323 (skip-chars-backward "#") |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5324 (setq new-comm-indent (current-column)))))))) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5325 (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
|
5326 ;; Now run the update hooks |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5327 (and after-change-functions |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5328 cperl-update-end |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5329 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5330 (goto-char cperl-update-end) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5331 (insert " ") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5332 (delete-char -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5333 (goto-char cperl-update-start) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5334 (insert " ") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5335 (delete-char -1)))))) |
20323 | 5336 |
5337 ;; Stolen from lisp-mode with a lot of improvements | |
5338 | |
5339 (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
|
5340 "Like `fill-paragraph', but handle CPerl comments. |
20323 | 5341 If any of the current line is a comment, fill the comment or the |
5342 block of it that point is in, preserving the comment's initial | |
5343 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
|
5344 ;; (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
|
5345 (let (;; Non-nil if the current line contains a comment. |
20323 | 5346 has-comment |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5347 fill-paragraph-function ; do not recurse |
20323 | 5348 ;; If has-comment, the appropriate fill-prefix for the comment. |
5349 comment-fill-prefix | |
5350 ;; Line that contains code and comment (or nil) | |
5351 start | |
5352 c spaces len dc (comment-column comment-column)) | |
5353 ;; Figure out what kind of comment we are looking at. | |
5354 (save-excursion | |
5355 (beginning-of-line) | |
5356 (cond | |
5357 | |
5358 ;; A line with nothing but a comment on it? | |
5359 ((looking-at "[ \t]*#[# \t]*") | |
5360 (setq has-comment t | |
5361 comment-fill-prefix (buffer-substring (match-beginning 0) | |
5362 (match-end 0)))) | |
5363 | |
5364 ;; A line with some code, followed by a comment? Remember that the | |
5365 ;; semi which starts the comment shouldn't be part of a string or | |
5366 ;; character. | |
5367 ((cperl-to-comment-or-eol) | |
5368 (setq has-comment t) | |
5369 (looking-at "#+[ \t]*") | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5370 (setq start (point) c (current-column) |
20323 | 5371 comment-fill-prefix |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5372 (concat (make-string (current-column) ?\s) |
20323 | 5373 (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
|
5374 spaces (progn (skip-chars-backward " \t") |
20323 | 5375 (buffer-substring (point) start)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5376 dc (- c (current-column)) len (- start (point)) |
20323 | 5377 start (point-marker)) |
5378 (delete-char len) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5379 (insert (make-string dc ?-))))) ; Placeholder (to avoid splitting???) |
20323 | 5380 (if (not has-comment) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5381 (fill-paragraph justify) ; Do the usual thing outside of comment |
20323 | 5382 ;; Narrow to include only the comment, and then fill the region. |
5383 (save-restriction | |
5384 (narrow-to-region | |
5385 ;; Find the first line we should include in the region to fill. | |
5386 (if start (progn (beginning-of-line) (point)) | |
5387 (save-excursion | |
5388 (while (and (zerop (forward-line -1)) | |
5389 (looking-at "^[ \t]*#+[ \t]*[^ \t\n#]"))) | |
5390 ;; We may have gone to far. Go forward again. | |
5391 (or (looking-at "^[ \t]*#+[ \t]*[^ \t\n#]") | |
5392 (forward-line 1)) | |
5393 (point))) | |
5394 ;; Find the beginning of the first line past the region to fill. | |
5395 (save-excursion | |
5396 (while (progn (forward-line 1) | |
5397 (looking-at "^[ \t]*#+[ \t]*[^ \t\n#]"))) | |
5398 (point))) | |
5399 ;; Remove existing hashes | |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5400 (goto-char (point-min)) |
53812
80c9f33653f7
(cperl-fill-paragraph): Call fill-paragraph
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53779
diff
changeset
|
5401 (save-excursion |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5402 (while (progn (forward-line 1) (< (point) (point-max))) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5403 (skip-chars-forward " \t") |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5404 (if (looking-at "#+") |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5405 (progn |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5406 (if (and (eq (point) (match-beginning 0)) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
5407 (not (eq (point) (match-end 0)))) nil |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5408 (error |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5409 "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
|
5410 (delete-char (- (match-end 0) (match-beginning 0))))))) |
20323 | 5411 |
5412 ;; Lines with only hashes on them can be paragraph boundaries. | |
5413 (let ((paragraph-start (concat paragraph-start "\\|^[ \t#]*$")) | |
5414 (paragraph-separate (concat paragraph-start "\\|^[ \t#]*$")) | |
5415 (fill-prefix comment-fill-prefix)) | |
5416 (fill-paragraph justify))) | |
5417 (if (and start) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5418 (progn |
20323 | 5419 (goto-char start) |
5420 (if (> dc 0) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5421 (progn (delete-char dc) (insert spaces))) |
20323 | 5422 (if (or (= (current-column) c) iteration) nil |
5423 (setq comment-column c) | |
5424 (indent-for-comment) | |
5425 ;; 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
|
5426 (cperl-fill-paragraph justify t)))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5427 t) |
20323 | 5428 |
5429 (defun cperl-do-auto-fill () | |
5430 ;; Break out if the line is short enough | |
5431 (if (> (save-excursion | |
5432 (end-of-line) | |
5433 (current-column)) | |
5434 fill-column) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5435 (let ((c (save-excursion (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5436 (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
|
5437 (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
|
5438 (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
|
5439 ;; 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
|
5440 nil |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5441 (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
|
5442 (fill-paragraph nil) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5443 (goto-char marker) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5444 ;; 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
|
5445 (if (bolp) (progn (re-search-forward "#+[ \t]*") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5446 (goto-char (match-end 0)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5447 ;; 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
|
5448 (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
|
5449 (insert " ") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5450 (backward-char 1)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5451 ;; 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
|
5452 (or (memq (preceding-char) '(?\s ?\t)) (insert " ")))))) |
20323 | 5453 |
5454 (defun cperl-imenu-addback (lst &optional isback name) | |
5455 ;; We suppose that the lst is a DAG, unless the first element only | |
5456 ;; loops back, and ISBACK is set. Thus this function cannot be | |
5457 ;; applied twice without ISBACK set. | |
5458 (cond ((not cperl-imenu-addback) lst) | |
5459 (t | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5460 (or name |
20323 | 5461 (setq name "+++BACK+++")) |
85223
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
5462 (mapc (lambda (elt) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
5463 (if (and (listp elt) (listp (cdr elt))) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
5464 (progn |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
5465 ;; In the other order it goes up |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
5466 ;; one level only ;-( |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
5467 (setcdr elt (cons (cons name lst) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
5468 (cdr elt))) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
5469 (cperl-imenu-addback (cdr elt) t name)))) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
5470 (if isback (cdr lst) lst)) |
20323 | 5471 lst))) |
5472 | |
31821 | 5473 (defun cperl-imenu--create-perl-index (&optional regexp) |
20323 | 5474 (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
|
5475 (let ((index-alist '()) (index-pack-alist '()) (index-pod-alist '()) |
20323 | 5476 (index-unsorted-alist '()) (i-s-f (default-value 'imenu-sort-function)) |
5477 (index-meth-alist '()) meth | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5478 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
|
5479 (prev-pos 0) is-pack index index1 name (end-range 0) package) |
20323 | 5480 (goto-char (point-min)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5481 (cperl-update-syntaxification (point-max) (point-max)) |
20323 | 5482 ;; Search for the function |
5483 (progn ;;save-match-data | |
5484 (while (re-search-forward | |
31821 | 5485 (or regexp cperl-imenu--function-name-regexp-perl) |
20323 | 5486 nil t) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5487 ;; 2=package-group, 5=package-name 8=sub-name |
20323 | 5488 (cond |
5489 ((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
|
5490 (match-beginning 5) ; package name |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5491 ;;(eq (char-after (match-beginning 2)) ?p) ; package |
20323 | 5492 (not (save-match-data |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5493 (looking-at "[ \t\n]*;")))) ; Plain text word 'package' |
20323 | 5494 nil) |
5495 ((and | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5496 (or (match-beginning 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5497 (match-beginning 8)) ; package or sub |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5498 ;; Skip if quoted (will not skip multi-line ''-strings :-(): |
20323 | 5499 (null (get-text-property (match-beginning 1) 'syntax-table)) |
5500 (null (get-text-property (match-beginning 1) 'syntax-type)) | |
5501 (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
|
5502 (setq is-pack (match-beginning 2)) |
20323 | 5503 ;; (if (looking-at "([^()]*)[ \t\n\f]*") |
5504 ;; (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
|
5505 (setq meth nil |
20323 | 5506 p (point)) |
5507 (while (and ends-ranges (>= p (car ends-ranges))) | |
5508 ;; delete obsolete entries | |
5509 (setq ends-ranges (cdr ends-ranges) packages (cdr packages))) | |
5510 (setq package (or (car packages) "") | |
5511 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
|
5512 (if is-pack ; doing "package" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5513 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5514 (if (match-beginning 5) ; named package |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5515 (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
|
5516 (match-end 5)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5517 name (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5518 (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
|
5519 name) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5520 package (concat name "::") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5521 name (concat "package " name)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5522 ;; Support nameless packages |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5523 (setq name "package;" package "")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5524 (setq end-range |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5525 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5526 (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
|
5527 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
|
5528 packages (cons package packages))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5529 (setq is-proto |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5530 (or (eq (following-char) ?\;) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5531 (eq 0 (get-text-property (point) 'attrib-group))))) |
20323 | 5532 ;; 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
|
5533 (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
|
5534 (or is-pack |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5535 (setq name |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5536 (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
|
5537 (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
|
5538 (setq marker (make-marker)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5539 (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
|
5540 (cond (is-pack nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5541 ((string-match "[:']" name) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5542 (setq meth t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5543 ((> p end-range) nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5544 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5545 (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
|
5546 (setq index (cons name marker)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5547 (if is-pack |
20323 | 5548 (push index index-pack-alist) |
5549 (push index index-alist)) | |
5550 (if meth (push index index-meth-alist)) | |
5551 (push index index-unsorted-alist))) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5552 ((match-beginning 16) ; POD section |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5553 (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
|
5554 marker (make-marker)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5555 (set-marker marker (match-beginning 17)) |
20323 | 5556 (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
|
5557 (setq name (concat (make-string |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5558 (* 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
|
5559 ?\ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5560 name) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5561 index (cons name marker)) |
20323 | 5562 (setq index1 (cons (concat "=" name) (cdr index))) |
5563 (push index index-pod-alist) | |
5564 (push index1 index-unsorted-alist))))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5565 (setq index-alist |
20323 | 5566 (if (default-value 'imenu-sort-function) |
5567 (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
|
5568 (nreverse index-alist))) |
20323 | 5569 (and index-pod-alist |
5570 (push (cons "+POD headers+..." | |
5571 (nreverse index-pod-alist)) | |
5572 index-alist)) | |
5573 (and (or index-pack-alist index-meth-alist) | |
5574 (let ((lst index-pack-alist) hier-list pack elt group name) | |
5575 ;; Remove "package ", reverse and uniquify. | |
5576 (while lst | |
5577 (setq elt (car lst) lst (cdr lst) name (substring (car elt) 8)) | |
5578 (if (assoc name hier-list) nil | |
5579 (setq hier-list (cons (cons name (cdr elt)) hier-list)))) | |
5580 (setq lst index-meth-alist) | |
5581 (while lst | |
5582 (setq elt (car lst) lst (cdr lst)) | |
5583 (cond ((string-match "\\(::\\|'\\)[_a-zA-Z0-9]+$" (car elt)) | |
5584 (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
|
5585 (if (setq group (assoc pack hier-list)) |
20323 | 5586 (if (listp (cdr group)) |
5587 ;; Have some functions already | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5588 (setcdr group |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5589 (cons (cons (substring |
20323 | 5590 (car elt) |
5591 (+ 2 (match-beginning 0))) | |
5592 (cdr elt)) | |
5593 (cdr group))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5594 (setcdr group (list (cons (substring |
20323 | 5595 (car elt) |
5596 (+ 2 (match-beginning 0))) | |
5597 (cdr elt))))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5598 (setq hier-list |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5599 (cons (cons pack |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5600 (list (cons (substring |
20323 | 5601 (car elt) |
5602 (+ 2 (match-beginning 0))) | |
5603 (cdr elt)))) | |
5604 hier-list)))))) | |
5605 (push (cons "+Hierarchy+..." | |
5606 hier-list) | |
5607 index-alist))) | |
5608 (and index-pack-alist | |
5609 (push (cons "+Packages+..." | |
5610 (nreverse index-pack-alist)) | |
5611 index-alist)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5612 (and (or index-pack-alist index-pod-alist |
20323 | 5613 (default-value 'imenu-sort-function)) |
5614 index-unsorted-alist | |
5615 (push (cons "+Unsorted List+..." | |
5616 (nreverse index-unsorted-alist)) | |
5617 index-alist)) | |
5618 (cperl-imenu-addback index-alist))) | |
5619 | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5620 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5621 ;; Suggested by Mark A. Hershberger |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5622 (defun cperl-outline-level () |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5623 (looking-at outline-regexp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5624 (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
|
5625 ;;;; 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
|
5626 ((match-beginning 2) 0) ; package |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5627 ((match-beginning 8) 1) ; sub |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5628 ((match-beginning 16) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5629 (- (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
|
5630 (t 5))) ; should not happen |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5631 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5632 |
20323 | 5633 (defun cperl-windowed-init () |
5634 "Initialization under windowed version." | |
73457
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5635 (cond ((featurep 'ps-print) |
78750
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
5636 (or cperl-faces-init |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
5637 (progn |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
5638 (and (boundp 'font-lock-multiline) |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
5639 (setq cperl-font-lock-multiline t)) |
c727abfbb05e
Merge upstream 5.23.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78660
diff
changeset
|
5640 (cperl-init-faces)))) |
73457
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5641 ((not cperl-faces-init) |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5642 (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
|
5643 (function |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5644 (lambda () |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5645 (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
|
5646 (progn |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5647 (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
|
5648 (if (fboundp 'eval-after-load) |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5649 (eval-after-load |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5650 "ps-print" |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5651 '(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
|
5652 |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5653 (defvar cperl-font-lock-keywords-1 nil |
31821 | 5654 "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
|
5655 (defvar cperl-font-lock-keywords nil |
31821 | 5656 "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
|
5657 (defvar cperl-font-lock-keywords-2 nil |
31821 | 5658 "Additional expressions to highlight in Perl mode. Maximal set") |
5659 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5660 (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
|
5661 (or cperl-faces-init (cperl-init-faces)) |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5662 cperl-font-lock-keywords) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5663 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5664 (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
|
5665 (or cperl-faces-init (cperl-init-faces)) |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5666 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
|
5667 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5668 (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
|
5669 (or cperl-faces-init (cperl-init-faces)) |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5670 cperl-font-lock-keywords-2) |
20323 | 5671 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5672 (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
|
5673 ;; 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
|
5674 (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
|
5675 (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
|
5676 "Face for constant and label names")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5677 (or (boundp 'font-lock-warning-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5678 (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
|
5679 "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
|
5680 ;;(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
|
5681 ) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5682 |
20323 | 5683 (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
|
5684 (condition-case errs |
20323 | 5685 (progn |
5686 (require 'font-lock) | |
5687 (and (fboundp 'font-lock-fontify-anchored-keywords) | |
5688 (featurep 'font-lock-extra) | |
5689 (message "You have an obsolete package `font-lock-extra'. Install `choose-color'.")) | |
5690 (let (t-font-lock-keywords t-font-lock-keywords-1 font-lock-anchored) | |
5691 (if (fboundp 'font-lock-fontify-anchored-keywords) | |
5692 (setq font-lock-anchored t)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5693 (setq |
20323 | 5694 t-font-lock-keywords |
5695 (list | |
104995
45d111e58a36
* progmodes/cperl-mode.el (cperl-init-faces): Revert last change.
Chong Yidong <cyd@stupidchicken.com>
parents:
104544
diff
changeset
|
5696 `("[ \t]+$" 0 ',cperl-invalid-face t) |
20323 | 5697 (cons |
5698 (concat | |
5699 "\\(^\\|[^$@%&\\]\\)\\<\\(" | |
5700 (mapconcat | |
5701 'identity | |
5702 '("if" "until" "while" "elsif" "else" "unless" "for" | |
5703 "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
|
5704 "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
|
5705 "require" "package" "eval" "my" "BEGIN" "END" "CHECK" "INIT") |
20323 | 5706 "\\|") ; Flow control |
5707 "\\)\\>") 2) ; was "\\)[ \n\t;():,\|&]" | |
5708 ; In what follows we use `type' style | |
5709 ; for overwritable builtins | |
5710 (list | |
5711 (concat | |
5712 "\\(^\\|[^$@%&\\]\\)\\<\\(" | |
5713 ;; "CORE" "__FILE__" "__LINE__" "abs" "accept" "alarm" | |
5714 ;; "and" "atan2" "bind" "binmode" "bless" "caller" | |
5715 ;; "chdir" "chmod" "chown" "chr" "chroot" "close" | |
5716 ;; "closedir" "cmp" "connect" "continue" "cos" "crypt" | |
5717 ;; "dbmclose" "dbmopen" "die" "dump" "endgrent" | |
5718 ;; "endhostent" "endnetent" "endprotoent" "endpwent" | |
5719 ;; "endservent" "eof" "eq" "exec" "exit" "exp" "fcntl" | |
5720 ;; "fileno" "flock" "fork" "formline" "ge" "getc" | |
5721 ;; "getgrent" "getgrgid" "getgrnam" "gethostbyaddr" | |
5722 ;; "gethostbyname" "gethostent" "getlogin" | |
5723 ;; "getnetbyaddr" "getnetbyname" "getnetent" | |
5724 ;; "getpeername" "getpgrp" "getppid" "getpriority" | |
5725 ;; "getprotobyname" "getprotobynumber" "getprotoent" | |
5726 ;; "getpwent" "getpwnam" "getpwuid" "getservbyname" | |
5727 ;; "getservbyport" "getservent" "getsockname" | |
5728 ;; "getsockopt" "glob" "gmtime" "gt" "hex" "index" "int" | |
5729 ;; "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
|
5730 ;; "link" "listen" "localtime" "lock" "log" "lstat" "lt" |
20323 | 5731 ;; "mkdir" "msgctl" "msgget" "msgrcv" "msgsnd" "ne" |
5732 ;; "not" "oct" "open" "opendir" "or" "ord" "pack" "pipe" | |
5733 ;; "quotemeta" "rand" "read" "readdir" "readline" | |
5734 ;; "readlink" "readpipe" "recv" "ref" "rename" "require" | |
5735 ;; "reset" "reverse" "rewinddir" "rindex" "rmdir" "seek" | |
5736 ;; "seekdir" "select" "semctl" "semget" "semop" "send" | |
5737 ;; "setgrent" "sethostent" "setnetent" "setpgrp" | |
5738 ;; "setpriority" "setprotoent" "setpwent" "setservent" | |
5739 ;; "setsockopt" "shmctl" "shmget" "shmread" "shmwrite" | |
5740 ;; "shutdown" "sin" "sleep" "socket" "socketpair" | |
5741 ;; "sprintf" "sqrt" "srand" "stat" "substr" "symlink" | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5742 ;; "syscall" "sysopen" "sysread" "system" "syswrite" "tell" |
20323 | 5743 ;; "telldir" "time" "times" "truncate" "uc" "ucfirst" |
5744 ;; "umask" "unlink" "unpack" "utime" "values" "vec" | |
5745 ;; "wait" "waitpid" "wantarray" "warn" "write" "x" "xor" | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5746 "a\\(bs\\|ccept\\|tan2\\|larm\\|nd\\)\\|" |
20323 | 5747 "b\\(in\\(d\\|mode\\)\\|less\\)\\|" |
5748 "c\\(h\\(r\\(\\|oot\\)\\|dir\\|mod\\|own\\)\\|aller\\|rypt\\|" | |
5749 "lose\\(\\|dir\\)\\|mp\\|o\\(s\\|n\\(tinue\\|nect\\)\\)\\)\\|" | |
5750 "CORE\\|d\\(ie\\|bm\\(close\\|open\\)\\|ump\\)\\|" | |
5751 "e\\(x\\(p\\|it\\|ec\\)\\|q\\|nd\\(p\\(rotoent\\|went\\)\\|" | |
5752 "hostent\\|servent\\|netent\\|grent\\)\\|of\\)\\|" | |
5753 "f\\(ileno\\|cntl\\|lock\\|or\\(k\\|mline\\)\\)\\|" | |
5754 "g\\(t\\|lob\\|mtime\\|e\\(\\|t\\(p\\(pid\\|r\\(iority\\|" | |
5755 "oto\\(byn\\(ame\\|umber\\)\\|ent\\)\\)\\|eername\\|w" | |
5756 "\\(uid\\|ent\\|nam\\)\\|grp\\)\\|host\\(by\\(addr\\|name\\)\\|" | |
5757 "ent\\)\\|s\\(erv\\(by\\(port\\|name\\)\\|ent\\)\\|" | |
5758 "ock\\(name\\|opt\\)\\)\\|c\\|login\\|net\\(by\\(addr\\|name\\)\\|" | |
5759 "ent\\)\\|gr\\(ent\\|nam\\|gid\\)\\)\\)\\)\\|" | |
5760 "hex\\|i\\(n\\(t\\|dex\\)\\|octl\\)\\|join\\|kill\\|" | |
5761 "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
|
5762 "\\(\\|ngth\\)\\|o\\(c\\(altime\\|k\\)\\|g\\)\\)\\|m\\(sg\\(rcv\\|snd\\|" |
20323 | 5763 "ctl\\|get\\)\\|kdir\\)\\|n\\(e\\|ot\\)\\|o\\(pen\\(\\|dir\\)\\|" |
5764 "r\\(\\|d\\)\\|ct\\)\\|p\\(ipe\\|ack\\)\\|quotemeta\\|" | |
5765 "r\\(index\\|and\\|mdir\\|e\\(quire\\|ad\\(pipe\\|\\|lin" | |
5766 "\\(k\\|e\\)\\|dir\\)\\|set\\|cv\\|verse\\|f\\|winddir\\|name" | |
5767 "\\)\\)\\|s\\(printf\\|qrt\\|rand\\|tat\\|ubstr\\|e\\(t\\(p\\(r" | |
5768 "\\(iority\\|otoent\\)\\|went\\|grp\\)\\|hostent\\|s\\(ervent\\|" | |
5769 "ockopt\\)\\|netent\\|grent\\)\\|ek\\(\\|dir\\)\\|lect\\|" | |
5770 "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
|
5771 "write\\|get\\)\\)\\|y\\(s\\(read\\|call\\|open\\|tem\\|write\\)\\|" |
20323 | 5772 "mlink\\)\\|in\\|leep\\|ocket\\(pair\\|\\)\\)\\|t\\(runcate\\|" |
5773 "ell\\(\\|dir\\)\\|ime\\(\\|s\\)\\)\\|u\\(c\\(\\|first\\)\\|" | |
5774 "time\\|mask\\|n\\(pack\\|link\\)\\)\\|v\\(alues\\|ec\\)\\|" | |
5775 "w\\(a\\(rn\\|it\\(pid\\|\\)\\|ntarray\\)\\|rite\\)\\|" | |
5776 "x\\(\\|or\\)\\|__\\(FILE__\\|LINE__\\|PACKAGE__\\)" | |
5777 "\\)\\>") 2 'font-lock-type-face) | |
5778 ;; In what follows we use `other' style | |
5779 ;; for nonoverwritable builtins | |
5780 ;; Somehow 's', 'm' are not auto-generated??? | |
5781 (list | |
5782 (concat | |
5783 "\\(^\\|[^$@%&\\]\\)\\<\\(" | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5784 ;; "AUTOLOAD" "BEGIN" "CHECK" "DESTROY" "END" "INIT" "__END__" "chomp" |
20323 | 5785 ;; "chop" "defined" "delete" "do" "each" "else" "elsif" |
5786 ;; "eval" "exists" "for" "foreach" "format" "goto" | |
5787 ;; "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
|
5788 ;; "no" "our" "package" "pop" "pos" "print" "printf" "push" |
20323 | 5789 ;; "q" "qq" "qw" "qx" "redo" "return" "scalar" "shift" |
5790 ;; "sort" "splice" "split" "study" "sub" "tie" "tr" | |
5791 ;; "undef" "unless" "unshift" "untie" "until" "use" | |
5792 ;; "while" "y" | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5793 "AUTOLOAD\\|BEGIN\\|CHECK\\|cho\\(p\\|mp\\)\\|d\\(e\\(fined\\|lete\\)\\|" |
20323 | 5794 "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
|
5795 "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
|
5796 "l\\(ast\\|ocal\\)\\|m\\(ap\\|y\\)\\|n\\(ext\\|o\\)\\|our\\|" |
20323 | 5797 "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
|
5798 "q\\(\\|q\\|w\\|x\\|r\\)\\|re\\(turn\\|do\\)\\|s\\(pli\\(ce\\|t\\)\\|" |
20323 | 5799 "calar\\|tudy\\|ub\\|hift\\|ort\\)\\|t\\(r\\|ie\\)\\|" |
5800 "u\\(se\\|n\\(shift\\|ti\\(l\\|e\\)\\|def\\|less\\)\\)\\|" | |
5801 "while\\|y\\|__\\(END\\|DATA\\)__" ;__DATA__ added manually | |
5802 "\\|[sm]" ; Added manually | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5803 "\\)\\>") 2 'cperl-nonoverridable-face) |
20323 | 5804 ;; (mapconcat 'identity |
5805 ;; '("#endif" "#else" "#ifdef" "#ifndef" "#if" | |
5806 ;; "#include" "#define" "#undef") | |
5807 ;; "\\|") | |
5808 '("-[rwxoRWXOezsfdlpSbctugkTBMAC]\\>\\([ \t]+_\\>\\)?" 0 | |
5809 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
|
5810 ;; This highlights declarations and definitions differenty. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5811 ;; 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
|
5812 ;; 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
|
5813 (list (concat "\\<sub" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5814 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
|
5815 "\\([^ \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
|
5816 "\\(" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5817 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
|
5818 "([^()]*)\\)?" ; prototype |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5819 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
|
5820 "[{;]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5821 2 (if cperl-font-lock-multiline |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5822 '(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
|
5823 'font-lock-function-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5824 'font-lock-variable-name-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5825 ;; 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
|
5826 '(progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5827 (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
|
5828 (match-end 0))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5829 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5830 (+ 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
|
5831 'syntax-type 'multiline)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5832 (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
|
5833 'font-lock-function-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5834 'font-lock-variable-name-face)))) |
20323 | 5835 '("\\<\\(package\\|require\\|use\\|import\\|no\\|bootstrap\\)[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t;]" ; require A if B; |
5836 2 font-lock-function-name-face) | |
5837 '("^[ \t]*format[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t]*=[ \t]*$" | |
5838 1 font-lock-function-name-face) | |
5839 (cond ((featurep 'font-lock-extra) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5840 '("\\([]}\\\\%@>*&]\\|\\$[a-zA-Z0-9_:]*\\)[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" |
20323 | 5841 (2 font-lock-string-face t) |
5842 (0 '(restart 2 t)))) ; To highlight $a{bc}{ef} | |
5843 (font-lock-anchored | |
5844 '("\\([]}\\\\%@>*&]\\|\\$[a-zA-Z0-9_:]*\\)[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" | |
5845 (2 font-lock-string-face t) | |
5846 ("\\=[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" | |
5847 nil nil | |
5848 (1 font-lock-string-face t)))) | |
5849 (t '("\\([]}\\\\%@>*&]\\|\\$[a-zA-Z0-9_:]*\\)[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" | |
5850 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
|
5851 '("[\[ \t{,(]\\(-?[a-zA-Z0-9_:]+\\)[ \t]*=>" 1 |
20323 | 5852 font-lock-string-face t) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5853 '("^[ \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
|
5854 font-lock-constant-face) ; labels |
20323 | 5855 '("\\<\\(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
|
5856 2 font-lock-constant-face) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5857 ;; Uncomment to get perl-mode-like vars |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5858 ;;; '("[$*]{?\\(\\sw+\\)" 1 font-lock-variable-name-face) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5859 ;;; '("\\([@%]\\|\\$#\\)\\(\\sw+\\)" |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5860 ;;; (2 (cons font-lock-variable-name-face '(underline)))) |
20323 | 5861 (cond ((featurep 'font-lock-extra) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5862 '("^[ \t]*\\(my\\|local\\|our\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)\\([ \t]*,\\)?" |
20323 | 5863 (3 font-lock-variable-name-face) |
5864 (4 '(another 4 nil | |
5865 ("\\=[ \t]*,[ \t]*\\([$@%*][a-zA-Z0-9_:]+\\)\\([ \t]*,\\)?" | |
5866 (1 font-lock-variable-name-face) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5867 (2 '(restart 2 nil) nil t))) |
20323 | 5868 nil t))) ; local variables, multiple |
5869 (font-lock-anchored | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5870 ;; 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
|
5871 `(,(concat "\\<\\(my\\|local\\|our\\)" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5872 cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5873 "\\((" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5874 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
|
5875 "\\)?\\([$@%*]\\([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
|
5876 (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
|
5877 'font-lock-variable-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5878 '(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
|
5879 (match-beginning 0)) |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
5880 'font-lock-variable-name-face))) |
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
5881 (,(concat "\\=" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5882 cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5883 "," |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5884 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
|
5885 "\\([$@%*]\\([a-zA-Z0-9_:]+\\|[^a-zA-Z0-9_]\\)\\)") |
80057
1db7c78912f4
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
79717
diff
changeset
|
5886 ;; Bug in font-lock: limit is used not only to limit |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5887 ;; 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
|
5888 ;; 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
|
5889 ,(if cperl-font-lock-multiline |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5890 '(if (match-beginning 3) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5891 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5892 (goto-char (match-beginning 3)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5893 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5894 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5895 (error |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5896 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5897 (forward-char 200) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5898 (error nil)))) ; typeahead |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5899 (1- (point))) ; report limit |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5900 (forward-char -2)) ; disable continued expr |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5901 '(if (match-beginning 3) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5902 (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
|
5903 (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
|
5904 ,(if cperl-font-lock-multiline |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5905 nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5906 '(progn ; Do at end |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5907 ;; "my" may be already fontified (POD), |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5908 ;; 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
|
5909 (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
|
5910 (> 2 (count-lines |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5911 cperl-font-lock-multiline-start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5912 (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5913 nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5914 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5915 (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
|
5916 'syntax-type 'multiline)) |
78643
5c8d5235a4ac
(defcustom, x-color-defined-p, cperl-is-face)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78582
diff
changeset
|
5917 (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
|
5918 (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
|
5919 (t '("^[ \t{}]*\\(my\\|local\\|our\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)" |
20323 | 5920 3 font-lock-variable-name-face))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5921 '("\\<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
|
5922 4 font-lock-variable-name-face) |
62085
7dbe52d92117
Avoid $! for font-lock-negation-char-face.
Daniel Pfeiffer <occitan@esperanto.org>
parents:
62081
diff
changeset
|
5923 ;; 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
|
5924 '("\\(?:^\\|[^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
|
5925 '("\\[\\(\\^\\)" 1 font-lock-negation-char-face prepend))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
5926 (setq |
20323 | 5927 t-font-lock-keywords-1 |
5928 (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
|
5929 ;; 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
|
5930 (or |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
5931 (not (featurep 'xemacs)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5932 (string< "21.1.9" emacs-version) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5933 (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
|
5934 (string< emacs-version "21.1.2"))) |
20323 | 5935 '( |
5936 ("\\(\\([@%]\\|\$#\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)" 1 | |
5937 (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
|
5938 'cperl-hash-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5939 'cperl-array-face) |
20323 | 5940 t) ; arrays and hashes |
5941 ("\\(\\([$@]+\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)[ \t]*\\([[{]\\)" | |
5942 1 | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5943 (if (= (- (match-end 2) (match-beginning 2)) 1) |
20323 | 5944 (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
|
5945 'cperl-hash-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5946 'cperl-array-face) ; arrays and hashes |
20323 | 5947 font-lock-variable-name-face) ; Just to put something |
5948 t) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5949 ("\\(@\\|\\$#\\)\\(\\$+\\([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
|
5950 (1 cperl-array-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5951 (2 font-lock-variable-name-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5952 ("\\(%\\)\\(\\$+\\([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
|
5953 (1 cperl-hash-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5954 (2 font-lock-variable-name-face)) |
20323 | 5955 ;;("\\([smy]\\|tr\\)\\([^a-z_A-Z0-9]\\)\\(\\([^\n\\]*||\\)\\)\\2") |
5956 ;;; 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
|
5957 ;;("\\(\\<\\([msy]\\|tr\\)[ \t]*\\([^ \t\na-zA-Z0-9_]\\)\\|\\(/\\)\\)" |
20323 | 5958 ;;(3 font-lock-function-name-face t t) |
5959 ;;(4 | |
5960 ;; (if (cperl-slash-is-regexp) | |
5961 ;; font-lock-function-name-face 'default) nil t)) | |
5962 ))) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5963 (if cperl-highlight-variables-indiscriminately |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5964 (setq t-font-lock-keywords-1 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5965 (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
|
5966 (list '("\\([$*]{?\\sw+\\)" 1 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5967 font-lock-variable-name-face))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
5968 (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
|
5969 (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
|
5970 (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
|
5971 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
|
5972 t-font-lock-keywords) |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5973 cperl-font-lock-keywords cperl-font-lock-keywords-1 |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5974 cperl-font-lock-keywords-2 (append |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5975 cperl-font-lock-keywords-1 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5976 t-font-lock-keywords-1))) |
20323 | 5977 (if (fboundp 'ps-print-buffer) (cperl-ps-print-init)) |
5978 (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
|
5979 (eval ; Avoid a warning |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5980 '(font-lock-require-faces |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5981 (list |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5982 ;; 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
|
5983 (list 'font-lock-comment-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5984 ["Firebrick" "OrangeRed" "DimGray" "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5985 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5986 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5987 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5988 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5989 (list 'font-lock-string-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5990 ["RosyBrown" "LightSalmon" "Gray50" "LightGray"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5991 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5992 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5993 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5994 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5995 (list 'font-lock-function-name-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5996 (vector |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5997 "Blue" "LightSkyBlue" "Gray50" "LightGray" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5998 (cdr (assq 'background-color ; if mono |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5999 (frame-parameters)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6000 (vector |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6001 nil nil nil nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6002 (cdr (assq 'foreground-color ; if mono |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6003 (frame-parameters)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6004 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6005 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6006 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6007 (list 'font-lock-variable-name-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6008 ["DarkGoldenrod" "LightGoldenrod" "DimGray" "Gray90"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6009 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6010 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6011 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6012 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6013 (list 'font-lock-type-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6014 ["DarkOliveGreen" "PaleGreen" "DimGray" "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6015 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6016 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6017 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6018 [nil nil t t t]) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6019 (list 'font-lock-warning-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6020 ["Pink" "Red" "Gray50" "LightGray"] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6021 ["gray20" "gray90" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6022 "gray80" "gray20"] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6023 [nil nil t t t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6024 nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6025 [nil nil t t t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6026 ) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6027 (list 'font-lock-constant-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6028 ["CadetBlue" "Aquamarine" "Gray50" "LightGray"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6029 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6030 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6031 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6032 [nil nil t t t]) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6033 (list 'cperl-nonoverridable-face |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6034 ["chartreuse3" ("orchid1" "orange") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6035 nil "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6036 [nil nil "gray90"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6037 [nil nil nil t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6038 [nil nil t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6039 [nil nil t t t]) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6040 (list 'cperl-array-face |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6041 ["blue" "yellow" nil "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6042 ["lightyellow2" ("navy" "os2blue" "darkgreen") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6043 "gray90"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6044 t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6045 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6046 nil) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6047 (list 'cperl-hash-face |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6048 ["red" "red" nil "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6049 ["lightyellow2" ("navy" "os2blue" "darkgreen") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6050 "gray90"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6051 t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6052 t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6053 nil)))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6054 ;; Do it the dull way, without choose-color |
20323 | 6055 (defvar cperl-guessed-background nil |
6056 "Display characteristics as guessed by cperl.") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6057 ;; (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
|
6058 ;; (defalias 'x-color-defined-p |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6059 ;; (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
|
6060 ;; ;; XEmacs >= 19.12 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6061 ;; ((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
|
6062 ;; ;; XEmacs 19.11 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6063 ;; (t 'x-valid-color-name-p)))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6064 (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
|
6065 "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
|
6066 (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
|
6067 "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
|
6068 (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
|
6069 "Face for data types") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6070 (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
|
6071 "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
|
6072 (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
|
6073 "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
|
6074 (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
|
6075 "Face for comments") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6076 (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
|
6077 "Face for function names") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6078 (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
|
6079 "Face for hashes") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6080 (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
|
6081 "Face for arrays") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6082 ;;(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
|
6083 ;;(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
|
6084 ;;(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
|
6085 ;; (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
|
6086 ;; '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
|
6087 ;; "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
|
6088 ;;(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
|
6089 ;; (defconst cperl-nonoverridable-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6090 ;; '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
|
6091 ;; "Face to use for data types from another group.")) |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
6092 ;;(if (not (featurep 'xemacs)) nil |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6093 ;; (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
|
6094 ;; (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
|
6095 ;; '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
|
6096 ;; "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
|
6097 ;; (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
|
6098 ;; (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
|
6099 ;; '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
|
6100 ;; "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
|
6101 ;; (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
|
6102 ;; (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
|
6103 ;; '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
|
6104 ;; "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
|
6105 (if (and |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6106 (not (cperl-is-face 'cperl-array-face)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6107 (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
|
6108 (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
|
6109 (if (and |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6110 (not (cperl-is-face 'cperl-hash-face)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6111 (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
|
6112 (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
|
6113 (if (and |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6114 (not (cperl-is-face 'cperl-nonoverridable-face)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6115 (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
|
6116 (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
|
6117 ;;(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
|
6118 ;; (defconst cperl-hash-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6119 ;; '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
|
6120 ;; "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
|
6121 ;;(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
|
6122 ;; (defconst cperl-array-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6123 ;; '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
|
6124 ;; "Face to use for arrays.")) |
20323 | 6125 ;; Here we try to guess background |
6126 (let ((background | |
6127 (if (boundp 'font-lock-background-mode) | |
6128 font-lock-background-mode | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6129 'light)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6130 (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
|
6131 ;;;; (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
|
6132 ;;;; (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
|
6133 ;;;; (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
|
6134 ;;;; (face-list |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6135 ;;;; (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
|
6136 ;;;; (t |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6137 ;;;; (function (lambda (face) (boundp face)))))) |
20323 | 6138 (defvar cperl-guessed-background |
6139 (if (and (boundp 'font-lock-display-type) | |
6140 (eq font-lock-display-type 'grayscale)) | |
6141 'gray | |
6142 background) | |
6143 "Background as guessed by CPerl mode") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6144 (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
|
6145 (cperl-is-face 'font-lock-reference-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6146 (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
|
6147 (if (cperl-is-face 'font-lock-type-face) nil |
20323 | 6148 (copy-face 'default 'font-lock-type-face) |
6149 (cond | |
6150 ((eq background 'light) | |
6151 (set-face-foreground 'font-lock-type-face | |
6152 (if (x-color-defined-p "seagreen") | |
6153 "seagreen" | |
6154 "sea green"))) | |
6155 ((eq background 'dark) | |
6156 (set-face-foreground 'font-lock-type-face | |
6157 (if (x-color-defined-p "os2pink") | |
6158 "os2pink" | |
6159 "pink"))) | |
6160 (t | |
6161 (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
|
6162 (if (cperl-is-face 'cperl-nonoverridable-face) |
20323 | 6163 nil |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6164 (copy-face 'font-lock-type-face 'cperl-nonoverridable-face) |
20323 | 6165 (cond |
6166 ((eq background 'light) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6167 (set-face-foreground 'cperl-nonoverridable-face |
20323 | 6168 (if (x-color-defined-p "chartreuse3") |
6169 "chartreuse3" | |
6170 "chartreuse"))) | |
6171 ((eq background 'dark) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6172 (set-face-foreground 'cperl-nonoverridable-face |
20323 | 6173 (if (x-color-defined-p "orchid1") |
6174 "orchid1" | |
6175 "orange"))))) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6176 ;;; (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
|
6177 ;;; (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
|
6178 ;;; (cond |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6179 ;;; ((eq background 'light) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6180 ;;; (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
|
6181 ;;; (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
|
6182 ;;; "lightyellow2" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6183 ;;; (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
|
6184 ;;; "lightyellow" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6185 ;;; "light yellow")))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6186 ;;; ((eq background 'dark) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6187 ;;; (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
|
6188 ;;; (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
|
6189 ;;; "navy" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6190 ;;; (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
|
6191 ;;; "darkgreen" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6192 ;;; "dark green")))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6193 ;;; (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
|
6194 ;;; (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
|
6195 ;;; (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
|
6196 ;;; (cond |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6197 ;;; ((eq background 'light) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6198 ;;; (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
|
6199 ;;; (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
|
6200 ;;; "lightyellow2" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6201 ;;; "lightyellow"))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6202 ;;; ((eq background 'dark) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6203 ;;; (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
|
6204 ;;; (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
|
6205 ;;; "navy" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6206 ;;; (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
|
6207 ;;; "darkgreen" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6208 ;;; "dark green")))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6209 ;;; (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
|
6210 (if (cperl-is-face 'font-lock-variable-name-face) nil |
20323 | 6211 (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
|
6212 (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
|
6213 (copy-face 'italic 'font-lock-constant-face)))) |
20323 | 6214 (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
|
6215 (error (message "cperl-init-faces (ignored): %s" errs)))) |
20323 | 6216 |
6217 | |
6218 (defun cperl-ps-print-init () | |
6219 "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
|
6220 (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
|
6221 '(setq ps-bold-faces |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6222 ;; 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
|
6223 ;; font-lock-constant-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6224 (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
|
6225 ps-bold-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6226 ps-italic-faces |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6227 ;; font-lock-constant-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6228 (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
|
6229 ps-italic-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6230 ps-underlined-faces |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6231 ;; font-lock-type-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6232 (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
|
6233 ps-underlined-faces)))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6234 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6235 (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
|
6236 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6237 (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
|
6238 "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
|
6239 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
|
6240 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
|
6241 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6242 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
|
6243 (interactive) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6244 (or file |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6245 (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
|
6246 "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
|
6247 (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
|
6248 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
|
6249 (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
|
6250 (setq file nil)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6251 (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
|
6252 (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
|
6253 (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
|
6254 (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
|
6255 (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
|
6256 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6257 ;;; (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
|
6258 ;;; "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
|
6259 ;;; ;; 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
|
6260 ;;; (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
|
6261 ;;; (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
|
6262 ;;; (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
|
6263 ;;; (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
|
6264 ;;; (append '(font-lock-emphasized-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6265 ;;; cperl-array-face |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6266 ;;; font-lock-keyword-face |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6267 ;;; font-lock-variable-name-face |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6268 ;;; font-lock-constant-face |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6269 ;;; 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
|
6270 ;;; font-lock-other-emphasized-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6271 ;;; 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
|
6272 ;;; ps-bold-faces)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6273 ;;; (setq ps-italic-faces |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6274 ;;; (append '(cperl-nonoverridable-face |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6275 ;;; font-lock-constant-face |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6276 ;;; 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
|
6277 ;;; font-lock-other-emphasized-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6278 ;;; 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
|
6279 ;;; ps-italic-faces)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6280 ;;; (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
|
6281 ;;; (append '(font-lock-emphasized-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6282 ;;; 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
|
6283 ;;; font-lock-other-emphasized-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6284 ;;; cperl-hash-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6285 ;;; 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
|
6286 ;;; ps-underlined-faces)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6287 ;;; (cons 'font-lock-type-face ps-underlined-faces)) |
20323 | 6288 |
6289 | |
6290 (if (cperl-enable-font-lock) (cperl-windowed-init)) | |
6291 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6292 (defconst cperl-styles-entries |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6293 '(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
|
6294 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
|
6295 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
|
6296 cperl-merge-trailing-else |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6297 cperl-continued-statement-offset)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6298 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6299 (defconst cperl-style-examples |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6300 "##### 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
|
6301 ##### 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
|
6302 ##### cperl-continued-statement-offset |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6303 ##### 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
|
6304 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6305 ########### (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
|
6306 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6307 ### 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
|
6308 if (foo) { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6309 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6310 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6311 label: |
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 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6314 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6315 } else { |
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 ### 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
|
6320 if (foo) { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6321 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6322 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6323 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6324 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6325 boon; |
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 } else { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6328 stop; |
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 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6331 ### 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
|
6332 if (foo) |
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 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6335 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6336 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6337 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6338 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6339 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6340 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6341 else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6342 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6343 stop; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6344 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6345 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6346 ### 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
|
6347 if (foo) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6348 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6349 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6350 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6351 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6352 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6353 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6354 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6355 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6356 else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6357 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6358 stop; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6359 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6360 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6361 ### 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
|
6362 ### 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
|
6363 if (foo) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6364 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6365 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6366 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6367 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6368 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6369 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6370 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6371 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6372 else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6373 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6374 stop; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6375 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6376 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6377 ### 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
|
6378 ### 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
|
6379 if (foo) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6380 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6381 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6382 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6383 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6384 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6385 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6386 } |
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 else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6389 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6390 stop; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6391 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6392 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6393 ### 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
|
6394 ### 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
|
6395 if (foo) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6396 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6397 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6398 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6399 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6400 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6401 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6402 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6403 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6404 else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6405 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6406 stop; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6407 } |
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 "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
|
6410 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6411 (defconst cperl-style-alist |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6412 '(("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
|
6413 (cperl-indent-level . 2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6414 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6415 (cperl-continued-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6416 (cperl-label-offset . -2) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6417 (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
|
6418 (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
|
6419 (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
|
6420 (cperl-merge-trailing-else . t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6421 |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6422 ("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
|
6423 (cperl-indent-level . 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6424 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6425 (cperl-continued-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6426 (cperl-label-offset . -4) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6427 (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
|
6428 (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
|
6429 (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
|
6430 (cperl-merge-trailing-else . t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6431 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6432 ("GNU" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6433 (cperl-indent-level . 2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6434 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6435 (cperl-continued-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6436 (cperl-label-offset . -2) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6437 (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
|
6438 (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
|
6439 (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
|
6440 (cperl-merge-trailing-else . nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6441 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6442 ("K&R" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6443 (cperl-indent-level . 5) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6444 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6445 (cperl-continued-brace-offset . -5) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6446 (cperl-label-offset . -5) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6447 (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
|
6448 ;;(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
|
6449 ;;(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
|
6450 (cperl-merge-trailing-else . nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6451 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6452 ("BSD" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6453 (cperl-indent-level . 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6454 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6455 (cperl-continued-brace-offset . -4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6456 (cperl-label-offset . -4) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6457 (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
|
6458 ;;(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
|
6459 ;;(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
|
6460 ;;(cperl-merge-trailing-else . nil) ; ??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6461 ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6462 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6463 ("C++" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6464 (cperl-indent-level . 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6465 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6466 (cperl-continued-brace-offset . -4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6467 (cperl-label-offset . -4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6468 (cperl-continued-statement-offset . 4) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6469 (cperl-extra-newline-before-brace . t) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6470 (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
|
6471 (cperl-merge-trailing-else . nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6472 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6473 ("Whitesmith" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6474 (cperl-indent-level . 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6475 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6476 (cperl-continued-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6477 (cperl-label-offset . -4) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6478 (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
|
6479 ;;(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
|
6480 ;;(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
|
6481 ;;(cperl-merge-trailing-else . nil) ; ??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6482 ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6483 ("Current")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6484 "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
|
6485 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
|
6486 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6487 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
|
6488 |
20323 | 6489 (defun cperl-set-style (style) |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
6490 "Set CPerl mode variables to use one of several different indentation styles. |
20323 | 6491 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
|
6492 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
|
6493 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
|
6494 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6495 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
|
6496 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
|
6497 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6498 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
|
6499 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
|
6500 (interactive |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
6501 (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
|
6502 cperl-style-alist))) |
20323 | 6503 (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
|
6504 (or cperl-old-style |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6505 (setq cperl-old-style |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6506 (mapcar (function |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6507 (lambda (name) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6508 (cons name (eval name)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6509 cperl-styles-entries))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6510 (let ((style (cdr (assoc style cperl-style-alist))) setting str sym) |
20323 | 6511 (while style |
6512 (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
|
6513 (set (car setting) (cdr setting))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6514 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6515 (defun cperl-set-style-back () |
63518
475955d58ad4
(cperl-set-style-back): Fix spelling in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
63460
diff
changeset
|
6516 "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
|
6517 (interactive) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6518 (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
|
6519 (let (setting) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6520 (while cperl-old-style |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6521 (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
|
6522 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
|
6523 (set (car setting) (cdr setting))))) |
20323 | 6524 |
6525 (defun cperl-check-syntax () | |
6526 (interactive) | |
6527 (require 'mode-compile) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6528 (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
|
6529 (eval '(mode-compile)))) ; Avoid a warning |
20323 | 6530 |
6531 (defun cperl-info-buffer (type) | |
6532 ;; Returns buffer with documentation. Creates if missing. | |
6533 ;; If TYPE, this vars buffer. | |
6534 ;; Special care is taken to not stomp over an existing info buffer | |
6535 (let* ((bname (if type "*info-perl-var*" "*info-perl*")) | |
6536 (info (get-buffer bname)) | |
6537 (oldbuf (get-buffer "*info*"))) | |
6538 (if info info | |
6539 (save-window-excursion | |
6540 ;; Get Info running | |
6541 (require 'info) | |
6542 (cond (oldbuf | |
6543 (set-buffer oldbuf) | |
6544 (rename-buffer "*info-perl-tmp*"))) | |
6545 (save-window-excursion | |
6546 (info)) | |
6547 (Info-find-node cperl-info-page (if type "perlvar" "perlfunc")) | |
6548 (set-buffer "*info*") | |
6549 (rename-buffer bname) | |
6550 (cond (oldbuf | |
6551 (set-buffer "*info-perl-tmp*") | |
6552 (rename-buffer "*info*") | |
6553 (set-buffer bname))) | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
6554 (make-local-variable 'window-min-height) |
20323 | 6555 (setq window-min-height 2) |
6556 (current-buffer))))) | |
6557 | |
6558 (defun cperl-word-at-point (&optional p) | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
6559 "Return the word at point or at P." |
20323 | 6560 (save-excursion |
6561 (if p (goto-char p)) | |
6562 (or (cperl-word-at-point-hard) | |
6563 (progn | |
6564 (require 'etags) | |
6565 (funcall (or (and (boundp 'find-tag-default-function) | |
6566 find-tag-default-function) | |
6567 (get major-mode 'find-tag-default-function) | |
6568 ;; XEmacs 19.12 has `find-tag-default-hook'; it is | |
6569 ;; automatically used within `find-tag-default': | |
6570 'find-tag-default)))))) | |
6571 | |
6572 (defun cperl-info-on-command (command) | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
6573 "Show documentation for Perl command COMMAND in other window. |
20323 | 6574 If perl-info buffer is shown in some frame, uses this frame. |
6575 Customized by setting variables `cperl-shrink-wrap-info-frame', | |
6576 `cperl-max-help-size'." | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6577 (interactive |
20323 | 6578 (let* ((default (cperl-word-at-point)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6579 (read (read-string |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6580 (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
|
6581 default)))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6582 (list (if (equal read "") |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6583 default |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6584 read)))) |
20323 | 6585 |
6586 (let ((buffer (current-buffer)) | |
6587 (cmd-desc (concat "^" (regexp-quote command) "[^a-zA-Z_0-9]")) ; "tr///" | |
6588 pos isvar height iniheight frheight buf win fr1 fr2 iniwin not-loner | |
6589 max-height char-height buf-list) | |
6590 (if (string-match "^-[a-zA-Z]$" command) | |
6591 (setq cmd-desc "^-X[ \t\n]")) | |
6592 (setq isvar (string-match "^[$@%]" command) | |
6593 buf (cperl-info-buffer isvar) | |
6594 iniwin (selected-window) | |
6595 fr1 (window-frame iniwin)) | |
6596 (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
|
6597 (goto-char (point-min)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6598 (or isvar |
20323 | 6599 (progn (re-search-forward "^-X[ \t\n]") |
6600 (forward-line -1))) | |
6601 (if (re-search-forward cmd-desc nil t) | |
6602 (progn | |
6603 ;; Go back to beginning of the group (ex, for qq) | |
6604 (if (re-search-backward "^[ \t\n\f]") | |
6605 (forward-line 1)) | |
6606 (beginning-of-line) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6607 ;; Get some of |
20323 | 6608 (setq pos (point) |
6609 buf-list (list buf "*info-perl-var*" "*info-perl*")) | |
6610 (while (and (not win) buf-list) | |
6611 (setq win (get-buffer-window (car buf-list) t)) | |
6612 (setq buf-list (cdr buf-list))) | |
6613 (or (not win) | |
6614 (eq (window-buffer win) buf) | |
6615 (set-window-buffer win buf)) | |
6616 (and win (setq fr2 (window-frame win))) | |
6617 (if (or (not fr2) (eq fr1 fr2)) | |
6618 (pop-to-buffer buf) | |
6619 (special-display-popup-frame buf) ; Make it visible | |
6620 (select-window win)) | |
6621 (goto-char pos) ; Needed (?!). | |
6622 ;; Resize | |
6623 (setq iniheight (window-height) | |
6624 frheight (frame-height) | |
6625 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
|
6626 (cond ((if not-loner cperl-max-help-size |
20323 | 6627 cperl-shrink-wrap-info-frame) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6628 (setq height |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6629 (+ 2 |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6630 (count-lines |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6631 pos |
20323 | 6632 (save-excursion |
6633 (if (re-search-forward | |
6634 "^[ \t][^\n]*\n+\\([^ \t\n\f]\\|\\'\\)" nil t) | |
6635 (match-beginning 0) (point-max))))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6636 max-height |
20323 | 6637 (if not-loner |
6638 (/ (* (- frheight 3) cperl-max-help-size) 100) | |
6639 (setq char-height (frame-char-height)) | |
6640 ;; Non-functioning under OS/2: | |
6641 (if (eq char-height 1) (setq char-height 18)) | |
6642 ;; Title, menubar, + 2 for slack | |
95832
fc8e5aad9764
(cperl-info-on-command): Use display-pixel-height rather than
Glenn Morris <rgm@gnu.org>
parents:
94673
diff
changeset
|
6643 (- (/ (display-pixel-height) char-height) 4))) |
20323 | 6644 (if (> height max-height) (setq height max-height)) |
6645 ;;(message "was %s doing %s" iniheight height) | |
6646 (if not-loner | |
6647 (enlarge-window (- height iniheight)) | |
6648 (set-frame-height (window-frame win) (1+ height))))) | |
6649 (set-window-start (selected-window) pos)) | |
6650 (message "No entry for %s found." command)) | |
6651 ;;(pop-to-buffer buffer) | |
6652 (select-window iniwin))) | |
6653 | |
6654 (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
|
6655 "Show documentation for Perl command at point in other window." |
20323 | 6656 (interactive) |
6657 (cperl-info-on-command (cperl-word-at-point))) | |
6658 | |
6659 (defun cperl-imenu-info-imenu-search () | |
6660 (if (looking-at "^-X[ \t\n]") nil | |
6661 (re-search-backward | |
6662 "^\n\\([-a-zA-Z_]+\\)[ \t\n]") | |
6663 (forward-line 1))) | |
6664 | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6665 (defun cperl-imenu-info-imenu-name () |
20323 | 6666 (buffer-substring |
6667 (match-beginning 1) (match-end 1))) | |
6668 | |
6669 (defun cperl-imenu-on-info () | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6670 "Shows imenu for Perl Info Buffer. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6671 Opens Perl Info buffer if needed." |
20323 | 6672 (interactive) |
6673 (let* ((buffer (current-buffer)) | |
6674 imenu-create-index-function | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6675 imenu-prev-index-position-function |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6676 imenu-extract-index-name-function |
20323 | 6677 (index-item (save-restriction |
6678 (save-window-excursion | |
6679 (set-buffer (cperl-info-buffer nil)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6680 (setq imenu-create-index-function |
20323 | 6681 'imenu-default-create-index-function |
6682 imenu-prev-index-position-function | |
6683 'cperl-imenu-info-imenu-search | |
6684 imenu-extract-index-name-function | |
6685 'cperl-imenu-info-imenu-name) | |
6686 (imenu-choose-buffer-index))))) | |
6687 (and index-item | |
6688 (progn | |
6689 (push-mark) | |
6690 (pop-to-buffer "*info-perl*") | |
6691 (cond | |
6692 ((markerp (cdr index-item)) | |
6693 (goto-char (marker-position (cdr index-item)))) | |
6694 (t | |
6695 (goto-char (cdr index-item)))) | |
6696 (set-window-start (selected-window) (point)) | |
6697 (pop-to-buffer buffer))))) | |
6698 | |
6699 (defun cperl-lineup (beg end &optional step minshift) | |
6700 "Lineup construction in a region. | |
6701 Beginning of region should be at the start of a construction. | |
6702 All first occurrences of this construction in the lines that are | |
6703 partially contained in the region are lined up at the same column. | |
6704 | |
6705 MINSHIFT is the minimal amount of space to insert before the construction. | |
6706 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
|
6707 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
|
6708 \(or `cperl-indent-level', if `cperl-lineup-step' is nil). |
20323 | 6709 Will not move the position at the start to the left." |
6710 (interactive "r") | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6711 (let (search col tcol seen b) |
20323 | 6712 (save-excursion |
6713 (goto-char end) | |
6714 (end-of-line) | |
6715 (setq end (point-marker)) | |
6716 (goto-char beg) | |
6717 (skip-chars-forward " \t\f") | |
6718 (setq beg (point-marker)) | |
6719 (indent-region beg end nil) | |
6720 (goto-char beg) | |
6721 (setq col (current-column)) | |
6722 (if (looking-at "[a-zA-Z0-9_]") | |
6723 (if (looking-at "\\<[a-zA-Z0-9_]+\\>") | |
6724 (setq search | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6725 (concat "\\<" |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6726 (regexp-quote |
20323 | 6727 (buffer-substring (match-beginning 0) |
6728 (match-end 0))) "\\>")) | |
6729 (error "Cannot line up in a middle of the word")) | |
6730 (if (looking-at "$") | |
6731 (error "Cannot line up end of line")) | |
6732 (setq search (regexp-quote (char-to-string (following-char))))) | |
6733 (setq step (or step cperl-lineup-step cperl-indent-level)) | |
6734 (or minshift (setq minshift 1)) | |
6735 (while (progn | |
6736 (beginning-of-line 2) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6737 (and (< (point) end) |
20323 | 6738 (re-search-forward search end t) |
6739 (goto-char (match-beginning 0)))) | |
6740 (setq tcol (current-column) seen t) | |
6741 (if (> tcol col) (setq col tcol))) | |
6742 (or seen | |
6743 (error "The construction to line up occurred only once")) | |
6744 (goto-char beg) | |
6745 (setq col (+ col minshift)) | |
6746 (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
|
6747 (while |
20323 | 6748 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6749 (cperl-make-indent col) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6750 (beginning-of-line 2) |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6751 (and (< (point) end) |
20323 | 6752 (re-search-forward search end t) |
6753 (goto-char (match-beginning 0)))))))) ; No body | |
6754 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6755 (defun cperl-etags (&optional add all files) ;; NOT USED??? |
20323 | 6756 "Run etags with appropriate options for Perl files. |
6757 If optional argument ALL is `recursive', will process Perl files | |
6758 in subdirectories too." | |
6759 (interactive) | |
6760 (let ((cmd "etags") | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6761 (args '("-l" "none" "-r" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6762 ;; 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
|
6763 "/\\<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
|
6764 "-r" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6765 "/\\<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
|
6766 "-r" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6767 "/\\<\\(package\\)[ \\t]*;/\\1;/")) |
20323 | 6768 res) |
6769 (if add (setq args (cons "-a" args))) | |
6770 (or files (setq files (list buffer-file-name))) | |
6771 (cond | |
6772 ((eq all 'recursive) | |
6773 ;;(error "Not implemented: recursive") | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6774 (setq args (append (list "-e" |
20323 | 6775 "sub wanted {push @ARGV, $File::Find::name if /\\.[pP][Llm]$/} |
6776 use File::Find; | |
6777 find(\\&wanted, '.'); | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6778 exec @ARGV;" |
20323 | 6779 cmd) args) |
6780 cmd "perl")) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6781 (all |
20323 | 6782 ;;(error "Not implemented: all") |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6783 (setq args (append (list "-e" |
20323 | 6784 "push @ARGV, <*.PL *.pl *.pm>; |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6785 exec @ARGV;" |
20323 | 6786 cmd) args) |
6787 cmd "perl")) | |
6788 (t | |
6789 (setq args (append args files)))) | |
6790 (setq res (apply 'call-process cmd nil nil nil args)) | |
6791 (or (eq res 0) | |
6792 (message "etags returned \"%s\"" res)))) | |
6793 | |
6794 (defun cperl-toggle-auto-newline () | |
6795 "Toggle the state of `cperl-auto-newline'." | |
6796 (interactive) | |
6797 (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
|
6798 (message "Newlines will %sbe auto-inserted now." |
20323 | 6799 (if cperl-auto-newline "" "not "))) |
6800 | |
6801 (defun cperl-toggle-abbrev () | |
6802 "Toggle the state of automatic keyword expansion in CPerl mode." | |
6803 (interactive) | |
6804 (abbrev-mode (if abbrev-mode 0 1)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6805 (message "Perl control structure will %sbe auto-inserted now." |
20323 | 6806 (if abbrev-mode "" "not "))) |
6807 | |
6808 | |
6809 (defun cperl-toggle-electric () | |
6810 "Toggle the state of parentheses doubling in CPerl mode." | |
6811 (interactive) | |
6812 (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
|
6813 (message "Parentheses will %sbe auto-doubled now." |
20323 | 6814 (if (cperl-val 'cperl-electric-parens) "" "not "))) |
6815 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6816 (defun cperl-toggle-autohelp () |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
6817 "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
|
6818 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
|
6819 (interactive) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6820 (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
|
6821 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6822 (if cperl-lazy-installed |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
6823 (cperl-lazy-unstall) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6824 (cperl-lazy-install)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6825 (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
|
6826 (if cperl-lazy-installed "" "not "))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6827 (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
|
6828 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6829 (defun cperl-toggle-construct-fix () |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6830 "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
|
6831 (interactive) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6832 (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
|
6833 (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
|
6834 nil |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6835 1)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6836 (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
|
6837 (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
|
6838 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6839 (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
|
6840 "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
|
6841 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
|
6842 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
|
6843 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6844 The message looks like this: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6845 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6846 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
|
6847 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6848 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
|
6849 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
|
6850 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
|
6851 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
|
6852 by CPerl." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6853 (interactive "P") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6854 (or arg |
80057
1db7c78912f4
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
79717
diff
changeset
|
6855 (setq arg (if (eq cperl-syntaxify-by-font-lock |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6856 (if backtrace 'backtrace 'message)) 0 1))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6857 (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
|
6858 (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
|
6859 (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
|
6860 (if (eq arg t) "dis" "en"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6861 |
20323 | 6862 ;;;; Tags file creation. |
6863 | |
6864 (defvar cperl-tmp-buffer " *cperl-tmp*") | |
6865 | |
6866 (defun cperl-setup-tmp-buf () | |
6867 (set-buffer (get-buffer-create cperl-tmp-buffer)) | |
6868 (set-syntax-table cperl-mode-syntax-table) | |
6869 (buffer-disable-undo) | |
6870 (auto-fill-mode 0) | |
6871 (if cperl-use-syntax-table-text-property-for-tags | |
6872 (progn | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
6873 (make-local-variable 'parse-sexp-lookup-properties) |
20323 | 6874 ;; Do not introduce variable if not needed, we check it! |
6875 (set 'parse-sexp-lookup-properties t)))) | |
6876 | |
104544
5a7504ff8b85
(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
Glenn Morris <rgm@gnu.org>
parents:
104396
diff
changeset
|
6877 ;; Copied from imenu-example--name-and-position. |
5a7504ff8b85
(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
Glenn Morris <rgm@gnu.org>
parents:
104396
diff
changeset
|
6878 (defvar imenu-use-markers) |
5a7504ff8b85
(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
Glenn Morris <rgm@gnu.org>
parents:
104396
diff
changeset
|
6879 |
5a7504ff8b85
(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
Glenn Morris <rgm@gnu.org>
parents:
104396
diff
changeset
|
6880 (defun cperl-imenu-name-and-position () |
5a7504ff8b85
(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
Glenn Morris <rgm@gnu.org>
parents:
104396
diff
changeset
|
6881 "Return the current/previous sexp and its (beginning) location. |
5a7504ff8b85
(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
Glenn Morris <rgm@gnu.org>
parents:
104396
diff
changeset
|
6882 Does not move point." |
5a7504ff8b85
(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
Glenn Morris <rgm@gnu.org>
parents:
104396
diff
changeset
|
6883 (save-excursion |
5a7504ff8b85
(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
Glenn Morris <rgm@gnu.org>
parents:
104396
diff
changeset
|
6884 (forward-sexp -1) |
5a7504ff8b85
(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
Glenn Morris <rgm@gnu.org>
parents:
104396
diff
changeset
|
6885 (let ((beg (if imenu-use-markers (point-marker) (point))) |
5a7504ff8b85
(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
Glenn Morris <rgm@gnu.org>
parents:
104396
diff
changeset
|
6886 (end (progn (forward-sexp) (point)))) |
5a7504ff8b85
(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
Glenn Morris <rgm@gnu.org>
parents:
104396
diff
changeset
|
6887 (cons (buffer-substring beg end) |
5a7504ff8b85
(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
Glenn Morris <rgm@gnu.org>
parents:
104396
diff
changeset
|
6888 beg)))) |
5a7504ff8b85
(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
Glenn Morris <rgm@gnu.org>
parents:
104396
diff
changeset
|
6889 |
20323 | 6890 (defun cperl-xsub-scan () |
6891 (require 'imenu) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6892 (let ((index-alist '()) |
20323 | 6893 (prev-pos 0) index index1 name package prefix) |
6894 (goto-char (point-min)) | |
6895 ;; Search for the function | |
6896 (progn ;;save-match-data | |
6897 (while (re-search-forward | |
6898 "^\\([ \t]*MODULE\\>[^\n]*\\<PACKAGE[ \t]*=[ \t]*\\([a-zA-Z_][a-zA-Z_0-9:]*\\)\\>\\|\\([a-zA-Z_][a-zA-Z_0-9]*\\)(\\|[ \t]*BOOT:\\)" | |
6899 nil t) | |
6900 (cond | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6901 ((match-beginning 2) ; SECTION |
20323 | 6902 (setq package (buffer-substring (match-beginning 2) (match-end 2))) |
6903 (goto-char (match-beginning 0)) | |
6904 (skip-chars-forward " \t") | |
6905 (forward-char 1) | |
6906 (if (looking-at "[^\n]*\\<PREFIX[ \t]*=[ \t]*\\([a-zA-Z_][a-zA-Z_0-9]*\\)\\>") | |
6907 (setq prefix (buffer-substring (match-beginning 1) (match-end 1))) | |
6908 (setq prefix nil))) | |
6909 ((not package) nil) ; C language section | |
6910 ((match-beginning 3) ; XSUB | |
6911 (goto-char (1+ (match-beginning 3))) | |
104544
5a7504ff8b85
(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
Glenn Morris <rgm@gnu.org>
parents:
104396
diff
changeset
|
6912 (setq index (cperl-imenu-name-and-position)) |
20323 | 6913 (setq name (buffer-substring (match-beginning 3) (match-end 3))) |
6914 (if (and prefix (string-match (concat "^" prefix) name)) | |
6915 (setq name (substring name (length prefix)))) | |
6916 (cond ((string-match "::" name) nil) | |
6917 (t | |
6918 (setq index1 (cons (concat package "::" name) (cdr index))) | |
6919 (push index1 index-alist))) | |
6920 (setcar index name) | |
6921 (push index index-alist)) | |
6922 (t ; BOOT: section | |
6923 ;; (beginning-of-line) | |
104544
5a7504ff8b85
(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
Glenn Morris <rgm@gnu.org>
parents:
104396
diff
changeset
|
6924 (setq index (cperl-imenu-name-and-position)) |
20323 | 6925 (setcar index (concat package "::BOOT:")) |
6926 (push index index-alist))))) | |
6927 index-alist)) | |
6928 | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6929 (defvar cperl-unreadable-ok nil) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6930 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6931 (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
|
6932 (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
|
6933 (cperl-pod-here-fontify nil) f file) |
20323 | 6934 (save-excursion |
6935 (if b (set-buffer b) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6936 (cperl-setup-tmp-buf)) |
20323 | 6937 (erase-buffer) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6938 (condition-case err |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6939 (setq file (car (insert-file-contents ifile))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6940 (error (if cperl-unreadable-ok nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6941 (if (y-or-n-p |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6942 (format "File %s unreadable. Continue? " ifile)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6943 (setq cperl-unreadable-ok t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6944 (error "Aborting: unreadable file %s" ifile))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
6945 (if (not file) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6946 (message "Unreadable file %s" ifile) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6947 (message "Scanning file %s ..." file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6948 (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
|
6949 (not xs)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6950 (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
|
6951 (cperl-find-pods-heres nil nil noninteractive) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6952 (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
|
6953 (if xs |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6954 (setq lst (cperl-xsub-scan)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6955 (setq ind (cperl-imenu--create-perl-index)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6956 (setq lst (cdr (assoc "+Unsorted List+..." ind)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6957 (setq lst |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6958 (mapcar |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6959 (function |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6960 (lambda (elt) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6961 (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
|
6962 (goto-char (cdr elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6963 (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
|
6964 (list (car elt) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6965 (point) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6966 (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
|
6967 (buffer-substring (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6968 (goto-char (cdr elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6969 ;; After name now... |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6970 (or (eolp) (forward-char 1)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6971 (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6972 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6973 (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6974 (point)))))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6975 lst)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6976 (erase-buffer) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6977 (while lst |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6978 (setq elt (car lst) lst (cdr lst)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6979 (if elt |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6980 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6981 (insert (elt elt 3) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6982 127 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6983 (if (string-match "^package " (car elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6984 (substring (car elt) 8) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6985 (car elt) ) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6986 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6987 (number-to-string (elt elt 2)) ; Line |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6988 "," |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6989 (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
|
6990 "\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6991 (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
|
6992 (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
|
6993 (elt elt 3))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6994 ;; 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
|
6995 (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
|
6996 (match-beginning 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6997 (match-end 1)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6998 (cdr elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6999 lst)))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7000 (setq pos (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7001 (goto-char 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7002 (setq rel file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7003 ;; 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
|
7004 (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
|
7005 (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
|
7006 (setq rel (substring file (length topdir)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7007 (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
|
7008 (setq ret (buffer-substring 1 (point-max))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7009 (erase-buffer) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7010 (or noninteractive |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7011 (message "Scanning file %s finished" file)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7012 ret)))) |
20323 | 7013 |
7014 (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
|
7015 "Add to TAGS data for \"pure\" Perl files in the current directory and kids. |
20323 | 7016 Use as |
7017 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
|
7018 -f cperl-add-tags-recurse-noxs |
20323 | 7019 " |
7020 (cperl-write-tags nil nil t t nil t)) | |
7021 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7022 (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
|
7023 "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
|
7024 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
|
7025 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
|
7026 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
|
7027 -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
|
7028 " |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7029 (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
|
7030 |
20323 | 7031 (defun cperl-add-tags-recurse () |
7032 "Add to TAGS file data for Perl files in the current directory and kids. | |
7033 Use as | |
7034 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
|
7035 -f cperl-add-tags-recurse |
20323 | 7036 " |
7037 (cperl-write-tags nil nil t t)) | |
7038 | |
7039 (defun cperl-write-tags (&optional file erase recurse dir inbuffer noxs topdir) | |
7040 ;; If INBUFFER, do not select buffer, and do not save | |
7041 ;; If ERASE is `ignore', do not erase, and do not try to delete old info. | |
7042 (require 'etags) | |
7043 (if file nil | |
7044 (setq file (if dir default-directory (buffer-file-name))) | |
7045 (if (and (not dir) (buffer-modified-p)) (error "Save buffer first!"))) | |
7046 (or topdir | |
7047 (setq topdir default-directory)) | |
7048 (let ((tags-file-name "TAGS") | |
7049 (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
|
7050 xs rel tm) |
20323 | 7051 (save-excursion |
7052 (cond (inbuffer nil) ; Already there | |
7053 ((file-exists-p tags-file-name) | |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
7054 (if (featurep 'xemacs) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7055 (visit-tags-table-buffer) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7056 (visit-tags-table-buffer tags-file-name))) |
20323 | 7057 (t (set-buffer (find-file-noselect tags-file-name)))) |
7058 (cond | |
7059 (dir | |
7060 (cond ((eq erase 'ignore)) | |
7061 (erase | |
7062 (erase-buffer) | |
7063 (setq erase 'ignore))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
7064 (let ((files |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7065 (condition-case err |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
7066 (directory-files file t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7067 (if recurse nil cperl-scan-files-regexp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7068 t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7069 (error |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7070 (if cperl-unreadable-ok nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7071 (if (y-or-n-p |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7072 (format "Directory %s unreadable. Continue? " file)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
7073 (setq cperl-unreadable-ok t |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7074 tm nil) ; Return empty list |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7075 (error "Aborting: unreadable directory %s" file))))))) |
85223
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7076 (mapc (function |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7077 (lambda (file) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7078 (cond |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7079 ((string-match cperl-noscan-files-regexp file) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7080 nil) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7081 ((not (file-directory-p file)) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7082 (if (string-match cperl-scan-files-regexp file) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7083 (cperl-write-tags file erase recurse nil t noxs topdir))) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7084 ((not recurse) nil) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7085 (t (cperl-write-tags file erase recurse t t noxs topdir))))) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7086 files))) |
20323 | 7087 (t |
7088 (setq xs (string-match "\\.xs$" file)) | |
7089 (if (not (and xs noxs)) | |
7090 (progn | |
7091 (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
|
7092 (erase (erase-buffer)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7093 (t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7094 (goto-char 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7095 (setq rel file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7096 ;; 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
|
7097 (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
|
7098 (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
|
7099 (setq rel (substring file (length topdir)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7100 (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
|
7101 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7102 (search-backward "\f\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7103 (delete-region (point) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7104 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7105 (forward-char 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7106 (if (search-forward "\f\n" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7107 nil 'toend) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7108 (- (point) 2) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7109 (point-max))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7110 (goto-char (point-max))))) |
20323 | 7111 (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
|
7112 (if inbuffer nil ; Delegate to the caller |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7113 (save-buffer 0) ; No backup |
20323 | 7114 (if (fboundp 'initialize-new-tags-table) ; Do we need something special in XEmacs? |
7115 (initialize-new-tags-table)))))) | |
7116 | |
7117 (defvar cperl-tags-hier-regexp-list | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7118 (concat |
20323 | 7119 "^\\(" |
7120 "\\(package\\)\\>" | |
7121 "\\|" | |
7122 "sub\\>[^\n]+::" | |
7123 "\\|" | |
7124 "[a-zA-Z_][a-zA-Z_0-9:]*(\C-?[^\n]+::" ; XSUB? | |
7125 "\\|" | |
7126 "[ \t]*BOOT:\C-?[^\n]+::" ; BOOT section | |
7127 "\\)")) | |
7128 | |
7129 (defvar cperl-hierarchy '(() ()) | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
7130 "Global hierarchy of classes.") |
20323 | 7131 |
7132 (defun cperl-tags-hier-fill () | |
7133 ;; Suppose we are in a tag table cooked by cperl. | |
7134 (goto-char 1) | |
7135 (let (type pack name pos line chunk ord cons1 file str info fileind) | |
7136 (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
|
7137 (setq pos (match-beginning 0) |
20323 | 7138 pack (match-beginning 2)) |
7139 (beginning-of-line) | |
7140 (if (looking-at (concat | |
7141 "\\([^\n]+\\)" | |
7142 "\C-?" | |
7143 "\\([^\n]+\\)" | |
7144 "\C-a" | |
7145 "\\([0-9]+\\)" | |
7146 "," | |
7147 "\\([0-9]+\\)")) | |
7148 (progn | |
7149 (setq ;;str (buffer-substring (match-beginning 1) (match-end 1)) | |
7150 name (buffer-substring (match-beginning 2) (match-end 2)) | |
7151 ;;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
|
7152 line (buffer-substring (match-beginning 3) (match-end 3)) |
20323 | 7153 ord (if pack 1 0) |
7154 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
|
7155 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
|
7156 ;; 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
|
7157 info (cperl-etags-snarf-tag file line)) |
20323 | 7158 ;; Move back |
7159 (forward-char -1) | |
7160 ;; Make new member of hierarchy name ==> file ==> pos if needed | |
7161 (if (setq cons1 (assoc name (nth ord cperl-hierarchy))) | |
7162 ;; Name known | |
7163 (setcdr cons1 (cons (cons fileind (vector file info)) | |
7164 (cdr cons1))) | |
7165 ;; First occurrence of the name, start alist | |
7166 (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
|
7167 (if pack |
20323 | 7168 (setcar (cdr cperl-hierarchy) |
7169 (cons cons1 (nth 1 cperl-hierarchy))) | |
7170 (setcar cperl-hierarchy | |
7171 (cons cons1 (car cperl-hierarchy))))))) | |
7172 (end-of-line)))) | |
7173 | |
105933
8f110099da5c
Update x-popup-menu declaration.
Glenn Morris <rgm@gnu.org>
parents:
105813
diff
changeset
|
7174 (declare-function x-popup-menu "menu.c" (position menu)) |
97422
6e551caf98f6
Add declarations for builds without X.
Glenn Morris <rgm@gnu.org>
parents:
96459
diff
changeset
|
7175 |
20323 | 7176 (defun cperl-tags-hier-init (&optional update) |
7177 "Show hierarchical menu of classes and methods. | |
7178 Finds info about classes by a scan of loaded TAGS files. | |
7179 Supposes that the TAGS files contain fully qualified function names. | |
7180 One may build such TAGS files from CPerl mode menu." | |
7181 (interactive) | |
7182 (require 'etags) | |
7183 (require 'imenu) | |
7184 (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
|
7185 (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
|
7186 (or (nthcdr 2 elt) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7187 ;; Only in one file |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7188 (setcdr elt (cdr (nth 1 elt))))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7189 pack name cons1 to l1 l2 l3 l4 b) |
20323 | 7190 ;; (setq cperl-hierarchy '(() () ())) ; Would write into '() later! |
7191 (setq cperl-hierarchy (list l1 l2 l3)) | |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
7192 (if (featurep 'xemacs) ; Not checked |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7193 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7194 (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
|
7195 ;; Does this work in XEmacs? |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
7196 (call-interactively 'visit-tags-table)) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
7197 (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
|
7198 (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
|
7199 (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
|
7200 (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
|
7201 (call-interactively 'visit-tags-table)) |
85223
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7202 (mapc |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7203 (function |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7204 (lambda (tagsfile) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7205 (message "Updating list of classes... %s" tagsfile) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
7206 (set-buffer (get-file-buffer tagsfile)) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
7207 (cperl-tags-hier-fill))) |
85223
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7208 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
|
7209 (message "Updating list of classes... postprocessing...")) |
85223
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7210 (mapc remover (car cperl-hierarchy)) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7211 (mapc remover (nth 1 cperl-hierarchy)) |
20323 | 7212 (setq to (list nil (cons "Packages: " (nth 1 cperl-hierarchy)) |
7213 (cons "Methods: " (car cperl-hierarchy)))) | |
7214 (cperl-tags-treeify to 1) | |
7215 (setcar (nthcdr 2 cperl-hierarchy) | |
7216 (cperl-menu-to-keymap (cons '("+++UPDATE+++" . -999) (cdr to)))) | |
7217 (message "Updating list of classes: done, requesting display...") | |
7218 ;;(cperl-imenu-addback (nth 2 cperl-hierarchy)) | |
7219 )) | |
7220 (or (nth 2 cperl-hierarchy) | |
7221 (error "No items found")) | |
7222 (setq update | |
7223 ;;; (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
|
7224 (if (if (fboundp 'display-popup-menus-p) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7225 (let ((f 'display-popup-menus-p)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7226 (funcall f)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7227 window-system) |
20323 | 7228 (x-popup-menu t (nth 2 cperl-hierarchy)) |
7229 (require 'tmm) | |
7230 (tmm-prompt (nth 2 cperl-hierarchy)))) | |
7231 (if (and update (listp update)) | |
7232 (progn (while (cdr update) (setq update (cdr update))) | |
7233 (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
|
7234 (if (vectorp update) |
20323 | 7235 (progn |
7236 (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
|
7237 (cperl-etags-goto-tag-location (elt update 1)))) |
20323 | 7238 (if (eq update -999) (cperl-tags-hier-init t))) |
7239 | |
7240 (defun cperl-tags-treeify (to level) | |
7241 ;; 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
|
7242 (let* ((regexp (concat "^\\(" (mapconcat |
20323 | 7243 'identity |
7244 (make-list level "[_a-zA-Z0-9]+") | |
7245 "::") | |
7246 "\\)\\(::\\)?")) | |
7247 (packages (cdr (nth 1 to))) | |
7248 (methods (cdr (nth 2 to))) | |
7249 l1 head tail cons1 cons2 ord writeto packs recurse | |
7250 root-packages root-functions ms many_ms same_name ps | |
7251 (move-deeper | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7252 (function |
20323 | 7253 (lambda (elt) |
7254 (cond ((and (string-match regexp (car elt)) | |
7255 (or (eq ord 1) (match-end 2))) | |
7256 (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
|
7257 tail (if (match-end 2) (substring (car elt) |
20323 | 7258 (match-end 2))) |
7259 recurse t) | |
7260 (if (setq cons1 (assoc head writeto)) nil | |
7261 ;; Need to init new head | |
7262 (setcdr writeto (cons (list head (list "Packages: ") | |
7263 (list "Methods: ")) | |
7264 (cdr writeto))) | |
7265 (setq cons1 (nth 1 writeto))) | |
7266 (setq cons2 (nth ord cons1)) ; Either packs or meths | |
7267 (setcdr cons2 (cons elt (cdr cons2)))) | |
7268 ((eq ord 2) | |
7269 (setq root-functions (cons elt root-functions))) | |
7270 (t | |
7271 (setq root-packages (cons elt root-packages)))))))) | |
7272 (setcdr to l1) ; Init to dynamic space | |
7273 (setq writeto to) | |
7274 (setq ord 1) | |
85223
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7275 (mapc move-deeper packages) |
20323 | 7276 (setq ord 2) |
85223
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7277 (mapc move-deeper methods) |
20323 | 7278 (if recurse |
85223
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7279 (mapc (function (lambda (elt) |
20323 | 7280 (cperl-tags-treeify elt (1+ level)))) |
85223
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7281 (cdr to))) |
20323 | 7282 ;;Now clean up leaders with one child only |
85223
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7283 (mapc (function (lambda (elt) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7284 (if (not (and (listp (cdr elt)) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7285 (eq (length elt) 2))) nil |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7286 (setcar elt (car (nth 1 elt))) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7287 (setcdr elt (cdr (nth 1 elt)))))) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7288 (cdr to)) |
20323 | 7289 ;; Sort the roots of subtrees |
7290 (if (default-value 'imenu-sort-function) | |
7291 (setcdr to | |
7292 (sort (cdr to) (default-value 'imenu-sort-function)))) | |
7293 ;; Now add back functions removed from display | |
85223
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7294 (mapc (function (lambda (elt) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7295 (setcdr to (cons elt (cdr to))))) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7296 (if (default-value 'imenu-sort-function) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7297 (nreverse |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7298 (sort root-functions (default-value 'imenu-sort-function))) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7299 root-functions)) |
20323 | 7300 ;; Now add back packages removed from display |
85223
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7301 (mapc (function (lambda (elt) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7302 (setcdr to (cons (cons (concat "package " (car elt)) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7303 (cdr elt)) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7304 (cdr to))))) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7305 (if (default-value 'imenu-sort-function) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7306 (nreverse |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7307 (sort root-packages (default-value 'imenu-sort-function))) |
455aadb38992
(top level, cperl-imenu-addback)
Glenn Morris <rgm@gnu.org>
parents:
85114
diff
changeset
|
7308 root-packages)))) |
20323 | 7309 |
7310 ;;;(x-popup-menu t | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7311 ;;; '(keymap "Name1" |
20323 | 7312 ;;; ("Ret1" "aa") |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7313 ;;; ("Head1" "ab" |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7314 ;;; keymap "Name2" |
20323 | 7315 ;;; ("Tail1" "x") ("Tail2" "y")))) |
7316 | |
7317 (defun cperl-list-fold (list name limit) | |
7318 (let (list1 list2 elt1 (num 0)) | |
7319 (if (<= (length list) limit) list | |
7320 (setq list1 nil list2 nil) | |
7321 (while list | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7322 (setq num (1+ num) |
20323 | 7323 elt1 (car list) |
7324 list (cdr list)) | |
7325 (if (<= num imenu-max-items) | |
7326 (setq list2 (cons elt1 list2)) | |
7327 (setq list1 (cons (cons name | |
7328 (nreverse list2)) | |
7329 list1) | |
7330 list2 (list elt1) | |
7331 num 1))) | |
7332 (nreverse (cons (cons name | |
7333 (nreverse list2)) | |
7334 list1))))) | |
7335 | |
7336 (defun cperl-menu-to-keymap (menu &optional name) | |
7337 (let (list) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7338 (cons 'keymap |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7339 (mapcar |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7340 (function |
20323 | 7341 (lambda (elt) |
7342 (cond ((listp (cdr elt)) | |
7343 (setq list (cperl-list-fold | |
7344 (cdr elt) (car elt) imenu-max-items)) | |
7345 (cons nil | |
7346 (cons (car elt) | |
7347 (cperl-menu-to-keymap list)))) | |
7348 (t | |
7349 (list (cdr elt) (car elt) t))))) ; t is needed in 19.34 | |
7350 (cperl-list-fold menu "Root" imenu-max-items))))) | |
7351 | |
7352 | |
7353 (defvar cperl-bad-style-regexp | |
7354 (mapconcat 'identity | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7355 '("[^-\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
|
7356 "[-<>=+^&|]+[^- \t\n=+<>~]") ; sign+ char |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7357 "\\|") |
20323 | 7358 "Finds places such that insertion of a whitespace may help a lot.") |
7359 | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7360 (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
|
7361 (mapconcat |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7362 'identity |
20323 | 7363 '("[^-\t <>=+]\\(--\\|\\+\\+\\)" ; var-- var++ |
7364 "[a-zA-Z0-9_][|&][a-zA-Z0-9_$]" ; abc|def abc&def are often used. | |
7365 "&[(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
|
7366 "<\\$?\\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
|
7367 "-[a-zA-Z][ \t]+[_$\"'`a-zA-Z]" ; -f file, -t STDIN |
20323 | 7368 "-[0-9]" ; -5 |
7369 "\\+\\+" ; ++var | |
7370 "--" ; --var | |
7371 ".->" ; a->b | |
7372 "->" ; a SPACE ->b | |
7373 "\\[-" ; a[-1] | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7374 "\\\\[&$@*\\\\]" ; \&func |
20323 | 7375 "^=" ; =head |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7376 "\\$." ; $| |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7377 "<<[a-zA-Z_'\"`]" ; <<FOO, <<'FOO' |
20323 | 7378 "||" |
7379 "&&" | |
7380 "[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
|
7381 "-[a-zA-Z_0-9]+[ \t]*=>" ; -option => value |
20323 | 7382 ;; Unaddressed trouble spots: = -abc, f(56, -abc) --- specialcased below |
7383 ;;"[*/+-|&<.]+=" | |
7384 ) | |
7385 "\\|") | |
7386 "If matches at the start of match found by `my-bad-c-style-regexp', | |
7387 insertion of a whitespace will not help.") | |
7388 | |
7389 (defvar found-bad) | |
7390 | |
7391 (defun cperl-find-bad-style () | |
7392 "Find places in the buffer where insertion of a whitespace may help. | |
7393 Prompts user for insertion of spaces. | |
7394 Currently it is tuned to C and Perl syntax." | |
7395 (interactive) | |
7396 (let (found-bad (p (point))) | |
7397 (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
|
7398 (goto-char (point-min)) |
20323 | 7399 (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
|
7400 (lambda (arg) (insert " ")) |
20323 | 7401 'cperl-next-bad-style |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7402 '("location" "locations" "insert a space into") |
20323 | 7403 '((?\C-r (lambda (arg) |
7404 (let ((buffer-quit-function | |
7405 'exit-recursive-edit)) | |
7406 (message "Exit with Esc Esc") | |
7407 (recursive-edit) | |
7408 t)) ; Consider acted upon | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7409 "edit, exit with Esc Esc") |
20323 | 7410 (?e (lambda (arg) |
7411 (let ((buffer-quit-function | |
7412 'exit-recursive-edit)) | |
7413 (message "Exit with Esc Esc") | |
7414 (recursive-edit) | |
7415 t)) ; Consider acted upon | |
7416 "edit, exit with Esc Esc")) | |
7417 t) | |
7418 (if found-bad (goto-char found-bad) | |
7419 (goto-char p) | |
7420 (message "No appropriate place found")))) | |
7421 | |
7422 (defun cperl-next-bad-style () | |
7423 (let (p (not-found t) (point (point)) found) | |
7424 (while (and not-found | |
7425 (re-search-forward cperl-bad-style-regexp nil 'to-end)) | |
7426 (setq p (point)) | |
7427 (goto-char (match-beginning 0)) | |
7428 (if (or | |
7429 (looking-at cperl-not-bad-style-regexp) | |
7430 ;; Check for a < -b and friends | |
7431 (and (eq (following-char) ?\-) | |
7432 (save-excursion | |
7433 (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
|
7434 (memq (preceding-char) '(?\= ?\> ?\< ?\, ?\( ?\[ ?\{)))) |
20323 | 7435 ;; Now check for syntax type |
7436 (save-match-data | |
7437 (setq found (point)) | |
7438 (beginning-of-defun) | |
7439 (let ((pps (parse-partial-sexp (point) found))) | |
7440 (or (nth 3 pps) (nth 4 pps) (nth 5 pps))))) | |
7441 (goto-char (match-end 0)) | |
7442 (goto-char (1- p)) | |
7443 (setq not-found nil | |
7444 found-bad found))) | |
7445 (not not-found))) | |
7446 | |
27248 | 7447 |
20323 | 7448 ;;; Getting help |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7449 (defvar cperl-have-help-regexp |
20323 | 7450 ;;(concat "\\(" |
7451 (mapconcat | |
7452 'identity | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7453 '("[$@%*&][0-9a-zA-Z_:]+\\([ \t]*[[{]\\)?" ; Usual variable |
20323 | 7454 "[$@]\\^[a-zA-Z]" ; Special variable |
7455 "[$@][^ \n\t]" ; Special variable | |
7456 "-[a-zA-Z]" ; File test | |
7457 "\\\\[a-zA-Z0]" ; Special chars | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7458 "^=[a-z][a-zA-Z0-9_]*" ; POD sections |
20323 | 7459 "[-!&*+,-./<=>?\\\\^|~]+" ; Operator |
7460 "[a-zA-Z_0-9:]+" ; symbol or number | |
7461 "x=" | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7462 "#!") |
20323 | 7463 ;;"\\)\\|\\(" |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7464 "\\|") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7465 ;;"\\)" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7466 ;;) |
20323 | 7467 "Matches places in the buffer we can find help for.") |
7468 | |
7469 (defvar cperl-message-on-help-error t) | |
7470 (defvar cperl-help-from-timer nil) | |
7471 | |
7472 (defun cperl-word-at-point-hard () | |
7473 ;; Does not save-excursion | |
7474 ;; Get to the something meaningful | |
7475 (or (eobp) (eolp) (forward-char 1)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7476 (re-search-backward "[-a-zA-Z0-9_:!&*+,-./<=>?\\\\^|~$%@]" |
20323 | 7477 (save-excursion (beginning-of-line) (point)) |
7478 'to-beg) | |
7479 ;; (cond | |
7480 ;; ((or (eobp) (looking-at "[][ \t\n{}();,]")) ; Not at a symbol | |
7481 ;; (skip-chars-backward " \n\t\r({[]});,") | |
7482 ;; (or (bobp) (backward-char 1)))) | |
7483 ;; Try to backtrace | |
7484 (cond | |
7485 ((looking-at "[a-zA-Z0-9_:]") ; symbol | |
7486 (skip-chars-backward "a-zA-Z0-9_:") | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7487 (cond |
20323 | 7488 ((and (eq (preceding-char) ?^) ; $^I |
7489 (eq (char-after (- (point) 2)) ?\$)) | |
7490 (forward-char -2)) | |
7491 ((memq (preceding-char) (append "*$@%&\\" nil)) ; *glob | |
7492 (forward-char -1)) | |
7493 ((and (eq (preceding-char) ?\=) | |
7494 (eq (current-column) 1)) | |
7495 (forward-char -1))) ; =head1 | |
7496 (if (and (eq (preceding-char) ?\<) | |
7497 (looking-at "\\$?[a-zA-Z0-9_:]+>")) ; <FH> | |
7498 (forward-char -1))) | |
7499 ((and (looking-at "=") (eq (preceding-char) ?x)) ; x= | |
7500 (forward-char -1)) | |
7501 ((and (looking-at "\\^") (eq (preceding-char) ?\$)) ; $^I | |
7502 (forward-char -1)) | |
7503 ((looking-at "[-!&*+,-./<=>?\\\\^|~]") | |
7504 (skip-chars-backward "-!&*+,-./<=>?\\\\^|~") | |
7505 (cond | |
7506 ((and (eq (preceding-char) ?\$) | |
7507 (not (eq (char-after (- (point) 2)) ?\$))) ; $- | |
7508 (forward-char -1)) | |
7509 ((and (eq (following-char) ?\>) | |
7510 (string-match "[a-zA-Z0-9_]" (char-to-string (preceding-char))) | |
7511 (save-excursion | |
7512 (forward-sexp -1) | |
7513 (and (eq (preceding-char) ?\<) | |
7514 (looking-at "\\$?[a-zA-Z0-9_:]+>")))) ; <FH> | |
7515 (search-backward "<")))) | |
7516 ((and (eq (following-char) ?\$) | |
7517 (eq (preceding-char) ?\<) | |
7518 (looking-at "\\$?[a-zA-Z0-9_:]+>")) ; <$fh> | |
7519 (forward-char -1))) | |
7520 (if (looking-at cperl-have-help-regexp) | |
7521 (buffer-substring (match-beginning 0) (match-end 0)))) | |
7522 | |
7523 (defun cperl-get-help () | |
7524 "Get one-line docs on the symbol at the point. | |
7525 The data for these docs is a little bit obsolete and may be in fact longer | |
7526 than a line. Your contribution to update/shorten it is appreciated." | |
7527 (interactive) | |
7528 (save-match-data ; May be called "inside" query-replace | |
7529 (save-excursion | |
7530 (let ((word (cperl-word-at-point-hard))) | |
7531 (if word | |
7532 (if (and cperl-help-from-timer ; Bail out if not in mainland | |
7533 (not (string-match "^#!\\|\\\\\\|^=" word)) ; Show help even in comments/strings. | |
7534 (or (memq (get-text-property (point) 'face) | |
7535 '(font-lock-comment-face font-lock-string-face)) | |
7536 (memq (get-text-property (point) 'syntax-type) | |
7537 '(pod here-doc format)))) | |
7538 nil | |
7539 (cperl-describe-perl-symbol word)) | |
7540 (if cperl-message-on-help-error | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7541 (message "Nothing found for %s..." |
20323 | 7542 (buffer-substring (point) (min (+ 5 (point)) (point-max)))))))))) |
7543 | |
7544 ;;; Stolen from perl-descr.el by Johan Vromans: | |
7545 | |
7546 (defvar cperl-doc-buffer " *perl-doc*" | |
7547 "Where the documentation can be found.") | |
7548 | |
7549 (defun cperl-describe-perl-symbol (val) | |
7550 "Display the documentation of symbol at point, a Perl operator." | |
7551 (let ((enable-recursive-minibuffers t) | |
7552 args-file regexp) | |
7553 (cond | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7554 ((string-match "^[&*][a-zA-Z_]" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7555 (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
|
7556 ((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
|
7557 (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
|
7558 ((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
|
7559 (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
|
7560 ((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
|
7561 (setq val "x=")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7562 ((string-match "^\\$[\C-a-\C-z]" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7563 (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
|
7564 ((string-match "^CORE::" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7565 (setq val "CORE::")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7566 ((string-match "^SUPER::" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7567 (setq val "SUPER::")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7568 ((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
|
7569 (setq val "<NAME>"))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7570 (setq regexp (concat "^" |
20323 | 7571 "\\([^a-zA-Z0-9_:]+[ \t]+\\)?" |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7572 (regexp-quote val) |
20323 | 7573 "\\([ \t([/]\\|$\\)")) |
7574 | |
7575 ;; get the buffer with the documentation text | |
7576 (cperl-switch-to-doc-buffer) | |
7577 | |
7578 ;; lookup in the doc | |
7579 (goto-char (point-min)) | |
7580 (let ((case-fold-search nil)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7581 (list |
20323 | 7582 (if (re-search-forward regexp (point-max) t) |
7583 (save-excursion | |
7584 (beginning-of-line 1) | |
7585 (let ((lnstart (point))) | |
7586 (end-of-line) | |
7587 (message "%s" (buffer-substring lnstart (point))))) | |
7588 (if cperl-message-on-help-error | |
7589 (message "No definition for %s" val))))))) | |
7590 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7591 (defvar cperl-short-docs 'please-ignore-this-line |
20323 | 7592 ;; Perl4 version was written by Johan Vromans (jvromans@squirrel.nl) |
7593 "# 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
|
7594 ... 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
|
7595 ! ... Logical negation. |
20323 | 7596 ... != ... Numeric inequality. |
7597 ... !~ ... Search pattern, substitution, or translation (negated). | |
7598 $! In numeric context: errno. In a string context: error string. | |
7599 $\" 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
|
7600 $# The output format for printed numbers. Default is %.15g or close. |
20323 | 7601 $$ Process number of this script. Changes in the fork()ed child process. |
7602 $% The current page number of the currently selected output channel. | |
7603 | |
7604 The following variables are always local to the current block: | |
7605 | |
7606 $1 Match of the 1st set of parentheses in the last match (auto-local). | |
7607 $2 Match of the 2nd set of parentheses in the last match (auto-local). | |
7608 $3 Match of the 3rd set of parentheses in the last match (auto-local). | |
7609 $4 Match of the 4th set of parentheses in the last match (auto-local). | |
7610 $5 Match of the 5th set of parentheses in the last match (auto-local). | |
7611 $6 Match of the 6th set of parentheses in the last match (auto-local). | |
7612 $7 Match of the 7th set of parentheses in the last match (auto-local). | |
7613 $8 Match of the 8th set of parentheses in the last match (auto-local). | |
7614 $9 Match of the 9th set of parentheses in the last match (auto-local). | |
7615 $& The string matched by the last pattern match (auto-local). | |
7616 $' The string after what was matched by the last match (auto-local). | |
7617 $` The string before what was matched by the last match (auto-local). | |
7618 | |
7619 $( The real gid of this process. | |
7620 $) The effective gid of this process. | |
7621 $* Deprecated: Set to 1 to do multiline matching within a string. | |
7622 $+ The last bracket matched by the last search pattern. | |
7623 $, The output field separator for the print operator. | |
7624 $- The number of lines left on the page. | |
7625 $. The current input line number of the last filehandle that was read. | |
7626 $/ 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
|
7627 $0 Name of the file containing the current perl script (read/write). |
20323 | 7628 $: String may be broken after these characters to fill ^-lines in a format. |
7629 $; Subscript separator for multi-dim array emulation. Default \"\\034\". | |
7630 $< The real uid of this process. | |
7631 $= The page length of the current output channel. Default is 60 lines. | |
7632 $> The effective uid of this process. | |
7633 $? The status returned by the last ``, pipe close or `system'. | |
7634 $@ The perl error message from the last eval or do @var{EXPR} command. | |
7635 $ARGV The name of the current file used with <> . | |
7636 $[ Deprecated: The index of the first element/char in an array/string. | |
7637 $\\ The output record separator for the print operator. | |
7638 $] The perl version string as displayed with perl -v. | |
7639 $^ The name of the current top-of-page format. | |
7640 $^A The current value of the write() accumulator for format() lines. | |
7641 $^D The value of the perl debug (-D) flags. | |
7642 $^E Information about the last system error other than that provided by $!. | |
7643 $^F The highest system file descriptor, ordinarily 2. | |
7644 $^H The current set of syntax checks enabled by `use strict'. | |
7645 $^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
|
7646 $^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
|
7647 $^M A buffer for emergency memory allocation when running out of memory. |
20323 | 7648 $^O The operating system name under which this copy of Perl was built. |
7649 $^P Internal debugging flag. | |
7650 $^T The time the script was started. Used by -A/-M/-C file tests. | |
7651 $^W True if warnings are requested (perl -w flag). | |
7652 $^X The name under which perl was invoked (argv[0] in C-speech). | |
7653 $_ The default input and pattern-searching space. | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7654 $| Auto-flush after write/print on current output channel? Default 0. |
20323 | 7655 $~ The name of the current report format. |
7656 ... % ... Modulo division. | |
7657 ... %= ... Modulo division assignment. | |
7658 %ENV Contains the current environment. | |
7659 %INC List of files that have been require-d or do-ne. | |
7660 %SIG Used to set signal handlers for various signals. | |
7661 ... & ... Bitwise and. | |
7662 ... && ... Logical and. | |
7663 ... &&= ... Logical and assignment. | |
7664 ... &= ... Bitwise and assignment. | |
7665 ... * ... Multiplication. | |
7666 ... ** ... Exponentiation. | |
7667 *NAME Glob: all objects refered by NAME. *NAM1 = *NAM2 aliases NAM1 to NAM2. | |
7668 &NAME(arg0, ...) Subroutine call. Arguments go to @_. | |
7669 ... + ... Addition. +EXPR Makes EXPR into scalar context. | |
7670 ++ Auto-increment (magical on strings). ++EXPR EXPR++ | |
7671 ... += ... Addition assignment. | |
7672 , Comma operator. | |
7673 ... - ... Subtraction. | |
7674 -- Auto-decrement (NOT magical on strings). --EXPR EXPR-- | |
7675 ... -= ... Subtraction assignment. | |
7676 -A Access time in days since script started. | |
7677 -B File is a non-text (binary) file. | |
7678 -C Inode change time in days since script started. | |
7679 -M Age in days since script started. | |
7680 -O File is owned by real uid. | |
7681 -R File is readable by real uid. | |
7682 -S File is a socket . | |
7683 -T File is a text file. | |
7684 -W File is writable by real uid. | |
7685 -X File is executable by real uid. | |
7686 -b File is a block special file. | |
7687 -c File is a character special file. | |
7688 -d File is a directory. | |
7689 -e File exists . | |
7690 -f File is a plain file. | |
7691 -g File has setgid bit set. | |
7692 -k File has sticky bit set. | |
7693 -l File is a symbolic link. | |
7694 -o File is owned by effective uid. | |
7695 -p File is a named pipe (FIFO). | |
7696 -r File is readable by effective uid. | |
7697 -s File has non-zero size. | |
7698 -t Tests if filehandle (STDIN by default) is opened to a tty. | |
7699 -u File has setuid bit set. | |
7700 -w File is writable by effective uid. | |
7701 -x File is executable by effective uid. | |
7702 -z File has zero size. | |
7703 . Concatenate strings. | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7704 .. Range (list context); flip/flop (scalar context) operator. |
20323 | 7705 .= Concatenate assignment strings |
7706 ... / ... Division. /PATTERN/ioxsmg Pattern match | |
7707 ... /= ... Division assignment. | |
7708 /PATTERN/ioxsmg Pattern match. | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7709 ... < ... Numeric less than. <pattern> Glob. See <NAME>, <> as well. |
20323 | 7710 <NAME> Reads line from filehandle NAME (a bareword or dollar-bareword). |
7711 <pattern> Glob (Unless pattern is bareword/dollar-bareword - see <NAME>). | |
7712 <> Reads line from union of files in @ARGV (= command line) and STDIN. | |
7713 ... << ... Bitwise shift left. << start of HERE-DOCUMENT. | |
7714 ... <= ... Numeric less than or equal to. | |
7715 ... <=> ... Numeric compare. | |
7716 ... = ... Assignment. | |
7717 ... == ... Numeric equality. | |
7718 ... =~ ... Search pattern, substitution, or translation | |
7719 ... > ... Numeric greater than. | |
7720 ... >= ... Numeric greater than or equal to. | |
7721 ... >> ... Bitwise shift right. | |
7722 ... >>= ... Bitwise shift right assignment. | |
7723 ... ? ... : ... Condition=if-then-else operator. ?PAT? One-time pattern match. | |
7724 ?PATTERN? One-time pattern match. | |
7725 @ARGV Command line arguments (not including the command name - see $0). | |
7726 @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
|
7727 @_ 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
|
7728 \\ Creates reference to what follows, like \\$var, or quotes non-\\w in strings. |
20323 | 7729 \\0 Octal char, e.g. \\033. |
7730 \\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
|
7731 \\L Lowercase until \\E . See also \\l, lc. |
7293b63aa3ba
(cperl-short-docs): Fix quoting
Andreas Schwab <schwab@suse.de>
parents:
68773
diff
changeset
|
7732 \\U Upcase until \\E . See also \\u, uc. |
20323 | 7733 \\Q Quote metacharacters until \\E . See also quotemeta. |
7734 \\a Alarm character (octal 007). | |
7735 \\b Backspace character (octal 010). | |
7736 \\c Control character, e.g. \\c[ . | |
7737 \\e Escape character (octal 033). | |
7738 \\f Formfeed character (octal 014). | |
7739 \\l Lowercase the next character. See also \\L and \\u, lcfirst. | |
7740 \\n Newline character (octal 012 on most systems). | |
7741 \\r Return character (octal 015 on most systems). | |
7742 \\t Tab character (octal 011). | |
7743 \\u Upcase the next character. See also \\U and \\l, ucfirst. | |
7744 \\x Hex character, e.g. \\x1b. | |
7745 ... ^ ... Bitwise exclusive or. | |
7746 __END__ Ends program source. | |
7747 __DATA__ Ends program source. | |
7748 __FILE__ Current (source) filename. | |
7749 __LINE__ Current line in current source. | |
7750 __PACKAGE__ Current package. | |
7751 ARGV Default multi-file input filehandle. <ARGV> is a synonym for <>. | |
7752 ARGVOUT Output filehandle with -i flag. | |
7753 BEGIN { ... } Immediately executed (during compilation) piece of code. | |
7754 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
|
7755 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
|
7756 INIT { ... } Pseudo-subroutine executed before the script starts running. |
20323 | 7757 DATA Input filehandle for what follows after __END__ or __DATA__. |
7758 accept(NEWSOCKET,GENERICSOCKET) | |
7759 alarm(SECONDS) | |
7760 atan2(X,Y) | |
7761 bind(SOCKET,NAME) | |
7762 binmode(FILEHANDLE) | |
7763 caller[(LEVEL)] | |
7764 chdir(EXPR) | |
7765 chmod(LIST) | |
7766 chop[(LIST|VAR)] | |
7767 chown(LIST) | |
7768 chroot(FILENAME) | |
7769 close(FILEHANDLE) | |
7770 closedir(DIRHANDLE) | |
7771 ... cmp ... String compare. | |
7772 connect(SOCKET,NAME) | |
7773 continue of { block } continue { block }. Is executed after `next' or at end. | |
7774 cos(EXPR) | |
7775 crypt(PLAINTEXT,SALT) | |
7776 dbmclose(%HASH) | |
7777 dbmopen(%HASH,DBNAME,MODE) | |
7778 defined(EXPR) | |
7779 delete($HASH{KEY}) | |
7780 die(LIST) | |
7781 do { ... }|SUBR while|until EXPR executes at least once | |
7782 do(EXPR|SUBR([LIST])) (with while|until executes at least once) | |
7783 dump LABEL | |
7784 each(%HASH) | |
7785 endgrent | |
7786 endhostent | |
7787 endnetent | |
7788 endprotoent | |
7789 endpwent | |
7790 endservent | |
7791 eof[([FILEHANDLE])] | |
7792 ... eq ... String equality. | |
7793 eval(EXPR) or eval { BLOCK } | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7794 exec([TRUENAME] ARGV0, ARGVs) or exec(SHELL_COMMAND_LINE) |
20323 | 7795 exit(EXPR) |
7796 exp(EXPR) | |
7797 fcntl(FILEHANDLE,FUNCTION,SCALAR) | |
7798 fileno(FILEHANDLE) | |
7799 flock(FILEHANDLE,OPERATION) | |
7800 for (EXPR;EXPR;EXPR) { ... } | |
7801 foreach [VAR] (@ARRAY) { ... } | |
7802 fork | |
7803 ... ge ... String greater than or equal. | |
7804 getc[(FILEHANDLE)] | |
7805 getgrent | |
7806 getgrgid(GID) | |
7807 getgrnam(NAME) | |
7808 gethostbyaddr(ADDR,ADDRTYPE) | |
7809 gethostbyname(NAME) | |
7810 gethostent | |
7811 getlogin | |
7812 getnetbyaddr(ADDR,ADDRTYPE) | |
7813 getnetbyname(NAME) | |
7814 getnetent | |
7815 getpeername(SOCKET) | |
7816 getpgrp(PID) | |
7817 getppid | |
7818 getpriority(WHICH,WHO) | |
7819 getprotobyname(NAME) | |
7820 getprotobynumber(NUMBER) | |
7821 getprotoent | |
7822 getpwent | |
7823 getpwnam(NAME) | |
7824 getpwuid(UID) | |
7825 getservbyname(NAME,PROTO) | |
7826 getservbyport(PORT,PROTO) | |
7827 getservent | |
7828 getsockname(SOCKET) | |
7829 getsockopt(SOCKET,LEVEL,OPTNAME) | |
7830 gmtime(EXPR) | |
7831 goto LABEL | |
7832 ... gt ... String greater than. | |
7833 hex(EXPR) | |
7834 if (EXPR) { ... } [ elsif (EXPR) { ... } ... ] [ else { ... } ] or EXPR if EXPR | |
7835 index(STR,SUBSTR[,OFFSET]) | |
7836 int(EXPR) | |
7837 ioctl(FILEHANDLE,FUNCTION,SCALAR) | |
7838 join(EXPR,LIST) | |
7839 keys(%HASH) | |
7840 kill(LIST) | |
7841 last [LABEL] | |
7842 ... le ... String less than or equal. | |
7843 length(EXPR) | |
7844 link(OLDFILE,NEWFILE) | |
7845 listen(SOCKET,QUEUESIZE) | |
7846 local(LIST) | |
7847 localtime(EXPR) | |
7848 log(EXPR) | |
7849 lstat(EXPR|FILEHANDLE|VAR) | |
7850 ... lt ... String less than. | |
7851 m/PATTERN/iogsmx | |
7852 mkdir(FILENAME,MODE) | |
7853 msgctl(ID,CMD,ARG) | |
7854 msgget(KEY,FLAGS) | |
7855 msgrcv(ID,VAR,SIZE,TYPE.FLAGS) | |
7856 msgsnd(ID,MSG,FLAGS) | |
7857 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
|
7858 our VAR or our (VAR1,...) Lexically enable a global variable ($V, @A, or %H). |
20323 | 7859 ... ne ... String inequality. |
7860 next [LABEL] | |
7861 oct(EXPR) | |
7862 open(FILEHANDLE[,EXPR]) | |
7863 opendir(DIRHANDLE,EXPR) | |
7864 ord(EXPR) ASCII value of the first char of the string. | |
7865 pack(TEMPLATE,LIST) | |
7866 package NAME Introduces package context. | |
7867 pipe(READHANDLE,WRITEHANDLE) Create a pair of filehandles on ends of a pipe. | |
7868 pop(ARRAY) | |
7869 print [FILEHANDLE] [(LIST)] | |
7870 printf [FILEHANDLE] (FORMAT,LIST) | |
7871 push(ARRAY,LIST) | |
7872 q/STRING/ Synonym for 'STRING' | |
7873 qq/STRING/ Synonym for \"STRING\" | |
7874 qx/STRING/ Synonym for `STRING` | |
7875 rand[(EXPR)] | |
7876 read(FILEHANDLE,SCALAR,LENGTH[,OFFSET]) | |
7877 readdir(DIRHANDLE) | |
7878 readlink(EXPR) | |
7879 recv(SOCKET,SCALAR,LEN,FLAGS) | |
7880 redo [LABEL] | |
7881 rename(OLDNAME,NEWNAME) | |
7882 require [FILENAME | PERL_VERSION] | |
7883 reset[(EXPR)] | |
7884 return(LIST) | |
7885 reverse(LIST) | |
7886 rewinddir(DIRHANDLE) | |
7887 rindex(STR,SUBSTR[,OFFSET]) | |
7888 rmdir(FILENAME) | |
7889 s/PATTERN/REPLACEMENT/gieoxsm | |
7890 scalar(EXPR) | |
7891 seek(FILEHANDLE,POSITION,WHENCE) | |
7892 seekdir(DIRHANDLE,POS) | |
7893 select(FILEHANDLE | RBITS,WBITS,EBITS,TIMEOUT) | |
7894 semctl(ID,SEMNUM,CMD,ARG) | |
7895 semget(KEY,NSEMS,SIZE,FLAGS) | |
7896 semop(KEY,...) | |
7897 send(SOCKET,MSG,FLAGS[,TO]) | |
7898 setgrent | |
7899 sethostent(STAYOPEN) | |
7900 setnetent(STAYOPEN) | |
7901 setpgrp(PID,PGRP) | |
7902 setpriority(WHICH,WHO,PRIORITY) | |
7903 setprotoent(STAYOPEN) | |
7904 setpwent | |
7905 setservent(STAYOPEN) | |
7906 setsockopt(SOCKET,LEVEL,OPTNAME,OPTVAL) | |
7907 shift[(ARRAY)] | |
7908 shmctl(ID,CMD,ARG) | |
7909 shmget(KEY,SIZE,FLAGS) | |
7910 shmread(ID,VAR,POS,SIZE) | |
7911 shmwrite(ID,STRING,POS,SIZE) | |
7912 shutdown(SOCKET,HOW) | |
7913 sin(EXPR) | |
7914 sleep[(EXPR)] | |
7915 socket(SOCKET,DOMAIN,TYPE,PROTOCOL) | |
7916 socketpair(SOCKET1,SOCKET2,DOMAIN,TYPE,PROTOCOL) | |
7917 sort [SUBROUTINE] (LIST) | |
7918 splice(ARRAY,OFFSET[,LENGTH[,LIST]]) | |
7919 split[(/PATTERN/[,EXPR[,LIMIT]])] | |
7920 sprintf(FORMAT,LIST) | |
7921 sqrt(EXPR) | |
7922 srand(EXPR) | |
7923 stat(EXPR|FILEHANDLE|VAR) | |
7924 study[(SCALAR)] | |
7925 sub [NAME [(format)]] { BODY } sub NAME [(format)]; sub [(format)] {...} | |
7926 substr(EXPR,OFFSET[,LEN]) | |
7927 symlink(OLDFILE,NEWFILE) | |
7928 syscall(LIST) | |
7929 sysread(FILEHANDLE,SCALAR,LENGTH[,OFFSET]) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7930 system([TRUENAME] ARGV0 [,ARGV]) or system(SHELL_COMMAND_LINE) |
20323 | 7931 syswrite(FILEHANDLE,SCALAR,LENGTH[,OFFSET]) |
7932 tell[(FILEHANDLE)] | |
7933 telldir(DIRHANDLE) | |
7934 time | |
7935 times | |
7936 tr/SEARCHLIST/REPLACEMENTLIST/cds | |
7937 truncate(FILE|EXPR,LENGTH) | |
7938 umask[(EXPR)] | |
7939 undef[(EXPR)] | |
7940 unless (EXPR) { ... } [ else { ... } ] or EXPR unless EXPR | |
7941 unlink(LIST) | |
7942 unpack(TEMPLATE,EXPR) | |
7943 unshift(ARRAY,LIST) | |
7944 until (EXPR) { ... } EXPR until EXPR | |
7945 utime(LIST) | |
7946 values(%HASH) | |
7947 vec(EXPR,OFFSET,BITS) | |
7948 wait | |
7949 waitpid(PID,FLAGS) | |
7950 wantarray Returns true if the sub/eval is called in list context. | |
7951 warn(LIST) | |
7952 while (EXPR) { ... } EXPR while EXPR | |
7953 write[(EXPR|FILEHANDLE)] | |
7954 ... x ... Repeat string or array. | |
7955 x= ... Repetition assignment. | |
7956 y/SEARCHLIST/REPLACEMENTLIST/ | |
7957 ... | ... Bitwise or. | |
7958 ... || ... Logical or. | |
7959 ~ ... Unary bitwise complement. | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7960 #! OS interpreter indicator. If contains `perl', used for options, and -x. |
20323 | 7961 AUTOLOAD {...} Shorthand for `sub AUTOLOAD {...}'. |
7962 CORE:: Prefix to access builtin function if imported sub obscures it. | |
7963 SUPER:: Prefix to lookup for a method in @ISA classes. | |
7964 DESTROY Shorthand for `sub DESTROY {...}'. | |
7965 ... EQ ... Obsolete synonym of `eq'. | |
7966 ... GE ... Obsolete synonym of `ge'. | |
7967 ... GT ... Obsolete synonym of `gt'. | |
7968 ... LE ... Obsolete synonym of `le'. | |
7969 ... LT ... Obsolete synonym of `lt'. | |
7970 ... NE ... Obsolete synonym of `ne'. | |
7971 abs [ EXPR ] absolute value | |
7972 ... and ... Low-precedence synonym for &&. | |
7973 bless REFERENCE [, PACKAGE] Makes reference into an object of a package. | |
7974 chomp [LIST] Strips $/ off LIST/$_. Returns count. Special if $/ eq ''! | |
7975 chr Converts a number to char with the same ordinal. | |
7976 else Part of if/unless {BLOCK} elsif {BLOCK} else {BLOCK}. | |
7977 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
|
7978 exists $HASH{KEY} True if the key exists. |
20323 | 7979 format [NAME] = Start of output format. Ended by a single dot (.) on a line. |
7980 formline PICTURE, LIST Backdoor into \"format\" processing. | |
7981 glob EXPR Synonym of <EXPR>. | |
7982 lc [ EXPR ] Returns lowercased EXPR. | |
7983 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
|
7984 grep EXPR,LIST or grep {BLOCK} LIST Filters LIST via EXPR/BLOCK. |
20323 | 7985 map EXPR, LIST or map {BLOCK} LIST Applies EXPR/BLOCK to elts of LIST. |
7986 no PACKAGE [SYMBOL1, ...] Partial reverse for `use'. Runs `unimport' method. | |
7987 not ... Low-precedence synonym for ! - negation. | |
7988 ... or ... Low-precedence synonym for ||. | |
7989 pos STRING Set/Get end-position of the last match over this string, see \\G. | |
7990 quotemeta [ EXPR ] Quote regexp metacharacters. | |
7991 qw/WORD1 .../ Synonym of split('', 'WORD1 ...') | |
7992 readline FH Synonym of <FH>. | |
7993 readpipe CMD Synonym of `CMD`. | |
7994 ref [ EXPR ] Type of EXPR when dereferenced. | |
7995 sysopen FH, FILENAME, MODE [, PERM] (MODE is numeric, see Fcntl.) | |
7996 tie VAR, PACKAGE, LIST Hide an object behind a simple Perl variable. | |
7997 tied Returns internal object for a tied data. | |
7998 uc [ EXPR ] Returns upcased EXPR. | |
7999 ucfirst [ EXPR ] Returns EXPR with upcased first letter. | |
8000 untie VAR Unlink an object from a simple Perl variable. | |
8001 use PACKAGE [SYMBOL1, ...] Compile-time `require' with consequent `import'. | |
8002 ... xor ... Low-precedence synonym for exclusive or. | |
71304
7293b63aa3ba
(cperl-short-docs): Fix quoting
Andreas Schwab <schwab@suse.de>
parents:
68773
diff
changeset
|
8003 prototype \\&SUB Returns prototype of the function given a reference. |
20323 | 8004 =head1 Top-level heading. |
8005 =head2 Second-level heading. | |
8006 =head3 Third-level heading (is there such?). | |
8007 =over [ NUMBER ] Start list. | |
8008 =item [ TITLE ] Start new item in the list. | |
8009 =back End list. | |
8010 =cut Switch from POD to Perl. | |
8011 =pod Switch from Perl to POD. | |
8012 ") | |
8013 | |
57823
d77a1264b555
(cperl-switch-to-doc-buffer): Don't use interactive-p.
Richard M. Stallman <rms@gnu.org>
parents:
56377
diff
changeset
|
8014 (defun cperl-switch-to-doc-buffer (&optional interactive) |
20323 | 8015 "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
|
8016 (interactive "p") |
20323 | 8017 (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
|
8018 (if interactive |
20323 | 8019 (switch-to-buffer-other-window buf) |
8020 (set-buffer buf)) | |
8021 (if (= (buffer-size) 0) | |
8022 (progn | |
8023 (insert (documentation-property 'cperl-short-docs | |
8024 'variable-documentation)) | |
8025 (setq buffer-read-only t))))) | |
8026 | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8027 (defun cperl-beautify-regexp-piece (b e embed level) |
20323 | 8028 ;; b is before the starting delimiter, e before the ending |
8029 ;; 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
|
8030 ;; 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
|
8031 ;; 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
|
8032 ;; 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
|
8033 ;; 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
|
8034 (let (s c tmp (m (make-marker)) (m1 (make-marker)) c1 spaces inline code pos) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8035 (if embed |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8036 (progn |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8037 (goto-char b) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8038 (setq c (if (eq embed t) (current-indentation) (current-column))) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8039 (cond ((looking-at "(\\?\\\\#") ; (?#) wrongly commented when //x-ing |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8040 (forward-char 2) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8041 (delete-char 1) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8042 (forward-char 1)) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8043 ((looking-at "(\\?[^a-zA-Z]") |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8044 (forward-char 3)) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8045 ((looking-at "(\\?") ; (?i) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8046 (forward-char 2)) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8047 (t |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8048 (forward-char 1)))) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8049 (goto-char (1+ b)) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8050 (setq c (1- (current-column)))) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8051 (setq c1 (+ c (or cperl-regexp-indent-step cperl-indent-level))) |
20323 | 8052 (or (looking-at "[ \t]*[\n#]") |
8053 (progn | |
8054 (insert "\n"))) | |
8055 (goto-char e) | |
8056 (beginning-of-line) | |
8057 (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
|
8058 (progn ; Something before the ending delimiter |
20323 | 8059 (goto-char e) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8060 (delete-horizontal-space) |
20323 | 8061 (insert "\n") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8062 (cperl-make-indent c) |
20323 | 8063 (set-marker e (point)))) |
8064 (goto-char b) | |
8065 (end-of-line 2) | |
8066 (while (< (point) (marker-position e)) | |
8067 (beginning-of-line) | |
8068 (setq s (point) | |
8069 inline t) | |
8070 (skip-chars-forward " \t") | |
8071 (delete-region s (point)) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8072 (cperl-make-indent c1) |
20323 | 8073 (while (and |
8074 inline | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8075 (looking-at |
20323 | 8076 (concat "\\([a-zA-Z0-9]+[^*+{?]\\)" ; 1 word |
8077 "\\|" ; Embedded variable | |
8078 "\\$\\([a-zA-Z0-9_]+\\([[{]\\)?\\|[^\n \t)|]\\)" ; 2 3 | |
8079 "\\|" ; $ ^ | |
8080 "[$^]" | |
8081 "\\|" ; simple-code simple-code*? | |
8082 "\\(\\\\.\\|[^][()#|*+?\n]\\)\\([*+{?]\\??\\)?" ; 4 5 | |
8083 "\\|" ; Class | |
8084 "\\(\\[\\)" ; 6 | |
8085 "\\|" ; Grouping | |
8086 "\\((\\(\\?\\)?\\)" ; 7 8 | |
8087 "\\|" ; | | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8088 "\\(|\\)"))) ; 9 |
20323 | 8089 (goto-char (match-end 0)) |
8090 (setq spaces t) | |
8091 (cond ((match-beginning 1) ; Alphanum word + junk | |
8092 (forward-char -1)) | |
8093 ((or (match-beginning 3) ; $ab[12] | |
8094 (and (match-beginning 5) ; X* X+ X{2,3} | |
8095 (eq (preceding-char) ?\{))) | |
8096 (forward-char -1) | |
8097 (forward-sexp 1)) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8098 ((and ; [], already syntaxified |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8099 (match-beginning 6) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8100 cperl-regexp-scan |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8101 cperl-use-syntax-table-text-property) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8102 (forward-char -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8103 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8104 (or (eq (preceding-char) ?\]) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8105 (error "[]-group not terminated")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8106 (re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8107 "\\=\\([*+?]\\|{[0-9]+\\(,[0-9]*\\)?}\\)\\??" e t)) |
20323 | 8108 ((match-beginning 6) ; [] |
8109 (setq tmp (point)) | |
8110 (if (looking-at "\\^?\\]") | |
8111 (goto-char (match-end 0))) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8112 ;; XXXX POSIX classes?! |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8113 (while (and (not pos) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8114 (re-search-forward "\\[:\\|\\]" e t)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8115 (if (eq (preceding-char) ?:) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8116 (or (re-search-forward ":\\]" e t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8117 (error "[:POSIX:]-group in []-group not terminated")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8118 (setq pos t))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8119 (or (eq (preceding-char) ?\]) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8120 (error "[]-group not terminated")) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8121 (re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8122 "\\=\\([*+?]\\|{[0-9]+\\(,[0-9]*\\)?}\\)\\??" e t)) |
20323 | 8123 ((match-beginning 7) ; () |
8124 (goto-char (match-beginning 0)) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8125 (setq pos (current-column)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8126 (or (eq pos c1) |
20323 | 8127 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8128 (delete-horizontal-space) |
20323 | 8129 (insert "\n") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8130 (cperl-make-indent c1))) |
20323 | 8131 (setq tmp (point)) |
8132 (forward-sexp 1) | |
8133 ;; (or (forward-sexp 1) | |
8134 ;; (progn | |
8135 ;; (goto-char tmp) | |
8136 ;; (error "()-group not terminated"))) | |
8137 (set-marker m (1- (point))) | |
8138 (set-marker m1 (point)) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8139 (if (= level 1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8140 (if (progn ; indent rigidly if multiline |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
8141 ;; 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
|
8142 ;; 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
|
8143 ;; to insertion of "\n" and " " |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8144 (goto-char tmp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8145 (search-forward "\n" m1 t)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8146 (indent-rigidly (point) m1 (- c1 pos))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8147 (setq level (1- level)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8148 (cond |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8149 ((not (match-beginning 8)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8150 (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
|
8151 ((eq (char-after (+ 2 tmp)) ?\{) ; Code |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8152 t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8153 ((eq (char-after (+ 2 tmp)) ?\() ; Conditional |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8154 (goto-char (+ 2 tmp)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8155 (forward-sexp 1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8156 (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
|
8157 ((eq (char-after (+ 2 tmp)) ?<) ; Lookbehind |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8158 (goto-char (+ 3 tmp)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8159 (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
|
8160 (t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8161 (cperl-beautify-regexp-piece tmp m t level)))) |
20323 | 8162 (goto-char m1) |
8163 (cond ((looking-at "[*+?]\\??") | |
8164 (goto-char (match-end 0))) | |
8165 ((eq (following-char) ?\{) | |
8166 (forward-sexp 1) | |
8167 (if (eq (following-char) ?\?) | |
8168 (forward-char)))) | |
8169 (skip-chars-forward " \t") | |
8170 (setq spaces nil) | |
8171 (if (looking-at "[#\n]") | |
8172 (progn | |
8173 (or (eolp) (indent-for-comment)) | |
8174 (beginning-of-line 2)) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8175 (delete-horizontal-space) |
20323 | 8176 (insert "\n")) |
8177 (end-of-line) | |
8178 (setq inline nil)) | |
8179 ((match-beginning 9) ; | | |
8180 (forward-char -1) | |
8181 (setq tmp (point)) | |
8182 (beginning-of-line) | |
8183 (if (re-search-forward "[^ \t]" tmp t) | |
8184 (progn | |
8185 (goto-char tmp) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8186 (delete-horizontal-space) |
20323 | 8187 (insert "\n")) |
8188 ;; first at line | |
8189 (delete-region (point) tmp)) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8190 (cperl-make-indent c) |
20323 | 8191 (forward-char 1) |
8192 (skip-chars-forward " \t") | |
8193 (setq spaces nil) | |
8194 (if (looking-at "[#\n]") | |
8195 (beginning-of-line 2) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8196 (delete-horizontal-space) |
20323 | 8197 (insert "\n")) |
8198 (end-of-line) | |
8199 (setq inline nil))) | |
8200 (or (looking-at "[ \t\n]") | |
8201 (not spaces) | |
8202 (insert " ")) | |
8203 (skip-chars-forward " \t")) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8204 (or (looking-at "[#\n]") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8205 (error "Unknown code `%s' in a regexp" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8206 (buffer-substring (point) (1+ (point))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8207 (and inline (end-of-line 2))) |
20323 | 8208 ;; Special-case the last line of group |
8209 (if (and (>= (point) (marker-position e)) | |
8210 (/= (current-indentation) c)) | |
8211 (progn | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8212 (beginning-of-line) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8213 (cperl-make-indent c))))) |
20323 | 8214 |
8215 (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
|
8216 ;; Returns position of the start |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8217 ;; XXX this is called too often! Need to cache the result! |
20323 | 8218 (save-excursion |
8219 (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
|
8220 (error "I need to have a regexp marked!")) |
20323 | 8221 ;; Find the start |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8222 (if (looking-at "\\s|") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8223 nil ; good already |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8224 (if (or (looking-at "\\([smy]\\|qr\\)\\s|") |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8225 (and (eq (preceding-char) ?q) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8226 (looking-at "\\(r\\)\\s|"))) |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8227 (goto-char (match-end 1)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8228 (re-search-backward "\\s|"))) ; Assume it is scanned already. |
20323 | 8229 ;;(forward-char 1) |
8230 (let ((b (point)) (e (make-marker)) have-x delim (c (current-column)) | |
8231 (sub-p (eq (preceding-char) ?s)) s) | |
8232 (forward-sexp 1) | |
8233 (set-marker e (1- (point))) | |
8234 (setq delim (preceding-char)) | |
8235 (if (and sub-p (eq delim (char-after (- (point) 2)))) | |
8236 (error "Possible s/blah// - do not know how to deal with")) | |
8237 (if sub-p (forward-sexp 1)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8238 (if (looking-at "\\sw*x") |
20323 | 8239 (setq have-x t) |
8240 (insert "x")) | |
8241 ;; Protect fragile " ", "#" | |
8242 (if have-x nil | |
8243 (goto-char (1+ b)) | |
8244 (while (re-search-forward "\\(\\=\\|[^\\\\]\\)\\(\\\\\\\\\\)*[ \t\n#]" e t) ; Need to include (?#) too? | |
8245 (forward-char -1) | |
8246 (insert "\\") | |
8247 (forward-char 1))) | |
8248 b))) | |
8249 | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8250 (defun cperl-beautify-regexp (&optional deep) |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
8251 "Do it. (Experimental, may change semantics, recheck the result.) |
20323 | 8252 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
|
8253 (interactive "P") |
49516
774eed0b5c78
(cperl-beautify-level, cperl-beautify-regexp): Fix use of
Juanma Barranquero <lekktu@gmail.com>
parents:
49304
diff
changeset
|
8254 (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
|
8255 (save-excursion |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8256 (goto-char (cperl-make-regexp-x)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8257 (let ((b (point)) (e (make-marker))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8258 (forward-sexp 1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8259 (set-marker e (1- (point))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8260 (cperl-beautify-regexp-piece b e nil deep)))) |
20323 | 8261 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8262 (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
|
8263 "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
|
8264 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
|
8265 (interactive) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8266 (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
|
8267 (while (not done) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8268 (or (eq (following-char) ?\() |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8269 (search-backward "(" (1+ limit) t) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8270 (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
|
8271 (setq done |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8272 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8273 (skip-chars-backward "\\") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8274 (looking-at "\\(\\\\\\\\\\)*("))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8275 (or done (forward-char -1))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8276 |
20323 | 8277 (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
|
8278 "Find an enclosing group in regexp and contract it. |
20323 | 8279 \(Experimental, may change semantics, recheck the result.) |
8280 We suppose that the regexp is scanned already." | |
8281 (interactive) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8282 ;; (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
|
8283 (cperl-regext-to-level-start) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8284 (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
|
8285 (forward-sexp 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8286 (set-marker e (1- (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8287 (goto-char b) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8288 (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
|
8289 (cond |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8290 ((match-beginning 1) ; #-comment |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8291 (or c (setq c (current-indentation))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8292 (beginning-of-line 2) ; Skip |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8293 (cperl-make-indent c)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8294 (t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8295 (delete-char -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8296 (just-one-space)))))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8297 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8298 (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
|
8299 "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
|
8300 \(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
|
8301 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
|
8302 (interactive) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8303 (save-excursion |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8304 (condition-case nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8305 (cperl-regext-to-level-start) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8306 (error ; We are outside outermost group |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8307 (goto-char (cperl-make-regexp-x)))) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8308 (let ((b (point)) (e (make-marker)) s c) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8309 (forward-sexp 1) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8310 (set-marker e (1- (point))) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8311 (goto-char (1+ b)) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8312 (while (re-search-forward "\\(\\\\\\\\\\)\\|(" e t) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
8313 (cond |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8314 ((match-beginning 1) ; Skip |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8315 nil) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8316 (t ; Group |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8317 (cperl-contract-level))))))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8318 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8319 (defun cperl-beautify-level (&optional deep) |
20323 | 8320 "Find an enclosing group in regexp and beautify it. |
8321 \(Experimental, may change semantics, recheck the result.) | |
8322 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
|
8323 (interactive "P") |
49516
774eed0b5c78
(cperl-beautify-level, cperl-beautify-regexp): Fix use of
Juanma Barranquero <lekktu@gmail.com>
parents:
49304
diff
changeset
|
8324 (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
|
8325 (save-excursion |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8326 (cperl-regext-to-level-start) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8327 (let ((b (point)) (e (make-marker))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8328 (forward-sexp 1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8329 (set-marker e (1- (point))) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8330 (cperl-beautify-regexp-piece b e 'level deep)))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8331 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8332 (defun cperl-invert-if-unless-modifiers () |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8333 "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
|
8334 \(Unfinished.)" |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8335 (interactive) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8336 (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
|
8337 (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
|
8338 (and (= (char-syntax (preceding-char)) ?w) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8339 (forward-sexp -1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8340 (setq pre-if (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8341 (cperl-backward-to-start-of-expr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8342 (setq pre-B (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8343 (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
|
8344 (cperl-forward-to-end-of-expr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8345 (setq post-A (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8346 (goto-char pre-if) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8347 (or (looking-at w-rex) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8348 ;; Find the position |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8349 (progn (goto-char post-A) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8350 (while (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8351 (not (looking-at w-rex)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8352 (> (point) pre-B)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8353 (forward-sexp -1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8354 (setq pre-if (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8355 (or (looking-at w-rex) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8356 (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
|
8357 ;; 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
|
8358 (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
|
8359 ;; First, simple part: find code boundaries |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8360 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8361 (setq post-if (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8362 (forward-sexp -2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8363 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8364 (setq post-B (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8365 (cperl-backward-to-start-of-expr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8366 (setq pre-B (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8367 (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
|
8368 (goto-char pre-if) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8369 (forward-sexp 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8370 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8371 ;; 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
|
8372 (skip-chars-backward "$@%#") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8373 (setq pre-A (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8374 (cperl-forward-to-end-of-expr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8375 (setq post-A (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8376 (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
|
8377 ;; 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
|
8378 (skip-chars-forward " \t;") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8379 (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
|
8380 (insert "\n" B ";\n}") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8381 (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
|
8382 (delete-region pre-if post-if) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8383 (delete-region pre-B post-B) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8384 (goto-char pre-B) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8385 (insert if-string " (" A ") {") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8386 (setq post-B (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8387 (if (looking-at "[ \t]+$") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8388 (delete-horizontal-space) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8389 (if (looking-at "[ \t]*#") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8390 (cperl-indent-for-comment) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8391 (just-one-space))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8392 (forward-line 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8393 (if (looking-at "[ \t]*$") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8394 (progn ; delete line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8395 (delete-horizontal-space) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8396 (delete-region (point) (1+ (point))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8397 (cperl-indent-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8398 (goto-char (1- post-B)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8399 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8400 (cperl-indent-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8401 (goto-char pre-B))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8402 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8403 (defun cperl-invert-if-unless () |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8404 "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
|
8405 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
|
8406 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
|
8407 the appropriate statement modifier." |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8408 (interactive) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8409 (and (= (char-syntax (preceding-char)) ?w) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8410 (forward-sexp -1)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8411 (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
|
8412 (let ((pre-if (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8413 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
|
8414 (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
|
8415 (forward-sexp 2) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8416 (setq post-A (point)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8417 (forward-sexp -1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8418 (setq pre-A (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8419 (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
|
8420 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8421 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8422 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8423 (forward-sexp 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8424 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8425 (eq (following-char) ?\{ )) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8426 (error nil))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8427 (if is-block |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8428 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8429 (goto-char post-A) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8430 (forward-sexp 1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8431 (setq post-B (point)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8432 (forward-sexp -1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8433 (setq pre-B (point)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8434 (if (and (eq (following-char) ?\{ ) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8435 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8436 (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
|
8437 (eq (preceding-char) ?\) ))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8438 (if (condition-case nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8439 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8440 (goto-char post-B) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8441 (forward-sexp 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8442 (forward-sexp -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8443 (looking-at "\\<els\\(e\\|if\\)\\>")) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8444 (error nil)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8445 (error |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8446 "`%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
|
8447 (goto-char (1- post-B)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8448 (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
|
8449 (if (eq (preceding-char) ?\;) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8450 (forward-char -1)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8451 (setq end-B-code (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8452 (goto-char pre-B) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8453 (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
|
8454 (setq p (match-beginning 0) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8455 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
|
8456 state (parse-partial-sexp pre-B p)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8457 (or (nth 3 state) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8458 (nth 4 state) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8459 (nth 5 state) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8460 (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
|
8461 (goto-char (match-end 0))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8462 ;; Finally got it |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8463 (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
|
8464 (skip-chars-forward " \t\n") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8465 (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
|
8466 (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
|
8467 (or (looking-at ";?[ \t\n]*}") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8468 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8469 (skip-chars-forward "; \t\n") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8470 (setq B-comment |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8471 (buffer-substring (point) (1- post-B))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8472 (and (equal B "") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8473 (setq B "1")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8474 (goto-char (1- post-A)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8475 (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
|
8476 (or (looking-at "[ \t\n]*)") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8477 (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
|
8478 (setq p (point)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8479 (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
|
8480 (skip-chars-forward " \t\n") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8481 (setq A (buffer-substring (point) p)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8482 (delete-region pre-B post-B) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8483 (delete-region pre-A post-A) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8484 (goto-char pre-if) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8485 (insert B " ") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8486 (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
|
8487 (just-one-space) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8488 (forward-word 1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8489 (setq pre-A (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8490 (insert " " A ";") |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8491 (delete-horizontal-space) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8492 (setq post-B (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8493 (if (looking-at "#") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8494 (indent-for-comment)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8495 (goto-char post-B) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8496 (forward-char -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8497 (delete-horizontal-space) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8498 (goto-char pre-A) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8499 (just-one-space) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8500 (goto-char pre-if) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8501 (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
|
8502 (while (<= (point) (marker-position pre-A)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8503 (cperl-indent-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8504 (forward-line 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8505 (goto-char (marker-position pre-A)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8506 (if B-comment |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8507 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8508 (forward-line -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8509 (indent-for-comment) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8510 (goto-char (marker-position pre-A))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8511 (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
|
8512 ;; (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
|
8513 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8514 (cperl-invert-if-unless-modifiers))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8515 ;;(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
|
8516 (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
|
8517 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8518 ;;; By Anthony Foiani <afoiani@uswest.com> |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8519 ;;; Getting help on modules in C-h f ? |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8520 ;;; This is a modified version of `man'. |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8521 ;;; 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
|
8522 ;;;###autoload |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8523 (defun cperl-perldoc (word) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8524 "Run `perldoc' on WORD." |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8525 (interactive |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8526 (list (let* ((default-entry (cperl-word-at-point)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8527 (input (read-string |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8528 (format "perldoc entry%s: " |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8529 (if (string= default-entry "") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8530 "" |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8531 (format " (default %s)" default-entry)))))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8532 (if (string= input "") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8533 (if (string= default-entry "") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8534 (error "No perldoc args given") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8535 default-entry) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8536 input)))) |
41309
8c4c4027c7bd
(cperl-perldoc): Require man before binding `manual-program'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39836
diff
changeset
|
8537 (require 'man) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8538 (let* ((case-fold-search nil) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8539 (is-func (and |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8540 (string-match "^[a-z]+$" word) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8541 (string-match (concat "^" word "\\>") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8542 (documentation-property |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8543 'cperl-short-docs |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8544 'variable-documentation)))) |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8545 (Man-switches "") |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8546 (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
|
8547 (cond |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
8548 ((featurep 'xemacs) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8549 (let ((Manual-program "perldoc") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8550 (Manual-switches (if is-func (list "-f")))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8551 (manual-entry word))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8552 (t |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8553 (Man-getpage-in-background word))))) |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8554 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8555 ;;;###autoload |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8556 (defun cperl-perldoc-at-point () |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8557 "Run a `perldoc' on the word around point." |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8558 (interactive) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8559 (cperl-perldoc (cperl-word-at-point))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8560 |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8561 (defcustom pod2man-program "pod2man" |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8562 "*File name for `pod2man'." |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8563 :type 'file |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8564 :group 'cperl) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8565 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8566 ;;; 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
|
8567 (defun cperl-pod-to-manpage () |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8568 "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
|
8569 (interactive) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8570 (require 'man) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8571 (let* ((pod2man-args (concat buffer-file-name " | nroff -man ")) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8572 (bufname (concat "Man " buffer-file-name)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8573 (buffer (generate-new-buffer bufname))) |
105813
df4934f25eef
* textmodes/two-column.el (2C-split):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104995
diff
changeset
|
8574 (with-current-buffer buffer |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8575 (let ((process-environment (copy-sequence process-environment))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8576 ;; Prevent any attempt to use display terminal fanciness. |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8577 (setenv "TERM" "dumb") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8578 (set-process-sentinel |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8579 (start-process pod2man-program buffer "sh" "-c" |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8580 (format (cperl-pod2man-build-command) pod2man-args)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8581 'Man-bgproc-sentinel))))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8582 |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8583 ;;; Updated version by him too |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8584 (defun cperl-build-manpage () |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8585 "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
|
8586 (interactive) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8587 (require 'man) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8588 (cond |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
8589 ((featurep 'xemacs) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8590 (let ((Manual-program "perldoc")) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8591 (manual-entry buffer-file-name))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8592 (t |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8593 (let* ((manual-program "perldoc") |
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8594 (Man-switches "")) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8595 (Man-getpage-in-background buffer-file-name))))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8596 |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8597 (defun cperl-pod2man-build-command () |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8598 "Builds the entire background manpage and cleaning command." |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8599 (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
|
8600 (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
|
8601 (while (and flist (car flist)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8602 (let ((pcom (car (car flist))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8603 (pargs (cdr (car flist)))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8604 (setq command |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8605 (concat command " | " pcom " " |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8606 (mapconcat '(lambda (phrase) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8607 (if (not (stringp phrase)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8608 (error "Malformed Man-filter-list")) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8609 phrase) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8610 pargs " "))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8611 (setq flist (cdr flist)))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8612 command)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8613 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8614 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8615 (defun cperl-next-interpolated-REx-1 () |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8616 "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
|
8617 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
|
8618 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8619 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
|
8620 (interactive "") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8621 (cperl-next-interpolated-REx 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8622 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8623 (defun cperl-next-interpolated-REx-0 () |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8624 "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
|
8625 (interactive "") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8626 (cperl-next-interpolated-REx 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8627 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8628 (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
|
8629 "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
|
8630 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
|
8631 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
|
8632 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8633 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
|
8634 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
|
8635 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8636 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
|
8637 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
|
8638 (interactive "P") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8639 (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
|
8640 (or beg (setq beg (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8641 (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
|
8642 (let (pp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8643 (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
|
8644 (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
|
8645 (cperl-map-pods-heres |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8646 (function (lambda (s e p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8647 (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
|
8648 t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8649 (setq pp s) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8650 nil))) ; nil stops |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8651 'REx-interpolated beg limit) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8652 (if pp (goto-char pp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8653 (message "No more interpolated REx")))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8654 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8655 ;;; Initial version contributed by Trey Belew |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8656 (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
|
8657 "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
|
8658 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
|
8659 (interactive "") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8660 (cperl-pod-spell t beg end)) |
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-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
|
8663 "Spell-check POD documentation. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8664 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
|
8665 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
|
8666 (interactive "P") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8667 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8668 (let (beg end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8669 (if (cperl-mark-active) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8670 (setq beg (min (mark) (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8671 end (max (mark) (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8672 (setq beg (point-min) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8673 end (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8674 (cperl-map-pods-heres (function |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8675 (lambda (s e p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8676 (if do-heres |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8677 (setq e (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8678 (goto-char e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8679 (forward-line -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8680 (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8681 (ispell-region s e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8682 t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8683 (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
|
8684 beg end)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8685 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8686 (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
|
8687 "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
|
8688 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
|
8689 function returns nil." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8690 (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
|
8691 (or prop (setq prop 'in-pod)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8692 (or s (setq s (point-min))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8693 (or end (setq end (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8694 (cperl-update-syntaxification end end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8695 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8696 (goto-char (setq pos s)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8697 (while (and cont (< pos end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8698 (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
|
8699 (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
|
8700 (and has-prop |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8701 (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
|
8702 (setq pos posend))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8703 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8704 ;;; Based on code by Masatake YAMATO: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8705 (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
|
8706 "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
|
8707 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
|
8708 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
|
8709 (or pos (setq pos (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8710 (cperl-update-syntaxification pos pos) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8711 (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
|
8712 (and pod |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8713 (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
|
8714 (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
|
8715 (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
|
8716 (cons b (or e (point-max)))))) |
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 (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
|
8719 "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
|
8720 POS defaults to the point." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8721 (interactive "d") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8722 (or pos (setq pos (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8723 (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
|
8724 (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
|
8725 (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
|
8726 (message |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8727 "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
|
8728 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8729 (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
|
8730 "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
|
8731 POS defaults to the point." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8732 (interactive "d") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8733 (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
|
8734 (if p |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8735 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8736 (goto-char (car p)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8737 (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
|
8738 (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
|
8739 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8740 (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
|
8741 "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
|
8742 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
|
8743 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
|
8744 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8745 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
|
8746 (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
|
8747 (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
|
8748 (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
|
8749 (cdr (or (assq face '((bold . "B<") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8750 (italic . "I<") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8751 (bold-italic . "B<I<") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8752 (underline . "C<"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8753 (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
|
8754 face)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8755 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8756 (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
|
8757 "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
|
8758 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
|
8759 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
|
8760 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
|
8761 *Messages* buffer. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8762 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8763 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
|
8764 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
|
8765 (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
|
8766 (or l (setq l 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8767 (or step (setq step 500)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8768 (or lim (setq lim 40)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8769 (let* ((timems (function (lambda () |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8770 (let ((tt (current-time))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8771 (+ (* 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
|
8772 (tt (funcall timems)) (c 0) delta tot) |
104544
5a7504ff8b85
(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
Glenn Morris <rgm@gnu.org>
parents:
104396
diff
changeset
|
8773 (goto-char (point-min)) |
5a7504ff8b85
(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
Glenn Morris <rgm@gnu.org>
parents:
104396
diff
changeset
|
8774 (forward-line (1- l)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8775 (cperl-mode) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8776 (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
|
8777 (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
|
8778 (while (and (< c lim) (not (eobp))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8779 (forward-line step) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8780 (setq l (+ l step)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8781 (setq c (1+ c)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8782 (cperl-update-syntaxification (point) (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8783 (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
|
8784 (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
|
8785 tot)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8786 |
85762
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
8787 (defvar font-lock-cache-position) |
29e75576e47f
* calc/calc.el (calc-emacs-type-lucid): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85223
diff
changeset
|
8788 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8789 (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
|
8790 "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
|
8791 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
|
8792 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
|
8793 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
|
8794 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
|
8795 (interactive |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8796 "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
|
8797 (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
|
8798 (let ((pos (if (> window-size 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8799 (point-min) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8800 (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8801 p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8802 (goto-char pos) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8803 (normal-mode) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8804 ;; Why needed??? With older font-locks??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8805 (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
|
8806 (while (if (> window-size 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8807 (< pos (point-max)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8808 (> pos (point-min))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8809 (setq p (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8810 (forward-line window-size) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8811 (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8812 (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
|
8813 (setq pos p)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8814 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8815 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8816 (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
|
8817 (defun cperl-lazy-unstall ()) ; Avoid a warning |
20323 | 8818 |
8819 (if (fboundp 'run-with-idle-timer) | |
8820 (progn | |
8821 (defvar cperl-help-shown nil | |
8822 "Non-nil means that the help was already shown now.") | |
8823 | |
8824 (defvar cperl-lazy-installed nil | |
8825 "Non-nil means that the lazy-help handlers are installed now.") | |
8826 | |
8827 (defun cperl-lazy-install () | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8828 "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
|
8829 Delay of auto-help controlled by `cperl-lazy-help-time'." |
20323 | 8830 (interactive) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8831 (make-local-variable 'cperl-help-shown) |
20323 | 8832 (if (and (cperl-val 'cperl-lazy-help-time) |
8833 (not cperl-lazy-installed)) | |
8834 (progn | |
8835 (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
|
8836 (run-with-idle-timer |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8837 (cperl-val 'cperl-lazy-help-time 1000000 5) |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8838 t |
20323 | 8839 'cperl-get-help-defer) |
8840 (setq cperl-lazy-installed t)))) | |
8841 | |
8842 (defun cperl-lazy-unstall () | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8843 "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
|
8844 Delay of auto-help controlled by `cperl-lazy-help-time'." |
20323 | 8845 (interactive) |
8846 (remove-hook 'post-command-hook 'cperl-lazy-hook) | |
8847 (cancel-function-timers 'cperl-get-help-defer) | |
8848 (setq cperl-lazy-installed nil)) | |
8849 | |
8850 (defun cperl-lazy-hook () | |
8851 (setq cperl-help-shown nil)) | |
8852 | |
8853 (defun cperl-get-help-defer () | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8854 (if (not (memq major-mode '(perl-mode cperl-mode))) nil |
20323 | 8855 (let ((cperl-message-on-help-error nil) (cperl-help-from-timer t)) |
8856 (cperl-get-help) | |
8857 (setq cperl-help-shown t)))) | |
8858 (cperl-lazy-install))) | |
8859 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8860 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8861 ;;; Plug for wrong font-lock: |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8862 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8863 (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
|
8864 (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
|
8865 (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
|
8866 before-change-functions after-change-functions |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8867 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
|
8868 (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
|
8869 (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
|
8870 (set-buffer-modified-p nil)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8871 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8872 (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
|
8873 "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
|
8874 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
|
8875 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
|
8876 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
|
8877 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8878 (goto-char beg) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8879 (while (and beg |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8880 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8881 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8882 (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
|
8883 'multiline))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8884 (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
|
8885 (goto-char beg))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8886 (setq beg (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8887 (goto-char end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8888 (while (and end |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8889 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8890 (or (bolp) (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8891 (forward-line 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8892 (error nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8893 (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
|
8894 'multiline))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8895 (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
|
8896 (goto-char end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8897 (setq end (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8898 (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
|
8899 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8900 (defvar cperl-d-l nil) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8901 (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
|
8902 ;; Some vars for debugging only |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8903 ;; (message "Syntaxifying...") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8904 (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
|
8905 (istate (car cperl-syntax-state)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8906 start from-start edebug-backtrace-buffer) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8907 (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
|
8908 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8909 (require 'edebug) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8910 (let ((f 'edebug-backtrace)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8911 (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
|
8912 (or cperl-syntax-done-to |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8913 (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
|
8914 from-start t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8915 (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
|
8916 (not from-start)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8917 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
|
8918 ;; 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
|
8919 (min cperl-syntax-done-to (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8920 (goto-char start) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8921 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8922 (setq start (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8923 (and cperl-syntaxify-unwind |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8924 (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
|
8925 start (point))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8926 (and (> end start) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8927 (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
|
8928 (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
|
8929 (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
|
8930 (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
|
8931 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
|
8932 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
|
8933 nil)) ; Do not iterate |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8934 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8935 (defun cperl-fontify-update (end) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8936 (let ((pos (point-min)) prop posend) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8937 (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
|
8938 (while (< pos end) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8939 (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
|
8940 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
|
8941 (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
|
8942 (setq pos posend))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8943 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
|
8944 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8945 (defun cperl-fontify-update-bad (end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8946 ;; 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
|
8947 ;; 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
|
8948 (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
|
8949 (if prop |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8950 (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
|
8951 (cperl-1+ pos) 'cperl-postpone) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8952 (point-min)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8953 (while (< pos end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8954 (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
|
8955 (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
|
8956 (setq pos posend) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8957 (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
|
8958 nil) ; Do not iterate |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8959 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8960 ;; 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
|
8961 (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
|
8962 ;; 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
|
8963 ;; 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
|
8964 (if cperl-syntax-done-to |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8965 (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
|
8966 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8967 (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
|
8968 (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
|
8969 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
|
8970 (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
|
8971 (< 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
|
8972 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8973 (save-excursion |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8974 (goto-char from) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8975 (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
|
8976 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8977 (defvar cperl-version |
104310
2ecd57cadf51
* progmodes/cperl-mode.el: Merge upstream 6.2.
Chong Yidong <cyd@stupidchicken.com>
parents:
102228
diff
changeset
|
8978 (let ((v "Revision: 6.2")) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8979 (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
|
8980 (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
|
8981 "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
|
8982 |
20323 | 8983 (provide 'cperl-mode) |
8984 | |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92148
diff
changeset
|
8985 ;; arch-tag: 42e5b19b-e187-4537-929f-1a7408980ce6 |
20323 | 8986 ;;; cperl-mode.el ends here |