Mercurial > emacs
annotate lisp/progmodes/cperl-mode.el @ 75362:f8f788e27407
Add missing comma in copyright years.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sun, 21 Jan 2007 20:47:39 +0000 |
parents | e3694f1cb928 |
children | 08cc2843c940 95d0cdf160ea |
rev | line source |
---|---|
20323 | 1 ;;; cperl-mode.el --- Perl code editing commands for Emacs |
2 | |
64699
629afbe74e61
Update copyright for release of 22.1 for progmodes directory.
Nick Roberts <nickrob@snap.net.nz>
parents:
64085
diff
changeset
|
3 ;; Copyright (C) 1985, 1986, 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1997, |
75347 | 4 ;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 |
20323 | 5 ;; Free Software Foundation, Inc. |
6 | |
7 ;; Author: Ilya Zakharevich and Bob Olson | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8 ;; Maintainer: Ilya Zakharevich <ilyaz@cpan.org> |
20323 | 9 ;; Keywords: languages, Perl |
10 | |
11 ;; This file is part of GNU Emacs. | |
12 | |
13 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
14 ;; it under the terms of the GNU General Public License as published by | |
15 ;; the Free Software Foundation; either version 2, or (at your option) | |
16 ;; any later version. | |
17 | |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 ;; GNU General Public License for more details. | |
22 | |
23 ;; You should have received a copy of the GNU General Public License | |
24 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
64085 | 25 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
26 ;; Boston, MA 02110-1301, USA. | |
20323 | 27 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
28 ;;; Corrections made by Ilya Zakharevich ilyaz@cpan.org |
20323 | 29 |
30 ;;; Commentary: | |
31 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
32 ;; You can either fine-tune the bells and whistles of this mode or |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
33 ;; bulk enable them by putting |
20323 | 34 |
35 ;; (setq cperl-hairy t) | |
36 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
37 ;; in your .emacs file. (Emacs rulers do not consider it politically |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
38 ;; correct to make whistles enabled by default.) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
39 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
40 ;; DO NOT FORGET to read micro-docs (available from `Perl' menu) <<<<<< |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
41 ;; or as help on variables `cperl-tips', `cperl-problems', <<<<<< |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
42 ;; `cperl-praise', `cperl-speed'. <<<<<< |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
43 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
44 ;; The mode information (on C-h m) provides some customization help. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
45 ;; If you use font-lock feature of this mode, it is advisable to use |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
46 ;; either lazy-lock-mode or fast-lock-mode. I prefer lazy-lock. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
47 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
48 ;; Faces used now: three faces for first-class and second-class keywords |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
49 ;; and control flow words, one for each: comments, string, labels, |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
50 ;; functions definitions and packages, arrays, hashes, and variable |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
51 ;; definitions. If you do not see all these faces, your font-lock does |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
52 ;; not define them, so you need to define them manually. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
53 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
54 ;; This mode supports font-lock, imenu and mode-compile. In the |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
55 ;; hairy version font-lock is on, but you should activate imenu |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
56 ;; yourself (note that mode-compile is not standard yet). Well, you |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
57 ;; can use imenu from keyboard anyway (M-x imenu), but it is better |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
58 ;; to bind it like that: |
20323 | 59 |
60 ;; (define-key global-map [M-S-down-mouse-3] 'imenu) | |
61 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
62 ;;; Font lock bugs as of v4.32: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
63 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
64 ;; The following kinds of Perl code erroneously start strings: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
65 ;; \$` \$' \$" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
66 ;; $opt::s $opt_s $opt{s} (s => ...) /\s+.../ |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
67 ;; likewise with m, tr, y, q, qX instead of s |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
68 |
20323 | 69 ;;; Code: |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
70 |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
71 (defvar vc-rcs-header) |
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
72 (defvar vc-sccs-header) |
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
73 |
31821 | 74 (eval-when-compile |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
75 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
76 (require 'custom) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
77 (error nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
78 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
79 (require 'man) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
80 (error nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
81 (defconst cperl-xemacs-p (string-match "XEmacs\\|Lucid" emacs-version)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
82 (defvar cperl-can-font-lock |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
83 (or cperl-xemacs-p |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
84 (and (boundp 'emacs-major-version) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
85 (or window-system |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
86 (> emacs-major-version 20))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
87 (if cperl-can-font-lock |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
88 (require 'font-lock)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
89 (defvar msb-menu-cond) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
90 (defvar gud-perldb-history) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
91 (defvar font-lock-background-mode) ; not in Emacs |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
92 (defvar font-lock-display-type) ; ditto |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
93 (defvar paren-backwards-message) ; Not in newer XEmacs? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
94 (or (fboundp 'defgroup) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
95 (defmacro defgroup (name val doc &rest arr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
96 nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
97 (or (fboundp 'custom-declare-variable) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
98 (defmacro defcustom (name val doc &rest arr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
99 (` (defvar (, name) (, val) (, doc))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
100 (or (and (fboundp 'custom-declare-variable) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
101 (string< "19.31" emacs-version)) ; Checked with 19.30: defface does not work |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
102 (defmacro defface (&rest arr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
103 nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
104 ;; Avoid warning (tmp definitions) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
105 (or (fboundp 'x-color-defined-p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
106 (defmacro x-color-defined-p (col) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
107 (cond ((fboundp 'color-defined-p) (` (color-defined-p (, col)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
108 ;; XEmacs >= 19.12 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
109 ((fboundp 'valid-color-name-p) (` (valid-color-name-p (, col)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
110 ;; XEmacs 19.11 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
111 ((fboundp 'x-valid-color-name-p) (` (x-valid-color-name-p (, col)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
112 (t '(error "Cannot implement color-defined-p"))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
113 (defmacro cperl-is-face (arg) ; Takes quoted arg |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
114 (cond ((fboundp 'find-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
115 (` (find-face (, arg)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
116 (;;(and (fboundp 'face-list) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
117 ;; (face-list)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
118 (fboundp 'face-list) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
119 (` (member (, arg) (and (fboundp 'face-list) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
120 (face-list))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
121 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
122 (` (boundp (, arg)))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
123 (defmacro cperl-make-face (arg descr) ; Takes unquoted arg |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
124 (cond ((fboundp 'make-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
125 (` (make-face (quote (, arg))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
126 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
127 (` (defvar (, arg) (quote (, arg)) (, descr)))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
128 (defmacro cperl-force-face (arg descr) ; Takes unquoted arg |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
129 (` (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
130 (or (cperl-is-face (quote (, arg))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
131 (cperl-make-face (, arg) (, descr))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
132 (or (boundp (quote (, arg))) ; We use unquoted variants too |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
133 (defvar (, arg) (quote (, arg)) (, descr)))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
134 (if cperl-xemacs-p |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
135 (defmacro cperl-etags-snarf-tag (file line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
136 (` (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
137 (beginning-of-line 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
138 (list (, file) (, line))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
139 (defmacro cperl-etags-snarf-tag (file line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
140 (` (etags-snarf-tag)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
141 (if cperl-xemacs-p |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
142 (defmacro cperl-etags-goto-tag-location (elt) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
143 (`;;(progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
144 ;; (switch-to-buffer (get-file-buffer (elt (, elt) 0))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
145 ;; (set-buffer (get-file-buffer (elt (, elt) 0))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
146 ;; Probably will not work due to some save-excursion??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
147 ;; Or save-file-position? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
148 ;; (message "Did I get to line %s?" (elt (, elt) 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
149 (goto-line (string-to-int (elt (, elt) 1))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
150 ;;) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
151 (defmacro cperl-etags-goto-tag-location (elt) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
152 (` (etags-goto-tag-location (, elt)))))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
153 |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
154 (defconst cperl-xemacs-p (string-match "XEmacs\\|Lucid" emacs-version)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
155 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
156 (defvar cperl-can-font-lock |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
157 (or cperl-xemacs-p |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
158 (and (boundp 'emacs-major-version) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
159 (or window-system |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
160 (> emacs-major-version 20))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
161 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
162 (defun cperl-choose-color (&rest list) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
163 (let (answer) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
164 (while list |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
165 (or answer |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
166 (if (or (x-color-defined-p (car list)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
167 (null (cdr list))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
168 (setq answer (car list)))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
169 (setq list (cdr list))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
170 answer)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
171 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
172 (defgroup cperl nil |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
173 "Major mode for editing Perl code." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
174 :prefix "cperl-" |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
175 :group 'languages |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
176 :version "20.3") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
177 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
178 (defgroup cperl-indentation-details nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
179 "Indentation." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
180 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
181 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
182 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
183 (defgroup cperl-affected-by-hairy nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
184 "Variables affected by `cperl-hairy'." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
185 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
186 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
187 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
188 (defgroup cperl-autoinsert-details nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
189 "Auto-insert tuneup." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
190 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
191 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
192 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
193 (defgroup cperl-faces nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
194 "Fontification colors." |
66963
a11fdee52c05
Add :link (custom-group-link font-lock-faces) to defgroup.
Juri Linkov <juri@jurta.org>
parents:
65229
diff
changeset
|
195 :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
196 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
197 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
198 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
199 (defgroup cperl-speed nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
200 "Speed vs. validity tuneup." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
201 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
202 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
203 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
204 (defgroup cperl-help-system nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
205 "Help system tuneup." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
206 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
207 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
208 |
20323 | 209 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
210 (defcustom cperl-extra-newline-before-brace nil |
20323 | 211 "*Non-nil means that if, elsif, while, until, else, for, foreach |
212 and do constructs look like: | |
213 | |
214 if () | |
215 { | |
216 } | |
217 | |
218 instead of: | |
219 | |
220 if () { | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
221 }" |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
222 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
223 :group 'cperl-autoinsert-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
224 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
225 (defcustom cperl-extra-newline-before-brace-multiline |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
226 cperl-extra-newline-before-brace |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
227 "*Non-nil means the same as `cperl-extra-newline-before-brace', but |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
228 for constructs with multiline if/unless/while/until/for/foreach condition." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
229 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
230 :group 'cperl-autoinsert-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
231 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
232 (defcustom cperl-indent-level 2 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
233 "*Indentation of CPerl statements with respect to containing block." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
234 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
235 :group 'cperl-indentation-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
236 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
237 (defcustom cperl-lineup-step nil |
20323 | 238 "*`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
|
239 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
|
240 :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
|
241 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
242 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
243 (defcustom cperl-brace-imaginary-offset 0 |
20323 | 244 "*Imagined indentation of a Perl open brace that actually follows a statement. |
245 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
|
246 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
|
247 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
248 :group 'cperl-indentation-details) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
249 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
250 (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
|
251 "*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
|
252 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
253 :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
|
254 (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
|
255 "*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
|
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 (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
|
259 "*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
|
260 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
261 :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
|
262 (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
|
263 "*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
|
264 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
265 :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
|
266 (defcustom cperl-continued-brace-offset 0 |
20323 | 267 "*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
|
268 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
|
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-close-paren-offset -1 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
272 "*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
|
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 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
276 (defcustom cperl-indent-wrt-brace t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
277 "*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
|
278 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
|
279 :type 'boolean |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
280 :group 'cperl-indentation-details) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
281 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
282 (defcustom cperl-auto-newline nil |
20323 | 283 "*Non-nil means automatically newline before and after braces, |
284 and after colons and semicolons, inserted in CPerl code. The following | |
285 \\[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
|
286 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
|
287 `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
|
288 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
289 :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
|
290 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
291 (defcustom cperl-autoindent-on-semi nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
292 "*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
|
293 Active if `cperl-auto-newline' is false." |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
294 :type 'boolean |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
295 :group 'cperl-autoinsert-details) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
296 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
297 (defcustom cperl-auto-newline-after-colon nil |
20323 | 298 "*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
|
299 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
|
300 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
301 :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
|
302 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
303 (defcustom cperl-tab-always-indent t |
20323 | 304 "*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
|
305 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
|
306 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
307 :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
|
308 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
309 (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
|
310 "*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
|
311 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
|
312 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
313 :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
|
314 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
315 (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
|
316 "*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
|
317 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
|
318 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
319 :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
|
320 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
321 (defcustom cperl-electric-parens-string "({[]})<" |
20323 | 322 "*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
|
323 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
|
324 :type 'string |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
325 :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
|
326 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
327 (defcustom cperl-electric-parens nil |
20323 | 328 "*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
|
329 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
|
330 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
331 :group 'cperl-affected-by-hairy) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
332 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
333 (defvar zmacs-regions) ; Avoid warning |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
334 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
335 (defcustom cperl-electric-parens-mark |
20323 | 336 (and window-system |
337 (or (and (boundp 'transient-mark-mode) ; For Emacs | |
338 transient-mark-mode) | |
339 (and (boundp 'zmacs-regions) ; For XEmacs | |
340 zmacs-regions))) | |
341 "*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
|
342 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
|
343 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
344 :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
|
345 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
346 (defcustom cperl-electric-linefeed nil |
20323 | 347 "*If true, LFD should be hairy in CPerl, otherwise C-c LFD is hairy. |
348 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
|
349 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
|
350 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
351 :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
|
352 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
353 (defcustom cperl-electric-keywords nil |
20323 | 354 "*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
|
355 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
|
356 |
c8f5a9de4a5e
(cperl-electric-keywords): Document in the doc string how to use personal
Eli Zaretskii <eliz@gnu.org>
parents:
74429
diff
changeset
|
357 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
|
358 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
|
359 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
|
360 \\[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
|
361 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
|
362 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
|
363 " |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
364 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
365 :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
|
366 |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
367 (defcustom cperl-electric-backspace-untabify t |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
368 "*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
|
369 :type 'boolean |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
370 :group 'cperl-autoinsert-details) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
371 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
372 (defcustom cperl-hairy nil |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
373 "*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
|
374 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
|
375 `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
|
376 `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
|
377 `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
|
378 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
379 :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
|
380 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
381 (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
|
382 "*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
|
383 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
384 :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
|
385 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
386 (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
|
387 "*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
|
388 :type 'boolean |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
389 :group 'cperl-indentation-details) |
62686
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
390 |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
391 (defcustom cperl-vc-sccs-header '("($sccs) = ('%W\%' =~ /(\\d+(\\.\\d+)+)/) ;") |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
392 "*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
|
393 :type '(repeat string) |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
394 :group 'cperl) |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
395 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
396 (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
|
397 "*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
|
398 :type '(repeat string) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
399 :group 'cperl) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
400 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
401 ;; This became obsolete... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
402 (defvar cperl-vc-header-alist nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
403 (make-obsolete-variable |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
404 'cperl-vc-header-alist |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
405 "use cperl-vc-rcs-header or cperl-vc-sccs-header instead.") |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
406 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
407 (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
|
408 (not |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
409 (and |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
410 (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
|
411 (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
|
412 (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
|
413 "*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
|
414 :type 'boolean |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
415 :group 'cperl) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
416 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
417 (defcustom cperl-info-on-command-no-prompt nil |
20323 | 418 "*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
|
419 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
|
420 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
|
421 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
422 :group 'cperl-affected-by-hairy) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
423 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
424 (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
|
425 "*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
|
426 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
|
427 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
|
428 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
429 :group 'cperl-affected-by-hairy) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
430 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
431 (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
|
432 "*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
|
433 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
|
434 :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
|
435 :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
|
436 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
437 (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
|
438 "*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
|
439 :type 'face |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
440 :group 'cperl-faces) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
441 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
442 (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
|
443 "*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
|
444 Font for POD headers." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
445 :type 'face |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
446 :group 'cperl-faces) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
447 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
448 (defcustom cperl-here-face 'font-lock-string-face |
31821 | 449 "*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
|
450 :type 'face |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
451 :group 'cperl-faces) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
452 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
453 ;;; Some double-evaluation happened with font-locks... Needed with 21.2... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
454 (defvar cperl-singly-quote-face cperl-xemacs-p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
455 |
73461
c09fdf139d4a
* progmodes/cperl-mode.el (cperl-invalid-face): Fix defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
73457
diff
changeset
|
456 (defcustom cperl-invalid-face 'underline |
c09fdf139d4a
* progmodes/cperl-mode.el (cperl-invalid-face): Fix defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
73457
diff
changeset
|
457 "*Face for highlighting trailing whitespace." |
31821 | 458 :type 'face |
35013
587807c5e8e6
(cperl-invalid-face): Don't double-quote
Dave Love <fx@gnu.org>
parents:
32880
diff
changeset
|
459 :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
|
460 :group 'cperl-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
461 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
462 (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
|
463 "*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
|
464 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
465 :group 'cperl-faces) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
466 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
467 (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
|
468 "*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
|
469 :type 'boolean |
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 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
472 (defcustom cperl-highlight-variables-indiscriminately nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
473 "*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
|
474 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
|
475 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
|
476 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
|
477 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
|
478 :type 'boolean |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
479 :group 'cperl) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
480 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
481 (defcustom cperl-pod-here-scan t |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
482 "*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
|
483 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
|
484 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
485 :group 'cperl-speed) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
486 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
487 (defcustom cperl-regexp-scan t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
488 "*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
|
489 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
|
490 :type 'boolean |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
491 :group 'cperl-speed) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
492 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
493 (defcustom cperl-hook-after-change t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
494 "*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
|
495 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
|
496 after reload." |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
497 :type 'boolean |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
498 :group 'cperl-speed) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
499 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
500 (defcustom cperl-imenu-addback nil |
20323 | 501 "*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
|
502 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
|
503 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
504 :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
|
505 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
506 (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
|
507 "*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
|
508 :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
|
509 :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
|
510 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
511 (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
|
512 "*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
|
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-info-page "perl" |
20323 | 517 "*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
|
518 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
|
519 :type 'string |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
520 :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
|
521 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
522 (defcustom cperl-use-syntax-table-text-property |
20323 | 523 (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
|
524 "*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
|
525 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
526 :group 'cperl-speed) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
527 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
528 (defcustom cperl-use-syntax-table-text-property-for-tags |
20323 | 529 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
|
530 "*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
|
531 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
532 :group 'cperl-speed) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
533 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
534 (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
|
535 "*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
|
536 :type 'regexp |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
537 :group 'cperl) |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
538 |
47334
e3cfc5df817a
(cperl-noscan-files-regexp): In addition to RCS, exclude CVS directories.
Richard M. Stallman <rms@gnu.org>
parents:
46132
diff
changeset
|
539 (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
|
540 "/\\(\\.\\.?\\|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
|
541 "*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
|
542 :type 'regexp |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
543 :group 'cperl) |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
544 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
545 (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
|
546 "*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
|
547 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
|
548 :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
|
549 :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
|
550 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
551 (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
|
552 "*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
|
553 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
554 :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
|
555 |
26667
a11929b241ab
(cperl-under-as-char): Make nil the default value.
Richard M. Stallman <rms@gnu.org>
parents:
26455
diff
changeset
|
556 (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
|
557 "*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
|
558 :type 'boolean |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
559 :group 'cperl) |
20323 | 560 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
561 (defcustom cperl-extra-perl-args "" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
562 "*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
|
563 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
|
564 :type 'string |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
565 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
566 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
567 (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
|
568 "*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
|
569 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
570 :group 'cperl-help-system) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
571 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
572 (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
|
573 "*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
|
574 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
|
575 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
|
576 :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
|
577 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
578 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
579 (defcustom cperl-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
|
580 "*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
|
581 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
|
582 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
583 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
584 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
585 (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
|
586 "*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
|
587 when indenting a region. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
588 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
|
589 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
590 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
591 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
592 (defcustom cperl-merge-trailing-else t |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
593 "*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
|
594 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
|
595 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
596 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
597 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
598 (defcustom cperl-indent-parens-as-block nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
599 "*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
|
600 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
|
601 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
|
602 :type 'boolean |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
603 :group 'cperl-indentation-details) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
604 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
605 (defcustom cperl-syntaxify-by-font-lock |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
606 (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
|
607 (boundp 'parse-sexp-lookup-properties)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
608 "*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
|
609 :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
|
610 :group 'cperl-speed) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
611 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
612 (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
|
613 t |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
614 "*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
|
615 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
|
616 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
617 :group 'cperl-speed) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
618 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
619 (defcustom cperl-syntaxify-for-menu |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
620 t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
621 "*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
|
622 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
|
623 :type 'boolean |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
624 :group 'cperl-speed) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
625 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
626 (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
|
627 '((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
|
628 (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
|
629 (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
|
630 (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
|
631 (cperl-array-face nil "LightGray" bold underline) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
632 (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
|
633 (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
|
634 (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
|
635 (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
|
636 (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
|
637 (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
|
638 (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
|
639 "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
|
640 :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
|
641 (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
|
642 (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
|
643 (repeat symbol))))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
644 :group 'cperl-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
645 |
49304
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
646 (defvar cperl-dark-background |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
647 (cperl-choose-color "navy" "os2blue" "darkgreen")) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
648 (defvar cperl-dark-foreground |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
649 (cperl-choose-color "orchid1" "orange")) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
650 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
651 (defface cperl-nonoverridable-face |
49304
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
652 `((((class grayscale) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
653 (:background "Gray90" :slant italic :underline t)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
654 (((class grayscale) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
655 (: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
|
656 (((class color) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
657 (:foreground "chartreuse3")) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
658 (((class color) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
659 (:foreground ,cperl-dark-foreground)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
660 (t (:weight bold :underline t))) |
50788
2a3bf1afbe82
(cperl-nonoverridable-face): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
50255
diff
changeset
|
661 "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
|
662 :group 'cperl-faces) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
663 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
664 (defface cperl-array-face |
49304
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
665 `((((class grayscale) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
666 (:background "Gray90" :weight bold)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
667 (((class grayscale) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
668 (:foreground "Gray80" :weight bold)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
669 (((class color) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
670 (:foreground "Blue" :background "lightyellow2" :weight bold)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
671 (((class color) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
672 (: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
|
673 (t (:weight bold))) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
674 "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
|
675 :group 'cperl-faces) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
676 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
677 (defface cperl-hash-face |
49304
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
678 `((((class grayscale) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
679 (:background "Gray90" :weight bold :slant italic)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
680 (((class grayscale) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
681 (:foreground "Gray80" :weight bold :slant italic)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
682 (((class color) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
683 (: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
|
684 (((class color) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
685 (: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
|
686 (t (:weight bold :slant italic))) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
687 "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
|
688 :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
|
689 |
20323 | 690 |
691 | |
692 ;;; Short extra-docs. | |
693 | |
694 (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
|
695 "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
|
696 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
|
697 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
|
698 patches to related files. |
20323 | 699 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
700 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
|
701 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
|
702 \(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
|
703 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
|
704 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
|
705 |
20323 | 706 Get support packages choose-color.el (or font-lock-extra.el before |
707 19.30), imenu-go.el from the same place. \(Look for other files there | |
708 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
|
709 later you should use choose-color.el *instead* of font-lock-extra.el |
20323 | 710 \(and you will not get smart highlighting in C :-(). |
711 | |
712 Note that to enable Compile choices in the menu you need to install | |
713 mode-compile.el. | |
714 | |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
715 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
|
716 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
|
717 |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
718 (defalias 'perl-mode 'cperl-mode) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
719 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
720 Get perl5-info from |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
721 $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
|
722 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
|
723 $CPAN/doc/manual/info/perl5/pod2texi-0.1.tar.gz |
20323 | 724 |
725 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
|
726 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
|
727 Tools/Tags submenu in Perl menu. |
20323 | 728 |
729 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
|
730 from Perl menu, or hierarchic view of imenu. The second one uses the |
20323 | 731 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
|
732 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
|
733 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
734 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
|
735 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
736 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
|
737 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
738 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
|
739 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
|
740 |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
741 \\[normal-mode] |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
742 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
743 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
|
744 |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
745 \\[load-library] cperl-mode RET |
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
746 \\[normal-mode] |
23977
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 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
|
749 micro-docs on what I know about CPerl problems.") |
20323 | 750 |
751 (defvar cperl-problems 'please-ignore-this-line | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
752 "Description of problems in CPerl mode. |
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
753 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
|
754 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
|
755 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
|
756 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
757 `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
|
758 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
|
759 to detect it and bulk out). |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
760 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
761 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
|
762 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
|
763 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
|
764 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
765 (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
|
766 "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
|
767 |
41351
d103d22e5b4f
(cperl-problems, cperl-tips, cperl-non-problems, cperl-praise): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
41309
diff
changeset
|
768 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
|
769 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
|
770 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
|
771 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
|
772 this respect (until 2003). |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
773 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
774 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
|
775 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
|
776 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
|
777 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
|
778 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
|
779 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
780 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
|
781 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
|
782 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
|
783 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
|
784 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
|
785 braces. |
20323 | 786 |
787 This may be confusing, since the regexp s#//#/#\; may be highlighted | |
788 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
|
789 code. Or the opposite case, when a POD section is highlighted, but |
20323 | 790 may break the indentation of the following code (though indentation |
791 should work if the balance of delimiters is not broken by POD). | |
792 | |
793 The main trick (to make $ a \"backslash\") makes constructions like | |
794 ${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
|
795 to insert it as $ {aaa} (valid in perl5, not in perl4). |
20323 | 796 |
797 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
|
798 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
|
799 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
800 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
|
801 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
|
802 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
|
803 and on CPAN. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
804 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
805 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
|
806 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
|
807 via `cperl-use-syntax-table-text-property'.") |
20323 | 808 |
809 (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
|
810 "Advantages of CPerl mode. |
20323 | 811 |
812 0) It uses the newest `syntax-table' property ;-); | |
813 | |
814 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
|
815 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
|
816 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
|
817 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
818 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
|
819 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
|
820 updates syntax assist hints when you edit your script. |
20323 | 821 |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
822 2) It is generally believed to be \"the most user-friendly Emacs |
20323 | 823 package\" whatever it may mean (I doubt that the people who say similar |
824 things tried _all_ the rest of Emacs ;-), but this was not a lonely | |
825 voice); | |
826 | |
827 3) Everything is customizable, one-by-one or in a big sweep; | |
828 | |
829 4) It has many easily-accessable \"tools\": | |
830 a) Can run program, check syntax, start debugger; | |
831 b) Can lineup vertically \"middles\" of rows, like `=' in | |
832 a = b; | |
833 cc = d; | |
834 c) Can insert spaces where this impoves readability (in one | |
835 interactive sweep over the buffer); | |
836 d) Has support for imenu, including: | |
837 1) Separate unordered list of \"interesting places\"; | |
838 2) Separate TOC of POD sections; | |
839 3) Separate list of packages; | |
840 4) Hierarchical view of methods in (sub)packages; | |
841 5) and functions (by the full name - with package); | |
842 e) Has an interface to INFO docs for Perl; The interface is | |
843 very flexible, including shrink-wrapping of | |
844 documentation buffer/frame; | |
845 f) Has a builtin list of one-line explanations for perl constructs. | |
846 g) Can show these explanations if you stay long enough at the | |
847 corresponding place (or on demand); | |
848 h) Has an enhanced fontification (using 3 or 4 additional faces | |
849 comparing to font-lock - basically, different | |
850 namespaces in Perl have different colors); | |
851 i) Can construct TAGS basing on its knowledge of Perl syntax, | |
852 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
|
853 TAGS (if \"by directory\", .xs files - with C-language |
20323 | 854 bindings - are included in the scan); |
855 j) Can build a hierarchical view of classes (via imenu) basing | |
856 on generated TAGS file; | |
857 k) Has electric parentheses, electric newlines, uses Abbrev | |
858 for electric logical constructs | |
859 while () {} | |
860 with different styles of expansion (context sensitive | |
861 to be not so bothering). Electric parentheses behave | |
862 \"as they should\" in a presence of a visible region. | |
863 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
|
864 m) Can convert from |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
865 if (A) { B } |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
866 to |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
867 B if A; |
20323 | 868 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
869 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
|
870 (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
|
871 o) Highlights trailing whitespace; |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
872 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
|
873 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
|
874 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
|
875 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
|
876 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
|
877 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
|
878 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
|
879 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
|
880 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
|
881 |
20323 | 882 5) The indentation engine was very smart, but most of tricks may be |
883 not needed anymore with the support for `syntax-table' property. Has | |
884 progress indicator for indentation (with `imenu' loaded). | |
885 | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
886 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
|
887 whitespace *inside* the conditional/loop constructs. |
20323 | 888 |
889 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
|
890 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
891 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
|
892 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
|
893 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
894 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
|
895 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
|
896 |
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
897 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
|
898 capable syntax engines). |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
899 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
900 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
|
901 ") |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
902 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
903 (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
|
904 "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
|
905 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
|
906 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
907 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
|
908 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
|
909 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
910 *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
|
911 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
|
912 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
|
913 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
|
914 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
|
915 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
916 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
|
917 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
|
918 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
|
919 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
920 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
|
921 PODs and HERE-documents), or |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
922 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
|
923 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
|
924 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
925 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
|
926 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
927 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
|
928 `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
|
929 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
|
930 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
931 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
|
932 `cperl-pod-here-scan' |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
933 to nil. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
934 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
935 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
|
936 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
937 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
|
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). This will disable |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
940 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
|
941 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
|
942 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
|
943 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
944 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
|
945 of, say, long POD sections.") |
20323 | 946 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
947 (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
|
948 "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
|
949 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
950 `cperl-array-face' Array names |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
951 `cperl-hash-face' Hash names |
32422 | 952 `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
|
953 syntaxically to be not code |
32422 | 954 `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
|
955 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
|
956 `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
|
957 `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
|
958 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
|
959 (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
|
960 package names (when recognized), format names |
32422 | 961 `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
|
962 `cperl-nonoverridable-face' Non-overridable keywords, modifiers of RExen |
32422 | 963 `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
|
964 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
|
965 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
|
966 as string literals |
32422 | 967 `font-lock-type-face' Overridable keywords |
968 `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
|
969 hash names, POD headers/item names |
63458
3265e9c7ab3d
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-418
Miles Bader <miles@gnu.org>
parents:
63350
diff
changeset
|
970 `cperl-invalid' Trailing whitespace |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
971 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
972 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
|
973 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
|
974 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
|
975 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
|
976 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
977 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
|
978 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
|
979 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
980 In regular expressions (except character classes): |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
981 `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
|
982 `font-lock-constant-face': Delimiters |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
983 `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
|
984 Mismatched closing delimiters, parens |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
985 we couldn't match, misplaced quantifiers, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
986 unrecognized escape sequences |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
987 `cperl-nonoverridable-face' Modifiers, as gism in m/REx/gism |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
988 `font-lock-type-face' POSIX classes inside charclasses, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
989 escape sequences with arguments (\x \23 \p \N) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
990 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
|
991 `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
|
992 `font-lock-function-name-face' Special symbols: $ ^ . [ ] [^ ] (?{ }) (??{ }) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
993 `font-lock-builtin-face' \"Remaining\" 0-length constructs, executable |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
994 parts of a REx, not-capturing parens |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
995 `font-lock-variable-name-face' Interpolated constructs, embedded code |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
996 `font-lock-comment-face' Embedded comments |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
997 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
998 ") |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
999 |
20323 | 1000 |
1001 | |
1002 ;;; Portability stuff: | |
1003 | |
1004 (defmacro cperl-define-key (emacs-key definition &optional xemacs-key) | |
26455 | 1005 `(define-key cperl-mode-map |
1006 ,(if xemacs-key | |
1007 `(if cperl-xemacs-p ,xemacs-key ,emacs-key) | |
1008 emacs-key) | |
1009 ,definition)) | |
20323 | 1010 |
1011 (defvar cperl-del-back-ch | |
1012 (car (append (where-is-internal 'delete-backward-char) | |
1013 (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
|
1014 "Character generated by key bound to `delete-backward-char'.") |
20323 | 1015 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1016 (and (vectorp cperl-del-back-ch) (= (length cperl-del-back-ch) 1) |
20323 | 1017 (setq cperl-del-back-ch (aref cperl-del-back-ch 0))) |
1018 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1019 (defun cperl-mark-active () (mark)) ; Avoid undefined warning |
20323 | 1020 (if cperl-xemacs-p |
1021 (progn | |
1022 ;; "Active regions" are on: use region only if active | |
1023 ;; "Active regions" are off: use region unconditionally | |
1024 (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
|
1025 (if zmacs-regions (mark) t))) |
20323 | 1026 (defun cperl-use-region-p () |
1027 (if transient-mark-mode mark-active t)) | |
1028 (defun cperl-mark-active () mark-active)) | |
1029 | |
1030 (defsubst cperl-enable-font-lock () | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1031 cperl-can-font-lock) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1032 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1033 (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
|
1034 (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
|
1035 |
55049
20627b978043
(cperl-putback-char): Delete Emacs 18 definition.
Richard M. Stallman <rms@gnu.org>
parents:
54556
diff
changeset
|
1036 (if cperl-xemacs-p |
20627b978043
(cperl-putback-char): Delete Emacs 18 definition.
Richard M. Stallman <rms@gnu.org>
parents:
54556
diff
changeset
|
1037 (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
|
1038 (setq unread-command-events (list (eval '(character-to-event c)))))) |
20323 | 1039 |
1040 (or (fboundp 'uncomment-region) | |
1041 (defun uncomment-region (beg end) | |
1042 (interactive "r") | |
1043 (comment-region beg end -1))) | |
1044 | |
1045 (defvar cperl-do-not-fontify | |
1046 (if (string< emacs-version "19.30") | |
1047 'fontified | |
1048 'lazy-lock) | |
1049 "Text property which inhibits refontification.") | |
1050 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1051 (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
|
1052 ;; 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
|
1053 (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
|
1054 nil |
20323 | 1055 (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
|
1056 to cperl-do-not-fontify t))) |
20323 | 1057 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
1058 (defcustom cperl-mode-hook nil |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
1059 "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
|
1060 :type 'hook |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
1061 :group 'cperl) |
20323 | 1062 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1063 (defvar cperl-syntax-state nil) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1064 (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
|
1065 (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
|
1066 (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
|
1067 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1068 ;; Make customization possible "in reverse" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1069 (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
|
1070 (cond |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1071 ((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
|
1072 (cperl-hairy (or hairy t)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1073 (t (symbol-value symbol)))) |
20323 | 1074 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1075 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1076 (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
|
1077 "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
|
1078 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
|
1079 versions of Emacs." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1080 (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
|
1081 (or keep |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1082 (delete-horizontal-space)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1083 (indent-to column minimum) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1084 ;; 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
|
1085 (and prop |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1086 (> (current-column) 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1087 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1088 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1089 (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
|
1090 (and (looking-at "\\=[ \t]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1091 (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
|
1092 'syntax-type prop))))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1093 |
20323 | 1094 ;;; Probably it is too late to set these guys already, but it can help later: |
1095 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1096 ;;;(and cperl-clobber-mode-lists |
20323 | 1097 ;;;(setq auto-mode-alist |
1098 ;;; (append '(("\\.\\([pP][Llm]\\|al\\)$" . perl-mode)) auto-mode-alist )) | |
1099 ;;;(and (boundp 'interpreter-mode-alist) | |
1100 ;;; (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
|
1101 ;;; '(("miniperl" . perl-mode)))))) |
31821 | 1102 (eval-when-compile |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1103 (mapcar (lambda (p) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1104 (condition-case nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1105 (require p) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1106 (error nil))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1107 '(imenu easymenu etags timer man info)) |
31821 | 1108 (if (fboundp 'ps-extend-face-list) |
1109 (defmacro cperl-ps-extend-face-list (arg) | |
1110 `(ps-extend-face-list ,arg)) | |
1111 (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
|
1112 `(error "This version of Emacs has no `ps-extend-face-list'"))) |
31821 | 1113 ;; Calling `cperl-enable-font-lock' below doesn't compile on XEmacs, |
1114 ;; macros instead of defsubsts don't work on Emacs, so we do the | |
1115 ;; expansion manually. Any other suggestions? | |
1116 (require 'cl)) | |
20323 | 1117 |
1118 (defvar cperl-mode-abbrev-table nil | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
1119 "Abbrev table in use in CPerl mode buffers.") |
20323 | 1120 |
1121 (add-hook 'edit-var-mode-alist '(perl-mode (regexp . "^cperl-"))) | |
1122 | |
1123 (defvar cperl-mode-map () "Keymap used in CPerl mode.") | |
1124 | |
1125 (if cperl-mode-map nil | |
1126 (setq cperl-mode-map (make-sparse-keymap)) | |
1127 (cperl-define-key "{" 'cperl-electric-lbrace) | |
1128 (cperl-define-key "[" 'cperl-electric-paren) | |
1129 (cperl-define-key "(" 'cperl-electric-paren) | |
1130 (cperl-define-key "<" 'cperl-electric-paren) | |
1131 (cperl-define-key "}" 'cperl-electric-brace) | |
1132 (cperl-define-key "]" 'cperl-electric-rparen) | |
1133 (cperl-define-key ")" 'cperl-electric-rparen) | |
1134 (cperl-define-key ";" 'cperl-electric-semi) | |
1135 (cperl-define-key ":" 'cperl-electric-terminator) | |
1136 (cperl-define-key "\C-j" 'newline-and-indent) | |
1137 (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
|
1138 (cperl-define-key "\C-c\C-t" 'cperl-invert-if-unless) |
20323 | 1139 (cperl-define-key "\C-c\C-a" 'cperl-toggle-auto-newline) |
1140 (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
|
1141 (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
|
1142 (cperl-define-key "\C-c\C-f" 'auto-fill-mode) |
20323 | 1143 (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
|
1144 (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
|
1145 (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
|
1146 (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
|
1147 (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
|
1148 (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
|
1149 (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
|
1150 (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
|
1151 (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
|
1152 (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
|
1153 (cperl-define-key "\C-c\C-hP" 'cperl-perldoc-at-point) |
20323 | 1154 (cperl-define-key "\e\C-q" 'cperl-indent-exp) ; Usually not bound |
1155 (cperl-define-key [?\C-\M-\|] 'cperl-lineup | |
1156 [(control meta |)]) | |
1157 ;;(cperl-define-key "\M-q" 'cperl-fill-paragraph) | |
1158 ;;(cperl-define-key "\e;" 'cperl-indent-for-comment) | |
1159 (cperl-define-key "\177" 'cperl-electric-backspace) | |
1160 (cperl-define-key "\t" 'cperl-indent-command) | |
1161 ;; 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
|
1162 (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
|
1163 [(control c) (control h) F]) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1164 (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
|
1165 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1166 (cperl-define-key "\C-hf" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1167 ;;(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
|
1168 'cperl-info-on-command |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1169 [(control h) f]) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1170 (cperl-define-key "\C-hv" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1171 ;;(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
|
1172 '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
|
1173 [(control h) v]) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1174 (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
|
1175 ;;(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
|
1176 (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
|
1177 [(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
|
1178 (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
|
1179 ;;(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
|
1180 (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
|
1181 [(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
|
1182 (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
|
1183 [(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
|
1184 (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
|
1185 ;;(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
|
1186 'cperl-get-help |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1187 [(control c) (control h) v])) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1188 (if (and cperl-xemacs-p |
20323 | 1189 (<= emacs-minor-version 11) (<= emacs-major-version 19)) |
1190 (progn | |
1191 ;; 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
|
1192 ;;;;;(cperl-define-key "\M-q" 'cperl-fill-paragraph) |
20323 | 1193 (cperl-define-key "\e;" 'cperl-indent-for-comment) |
1194 (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
|
1195 (or (boundp 'fill-paragraph-function) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1196 (substitute-key-definition |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1197 'fill-paragraph 'cperl-fill-paragraph |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1198 cperl-mode-map global-map)) |
20323 | 1199 (substitute-key-definition |
1200 'indent-sexp 'cperl-indent-exp | |
1201 cperl-mode-map global-map) | |
1202 (substitute-key-definition | |
1203 'indent-region 'cperl-indent-region | |
1204 cperl-mode-map global-map) | |
1205 (substitute-key-definition | |
1206 'indent-for-comment 'cperl-indent-for-comment | |
1207 cperl-mode-map global-map))) | |
1208 | |
1209 (defvar cperl-menu) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1210 (defvar cperl-lazy-installed) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1211 (defvar cperl-old-style nil) |
20323 | 1212 (condition-case nil |
1213 (progn | |
1214 (require 'easymenu) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1215 (easy-menu-define |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1216 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
|
1217 '("Perl" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1218 ["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
|
1219 ["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
|
1220 ["Mark function" mark-defun t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1221 ["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
|
1222 ["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
|
1223 "----" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1224 ["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
|
1225 ["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
|
1226 ("Regexp" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1227 ["Beautify" cperl-beautify-regexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1228 cperl-use-syntax-table-text-property] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1229 ["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
|
1230 cperl-use-syntax-table-text-property] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1231 ["Beautify a group" cperl-beautify-level |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1232 cperl-use-syntax-table-text-property] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1233 ["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
|
1234 cperl-use-syntax-table-text-property] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1235 ["Contract a group" cperl-contract-level |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1236 cperl-use-syntax-table-text-property] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1237 ["Contract groups" cperl-contract-levels |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1238 cperl-use-syntax-table-text-property] |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1239 "----" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1240 ["Find next interpolated" cperl-next-interpolated-REx |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1241 (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
|
1242 ["Find next interpolated (no //o)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1243 cperl-next-interpolated-REx-0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1244 (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
|
1245 (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
|
1246 ["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
|
1247 cperl-next-interpolated-REx-1 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1248 (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
|
1249 ["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
|
1250 ["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
|
1251 "----" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1252 ["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
|
1253 ["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
|
1254 ["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
|
1255 "----" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1256 ["Run" mode-compile (fboundp 'mode-compile)] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1257 ["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
|
1258 (get-buffer "*compilation*"))] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1259 ["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
|
1260 ["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
|
1261 "----" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1262 ["Debugger" cperl-db 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 ("Tools" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1265 ["Imenu" imenu (fboundp 'imenu)] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1266 ["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
|
1267 "----" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1268 ["Ispell PODs" cperl-pod-spell |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1269 ;; Better not to update syntaxification here: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1270 ;; 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
|
1271 (or |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1272 (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
|
1273 (< (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1274 (and cperl-syntaxify-for-menu |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1275 (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
|
1276 (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
|
1277 (point-max)))] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1278 ["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
|
1279 (< (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1280 (and cperl-syntaxify-for-menu |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1281 (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
|
1282 (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
|
1283 (point-max))] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1284 ["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
|
1285 (eq 'here-doc (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) (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1288 (get-text-property (point) 'syntax-type)))] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1289 ["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
|
1290 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
|
1291 (memq (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) (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1294 (get-text-property (point) 'syntax-type)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1295 '(here-doc pod))] |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1296 "----" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1297 ["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
|
1298 (fboundp 'ps-extend-face-list)] |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1299 "----" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1300 ["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
|
1301 (cperl-use-region-p)] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1302 ["Profile syntaxification" cperl-time-fontification t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1303 ["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
|
1304 ["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
|
1305 ["Debug backtrace on syntactic scan (BEWARE!!!)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1306 (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
|
1307 "----" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1308 ["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
|
1309 ;;["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
|
1310 ("Tags" |
20323 | 1311 ;;; ["Create tags for current file" cperl-etags t] |
1312 ;;; ["Add tags for current file" (cperl-etags t) t] | |
1313 ;;; ["Create tags for Perl files in directory" (cperl-etags nil t) t] | |
1314 ;;; ["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
|
1315 ;;; ["Create tags for Perl files in (sub)directories" |
20323 | 1316 ;;; (cperl-etags nil 'recursive) t] |
1317 ;;; ["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
|
1318 ;;; (cperl-etags t 'recursive) t]) |
20323 | 1319 ;;;; 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
|
1320 ["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
|
1321 ["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
|
1322 ["Create tags for Perl files in directory" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1323 (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
|
1324 ["Add tags for Perl files in directory" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1325 (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
|
1326 ["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
|
1327 (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
|
1328 ["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
|
1329 (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
|
1330 ("Perl docs" |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
1331 ["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
|
1332 (fboundp 'imenu-go-find-at-position)] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1333 ["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
|
1334 ["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
|
1335 ["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
|
1336 ["Perldoc" cperl-perldoc t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1337 ["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
|
1338 ["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
|
1339 ["Auto-help on" cperl-lazy-install |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1340 (and (fboundp 'run-with-idle-timer) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1341 (not cperl-lazy-installed))] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1342 ["Auto-help off" cperl-lazy-unstall |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1343 (and (fboundp 'run-with-idle-timer) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1344 cperl-lazy-installed)]) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1345 ("Toggle..." |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1346 ["Auto newline" cperl-toggle-auto-newline t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1347 ["Electric parens" cperl-toggle-electric t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1348 ["Electric keywords" cperl-toggle-abbrev t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1349 ["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
|
1350 ["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
|
1351 ["Auto fill" auto-fill-mode t]) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1352 ("Indent styles..." |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1353 ["CPerl" (cperl-set-style "CPerl") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1354 ["PerlStyle" (cperl-set-style "PerlStyle") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1355 ["GNU" (cperl-set-style "GNU") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1356 ["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
|
1357 ["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
|
1358 ["BSD" (cperl-set-style "BSD") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1359 ["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
|
1360 ["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
|
1361 ["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
|
1362 ("Micro-docs" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1363 ["Tips" (describe-variable 'cperl-tips) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1364 ["Problems" (describe-variable 'cperl-problems) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1365 ["Speed" (describe-variable 'cperl-speed) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1366 ["Praise" (describe-variable 'cperl-praise) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1367 ["Faces" (describe-variable 'cperl-tips-faces) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1368 ["CPerl mode" (describe-function 'cperl-mode) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1369 ["CPerl version" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1370 (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
|
1371 cperl-version) t])))) |
20323 | 1372 (error nil)) |
1373 | |
1374 (autoload 'c-macro-expand "cmacexp" | |
1375 "Display the result of expanding all C macros occurring in the region. | |
1376 The expansion is entirely correct because it uses the C preprocessor." | |
1377 t) | |
1378 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1379 ;;; 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
|
1380 (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
|
1381 "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
|
1382 Should contain exactly one group.") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1383 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1384 ;;; 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
|
1385 (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
|
1386 "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
|
1387 Should contain exactly one group.") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1388 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1389 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1390 ;;; 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
|
1391 ;;; `cperl-outline-regexp', `defun-prompt-regexp'. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1392 ;;; 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
|
1393 ;;; near mentioned above variable(s)... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1394 ;;; sub($$):lvalue{} sub:lvalue{} Both allowed... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1395 (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
|
1396 "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
|
1397 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
|
1398 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
|
1399 the last)." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1400 (concat ; Assume n groups before this... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1401 "\\(" ; n+1=name-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1402 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
|
1403 "\\(::[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
|
1404 "\\)" ; END n+1=name-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1405 (if named "" "?") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1406 "\\(" ; n+4=proto-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1407 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
|
1408 "\\(([^()]*)\\)" ; n+6=prototype |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1409 "\\)?" ; END n+4=proto-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1410 "\\(" ; n+7=attr-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1411 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
|
1412 "\\(" ; n+9=start-attr |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1413 ":" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1414 (if attr (concat |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1415 "\\(" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1416 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
|
1417 "\\(\\sw\\|_\\)+" ; attr-name |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1418 ;; 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
|
1419 "\\((\\(\\\\.\\|[^\\\\()]\\|([^\\\\()]*)\\)*)\\)?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1420 "\\(" ; optional : (XXX allows trailing???) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1421 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
|
1422 ":\\)?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1423 "\\)+") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1424 "[^:]") |
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 "\\)?" ; END n+6=proto-group |
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 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1429 ;;; 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
|
1430 ;;; and `cperl-outline-level'. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1431 ;;;; 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
|
1432 (defvar cperl-imenu--function-name-regexp-perl |
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1433 (concat |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1434 "^\\(" ; 1 = all |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1435 "\\([ \t]*package" ; 2 = package-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1436 "\\(" ; 3 = package-name-group |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1437 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
|
1438 "\\([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
|
1439 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1440 "[ \t]*sub" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1441 (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
|
1442 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
|
1443 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1444 "=head\\([1-4]\\)[ \t]+" ; 16=level |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1445 "\\([^\n]+\\)$" ; 17=text |
43943
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1446 "\\)")) |
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1447 |
43899
2b9c79cd9ecb
(cperl-outline-regexp): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
43688
diff
changeset
|
1448 (defvar cperl-outline-regexp |
2b9c79cd9ecb
(cperl-outline-regexp): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
43688
diff
changeset
|
1449 (concat cperl-imenu--function-name-regexp-perl "\\|" "\\`")) |
2b9c79cd9ecb
(cperl-outline-regexp): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
43688
diff
changeset
|
1450 |
20323 | 1451 (defvar cperl-mode-syntax-table nil |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
1452 "Syntax table in use in CPerl mode buffers.") |
20323 | 1453 |
1454 (defvar cperl-string-syntax-table nil | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
1455 "Syntax table in use in CPerl mode string-like chunks.") |
20323 | 1456 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1457 (defsubst cperl-1- (p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1458 (max (point-min) (1- p))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1459 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1460 (defsubst cperl-1+ (p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1461 (min (point-max) (1+ p))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1462 |
20323 | 1463 (if cperl-mode-syntax-table |
1464 () | |
1465 (setq cperl-mode-syntax-table (make-syntax-table)) | |
1466 (modify-syntax-entry ?\\ "\\" cperl-mode-syntax-table) | |
1467 (modify-syntax-entry ?/ "." cperl-mode-syntax-table) | |
1468 (modify-syntax-entry ?* "." cperl-mode-syntax-table) | |
1469 (modify-syntax-entry ?+ "." cperl-mode-syntax-table) | |
1470 (modify-syntax-entry ?- "." cperl-mode-syntax-table) | |
1471 (modify-syntax-entry ?= "." cperl-mode-syntax-table) | |
1472 (modify-syntax-entry ?% "." cperl-mode-syntax-table) | |
1473 (modify-syntax-entry ?< "." cperl-mode-syntax-table) | |
1474 (modify-syntax-entry ?> "." cperl-mode-syntax-table) | |
1475 (modify-syntax-entry ?& "." cperl-mode-syntax-table) | |
1476 (modify-syntax-entry ?$ "\\" cperl-mode-syntax-table) | |
1477 (modify-syntax-entry ?\n ">" cperl-mode-syntax-table) | |
1478 (modify-syntax-entry ?# "<" cperl-mode-syntax-table) | |
1479 (modify-syntax-entry ?' "\"" cperl-mode-syntax-table) | |
1480 (modify-syntax-entry ?` "\"" cperl-mode-syntax-table) | |
1481 (if cperl-under-as-char | |
1482 (modify-syntax-entry ?_ "w" cperl-mode-syntax-table)) | |
1483 (modify-syntax-entry ?: "_" cperl-mode-syntax-table) | |
1484 (modify-syntax-entry ?| "." cperl-mode-syntax-table) | |
1485 (setq cperl-string-syntax-table (copy-syntax-table cperl-mode-syntax-table)) | |
1486 (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
|
1487 (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
|
1488 (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
|
1489 (modify-syntax-entry ?# "." cperl-string-syntax-table)) ; (?# comment ) |
20323 | 1490 |
1491 | |
1492 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1493 (defvar cperl-faces-init nil) |
20323 | 1494 ;; Fix for msb.el |
1495 (defvar cperl-msb-fixed nil) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1496 (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
|
1497 (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
|
1498 (defvar cperl-font-lock-multiline nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1499 (defvar cperl-compilation-error-regexp-alist nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1500 (defvar cperl-font-locking nil) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1501 |
20323 | 1502 ;;;###autoload |
1503 (defun cperl-mode () | |
1504 "Major mode for editing Perl code. | |
1505 Expression and list commands understand all C brackets. | |
1506 Tab indents for Perl code. | |
1507 Paragraphs are separated by blank lines only. | |
1508 Delete converts tabs to spaces as it moves back. | |
1509 | |
1510 Various characters in Perl almost always come in pairs: {}, (), [], | |
1511 sometimes <>. When the user types the first, she gets the second as | |
1512 well, with optional special formatting done on {}. (Disabled by | |
1513 default.) You can always quote (with \\[quoted-insert]) the left | |
1514 \"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
|
1515 since most the time you mean \"less\". CPerl mode tries to guess |
20323 | 1516 whether you want to type pair <>, and inserts is if it |
1517 appropriate. You can set `cperl-electric-parens-string' to the string that | |
1518 contains the parenths from the above list you want to be electrical. | |
1519 Electricity of parenths is controlled by `cperl-electric-parens'. | |
1520 You may also set `cperl-electric-parens-mark' to have electric parens | |
1521 look for active mark and \"embrace\" a region if possible.' | |
1522 | |
1523 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
|
1524 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1525 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
|
1526 for, foreach, formy and foreachmy. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1527 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1528 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
|
1529 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1530 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
|
1531 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
|
1532 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
|
1533 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
|
1534 } { } 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
|
1535 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
|
1536 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
|
1537 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
|
1538 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
|
1539 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1540 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
|
1541 |
20323 | 1542 bite if angry; |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1543 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1544 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
|
1545 `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
|
1546 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
|
1547 to nil.) |
20323 | 1548 |
1549 \\[cperl-linefeed] is a convenience replacement for typing carriage | |
1550 return. It places you in the next line with proper indentation, or if | |
1551 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
|
1552 |
20323 | 1553 foreach (@lines) {print; print} |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1554 |
20323 | 1555 and you are on a boundary of a statement inside braces, it will |
1556 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
|
1557 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
|
1558 `newline-and-indent' behavior, it is on \\[newline-and-indent], |
20323 | 1559 see documentation on `cperl-electric-linefeed'. |
1560 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1561 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
|
1562 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1563 if (A) { B } |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1564 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1565 into |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1566 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1567 B if A; |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1568 |
20323 | 1569 \\{cperl-mode-map} |
1570 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1571 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
|
1572 \(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
|
1573 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
|
1574 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
|
1575 \(see also `cperl-electric-parens-mark' and `cperl-electric-parens'), |
20323 | 1576 setting `cperl-electric-keywords' enables electric expansion of |
1577 control structures in CPerl. `cperl-electric-linefeed' governs which | |
1578 one of two linefeed behavior is preferable. You can enable all these | |
1579 options simultaneously (recommended mode of use) by setting | |
1580 `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
|
1581 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
|
1582 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
|
1583 consequent \\[cperl-electric-backspace]. |
20323 | 1584 |
1585 If your site has perl5 documentation in info format, you can use commands | |
1586 \\[cperl-info-on-current-command] and \\[cperl-info-on-command] to access it. | |
1587 These keys run commands `cperl-info-on-current-command' and | |
1588 `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
|
1589 `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
|
1590 \(in turn affected by `cperl-hairy'). |
20323 | 1591 |
1592 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
|
1593 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
|
1594 man via menu. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1595 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1596 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
|
1597 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
|
1598 `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
|
1599 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
|
1600 menu, or via \\[cperl-toggle-autohelp]. Requires `run-with-idle-timer'. |
20323 | 1601 |
1602 Use \\[cperl-lineup] to vertically lineup some construction - put the | |
1603 beginning of the region at the start of construction, and make region | |
1604 span the needed amount of lines. | |
1605 | |
1606 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
|
1607 `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
|
1608 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
|
1609 for indentation too, otherwise they are used for highlighting only. |
20323 | 1610 |
1611 Variables controlling indentation style: | |
1612 `cperl-tab-always-indent' | |
1613 Non-nil means TAB in CPerl mode should always reindent the current line, | |
1614 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
|
1615 `cperl-indent-left-aligned-comments' |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1616 Non-nil means that the comment starting in leftmost column should indent. |
20323 | 1617 `cperl-auto-newline' |
1618 Non-nil means automatically newline before and after braces, | |
1619 and after colons and semicolons, inserted in Perl code. The following | |
1620 \\[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
|
1621 Insertion after colons requires both this variable and |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1622 `cperl-auto-newline-after-colon' set. |
20323 | 1623 `cperl-auto-newline-after-colon' |
1624 Non-nil means automatically newline even after colons. | |
1625 Subject to `cperl-auto-newline' setting. | |
1626 `cperl-indent-level' | |
1627 Indentation of Perl statements within surrounding block. | |
1628 The surrounding block's indentation is the indentation | |
1629 of the line on which the open-brace appears. | |
1630 `cperl-continued-statement-offset' | |
1631 Extra indentation given to a substatement, such as the | |
1632 then-clause of an if, or body of a while, or just a statement continuation. | |
1633 `cperl-continued-brace-offset' | |
1634 Extra indentation given to a brace that starts a substatement. | |
1635 This is in addition to `cperl-continued-statement-offset'. | |
1636 `cperl-brace-offset' | |
1637 Extra indentation for line if it starts with an open brace. | |
1638 `cperl-brace-imaginary-offset' | |
1639 An open brace following other text is treated as if it the line started | |
1640 this far to the right of the actual line indentation. | |
1641 `cperl-label-offset' | |
1642 Extra indentation for line that is a label. | |
1643 `cperl-min-label-indent' | |
1644 Minimal indentation for line that is a label. | |
1645 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1646 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
|
1647 `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
|
1648 `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
|
1649 `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
|
1650 `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
|
1651 `cperl-continued-statement-offset' 5 4 2 4 |
20323 | 1652 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1653 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
|
1654 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
|
1655 \\[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
|
1656 \(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
|
1657 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1658 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
|
1659 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
|
1660 templates for these constructs are created (controlled by |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1661 `cperl-extra-newline-before-brace'), and how reflow-logic should treat \"continuation\" blocks of else/elsif/continue, controlled by the same variable, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1662 and by `cperl-extra-newline-before-brace-multiline', |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1663 `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
|
1664 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1665 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
|
1666 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
|
1667 `cperl-brace-offset'+`cperl-continued-statement-offset'. |
20323 | 1668 |
1669 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
|
1670 with no args. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1671 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1672 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
|
1673 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
|
1674 `cperl-praise', `cperl-speed'." |
20323 | 1675 (interactive) |
1676 (kill-all-local-variables) | |
1677 (use-local-map cperl-mode-map) | |
1678 (if (cperl-val 'cperl-electric-linefeed) | |
1679 (progn | |
1680 (local-set-key "\C-J" 'cperl-linefeed) | |
1681 (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
|
1682 (if (and |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1683 (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
|
1684 (cperl-val 'cperl-info-on-command-no-prompt)) |
20323 | 1685 (progn |
1686 ;; don't clobber the backspace binding: | |
1687 (cperl-define-key "\C-hf" 'cperl-info-on-current-command [(control h) f]) | |
1688 (cperl-define-key "\C-c\C-hf" 'cperl-info-on-command | |
1689 [(control c) (control h) f]))) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1690 (setq major-mode cperl-use-major-mode) |
20323 | 1691 (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
|
1692 (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
|
1693 (define-abbrev-table 'cperl-mode-abbrev-table '( |
20323 | 1694 ("if" "if" cperl-electric-keyword 0) |
1695 ("elsif" "elsif" cperl-electric-keyword 0) | |
1696 ("while" "while" cperl-electric-keyword 0) | |
1697 ("until" "until" cperl-electric-keyword 0) | |
1698 ("unless" "unless" cperl-electric-keyword 0) | |
1699 ("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
|
1700 ("continue" "continue" cperl-electric-else 0) |
20323 | 1701 ("for" "for" cperl-electric-keyword 0) |
1702 ("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
|
1703 ("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
|
1704 ("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
|
1705 ("do" "do" cperl-electric-keyword 0) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1706 ("=pod" "=pod" cperl-electric-pod 0) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1707 ("=over" "=over" cperl-electric-pod 0) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1708 ("=head1" "=head1" cperl-electric-pod 0) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1709 ("=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
|
1710 ("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
|
1711 ("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
|
1712 ("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
|
1713 ("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
|
1714 (setq abbrevs-changed prev-a-c)) |
20323 | 1715 (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
|
1716 (if (cperl-val 'cperl-electric-keywords) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1717 (abbrev-mode 1)) |
20323 | 1718 (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
|
1719 ;; 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
|
1720 (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
|
1721 (make-local-variable 'cperl-font-locking) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1722 (make-local-variable 'outline-regexp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1723 ;; (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
|
1724 (setq outline-regexp cperl-outline-regexp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1725 (make-local-variable 'outline-level) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1726 (setq outline-level 'cperl-outline-level) |
20323 | 1727 (make-local-variable 'paragraph-start) |
1728 (setq paragraph-start (concat "^$\\|" page-delimiter)) | |
1729 (make-local-variable 'paragraph-separate) | |
1730 (setq paragraph-separate paragraph-start) | |
1731 (make-local-variable 'paragraph-ignore-fill-prefix) | |
1732 (setq paragraph-ignore-fill-prefix t) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1733 (if cperl-xemacs-p |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1734 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1735 (make-local-variable 'paren-backwards-message) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1736 (set 'paren-backwards-message t))) |
20323 | 1737 (make-local-variable 'indent-line-function) |
1738 (setq indent-line-function 'cperl-indent-line) | |
1739 (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
|
1740 (setq require-final-newline mode-require-final-newline) |
20323 | 1741 (make-local-variable 'comment-start) |
1742 (setq comment-start "# ") | |
1743 (make-local-variable 'comment-end) | |
1744 (setq comment-end "") | |
1745 (make-local-variable 'comment-column) | |
1746 (setq comment-column cperl-comment-column) | |
1747 (make-local-variable 'comment-start-skip) | |
1748 (setq comment-start-skip "#+ *") | |
1749 (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
|
1750 ;;; "[ \t]*sub" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1751 ;;; (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
|
1752 ;;; 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
|
1753 (setq defun-prompt-regexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1754 (concat "^[ \t]*\\(sub" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1755 (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
|
1756 "\\|" ; per toke.c |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1757 "\\(BEGIN\\|CHECK\\|INIT\\|END\\|AUTOLOAD\\|DESTROY\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1758 "\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1759 cperl-maybe-white-and-comment-rex)) |
20323 | 1760 (make-local-variable 'comment-indent-function) |
1761 (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
|
1762 (and (boundp 'fill-paragraph-function) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1763 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1764 (make-local-variable 'fill-paragraph-function) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1765 (set 'fill-paragraph-function 'cperl-fill-paragraph))) |
20323 | 1766 (make-local-variable 'parse-sexp-ignore-comments) |
1767 (setq parse-sexp-ignore-comments t) | |
1768 (make-local-variable 'indent-region-function) | |
1769 (setq indent-region-function 'cperl-indent-region) | |
1770 ;;(setq auto-fill-function 'cperl-do-auto-fill) ; Need to switch on and off! | |
1771 (make-local-variable 'imenu-create-index-function) | |
1772 (setq imenu-create-index-function | |
31821 | 1773 (function cperl-imenu--create-perl-index)) |
20323 | 1774 (make-local-variable 'imenu-sort-function) |
1775 (setq imenu-sort-function nil) | |
62686
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
1776 (make-local-variable 'vc-rcs-header) |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
1777 (set 'vc-rcs-header cperl-vc-rcs-header) |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
1778 (make-local-variable 'vc-sccs-header) |
25f639ed2b2d
(cperl-vc-header-alist): Obsoleted.
André Spiegel <spiegel@gnu.org>
parents:
62402
diff
changeset
|
1779 (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
|
1780 ;; This one is obsolete... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1781 (make-local-variable 'vc-header-alist) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1782 (set 'vc-header-alist (or cperl-vc-header-alist ; Avoid warning |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1783 (` ((SCCS (, (car cperl-vc-sccs-header))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1784 (RCS (, (car cperl-vc-rcs-header))))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1785 (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
|
1786 (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
|
1787 (set 'compilation-error-regexp-alist-alist |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1788 (cons (cons 'cperl cperl-compilation-error-regexp-alist) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1789 (symbol-value 'compilation-error-regexp-alist-alist))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1790 (if (fboundp 'compilation-build-compilation-error-regexp-alist) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1791 (let ((f 'compilation-build-compilation-error-regexp-alist)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1792 (funcall f)) |
73921
9bcc33b6d297
(cperl-mode): Before adding to it, make `compilation-error-regexp-alist'
Romain Francoise <romain@orebokech.com>
parents:
73461
diff
changeset
|
1793 (make-local-variable 'compilation-error-regexp-alist) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1794 (push 'cperl compilation-error-regexp-alist))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1795 ((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
|
1796 (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
|
1797 (set 'compilation-error-regexp-alist |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1798 (cons cperl-compilation-error-regexp-alist |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1799 (symbol-value 'compilation-error-regexp-alist))))) |
20323 | 1800 (make-local-variable 'font-lock-defaults) |
1801 (setq font-lock-defaults | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1802 (cond |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1803 ((string< emacs-version "19.30") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1804 '(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
|
1805 ((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
|
1806 '((cperl-font-lock-keywords |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
1807 cperl-font-lock-keywords-1 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1808 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
|
1809 (t |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1810 '((cperl-load-font-lock-keywords |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1811 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
|
1812 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
|
1813 (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
|
1814 (setq cperl-syntax-state nil) ; reset syntaxification cache |
20323 | 1815 (if cperl-use-syntax-table-text-property |
1816 (progn | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
1817 (make-local-variable 'parse-sexp-lookup-properties) |
20323 | 1818 ;; 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
|
1819 (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
|
1820 ;; Fix broken font-lock: |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1821 (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
|
1822 (set 'font-lock-unfontify-region-function |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1823 'font-lock-default-unfontify-region)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1824 (unless cperl-xemacs-p ; Our: just a plug for wrong font-lock |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1825 (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
|
1826 (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
|
1827 '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
|
1828 (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
|
1829 (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
|
1830 (make-local-variable 'font-lock-syntactic-keywords) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1831 (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
|
1832 (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
|
1833 '((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
|
1834 ;; 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
|
1835 ;; 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
|
1836 ;; 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
|
1837 ;; are defined. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1838 '(t))))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1839 (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
|
1840 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1841 (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
|
1842 (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
|
1843 (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
|
1844 (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
|
1845 'cperl-font-lock-fontify-region-function)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1846 (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
|
1847 (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
|
1848 '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
|
1849 (make-local-variable 'cperl-old-style) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1850 (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
|
1851 (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
|
1852 'cperl-do-auto-fill) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1853 (or (fboundp 'cperl-old-auto-fill-mode) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1854 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1855 (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
|
1856 (defun auto-fill-mode (&optional arg) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1857 (interactive "P") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1858 (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
|
1859 (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
|
1860 (setq auto-fill-function 'cperl-do-auto-fill)))))) |
20323 | 1861 (if (cperl-enable-font-lock) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1862 (if (cperl-val 'cperl-font-lock) |
20323 | 1863 (progn (or cperl-faces-init (cperl-init-faces)) |
1864 (font-lock-mode 1)))) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1865 (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
|
1866 'cperl-facemenu-add-face-function) ; XXXX What this guy is for??? |
20323 | 1867 (and (boundp 'msb-menu-cond) |
1868 (not cperl-msb-fixed) | |
1869 (cperl-msb-fix)) | |
1870 (if (featurep 'easymenu) | |
22392
7300e6ab99d2
(cperl-problems): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
22391
diff
changeset
|
1871 (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
|
1872 (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
|
1873 (if cperl-hook-after-change |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1874 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1875 (make-local-hook 'after-change-functions) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1876 (add-hook 'after-change-functions 'cperl-after-change-function nil t))) |
20323 | 1877 ;; After hooks since fontification will break this |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1878 (if cperl-pod-here-scan |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1879 (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
|
1880 (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
|
1881 (cperl-find-pods-heres))))) |
20323 | 1882 |
1883 ;; Fix for perldb - make default reasonable | |
1884 (defun cperl-db () | |
1885 (interactive) | |
1886 (require 'gud) | |
1887 (perldb (read-from-minibuffer "Run perldb (like this): " | |
1888 (if (consp gud-perldb-history) | |
1889 (car gud-perldb-history) | |
1890 (concat "perl " ;;(file-name-nondirectory | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1891 ;; I have problems |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1892 ;; in OS/2 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1893 ;; otherwise |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1894 (buffer-file-name))) |
20323 | 1895 nil nil |
1896 '(gud-perldb-history . 1)))) | |
1897 | |
1898 (defun cperl-msb-fix () | |
1899 ;; Adds perl files to msb menu, supposes that msb is already loaded | |
1900 (setq cperl-msb-fixed t) | |
1901 (let* ((l (length msb-menu-cond)) | |
1902 (last (nth (1- l) msb-menu-cond)) | |
1903 (precdr (nthcdr (- l 2) msb-menu-cond)) ; cdr of this is last | |
1904 (handle (1- (nth 1 last)))) | |
1905 (setcdr precdr (list | |
1906 (list | |
36602
4bcc2745d610
(cperl-msb-fix, cperl-get-help-defer):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36601
diff
changeset
|
1907 '(memq major-mode '(cperl-mode perl-mode)) |
20323 | 1908 handle |
1909 "Perl Files (%d)") | |
1910 last)))) | |
1911 | |
1912 ;; This is used by indent-for-comment | |
1913 ;; to decide how much to indent a comment in CPerl code | |
1914 ;; based on its context. Do fallback if comment is found wrong. | |
1915 | |
1916 (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
|
1917 (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
|
1918 (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
|
1919 (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
|
1920 (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
|
1921 (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
|
1922 (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
|
1923 |
20323 | 1924 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1925 (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
|
1926 (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
|
1927 (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
|
1928 (looking-at "^#")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1929 0 ; Existing comment at bol stays there. |
20323 | 1930 ;; Wrong comment found |
1931 (save-excursion | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1932 (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
|
1933 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
|
1934 cperl-st-cfence)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1935 (if phony |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1936 (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
|
1937 (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
|
1938 (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
|
1939 (forward-char -1)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1940 (setq was nil))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1941 (if (= (point) p) ; Our caller found a correct place |
20323 | 1942 (progn |
1943 (skip-chars-backward " \t") | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1944 (setq was (current-column)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1945 (if (eq was 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1946 comment-column |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1947 (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
|
1948 comment-column))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1949 ;; No, the caller found a random place; we need to edit ourselves |
20323 | 1950 (if was nil |
1951 (insert comment-start) | |
1952 (backward-char (length comment-start))) | |
1953 (setq cperl-wrong-comment t) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1954 (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
|
1955 c))))) |
20323 | 1956 |
1957 ;;;(defun cperl-comment-indent-fallback () | |
1958 ;;; "Is called if the standard comment-search procedure fails. | |
1959 ;;;Point is at start of real comment." | |
1960 ;;; (let ((c (current-column)) target cnt prevc) | |
1961 ;;; (if (= c comment-column) nil | |
1962 ;;; (setq cnt (skip-chars-backward "[ \t]")) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1963 ;;; (setq target (max (1+ (setq prevc |
20323 | 1964 ;;; (current-column))) ; Else indent at comment column |
1965 ;;; comment-column)) | |
1966 ;;; (if (= c comment-column) nil | |
1967 ;;; (delete-backward-char cnt) | |
1968 ;;; (while (< prevc target) | |
1969 ;;; (insert "\t") | |
1970 ;;; (setq prevc (current-column))) | |
1971 ;;; (if (> prevc target) (progn (delete-char -1) (setq prevc (current-column)))) | |
1972 ;;; (while (< prevc target) | |
1973 ;;; (insert " ") | |
1974 ;;; (setq prevc (current-column))))))) | |
1975 | |
1976 (defun cperl-indent-for-comment () | |
1977 "Substitute for `indent-for-comment' in CPerl." | |
1978 (interactive) | |
1979 (let (cperl-wrong-comment) | |
1980 (indent-for-comment) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
1981 (if cperl-wrong-comment ; set by `cperl-comment-indent' |
20323 | 1982 (progn (cperl-to-comment-or-eol) |
1983 (forward-char (length comment-start)))))) | |
1984 | |
1985 (defun cperl-comment-region (b e arg) | |
1986 "Comment or uncomment each line in the region in CPerl mode. | |
1987 See `comment-region'." | |
1988 (interactive "r\np") | |
1989 (let ((comment-start "#")) | |
1990 (comment-region b e arg))) | |
1991 | |
1992 (defun cperl-uncomment-region (b e arg) | |
1993 "Uncomment or comment each line in the region in CPerl mode. | |
1994 See `comment-region'." | |
1995 (interactive "r\np") | |
1996 (let ((comment-start "#")) | |
1997 (comment-region b e (- arg)))) | |
1998 | |
1999 (defvar cperl-brace-recursing nil) | |
2000 | |
2001 (defun cperl-electric-brace (arg &optional only-before) | |
2002 "Insert character and correct line's indentation. | |
2003 If ONLY-BEFORE and `cperl-auto-newline', will insert newline before the | |
2004 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
|
2005 char is \"{\", insert extra newline before only if |
20323 | 2006 `cperl-extra-newline-before-brace'." |
2007 (interactive "P") | |
2008 (let (insertpos | |
2009 (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
|
2010 (cperl-mark-active) |
20323 | 2011 (< (mark) (point))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2012 (mark) |
20323 | 2013 nil))) |
2014 (if (and other-end | |
2015 (not cperl-brace-recursing) | |
2016 (cperl-val 'cperl-electric-parens) | |
2017 (>= (save-excursion (cperl-to-comment-or-eol) (point)) (point))) | |
2018 ;; Need to insert a matching pair | |
2019 (progn | |
2020 (save-excursion | |
2021 (setq insertpos (point-marker)) | |
2022 (goto-char other-end) | |
2023 (setq last-command-char ?\{) | |
2024 (cperl-electric-lbrace arg insertpos)) | |
2025 (forward-char 1)) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2026 ;; Check whether we close something "usual" with `}' |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2027 (if (and (eq last-command-char ?\}) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2028 (not |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2029 (condition-case nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2030 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2031 (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
|
2032 ;;(cperl-after-block-p (point-min)) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2033 (or (cperl-after-expr-p nil "{;)") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2034 ;; after sub, else, continue |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2035 (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
|
2036 (error nil)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2037 ;; Just insert the guy |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2038 (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
|
2039 (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
|
2040 (eolp) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2041 (or (and (null only-before) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2042 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2043 (skip-chars-backward " \t") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2044 (bolp))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2045 (and (eq last-command-char ?\{) ; Do not insert newline |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2046 ;; 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
|
2047 ;; 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
|
2048 (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
|
2049 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2050 (skip-chars-backward " \t") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2051 (eq (preceding-char) ?\)))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2052 (if cperl-auto-newline |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2053 (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
|
2054 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2055 (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
|
2056 (cperl-indent-line) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2057 (if cperl-auto-newline |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2058 (setq insertpos (1- (point)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2059 (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
|
2060 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2061 (newline) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2062 (cperl-indent-line))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2063 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2064 (if insertpos (progn (goto-char insertpos) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2065 (search-forward (make-string |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2066 1 last-command-char)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2067 (setq insertpos (1- (point))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2068 (delete-char -1)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2069 (if insertpos |
20323 | 2070 (save-excursion |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2071 (goto-char insertpos) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2072 (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
|
2073 (self-insert-command (prefix-numeric-value arg))))))) |
20323 | 2074 |
2075 (defun cperl-electric-lbrace (arg &optional end) | |
2076 "Insert character, correct line's indentation, correct quoting by space." | |
2077 (interactive "P") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2078 (let ((cperl-brace-recursing t) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2079 (cperl-auto-newline cperl-auto-newline) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2080 (other-end (or end |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2081 (if (and cperl-electric-parens-mark |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2082 (cperl-mark-active) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2083 (> (mark) (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2084 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2085 (goto-char (mark)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2086 (point-marker)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2087 nil))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2088 pos after) |
20323 | 2089 (and (cperl-val 'cperl-electric-lbrace-space) |
2090 (eq (preceding-char) ?$) | |
2091 (save-excursion | |
2092 (skip-chars-backward "$") | |
2093 (looking-at "\\(\\$\\$\\)*\\$\\([^\\$]\\|$\\)")) | |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
2094 (insert ?\s)) |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2095 ;; Check whether we are in comment |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2096 (if (and |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2097 (save-excursion |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2098 (beginning-of-line) |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2099 (not (looking-at "[ \t]*#"))) |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2100 (cperl-after-expr-p nil "{;)")) |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2101 nil |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
2102 (setq cperl-auto-newline nil)) |
20323 | 2103 (cperl-electric-brace arg) |
2104 (and (cperl-val 'cperl-electric-parens) | |
2105 (eq last-command-char ?{) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2106 (memq last-command-char |
20323 | 2107 (append cperl-electric-parens-string nil)) |
2108 (or (if other-end (goto-char (marker-position other-end))) | |
2109 t) | |
2110 (setq last-command-char ?} pos (point)) | |
2111 (progn (cperl-electric-brace arg t) | |
2112 (goto-char pos))))) | |
2113 | |
2114 (defun cperl-electric-paren (arg) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2115 "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
|
2116 See `cperl-electric-parens'." |
20323 | 2117 (interactive "P") |
2118 (let ((beg (save-excursion (beginning-of-line) (point))) | |
2119 (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
|
2120 (cperl-mark-active) |
20323 | 2121 (> (mark) (point))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2122 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2123 (goto-char (mark)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2124 (point-marker)) |
20323 | 2125 nil))) |
2126 (if (and (cperl-val 'cperl-electric-parens) | |
2127 (memq last-command-char | |
2128 (append cperl-electric-parens-string nil)) | |
2129 (>= (save-excursion (cperl-to-comment-or-eol) (point)) (point)) | |
2130 ;;(not (save-excursion (search-backward "#" beg t))) | |
2131 (if (eq last-command-char ?<) | |
2132 (progn | |
2133 (and abbrev-mode ; later it is too late, may be after `for' | |
2134 (expand-abbrev)) | |
2135 (cperl-after-expr-p nil "{;(,:=")) | |
2136 1)) | |
2137 (progn | |
2138 (self-insert-command (prefix-numeric-value arg)) | |
2139 (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
|
2140 (insert (make-string |
20323 | 2141 (prefix-numeric-value arg) |
2142 (cdr (assoc last-command-char '((?{ .?}) | |
2143 (?[ . ?]) | |
2144 (?( . ?)) | |
2145 (?< . ?>)))))) | |
2146 (forward-char (- (prefix-numeric-value arg)))) | |
2147 (self-insert-command (prefix-numeric-value arg))))) | |
2148 | |
2149 (defun cperl-electric-rparen (arg) | |
2150 "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
|
2151 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
|
2152 Affected by `cperl-electric-parens'." |
20323 | 2153 (interactive "P") |
2154 (let ((beg (save-excursion (beginning-of-line) (point))) | |
2155 (other-end (if (and cperl-electric-parens-mark | |
2156 (cperl-val 'cperl-electric-parens) | |
2157 (memq last-command-char | |
2158 (append cperl-electric-parens-string nil)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2159 (cperl-mark-active) |
20323 | 2160 (< (mark) (point))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2161 (mark) |
20323 | 2162 nil)) |
2163 p) | |
2164 (if (and other-end | |
2165 (cperl-val 'cperl-electric-parens) | |
2166 (memq last-command-char '( ?\) ?\] ?\} ?\> )) | |
2167 (>= (save-excursion (cperl-to-comment-or-eol) (point)) (point)) | |
2168 ;;(not (save-excursion (search-backward "#" beg t))) | |
2169 ) | |
2170 (progn | |
2171 (self-insert-command (prefix-numeric-value arg)) | |
2172 (setq p (point)) | |
2173 (if other-end (goto-char other-end)) | |
2174 (insert (make-string | |
2175 (prefix-numeric-value arg) | |
2176 (cdr (assoc last-command-char '((?\} . ?\{) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2177 (?\] . ?\[) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2178 (?\) . ?\() |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2179 (?\> . ?\<)))))) |
20323 | 2180 (goto-char (1+ p))) |
2181 (self-insert-command (prefix-numeric-value arg))))) | |
2182 | |
2183 (defun cperl-electric-keyword () | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2184 "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
|
2185 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
|
2186 to nil." |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2187 (let ((beg (save-excursion (beginning-of-line) (point))) |
20323 | 2188 (dollar (and (eq last-command-char ?$) |
2189 (eq this-command 'self-insert-command))) | |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
2190 (delete (and (memq last-command-char '(?\s ?\n ?\t ?\f)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2191 (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
|
2192 my do) |
20323 | 2193 (and (save-excursion |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2194 (condition-case nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2195 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2196 (backward-sexp 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2197 (setq do (looking-at "do\\>"))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2198 (error nil)) |
20323 | 2199 (cperl-after-expr-p nil "{;:")) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2200 (save-excursion |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2201 (not |
20323 | 2202 (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
|
2203 "[#\"'`]\\|\\<q\\(\\|[wqxr]\\)\\>" |
20323 | 2204 beg t))) |
2205 (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
|
2206 (or |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2207 (looking-at "=cut") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2208 (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
|
2209 (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
|
2210 'syntax-type) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2211 'pod)))))) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2212 (save-excursion (forward-sexp -1) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2213 (not (memq (following-char) (append "$@%&*" nil)))) |
20323 | 2214 (progn |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2215 (and (eq (preceding-char) ?y) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2216 (progn ; "foreachmy" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2217 (forward-char -2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2218 (insert " ") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2219 (forward-char 2) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2220 (setq my t dollar t |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2221 delete |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2222 (memq this-command '(self-insert-command newline))))) |
20323 | 2223 (and dollar (insert " $")) |
2224 (cperl-indent-line) | |
2225 ;;(insert " () {\n}") | |
2226 (cond | |
2227 (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
|
2228 (insert (if do "\n" " ()\n")) |
20323 | 2229 (insert "{") |
2230 (cperl-indent-line) | |
2231 (insert "\n") | |
2232 (cperl-indent-line) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2233 (insert "\n}") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2234 (and do (insert " while ();"))) |
20323 | 2235 (t |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2236 (insert (if do " {\n} while ();" " () {\n}")))) |
20323 | 2237 (or (looking-at "[ \t]\\|$") (insert " ")) |
2238 (cperl-indent-line) | |
2239 (if dollar (progn (search-backward "$") | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2240 (if my |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2241 (forward-char 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2242 (delete-char 1))) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2243 (search-backward ")") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2244 (if (eq last-command-char ?\() |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2245 (progn ; Avoid "if (())" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2246 (delete-backward-char 1) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2247 (delete-backward-char -1)))) |
20323 | 2248 (if delete |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2249 (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
|
2250 (if cperl-message-electric-keyword |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2251 (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
|
2252 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2253 (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
|
2254 "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
|
2255 (or pos (setq pos (point))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2256 (if (looking-at "\n") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2257 (forward-char 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2258 (insert "\n")) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2259 (if (> n 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2260 (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
|
2261 (goto-char pos))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2262 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2263 (defun cperl-electric-pod () |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2264 "Insert a POD chunk appropriate after a =POD directive." |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
2265 (let ((delete (and (memq last-command-char '(?\s ?\n ?\t ?\f)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2266 (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
|
2267 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
|
2268 (and (save-excursion |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2269 (forward-word -1) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
2270 (and |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2271 (eq (preceding-char) ?=) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2272 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2273 (setq head1 (looking-at "head1\\>[ \t]*$")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2274 (setq over (and (looking-at "over\\>[ \t]*$") |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2275 (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
|
2276 (forward-char -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2277 (bolp)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2278 (or |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2279 (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
|
2280 (cperl-after-expr-p nil "{;:") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2281 (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
|
2282 (not (looking-at "\n*=cut")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2283 (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
|
2284 (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
|
2285 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2286 (save-excursion |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2287 (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
|
2288 (or notlast |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2289 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2290 (insert "\n\n=cut") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2291 (cperl-ensure-newlines 2) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2292 (forward-word -2) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
2293 (if (and head1 |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
2294 (not |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2295 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2296 (forward-char -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2297 (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
|
2298 nil t)))) ; Only one |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
2299 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2300 (forward-word 1) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2301 (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
|
2302 (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
|
2303 p (point)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2304 (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
|
2305 " - \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
|
2306 "=head1 DESCRIPTION") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2307 (cperl-ensure-newlines 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2308 (goto-char p) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2309 (forward-word 2) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2310 (end-of-line) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2311 (setq really-delete t)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2312 (forward-word 1)))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2313 (if over |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2314 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2315 (setq p (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2316 (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
|
2317 "=back") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2318 (cperl-ensure-newlines 2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2319 (goto-char p) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2320 (forward-word 1) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2321 (end-of-line) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2322 (setq really-delete t))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2323 (if (and delete really-delete) |
20323 | 2324 (cperl-putback-char cperl-del-back-ch)))))) |
2325 | |
2326 (defun cperl-electric-else () | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2327 "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
|
2328 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
|
2329 to nil." |
20323 | 2330 (let ((beg (save-excursion (beginning-of-line) (point)))) |
2331 (and (save-excursion | |
2332 (backward-sexp 1) | |
2333 (cperl-after-expr-p nil "{;:")) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2334 (save-excursion |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2335 (not |
20323 | 2336 (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
|
2337 "[#\"'`]\\|\\<q\\(\\|[wqxr]\\)\\>" |
20323 | 2338 beg t))) |
2339 (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
|
2340 (looking-at "=cut") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2341 (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
|
2342 (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
|
2343 'syntax-type) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2344 'pod))))) |
20323 | 2345 (progn |
2346 (cperl-indent-line) | |
2347 ;;(insert " {\n\n}") | |
2348 (cond | |
2349 (cperl-extra-newline-before-brace | |
2350 (insert "\n") | |
2351 (insert "{") | |
2352 (cperl-indent-line) | |
2353 (insert "\n\n}")) | |
2354 (t | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2355 (insert " {\n\n}"))) |
20323 | 2356 (or (looking-at "[ \t]\\|$") (insert " ")) |
2357 (cperl-indent-line) | |
2358 (forward-line -1) | |
2359 (cperl-indent-line) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2360 (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
|
2361 (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
|
2362 (if cperl-message-electric-keyword |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2363 (message "Precede char by C-q to avoid expansion")))))) |
20323 | 2364 |
2365 (defun cperl-linefeed () | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2366 "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
|
2367 If in POD, insert appropriate lines." |
20323 | 2368 (interactive) |
2369 (let ((beg (save-excursion (beginning-of-line) (point))) | |
2370 (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
|
2371 (pos (point)) start over cut res) |
20323 | 2372 (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
|
2373 ; i.e., on a boundary and inside "{...}" |
20323 | 2374 (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
|
2375 (>= (point) pos)) ; Not in a comment |
20323 | 2376 (or (save-excursion |
2377 (skip-chars-backward " \t" beg) | |
2378 (forward-char -1) | |
2379 (looking-at "[;{]")) ; After { or ; + spaces | |
2380 (looking-at "[ \t]*}") ; Before } | |
2381 (re-search-forward "\\=[ \t]*;" end t)) ; Before spaces + ; | |
2382 (save-excursion | |
2383 (and | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2384 (eq (car (parse-partial-sexp pos end -1)) -1) |
20323 | 2385 ; Leave the level of parens |
2386 (looking-at "[,; \t]*\\($\\|#\\)") ; Comma to allow anon subr | |
2387 ; Are at end | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2388 (cperl-after-block-p (point-min)) |
20323 | 2389 (progn |
2390 (backward-sexp 1) | |
2391 (setq start (point-marker)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2392 (<= start pos))))) ; Redundant? Are after the |
20323 | 2393 ; start of parens group. |
2394 (progn | |
2395 (skip-chars-backward " \t") | |
2396 (or (memq (preceding-char) (append ";{" nil)) | |
2397 (insert ";")) | |
2398 (insert "\n") | |
2399 (forward-line -1) | |
2400 (cperl-indent-line) | |
2401 (goto-char start) | |
2402 (or (looking-at "{[ \t]*$") ; If there is a statement | |
2403 ; before, move it to separate line | |
2404 (progn | |
2405 (forward-char 1) | |
2406 (insert "\n") | |
2407 (cperl-indent-line))) | |
2408 (forward-line 1) ; We are on the target line | |
2409 (cperl-indent-line) | |
2410 (beginning-of-line) | |
2411 (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
|
2412 ; after, move it to separate line |
20323 | 2413 (progn |
2414 (end-of-line) | |
2415 (search-backward "}" beg) | |
2416 (skip-chars-backward " \t") | |
2417 (or (memq (preceding-char) (append ";{" nil)) | |
2418 (insert ";")) | |
2419 (insert "\n") | |
2420 (cperl-indent-line) | |
2421 (forward-line -1))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2422 (forward-line -1) ; We are on the line before target |
20323 | 2423 (end-of-line) |
2424 (newline-and-indent)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2425 (end-of-line) ; else - no splitting |
20323 | 2426 (cond |
2427 ((and (looking-at "\n[ \t]*{$") | |
2428 (save-excursion | |
2429 (skip-chars-backward " \t") | |
2430 (eq (preceding-char) ?\)))) ; Probably if () {} group | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2431 ; with an extra newline. |
20323 | 2432 (forward-line 2) |
2433 (cperl-indent-line)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2434 ((save-excursion ; In POD header |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2435 (forward-paragraph -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2436 ;; (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
|
2437 ;; 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
|
2438 (if (looking-at "\\(\\`\n?\\|\n\\)=\\sw+") |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2439 (progn |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2440 (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
|
2441 (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
|
2442 t))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2443 (if (and over |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2444 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2445 (forward-paragraph -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2446 (forward-word 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2447 (setq pos (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2448 (setq cut (buffer-substring (point) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2449 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2450 (end-of-line) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2451 (point)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2452 (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
|
2453 (point))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2454 (setq res (expand-abbrev)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2455 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2456 (goto-char pos) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2457 (insert cut)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2458 res)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2459 nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2460 (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
|
2461 (forward-line 2))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2462 ((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
|
2463 (cperl-ensure-newlines 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2464 (forward-line 2)) |
20323 | 2465 ((looking-at "\n[ \t]*$") ; Next line is empty - use it. |
2466 (forward-line 1) | |
2467 (cperl-indent-line)) | |
2468 (t | |
2469 (newline-and-indent)))))) | |
2470 | |
2471 (defun cperl-electric-semi (arg) | |
2472 "Insert character and correct line's indentation." | |
2473 (interactive "P") | |
2474 (if cperl-auto-newline | |
2475 (cperl-electric-terminator arg) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2476 (self-insert-command (prefix-numeric-value arg)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2477 (if cperl-autoindent-on-semi |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2478 (cperl-indent-line)))) |
20323 | 2479 |
2480 (defun cperl-electric-terminator (arg) | |
2481 "Insert character and correct line's indentation." | |
2482 (interactive "P") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2483 (let ((end (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2484 (auto (and cperl-auto-newline |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2485 (or (not (eq last-command-char ?:)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2486 cperl-auto-newline-after-colon))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2487 insertpos) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2488 (if (and ;;(not arg) |
20323 | 2489 (eolp) |
2490 (not (save-excursion | |
2491 (beginning-of-line) | |
2492 (skip-chars-forward " \t") | |
2493 (or | |
2494 ;; Ignore in comment lines | |
2495 (= (following-char) ?#) | |
2496 ;; Colon is special only after a label | |
2497 ;; So quickly rule out most other uses of colon | |
2498 ;; and do no indentation for them. | |
2499 (and (eq last-command-char ?:) | |
2500 (save-excursion | |
2501 (forward-word 1) | |
2502 (skip-chars-forward " \t") | |
2503 (and (< (point) end) | |
2504 (progn (goto-char (- end 1)) | |
2505 (not (looking-at ":")))))) | |
2506 (progn | |
2507 (beginning-of-defun) | |
2508 (let ((pps (parse-partial-sexp (point) end))) | |
2509 (or (nth 3 pps) (nth 4 pps) (nth 5 pps)))))))) | |
2510 (progn | |
2511 (self-insert-command (prefix-numeric-value arg)) | |
2512 ;;(forward-char -1) | |
2513 (if auto (setq insertpos (point-marker))) | |
2514 ;;(forward-char 1) | |
2515 (cperl-indent-line) | |
2516 (if auto | |
2517 (progn | |
2518 (newline) | |
2519 (cperl-indent-line))) | |
2520 (save-excursion | |
2521 (if insertpos (goto-char (1- (marker-position insertpos))) | |
2522 (forward-char -1)) | |
2523 (delete-char 1)))) | |
2524 (if insertpos | |
2525 (save-excursion | |
2526 (goto-char insertpos) | |
2527 (self-insert-command (prefix-numeric-value arg))) | |
2528 (self-insert-command (prefix-numeric-value arg))))) | |
2529 | |
2530 (defun cperl-electric-backspace (arg) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2531 "Backspace, or remove the whitespace around the point inserted by an electric |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2532 key. Will untabify if `cperl-electric-backspace-untabify' is non-nil." |
20323 | 2533 (interactive "p") |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2534 (if (and cperl-auto-newline |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2535 (memq last-command '(cperl-electric-semi |
20323 | 2536 cperl-electric-terminator |
2537 cperl-electric-lbrace)) | |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
2538 (memq (preceding-char) '(?\s ?\t ?\n))) |
20323 | 2539 (let (p) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2540 (if (eq last-command 'cperl-electric-lbrace) |
20323 | 2541 (skip-chars-forward " \t\n")) |
2542 (setq p (point)) | |
2543 (skip-chars-backward " \t\n") | |
2544 (delete-region (point) p)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2545 (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
|
2546 ;; 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
|
2547 (setq this-command 'cperl-electric-else-really)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2548 (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
|
2549 (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
|
2550 (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
|
2551 (let (p) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2552 (skip-chars-forward " \t\n") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2553 (setq p (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2554 (skip-chars-backward " \t\n") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2555 (delete-region (point) p)) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2556 (if cperl-electric-backspace-untabify |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2557 (backward-delete-char-untabify arg) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2558 (delete-backward-char arg))))) |
20323 | 2559 |
50255
a716a67fdf9d
(cperl-electric-backspace): Add delete-selection property.
Kim F. Storm <storm@cua.dk>
parents:
49919
diff
changeset
|
2560 (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
|
2561 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2562 (defun cperl-inside-parens-p () ;; NOT USED???? |
20323 | 2563 (condition-case () |
2564 (save-excursion | |
2565 (save-restriction | |
2566 (narrow-to-region (point) | |
2567 (progn (beginning-of-defun) (point))) | |
2568 (goto-char (point-max)) | |
2569 (= (char-after (or (scan-lists (point) -1 1) (point-min))) ?\())) | |
2570 (error nil))) | |
2571 | |
2572 (defun cperl-indent-command (&optional whole-exp) | |
2573 "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
|
2574 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
|
2575 line. Otherwise, indent the current line only if point is at the left margin |
20323 | 2576 or in the line's indentation; otherwise insert a tab. |
2577 | |
2578 A numeric argument, regardless of its value, | |
2579 means indent rigidly all the lines of the expression starting after point | |
2580 so that this line becomes properly indented. | |
2581 The relative indentation among the lines of the expression are preserved." | |
2582 (interactive "P") | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2583 (cperl-update-syntaxification (point) (point)) |
20323 | 2584 (if whole-exp |
2585 ;; If arg, always indent this line as Perl | |
2586 ;; and shift remaining lines of expression the same amount. | |
2587 (let ((shift-amt (cperl-indent-line)) | |
2588 beg end) | |
2589 (save-excursion | |
2590 (if cperl-tab-always-indent | |
2591 (beginning-of-line)) | |
2592 (setq beg (point)) | |
2593 (forward-sexp 1) | |
2594 (setq end (point)) | |
2595 (goto-char beg) | |
2596 (forward-line 1) | |
2597 (setq beg (point))) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2598 (if (and shift-amt (> end beg)) |
20323 | 2599 (indent-code-rigidly beg end shift-amt "#"))) |
2600 (if (and (not cperl-tab-always-indent) | |
2601 (save-excursion | |
2602 (skip-chars-backward " \t") | |
2603 (not (bolp)))) | |
2604 (insert-tab) | |
2605 (cperl-indent-line)))) | |
2606 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2607 (defun cperl-indent-line (&optional parse-data) |
20323 | 2608 "Indent current line as Perl code. |
2609 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
|
2610 (let ((case-fold-search nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2611 (pos (- (point-max) (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2612 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
|
2613 (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
|
2614 i indent) |
20323 | 2615 (beginning-of-line) |
2616 (setq beg (point)) | |
2617 (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
|
2618 (setq indent (current-indentation) i nil)) |
20323 | 2619 ;;((eq indent t) ; Never? |
2620 ;; (setq indent (cperl-calculate-indent-within-comment))) | |
2621 ;;((looking-at "[ \t]*#") | |
2622 ;; (setq indent 0)) | |
2623 (t | |
2624 (skip-chars-forward " \t") | |
2625 (if (listp indent) (setq indent (car indent))) | |
2626 (cond ((looking-at "[A-Za-z_][A-Za-z_0-9]*:[^:]") | |
2627 (and (> indent 0) | |
2628 (setq indent (max cperl-min-label-indent | |
2629 (+ indent cperl-label-offset))))) | |
2630 ((= (following-char) ?}) | |
2631 (setq indent (- indent cperl-indent-level))) | |
2632 ((memq (following-char) '(?\) ?\])) ; To line up with opening paren. | |
2633 (setq indent (+ indent cperl-close-paren-offset))) | |
2634 ((= (following-char) ?{) | |
2635 (setq indent (+ indent cperl-brace-offset)))))) | |
2636 (skip-chars-forward " \t") | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2637 (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
|
2638 (if (or (not shift-amt) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2639 (zerop shift-amt)) |
20323 | 2640 (if (> (- (point-max) pos) (point)) |
2641 (goto-char (- (point-max) pos))) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2642 ;;;(delete-region beg (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2643 ;;;(indent-to indent) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2644 (cperl-make-indent indent) |
20323 | 2645 ;; If initial point was within line's indentation, |
2646 ;; position after the indentation. Else stay at same point in text. | |
2647 (if (> (- (point-max) pos) (point)) | |
2648 (goto-char (- (point-max) pos)))) | |
2649 shift-amt)) | |
2650 | |
2651 (defun cperl-after-label () | |
2652 ;; Returns true if the point is after label. Does not do save-excursion. | |
2653 (and (eq (preceding-char) ?:) | |
2654 (memq (char-syntax (char-after (- (point) 2))) | |
2655 '(?w ?_)) | |
2656 (progn | |
2657 (backward-sexp) | |
2658 (looking-at "[a-zA-Z_][a-zA-Z0-9_]*:[^:]")))) | |
2659 | |
2660 (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
|
2661 ;; 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
|
2662 ;; 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
|
2663 ;; 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
|
2664 ;; 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
|
2665 ;; 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
|
2666 ;; which contains START. |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2667 ;; PRESTART is the position basing on which START was found. |
20323 | 2668 (save-excursion |
2669 (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
|
2670 (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
|
2671 (<= parse-start start-point)) |
20323 | 2672 (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
|
2673 (beginning-of-defun) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2674 (setq start-state nil)) |
20323 | 2675 (setq prestart (point)) |
2676 (if start-state nil | |
2677 ;; Try to go out, if sub is not on the outermost level | |
2678 (while (< (point) start-point) | |
2679 (setq start (point) parse-start start depth nil | |
2680 state (parse-partial-sexp start start-point -1)) | |
2681 (if (> (car state) -1) nil | |
2682 ;; The current line could start like }}}, so the indentation | |
2683 ;; corresponds to a different level than what we reached | |
2684 (setq depth t) | |
2685 (beginning-of-line 2))) ; Go to the next line. | |
2686 (if start (goto-char start))) ; Not at the start of file | |
2687 (setq start (point)) | |
2688 (or state (setq state (parse-partial-sexp start start-point -1 nil start-state))) | |
2689 (list start state depth prestart)))) | |
2690 | |
2691 (defvar cperl-look-for-prop '((pod in-pod) (here-doc-delim here-doc-group))) | |
2692 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2693 (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
|
2694 "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
|
2695 Will not look before LIM." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2696 ;;; 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
|
2697 (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
|
2698 (point-min)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2699 ;;; (cond ((eq p (point-min)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2700 ;;; p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2701 ;;; ((and lim (<= p lim)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2702 ;;; p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2703 ;;; ((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
|
2704 ;;; p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2705 ;;; (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
|
2706 ;;; (point-min)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2707 ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2708 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2709 (defun cperl-sniff-for-indent (&optional parse-data) ; was parse-start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2710 ;; Old workhorse for calculation of indentation; the major problem |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2711 ;; is that it mixes the sniffer logic to understand what the current line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2712 ;; MEANS with the logic to actually calculate where to indent it. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2713 ;; The latter part should be eventually moved to `cperl-calculate-indent'; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2714 ;; actually, this is mostly done now... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2715 (cperl-update-syntaxification (point) (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2716 (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
|
2717 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2718 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2719 ((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
|
2720 (not (get-text-property (point) 'indentable))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2721 (vector res)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2722 ;; 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
|
2723 ((looking-at "[ \t]*\n=") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2724 (error "Spaces before POD section!")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2725 ((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
|
2726 (looking-at "^#")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2727 [comment-special:at-beginning-of-line]) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2728 ((get-text-property (point) 'in-pod) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2729 [in-pod]) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2730 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2731 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2732 (let* ((indent-point (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2733 (char-after-pos (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2734 (skip-chars-forward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2735 (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2736 (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
|
2737 (pre-indent-point (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2738 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
|
2739 (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
|
2740 (cperl-backward-to-noncomment nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2741 (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
|
2742 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
|
2743 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
|
2744 'syntax-type)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2745 (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
|
2746 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2747 (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
|
2748 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2749 (setq pre-indent-point (point))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2750 (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
|
2751 (let* ((case-fold-search nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2752 (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
|
2753 (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
|
2754 (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
|
2755 (state (nth 1 s-s)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2756 (containing-sexp (car (cdr state))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2757 old-indent) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2758 (if (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2759 ;;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
|
2760 parse-data) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2761 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2762 (setcar parse-data pre-indent-point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2763 (setcar (cdr parse-data) state) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2764 (or (nth 2 parse-data) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2765 (setcar (cddr parse-data) start)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2766 ;; Before this point: end of statement |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2767 (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
|
2768 (cond ((get-text-property (point) 'indentable) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2769 ;; indent to "after" the surrounding open |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2770 ;; (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
|
2771 ;; 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
|
2772 (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
|
2773 (get-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2774 (cperl-1+ char-after-pos) 'indentable) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2775 p (1+ (cperl-beginning-of-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2776 (point) 'indentable)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2777 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
|
2778 (save-excursion ; Find preceeding line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2779 (cperl-backward-to-noncomment p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2780 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2781 (if (<= (point) p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2782 (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
|
2783 (goto-char p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2784 (skip-chars-forward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2785 (if (memq (char-after (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2786 (append "#\n" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2787 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
|
2788 (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2789 (skip-chars-forward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2790 (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2791 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
|
2792 (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
|
2793 (vector 'indentable 'terminator p is-block)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2794 (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
|
2795 (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
|
2796 is-block char-after p)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2797 (t ; No preceeding line... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2798 (vector 'indentable 'first-line p)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2799 ((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
|
2800 (vector 'REx-part2 (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2801 ((nth 3 state) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2802 [comment]) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2803 ((nth 4 state) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2804 [string]) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2805 ;; 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
|
2806 ((null containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2807 ;; 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
|
2808 ;; or may be function argument declaration. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2809 ;; 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
|
2810 ;; 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
|
2811 ;; 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
|
2812 (skip-chars-forward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2813 (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
|
2814 (setq state |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2815 (or (bobp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2816 (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
|
2817 (eq (preceding-char) ?\;) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2818 ;; Had ?\) too |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2819 (and (eq (preceding-char) ?\}) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2820 (cperl-after-block-and-statement-beg |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2821 (point-min))) ; Was start - too close |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2822 (memq char-after (append ")]}" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2823 (and (eq (preceding-char) ?\:) ; label |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2824 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2825 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2826 (skip-chars-backward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2827 (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
|
2828 (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
|
2829 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2830 ;; 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
|
2831 ;; 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
|
2832 ;; 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
|
2833 ;; 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
|
2834 (and state |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2835 parse-data |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2836 (not (eq char-after ?\C-j)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2837 (setcdr (cddr parse-data) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2838 (list pre-indent-point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2839 (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
|
2840 ((not |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2841 (or (setq is-block |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2842 (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
|
2843 (save-excursion ; Is it a hash? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2844 (goto-char containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2845 (cperl-block-p)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2846 cperl-indent-parens-as-block)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2847 ;; 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
|
2848 ;; 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
|
2849 ;; 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
|
2850 (goto-char (1+ containing-sexp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2851 (or (memq char-after |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2852 (append (if delim "}" ")]}") nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2853 (looking-at "[ \t]*\\(#\\|$\\)") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2854 (skip-chars-forward " \t")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2855 (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
|
2856 (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
|
2857 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2858 ;; 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
|
2859 ;; Find previous non-comment character. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2860 (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
|
2861 (cperl-backward-to-noncomment containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2862 ;; 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
|
2863 ;; 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
|
2864 ;; (Had \, too) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2865 (while;;(or (eq (preceding-char) ?\,) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2866 (and (eq (preceding-char) ?:) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2867 (or;;(eq (char-after (- (point) 2)) ?\') ; ???? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2868 (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
|
2869 '(?w ?_)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2870 ;;) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2871 ;; This is always FALSE? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2872 (if (eq (preceding-char) ?\,) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2873 ;; 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
|
2874 ;; Will ignore embedded sexpr XXXX. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2875 (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
|
2876 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2877 (cperl-backward-to-noncomment containing-sexp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2878 ;; 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
|
2879 (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
|
2880 (memq (preceding-char) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2881 (append (if is-block " ;{" " ,;{") '(nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2882 (and (eq (preceding-char) ?\}) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2883 (cperl-after-block-and-statement-beg |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2884 containing-sexp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2885 (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
|
2886 ;; 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
|
2887 ;; 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
|
2888 ;; previous line of the statement. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2889 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2890 ;; 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
|
2891 ;; 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
|
2892 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2893 (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
|
2894 (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
|
2895 ;; This line starts a new statement. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2896 ;; Position following last unclosed open brace |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2897 (goto-char containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2898 ;; 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
|
2899 (or |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2900 ;; 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
|
2901 ;; 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
|
2902 ;; 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
|
2903 ;; small. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2904 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2905 (forward-char 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2906 (let ((colon-line-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2907 (while |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2908 (progn (skip-chars-forward " \t\n") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2909 (looking-at "#\\|[a-zA-Z0-9_$]*:[^:]\\|=[a-zA-Z]")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2910 ;; 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
|
2911 (cond ((= (following-char) ?\#) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2912 (forward-line 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2913 ((= (following-char) ?\=) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2914 (goto-char |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2915 (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
|
2916 (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
|
2917 ;; label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2918 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2919 (save-excursion (end-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2920 (setq colon-line-end (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2921 (search-forward ":")))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2922 ;; 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
|
2923 ;; First, the following code counts |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2924 ;; 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
|
2925 (and (< (point) indent-point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2926 (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
|
2927 containing-sexp)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2928 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2929 ;; If no previous statement, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2930 ;; 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
|
2931 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2932 ;; 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
|
2933 ;; add in cperl-brace-imaginary-offset. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2934 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2935 ;; If first thing on a line: ????? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2936 ;; 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
|
2937 (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
|
2938 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
|
2939 ;; 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
|
2940 ;; 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
|
2941 (or cperl-indent-wrt-brace |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2942 (cperl-backward-to-noncomment (point-min))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2943 ;; 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
|
2944 ;; move to the beginning of that; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2945 (if (eq (preceding-char) ?\)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2946 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2947 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2948 (cperl-backward-to-noncomment (point-min)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2949 ;; 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
|
2950 ;; 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
|
2951 ;; 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
|
2952 ;; anonymous sub in a hash. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2953 (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
|
2954 (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
|
2955 (goto-char (cperl-beginning-of-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2956 (point) 'attrib-group))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2957 ((eq (preceding-char) ?b) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2958 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2959 (looking-at "sub\\>"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2960 (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
|
2961 (parse-partial-sexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2962 (save-excursion (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2963 (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2964 (point))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2965 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2966 (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
|
2967 (skip-chars-forward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2968 (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
|
2969 (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
|
2970 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
|
2971 t (point) ; have something before... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2972 ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2973 ;;(current-column) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2974 ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2975 ;; 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
|
2976 ;; 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
|
2977 (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
|
2978 (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
|
2979 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
|
2980 nil (point) ; nothing interesting before |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2981 )))))))))))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2982 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2983 (defvar cperl-indent-rules-alist |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2984 '((pod nil) ; via `syntax-type' property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2985 (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
|
2986 (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
|
2987 (format nil) ; via `syntax-type' property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2988 (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
|
2989 (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
|
2990 (string t) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2991 (comment nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2992 "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
|
2993 The values mean: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2994 nil: do not indent; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2995 number: add this amount of indentation. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2996 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2997 Not finished.") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
2998 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2999 (defun cperl-calculate-indent (&optional parse-data) ; was parse-start |
20323 | 3000 "Return appropriate indentation for current line as Perl code. |
3001 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
|
3002 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
|
3003 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3004 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
|
3005 and closing parentheses and brackets." |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3006 ;; 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
|
3007 ;; compensate for some modifications which `cperl-indent-line' will add later |
20323 | 3008 (save-excursion |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3009 (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
|
3010 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3011 ;;((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
|
3012 ;; i) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3013 ((vectorp i) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3014 (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
|
3015 (cond |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3016 (what (cadr what)) ; Load from table |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3017 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3018 ;; 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
|
3019 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3020 ((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
|
3021 (goto-char (elt i 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3022 (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
|
3023 (forward-sexp -1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3024 (current-column)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3025 ((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
|
3026 (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
|
3027 ((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
|
3028 (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
|
3029 (1- (current-column))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3030 ((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
|
3031 (goto-char (elt i 2)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3032 (+ (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
|
3033 -1 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3034 (current-column))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3035 ((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
|
3036 ;; 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
|
3037 (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
|
3038 (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
|
3039 (setq p (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3040 (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
|
3041 (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
|
3042 ;; Number of parens in between: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3043 (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
|
3044 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
|
3045 (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
|
3046 (+ (* 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
|
3047 (cond ((eq what ?\) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3048 (- cperl-close-paren-offset)) ; compensate |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3049 ((eq what ?\| ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3050 (- (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
|
3051 (t 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3052 (if (eq (following-char) ?\| ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3053 (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
|
3054 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3055 (current-column))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3056 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3057 (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
|
3058 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3059 ;; Indenter for stuff at toplevel |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3060 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3061 ((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
|
3062 (+ (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
|
3063 (goto-char (elt i 1)) ; start = Good place to start parsing |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3064 (- (current-indentation) ; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3065 (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
|
3066 (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
|
3067 ;; 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
|
3068 ;; 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
|
3069 ;; 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
|
3070 ;; 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
|
3071 (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
|
3072 0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3073 cperl-continued-statement-offset))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3074 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3075 ;; 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
|
3076 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3077 ((eq 'in-parens (elt i 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3078 ;; 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
|
3079 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3080 ;; 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
|
3081 ;; 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
|
3082 ;; 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
|
3083 (+ (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3084 (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
|
3085 (current-column)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3086 (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
|
3087 (eq (elt i 1) ?\})) ; char-after |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3088 ;; Correct indentation of trailing ?\} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3089 (+ 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
|
3090 0))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3091 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3092 ;; Indenter for continuation lines |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3093 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3094 ((eq 'continuation (elt i 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3095 ;; [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
|
3096 (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
|
3097 (+ (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
|
3098 0 ; Closing parenth |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3099 cperl-continued-statement-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3100 (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
|
3101 (not (elt i 4)) ; is-brace |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3102 (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
|
3103 0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3104 ;; Now it is a hash reference |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3105 (+ 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
|
3106 ;; Labels do not take :: ... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3107 (if (looking-at "\\(\\w\\|_\\)+[ \t]*:") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3108 (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
|
3109 (- (current-indentation) cperl-label-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3110 ;; 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
|
3111 ;; be quick anyway (this comment comes |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3112 ;; from different location): |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3113 (cperl-calculate-indent)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3114 (current-column)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3115 (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
|
3116 cperl-continued-brace-offset 0))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3117 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3118 ;; 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
|
3119 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3120 ((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
|
3121 ;; [have-prev-sibling sibling-beg colon-line-end block-start] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3122 (goto-char (elt i 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3123 (if (> (elt i 2) (point)) ; colon-line-end; After-label, same line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3124 (if (> (current-indentation) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3125 cperl-min-label-indent) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3126 (- (current-indentation) cperl-label-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3127 ;; 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
|
3128 (+ cperl-indent-level |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3129 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3130 (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
|
3131 (current-indentation)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3132 (current-column))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3133 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3134 ;; 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
|
3135 ;; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3136 ((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
|
3137 ;;[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
|
3138 ;; 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
|
3139 ;; 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
|
3140 (goto-char (elt i 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3141 ;; 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
|
3142 ;; 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
|
3143 ;; 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
|
3144 (+ (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
|
3145 (+ 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
|
3146 cperl-indent-level) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3147 (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
|
3148 (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
|
3149 (+ 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
|
3150 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3151 ;; 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
|
3152 ;; add the cperl-brace-imaginary-offset. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3153 (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
|
3154 cperl-brace-imaginary-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3155 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3156 (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
|
3157 (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
|
3158 (current-column) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3159 ;; 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
|
3160 ;; 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
|
3161 (if (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3162 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3163 (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
|
3164 (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
|
3165 (- (current-indentation) cperl-label-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3166 ;; 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
|
3167 ;; be quick anyway: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3168 (cperl-calculate-indent)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3169 (current-indentation)))))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3170 (t |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3171 (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
|
3172 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3173 (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
|
3174 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3175 (defvar cperl-indent-alist |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3176 '((string nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3177 (comment nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3178 (toplevel 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3179 (toplevel-after-parenth 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3180 (toplevel-continued 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3181 (expression 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3182 "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
|
3183 The values mean: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3184 nil: do not indent; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3185 number: add this amount of indentation. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3186 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3187 Not finished, not used.") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3188 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3189 (defun cperl-where-am-i (&optional parse-start start-state) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3190 ;; Unfinished |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3191 "Return a list of lists ((TYPE POS)...) of good points before the point. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3192 POS may be nil if it is hard to find, say, when TYPE is `string' or `comment'. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3193 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3194 Not finished, not used." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3195 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3196 (let* ((start-point (point)) unused |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3197 (s-s (cperl-get-state)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3198 (start (nth 0 s-s)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3199 (state (nth 1 s-s)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3200 (prestart (nth 3 s-s)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3201 (containing-sexp (car (cdr state))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3202 (case-fold-search nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3203 (res (list (list 'parse-start start) (list 'parse-prestart prestart)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3204 (cond ((nth 3 state) ; In string |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3205 (setq res (cons (list 'string nil (nth 3 state)) res))) ; What started string |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3206 ((nth 4 state) ; In comment |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3207 (setq res (cons '(comment) res))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3208 ((null containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3209 ;; Line is at top level. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3210 ;; 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
|
3211 ;; 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
|
3212 ;; 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
|
3213 (cperl-backward-to-noncomment (or parse-start (point-min))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3214 ;;(skip-chars-backward " \t\f\n") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3215 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3216 ((or (bobp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3217 (memq (preceding-char) (append ";}" nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3218 (setq res (cons (list 'toplevel start) res))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3219 ((eq (preceding-char) ?\) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3220 (setq res (cons (list 'toplevel-after-parenth start) res))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3221 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3222 (setq res (cons (list 'toplevel-continued start) res))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3223 ((/= (char-after containing-sexp) ?{) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3224 ;; line is expression, not statement: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3225 ;; indent to just after the surrounding open. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3226 ;; 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
|
3227 (setq res (cons (list 'expression-blanks |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3228 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3229 (goto-char (1+ containing-sexp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3230 (or (looking-at "[ \t]*\\(#\\|$\\)") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3231 (skip-chars-forward " \t")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3232 (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3233 (cons (list 'expression containing-sexp) res)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3234 ((progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3235 ;; Containing-expr starts with \{. Check whether it is a hash. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3236 (goto-char containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3237 (not (cperl-block-p))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3238 (setq res (cons (list 'expression-blanks |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3239 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3240 (goto-char (1+ containing-sexp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3241 (or (looking-at "[ \t]*\\(#\\|$\\)") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3242 (skip-chars-forward " \t")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3243 (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3244 (cons (list 'expression containing-sexp) res)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3245 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3246 ;; Statement level. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3247 (setq res (cons (list 'in-block containing-sexp) res)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3248 ;; 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
|
3249 ;; Find previous non-comment character. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3250 (cperl-backward-to-noncomment containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3251 ;; 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
|
3252 ;; 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
|
3253 ;; Back up comma-delimited lines too ????? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3254 (while (or (eq (preceding-char) ?\,) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3255 (save-excursion (cperl-after-label))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3256 (if (eq (preceding-char) ?\,) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3257 ;; 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
|
3258 ;; Will ignore embedded sexpr XXXX. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3259 (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
|
3260 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3261 (cperl-backward-to-noncomment containing-sexp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3262 ;; Now we get the answer. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3263 (if (not (memq (preceding-char) (append ";}{" '(nil)))) ; Was ?\, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3264 ;; 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
|
3265 (list (list 'statement-continued containing-sexp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3266 ;; This line starts a new statement. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3267 ;; Position following last unclosed open. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3268 (goto-char containing-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3269 ;; 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
|
3270 (or |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3271 ;; 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
|
3272 ;; 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
|
3273 ;; 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
|
3274 ;; small. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3275 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3276 (forward-char 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3277 (let ((colon-line-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3278 (while (progn (skip-chars-forward " \t\n" start-point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3279 (and (< (point) start-point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3280 (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3281 "#\\|[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
|
3282 ;; 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
|
3283 (cond ((= (following-char) ?\#) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3284 ;;(forward-line 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3285 (end-of-line)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3286 ;; label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3287 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3288 (save-excursion (end-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3289 (setq colon-line-end (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3290 (search-forward ":")))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3291 ;; Now at the point, after label, or at start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3292 ;; of first statement in the block. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3293 (and (< (point) start-point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3294 (if (> colon-line-end (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3295 ;; Before statement after label |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3296 (if (> (current-indentation) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3297 cperl-min-label-indent) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3298 (list (list 'label-in-block (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3299 ;; Do not believe: `max' is involved |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3300 (list |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3301 (list 'label-in-block-min-indent (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3302 ;; Before statement |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3303 (list 'statement-in-block (point)))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3304 ;; If no previous statement, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3305 ;; 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
|
3306 ;; 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
|
3307 ;; start there too. If cperl-indent-level is zero, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3308 ;; 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
|
3309 ;; 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
|
3310 ;; add in cperl-brace-imaginary-offset. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3311 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3312 ;; If first thing on a line: ????? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3313 (setq unused ; This is not finished... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3314 (+ (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
|
3315 (+ 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
|
3316 cperl-indent-level) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3317 ;; 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
|
3318 ;; If openbrace is not first nonwhite thing on the line, |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3319 ;; add the cperl-brace-imaginary-offset. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3320 (progn (skip-chars-backward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3321 (if (bolp) 0 cperl-brace-imaginary-offset)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3322 ;; 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
|
3323 ;; move to the beginning of that; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3324 ;; possibly a different line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3325 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3326 (if (eq (preceding-char) ?\)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3327 (forward-sexp -1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3328 ;; 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
|
3329 ;; 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
|
3330 (if (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3331 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3332 (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
|
3333 (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
|
3334 (- (current-indentation) cperl-label-offset) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3335 (cperl-calculate-indent)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3336 (current-indentation))))))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3337 res))) |
20323 | 3338 |
3339 (defun cperl-calculate-indent-within-comment () | |
3340 "Return the indentation amount for line, assuming that | |
3341 the current line is to be regarded as part of a block comment." | |
3342 (let (end star-start) | |
3343 (save-excursion | |
3344 (beginning-of-line) | |
3345 (skip-chars-forward " \t") | |
3346 (setq end (point)) | |
3347 (and (= (following-char) ?#) | |
3348 (forward-line -1) | |
3349 (cperl-to-comment-or-eol) | |
3350 (setq end (point))) | |
3351 (goto-char end) | |
3352 (current-column)))) | |
3353 | |
3354 | |
3355 (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
|
3356 "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
|
3357 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
|
3358 ;; 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
|
3359 ;; 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
|
3360 (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
|
3361 (or cperl-font-locking |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3362 (cperl-update-syntaxification lim lim)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3363 (beginning-of-line) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3364 (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
|
3365 (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
|
3366 (if (or (eq pr 'pod) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3367 (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
|
3368 (re-search-forward "\\=[ \t]*\\(#\\|$\\)" lim t))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3369 (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
|
3370 ;; 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
|
3371 (and (and e (<= e lim)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3372 (goto-char e)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3373 (while (not stop-in) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3374 (setq state (parse-partial-sexp (point) lim nil nil nil t)) |
20323 | 3375 ; stop at comment |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3376 ;; 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
|
3377 (if (nth 4 state) ; After `#'; |
20323 | 3378 ; (nth 2 state) can be |
3379 ; beginning of m,s,qq and so | |
3380 ; on | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3381 (if (nth 2 state) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3382 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3383 (setq cpoint (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3384 (goto-char (nth 2 state)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3385 (cond |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3386 ((looking-at "\\(s\\|tr\\)\\>") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3387 (or (re-search-forward |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3388 "\\=\\w+[ \t]*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3389 lim 'move) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3390 (setq stop-in t))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3391 ((looking-at "\\(m\\|q\\([qxwr]\\)?\\)\\>") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3392 (or (re-search-forward |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3393 "\\=\\w+[ \t]*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*#" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3394 lim 'move) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3395 (setq stop-in t))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3396 (t ; It was fair comment |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3397 (setq stop-in t) ; Finish |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3398 (goto-char (1- cpoint))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3399 (setq stop-in t) ; Finish |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3400 (forward-char -1)) |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
3401 (setq stop-in t))) ; Finish |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3402 (nth 4 state)))) |
20323 | 3403 |
3404 (defsubst cperl-modify-syntax-type (at how) | |
3405 (if (< at (point-max)) | |
3406 (progn | |
3407 (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
|
3408 (put-text-property at (1+ at) 'rear-nonsticky '(syntax-table))))) |
20323 | 3409 |
3410 (defun cperl-protect-defun-start (s e) | |
3411 ;; C code looks for "^\\s(" to skip comment backward in "hard" situations | |
3412 (save-excursion | |
3413 (goto-char s) | |
3414 (while (re-search-forward "^\\s(" e 'to-end) | |
3415 (put-text-property (1- (point)) (point) 'syntax-table cperl-st-punct)))) | |
3416 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3417 (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
|
3418 (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
|
3419 (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
|
3420 nil |
20323 | 3421 ;; We suppose that e is _after_ the end of construction, as after eol. |
3422 (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
|
3423 (if (> bb (- e 2)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3424 ;; one-char string/comment?! |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3425 (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
|
3426 (cperl-modify-syntax-type bb string) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3427 (cperl-modify-syntax-type (1- e) string)) |
20323 | 3428 (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
|
3429 (put-text-property (1+ bb) (1- e) |
20323 | 3430 '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
|
3431 (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
|
3432 ;; Fontify |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3433 (or noface |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3434 (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
|
3435 (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
|
3436 'font-lock-comment-face))))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3437 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3438 (defvar cperl-starters '(( ?\( . ?\) ) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3439 ( ?\[ . ?\] ) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3440 ( ?\{ . ?\} ) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3441 ( ?\< . ?\> ))) |
20323 | 3442 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3443 (defun cperl-cached-syntax-table (st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3444 "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
|
3445 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
|
3446 is quoting." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3447 (if (car-safe st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3448 (car st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3449 (setcar st (make-syntax-table)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3450 (setq st (car st)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3451 (let ((i 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3452 (while (< i 256) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3453 (modify-syntax-entry i "." st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3454 (setq i (1+ i)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3455 (modify-syntax-entry ?\\ "\\" st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3456 st)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3457 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3458 (defun cperl-forward-re (lim end is-2arg st-l err-l argument |
20323 | 3459 &optional ostart oend) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3460 "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
|
3461 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
|
3462 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3463 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
|
3464 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
|
3465 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
|
3466 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
|
3467 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
|
3468 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
|
3469 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
|
3470 the second argument of 2ARG construct. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3471 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3472 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
|
3473 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
|
3474 (let (b starter ender st i i2 go-forward reset-st set-st) |
20323 | 3475 (skip-chars-forward " \t") |
3476 ;; ender means matching-char matcher. | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3477 (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
|
3478 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
|
3479 ender (cdr (assoc starter cperl-starters))) |
20323 | 3480 ;; What if starter == ?\\ ???? |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3481 (setq st (cperl-cached-syntax-table st-l)) |
20323 | 3482 (setq set-st t) |
3483 ;; Whether we have an intermediate point | |
3484 (setq i nil) | |
3485 ;; Prepare the syntax table: | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3486 (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
|
3487 (modify-syntax-entry starter "$" st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3488 (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
|
3489 (modify-syntax-entry ender (concat ")" (list starter)) st)) |
20323 | 3490 (condition-case bb |
3491 (progn | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3492 ;; 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
|
3493 ;; is recognized the same as $, so we need to check this manually. |
20323 | 3494 (if (and (eq starter (char-after (cperl-1+ b))) |
3495 (not ender)) | |
3496 ;; $ has TeXish matching rules, so $$ equiv $... | |
3497 (forward-char 2) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3498 (setq reset-st (syntax-table)) |
20323 | 3499 (set-syntax-table st) |
3500 (forward-sexp 1) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3501 (if (<= (point) (1+ b)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3502 (error "Unfinished regular expression")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3503 (set-syntax-table reset-st) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3504 (setq reset-st nil) |
20323 | 3505 ;; Now the problem is with m;blah;; |
3506 (and (not ender) | |
3507 (eq (preceding-char) | |
3508 (char-after (- (point) 2))) | |
3509 (save-excursion | |
3510 (forward-char -2) | |
3511 (= 0 (% (skip-chars-backward "\\\\") 2))) | |
3512 (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
|
3513 ;; Now we are after the first part. |
20323 | 3514 (and is-2arg ; Have trailing part |
3515 (not ender) | |
3516 (eq (following-char) starter) ; Empty trailing part | |
3517 (progn | |
3518 (or (eq (char-syntax (following-char)) ?.) | |
3519 ;; Make trailing letter into punctuation | |
3520 (cperl-modify-syntax-type (point) cperl-st-punct)) | |
3521 (setq is-2arg nil go-forward t))) ; Ignore the tail | |
3522 (if is-2arg ; Not number => have second part | |
3523 (progn | |
3524 (setq i (point) i2 i) | |
3525 (if ender | |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
3526 (if (memq (following-char) '(?\s ?\t ?\n ?\f)) |
20323 | 3527 (progn |
3528 (if (looking-at "[ \t\n\f]+\\(#[^\n]*\n[ \t\n\f]*\\)+") | |
3529 (goto-char (match-end 0)) | |
3530 (skip-chars-forward " \t\n\f")) | |
3531 (setq i2 (point)))) | |
3532 (forward-char -1)) | |
3533 (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
|
3534 (if ender (modify-syntax-entry ender "." st)) |
20323 | 3535 (setq set-st nil) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3536 (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
|
3537 argument starter ender) |
20323 | 3538 ender (nth 2 ender))))) |
3539 (error (goto-char lim) | |
3540 (setq set-st nil) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3541 (if reset-st |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3542 (set-syntax-table reset-st)) |
20323 | 3543 (or end |
3544 (message | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3545 "End of `%s%s%c ... %c' string/RE not found: %s" |
20323 | 3546 argument |
3547 (if ostart (format "%c ... %c" ostart (or oend ostart)) "") | |
3548 starter (or ender starter) bb) | |
3549 (or (car err-l) (setcar err-l b))))) | |
3550 (if set-st | |
3551 (progn | |
3552 (modify-syntax-entry starter (if (eq starter ?\\) "\\" ".") st) | |
3553 (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
|
3554 ;; i: have 2 args, after end of the first arg |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3555 ;; i2: start of the second arg, if any (before delim iff `ender'). |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3556 ;; 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
|
3557 ;; starter: the starting delimiter of the first arg |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3558 ;; go-forward: has 2 args, and the second part is empty |
20323 | 3559 (list i i2 ender starter go-forward))) |
3560 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3561 (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
|
3562 "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
|
3563 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
|
3564 Works before syntax recognition is done." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3565 ;; Works *before* syntax recognition is done |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3566 (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
|
3567 (let (st b reset-st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3568 (condition-case b |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3569 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3570 (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
|
3571 (modify-syntax-entry ?\( "()" st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3572 (modify-syntax-entry ?\) ")(" st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3573 (setq reset-st (syntax-table)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3574 (set-syntax-table st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3575 (forward-sexp 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3576 (error (message |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3577 "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
|
3578 ;; now restore the initial state |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3579 (if st |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3580 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3581 (modify-syntax-entry ?\( "." st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3582 (modify-syntax-entry ?\) "." st))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3583 (if reset-st |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3584 (set-syntax-table reset-st)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3585 b)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3586 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3587 |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3588 (defvar font-lock-string-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3589 ;;(defvar font-lock-reference-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3590 (defvar font-lock-constant-face) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3591 (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
|
3592 ;; 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
|
3593 (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
|
3594 (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
|
3595 (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
|
3596 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3597 ;;; 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
|
3598 ;;; recognized locally) are marked: |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3599 ;; a) PODs: |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3600 ;; 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
|
3601 ;; 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
|
3602 ;; 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
|
3603 ;; b) HEREs: |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3604 ;; 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
|
3605 ;; 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
|
3606 ;; 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
|
3607 ;; c) FORMATs: |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3608 ;; 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
|
3609 ;; 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
|
3610 ;; 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
|
3611 ;; 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
|
3612 ;; 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
|
3613 ;; 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
|
3614 ;; 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
|
3615 ;; (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
|
3616 ;; 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
|
3617 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3618 ;;; 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
|
3619 ;;; (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
|
3620 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3621 (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
|
3622 ;; 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
|
3623 (let ((pos (point)) opos) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3624 (while (and pos (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3625 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3626 (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
|
3627 (setq opos pos |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3628 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
|
3629 (if (eq pos (point-min)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3630 (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
|
3631 (if pos |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3632 (if before |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3633 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3634 (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
|
3635 (beginning-of-line) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3636 (setq pos (point))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3637 (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
|
3638 ;; 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
|
3639 (goto-char (point-min)))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3640 ;; Skip empty lines |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3641 (and (looking-at "\n*=") |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3642 (/= 0 (skip-chars-backward "\n")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3643 (forward-char)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3644 (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
|
3645 (if end |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3646 ;; 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
|
3647 (save-excursion |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3648 (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
|
3649 (setq pos end |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3650 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
|
3651 (if end (progn (goto-char end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3652 (or (bolp) (forward-line 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3653 (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
|
3654 (or end pos))))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3655 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3656 ;;; 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
|
3657 (defvar cperl-nonoverridable-face) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3658 (defvar font-lock-variable-name-face) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3659 (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
|
3660 (defvar font-lock-keyword-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3661 (defvar font-lock-builtin-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3662 (defvar font-lock-type-face) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3663 (defvar font-lock-comment-face) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3664 (defvar font-lock-warning-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3665 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3666 (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
|
3667 "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
|
3668 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
|
3669 ;; Works *before* syntax recognition is done |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3670 (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
|
3671 (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
|
3672 (condition-case b |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3673 (while (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3674 (concat |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3675 "\\(" ; 1=optional? colon |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3676 ":" 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
|
3677 "\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3678 (if after-first "?" "") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3679 ;; 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
|
3680 "\\(\\sw+\\)" ; 3=name |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3681 "\\((\\)?")) ; 4=optional paren |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3682 (and (match-beginning 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3683 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3684 (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
|
3685 'face font-lock-constant-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3686 (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
|
3687 (cperl-postpone-fontification start1 end1 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3688 'face font-lock-constant-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3689 (goto-char end1) ; end or before `(' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3690 (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
|
3691 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3692 (if st nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3693 (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
|
3694 (modify-syntax-entry ?\( "()" st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3695 (modify-syntax-entry ?\) ")(" st)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3696 (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
|
3697 (set-syntax-table st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3698 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3699 (set-syntax-table reset-st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3700 (setq reset-st nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3701 (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
|
3702 (forward-comment (buffer-size)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3703 (setq after-first t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3704 (error (message |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3705 "L%d: attribute `%s': %s" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3706 (count-lines (point-min) (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3707 (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
|
3708 (setq start nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3709 (and start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3710 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3711 (put-text-property start (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3712 '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
|
3713 (and pos |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3714 (< 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
|
3715 ;; 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
|
3716 (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
|
3717 'syntax-type 'sub-decl)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3718 (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
|
3719 (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
|
3720 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
|
3721 (if (looking-at "{") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3722 font-lock-function-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3723 font-lock-variable-name-face))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3724 ;; now restore the initial state |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3725 (if st |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3726 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3727 (modify-syntax-entry ?\( "." st) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3728 (modify-syntax-entry ?\) "." st))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3729 (if reset-st |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3730 (set-syntax-table reset-st)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3731 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3732 (defsubst 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
|
3733 (if (re-search-forward (concat "\\=" (if is-x-REx "[ \t\n]*" "") "[{?+*]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3734 (1- e) t) ; return nil on failure, no moving |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3735 (if (eq ?\{ (preceding-char)) nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3736 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3737 (1- (point)) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3738 'face font-lock-warning-face)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3739 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3740 ;;; 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
|
3741 (defun cperl-find-pods-heres (&optional min max non-inter end ignore-max end-of-here-doc) |
20323 | 3742 "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
|
3743 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
|
3744 the sections using `cperl-pod-head-face', `cperl-pod-face', |
20323 | 3745 `cperl-here-face'." |
3746 (interactive) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3747 (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
|
3748 cperl-syntax-state nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3749 cperl-syntax-done-to min)) |
20323 | 3750 (or max (setq max (point-max))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3751 (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
|
3752 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
|
3753 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
|
3754 (case-fold-search nil) (inhibit-read-only t) (buffer-undo-list t) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3755 (modified (buffer-modified-p)) overshoot is-o-REx |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3756 (after-change-functions nil) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3757 (cperl-font-locking t) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3758 (use-syntax-state (and cperl-syntax-state |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3759 (>= min (car cperl-syntax-state)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3760 (state-point (if use-syntax-state |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3761 (car cperl-syntax-state) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3762 (point-min))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3763 (state (if use-syntax-state |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3764 (cdr cperl-syntax-state))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3765 ;; (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
|
3766 (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
|
3767 ;; 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
|
3768 ;; (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
|
3769 (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
|
3770 font-lock-string-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3771 'font-lock-string-face)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3772 (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
|
3773 font-lock-constant-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3774 'font-lock-constant-face)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3775 (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
|
3776 (if (boundp 'font-lock-function-name-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3777 font-lock-function-name-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3778 'font-lock-function-name-face)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3779 (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
|
3780 (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
|
3781 font-lock-variable-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3782 'font-lock-variable-name-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3783 (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
|
3784 (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
|
3785 font-lock-function-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3786 'font-lock-function-name-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3787 (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
|
3788 (if (boundp 'font-lock-constant-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3789 font-lock-constant-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3790 'font-lock-constant-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3791 (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
|
3792 (if (boundp 'font-lock-builtin-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3793 font-lock-builtin-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3794 'font-lock-builtin-face)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3795 (font-lock-comment-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3796 (if (boundp 'font-lock-comment-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3797 font-lock-comment-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3798 'font-lock-comment-face)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3799 (font-lock-warning-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3800 (if (boundp 'font-lock-warning-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3801 font-lock-warning-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3802 'font-lock-warning-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3803 (my-cperl-REx-ctl-face ; (|) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3804 (if (boundp 'font-lock-keyword-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3805 font-lock-keyword-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3806 'font-lock-keyword-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3807 (my-cperl-REx-modifiers-face ; //gims |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3808 (if (boundp 'cperl-nonoverridable-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3809 cperl-nonoverridable-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3810 'cperl-nonoverridable-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3811 (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
|
3812 (if (boundp 'font-lock-type-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3813 font-lock-type-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3814 'font-lock-type-face)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3815 (stop-point (if ignore-max |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3816 (point-max) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3817 max)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3818 (search |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3819 (concat |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3820 "\\(\\`\n?\\|^\n\\)=" ; POD |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3821 "\\|" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3822 ;; One extra () before this: |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3823 "<<" ; HERE-DOC |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3824 "\\(" ; 1 + 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3825 ;; First variant "BLAH" or just ``. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3826 "[ \t]*" ; Yes, whitespace is allowed! |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3827 "\\([\"'`]\\)" ; 2 + 1 = 3 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3828 "\\([^\"'`\n]*\\)" ; 3 + 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3829 "\\3" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3830 "\\|" |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3831 ;; 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
|
3832 "\\\\?\\(\\([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
|
3833 ;; 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
|
3834 ;; "\\([^= \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
|
3835 "\\(\\)" ; To preserve count of pars :-( 6 + 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3836 "\\)" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3837 "\\|" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3838 ;; 1+6 extra () before this: |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3839 "^[ \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
|
3840 (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
|
3841 (concat |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3842 "\\|" |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3843 ;; 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
|
3844 "\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>" ; QUOTED CONSTRUCT |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3845 "\\|" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3846 ;; 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
|
3847 "\\([?/<]\\)" ; /blah/ or ?blah? or <file*glob> |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3848 "\\|" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3849 ;; 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
|
3850 "\\<sub\\>" ; sub with proto/attr |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3851 "\\(" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3852 cperl-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3853 "\\(::[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
|
3854 "\\(" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3855 cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3856 "\\(([^()]*)\\|:[^:]\\)\\)" ; prototype or attribute start |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3857 "\\|" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3858 ;; 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
|
3859 "\\$\\(['{]\\)" ; $' or ${foo} |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3860 "\\|" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3861 ;; 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
|
3862 ;; we do not support intervening comments...): |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3863 "\\(\\<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
|
3864 ;; 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
|
3865 "\\|" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3866 "__\\(END\\|DATA\\)__" ; __END__ or __DATA__ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3867 ;; 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
|
3868 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3869 "\\\\\\(['`\"($]\\)") ; BACKWACKED something-hairy |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3870 "")))) |
20323 | 3871 (unwind-protect |
3872 (progn | |
3873 (save-excursion | |
3874 (or non-inter | |
3875 (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
|
3876 ;;(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
|
3877 (and cperl-pod-here-fontify |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3878 ;; 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
|
3879 (setq face cperl-pod-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3880 head-face cperl-pod-head-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3881 here-face cperl-here-face)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3882 (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
|
3883 '(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
|
3884 attrib-group t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3885 REx-interpolated t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3886 cperl-postpone t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3887 syntax-subtype t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3888 rear-nonsticky t |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3889 front-sticky t |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3890 here-doc-group t |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3891 first-format-line t |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3892 REx-part2 t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3893 indentable t)) |
20323 | 3894 ;; Need to remove face as well... |
3895 (goto-char min) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3896 (and (eq system-type 'emx) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3897 (eq (point) 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3898 (let ((case-fold-search t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3899 (looking-at "extproc[ \t]")) ; Analogue of #! |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3900 (cperl-commentify min |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3901 (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
|
3902 nil)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3903 (while (and |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3904 (< (point) max) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3905 (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
|
3906 (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
|
3907 (setq b (match-beginning 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3908 state (save-excursion (parse-partial-sexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3909 state-point b nil nil state)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3910 state-point b) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3911 (cond |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3912 ;; 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
|
3913 ;; "\\$\\(['{]\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3914 ((match-beginning 18) ; $' or ${foo} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3915 (if (eq (preceding-char) ?\') ; $' |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3916 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3917 (setq b (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3918 state (parse-partial-sexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3919 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
|
3920 state-point (1- b)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3921 (if (nth 3 state) ; in string |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3922 (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
|
3923 (goto-char (1+ b))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3924 ;; else: ${ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3925 (setq bb (match-beginning 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3926 (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
|
3927 ;; 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
|
3928 ((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
|
3929 t) ; Do nothing in comment/string |
20323 | 3930 ((match-beginning 1) ; POD section |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3931 ;; "\\(\\`\n?\\|^\n\\)=" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3932 (setq b (match-beginning 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3933 state (parse-partial-sexp |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3934 state-point b nil nil state) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3935 state-point b) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3936 (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
|
3937 (looking-at "cut\\>")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3938 (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
|
3939 nil ; Doing a chunk only |
20323 | 3940 (message "=cut is not preceded by a POD section") |
3941 (or (car err-l) (setcar err-l (point)))) | |
3942 (beginning-of-line) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3943 |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
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 bb b |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3946 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
|
3947 b1 nil) ; error condition |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3948 ;; 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
|
3949 ;; 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
|
3950 (or (re-search-forward "^\n=cut\\>" stop-point 'toend) |
20323 | 3951 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3952 (goto-char b) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3953 (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
|
3954 (progn |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3955 (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
|
3956 (setq b1 t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3957 (or (car err-l) (setcar err-l b)))))) |
20323 | 3958 (beginning-of-line 2) ; An empty line after =cut is not POD! |
3959 (setq e (point)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3960 (and (> e max) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3961 (progn |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3962 (remove-text-properties |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3963 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
|
3964 attrib-group t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3965 REx-interpolated t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3966 cperl-postpone t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3967 syntax-subtype t |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3968 here-doc-group t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3969 rear-nonsticky t |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3970 front-sticky t |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3971 first-format-line t |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
3972 REx-part2 t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3973 indentable t)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3974 (setq tmpend tb))) |
20323 | 3975 (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
|
3976 (put-text-property b e 'syntax-type 'in-pod) |
20323 | 3977 (goto-char b) |
3978 (while (re-search-forward "\n\n[ \t]" e t) | |
3979 ;; We start 'pod 1 char earlier to include the preceding line | |
3980 (beginning-of-line) | |
3981 (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
|
3982 (cperl-put-do-not-fontify b (point) t) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3983 ;; mark the non-literal parts as PODs |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3984 (if cperl-pod-here-fontify |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3985 (cperl-postpone-fontification b (point) 'face face t)) |
20323 | 3986 (re-search-forward "\n\n[^ \t\f\n]" e 'toend) |
3987 (beginning-of-line) | |
3988 (setq b (point))) | |
3989 (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
|
3990 (cperl-put-do-not-fontify (point) e t) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3991 (if cperl-pod-here-fontify |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3992 (progn |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3993 ;; mark the non-literal parts as PODs |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3994 (cperl-postpone-fontification (point) e 'face face t) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3995 (goto-char bb) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3996 (if (looking-at |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3997 "=[a-zA-Z0-9_]+\\>[ \t]*\\(\\(\n?[^\n]\\)+\\)$") |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3998 ;; mark the headers |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3999 (cperl-postpone-fontification |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
4000 (match-beginning 1) (match-end 1) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4001 'face head-face)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4002 (while (re-search-forward |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4003 ;; One paragraph |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4004 "^\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
|
4005 e 'toend) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4006 ;; mark the headers |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4007 (cperl-postpone-fontification |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
4008 (match-beginning 1) (match-end 1) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
4009 'face head-face)))) |
20323 | 4010 (cperl-commentify bb e nil) |
4011 (goto-char e) | |
4012 (or (eq e (point-max)) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4013 (forward-char -1)))) ; Prepare for immediate POD start. |
20323 | 4014 ;; Here document |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4015 ;; 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
|
4016 ;; 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
|
4017 ;; ;; One extra () before this: |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4018 ;;"<<" |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4019 ;; "\\(" ; 1 + 1 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4020 ;; ;; First variant "BLAH" or just ``. |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4021 ;; "[ \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
|
4022 ;; "\\([\"'`]\\)" ; 2 + 1 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4023 ;; "\\([^\"'`\n]*\\)" ; 3 + 1 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4024 ;; "\\3" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4025 ;; "\\|" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4026 ;; ;; 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
|
4027 ;; "\\\\?\\(\\([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
|
4028 ;; ;; 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
|
4029 ;; ;; "\\([^= \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
|
4030 ;; "\\(\\)" ; 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
|
4031 ;; "\\)" |
20323 | 4032 ((match-beginning 2) ; 1 + 1 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4033 (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
|
4034 tb (match-beginning 0) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4035 c (and ; not HERE-DOC |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4036 (match-beginning 5) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4037 (save-match-data |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4038 (or (looking-at "[ \t]*(") ; << function_call() |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4039 (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
|
4040 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4041 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4042 (goto-char tb) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4043 ;;; XXX What to do: foo <<bar ??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4044 ;;; 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
|
4045 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4046 (save-match-data |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4047 ; $foo << b; $f .= <<B; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4048 ; ($f+1) << b; a($f) . <<B; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4049 ; foo 1, <<B; $x{a} <<b; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4050 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4051 ((looking-at "[0-9$({]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4052 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4053 (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4054 (looking-at "[ \t]*<<") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4055 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4056 ;; print $foo <<EOF |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4057 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4058 (forward-sexp -2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4059 (not |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4060 (looking-at "\\(printf?\\|system\\|exec\\|sort\\)\\>"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4061 (error t))))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4062 (error nil))) ; func(<<EOF) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4063 (and (not (match-beginning 6)) ; Empty |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4064 (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4065 "[ \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
|
4066 (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
|
4067 nil ; Skip it. |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4068 (setq c (match-end 2)) ; 1 + 1 |
20323 | 4069 (if (match-beginning 5) ;4 + 1 |
4070 (setq b1 (match-beginning 5) ; 4 + 1 | |
4071 e1 (match-end 5)) ; 4 + 1 | |
4072 (setq b1 (match-beginning 4) ; 3 + 1 | |
4073 e1 (match-end 4))) ; 3 + 1 | |
4074 (setq tag (buffer-substring b1 e1) | |
4075 qtag (regexp-quote tag)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4076 (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
|
4077 ;; Highlight the starting delimiter |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4078 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4079 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
|
4080 (cperl-put-do-not-fontify b1 e1 t))) |
20323 | 4081 (forward-line) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4082 (setq i (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4083 (if end-of-here-doc |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4084 (goto-char end-of-here-doc)) |
20323 | 4085 (setq b (point)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4086 ;; 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
|
4087 ;; 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
|
4088 (or (and (re-search-forward (concat "^" qtag "$") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4089 stop-point 'toend) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4090 ;;;(eq (following-char) ?\n) ; XXXX WHY??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4091 ) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4092 (progn ; Pretend we matched at the end |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4093 (goto-char (point-max)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4094 (re-search-forward "\\'") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4095 (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
|
4096 (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
|
4097 (if cperl-pod-here-fontify |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4098 (progn |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4099 ;; Highlight the ending delimiter |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4100 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4101 (match-beginning 0) (match-end 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4102 'face my-cperl-delimiters-face) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4103 (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
|
4104 ;; Highlight the HERE-DOC |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4105 (cperl-postpone-fontification b (match-beginning 0) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4106 'face here-face))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4107 (setq e1 (cperl-1+ (match-end 0))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4108 (put-text-property b (match-beginning 0) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4109 'syntax-type 'here-doc) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4110 (put-text-property (match-beginning 0) e1 |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4111 'syntax-type 'here-doc-delim) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4112 (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
|
4113 ;; 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
|
4114 ;; the whole construct: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4115 (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
|
4116 (cperl-commentify b e1 nil) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4117 (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
|
4118 ;; Cache the syntax info... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4119 (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
|
4120 ;; ... 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
|
4121 (setq overshoot |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4122 (elt ; non-inter ignore-max |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4123 (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
|
4124 (if (and overshoot (> overshoot (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4125 (goto-char overshoot) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4126 (setq overshoot e1)) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4127 (if (> e1 max) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4128 (setq tmpend tb)))) |
20323 | 4129 ;; format |
4130 ((match-beginning 8) | |
4131 ;; 1+6=7 extra () before this: | |
4132 ;;"^[ \t]*\\(format\\)[ \t]*\\([a-zA-Z0-9_]+\\)?[ \t]*=[ \t]*$" | |
4133 (setq b (point) | |
4134 name (if (match-beginning 8) ; 7 + 1 | |
4135 (buffer-substring (match-beginning 8) ; 7 + 1 | |
4136 (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
|
4137 "") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4138 tb (match-beginning 0)) |
20323 | 4139 (setq argument nil) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4140 (put-text-property (save-excursion |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4141 (beginning-of-line) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4142 (point)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4143 b 'first-format-line 't) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4144 (if cperl-pod-here-fontify |
20323 | 4145 (while (and (eq (forward-line) 0) |
4146 (not (looking-at "^[.;]$"))) | |
4147 (cond | |
4148 ((looking-at "^#")) ; Skip comments | |
4149 ((and argument ; Skip argument multi-lines | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4150 (looking-at "^[ \t]*{")) |
20323 | 4151 (forward-sexp 1) |
4152 (setq argument nil)) | |
4153 (argument ; Skip argument lines | |
4154 (setq argument nil)) | |
4155 (t ; Format line | |
4156 (setq b1 (point)) | |
4157 (setq argument (looking-at "^[^\n]*[@^]")) | |
4158 (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
|
4159 ;; Highlight the format line |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4160 (cperl-postpone-fontification b1 (point) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4161 'face font-lock-string-face) |
20323 | 4162 (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
|
4163 (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
|
4164 ;; 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
|
4165 ;; 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
|
4166 (re-search-forward "^[.;]$" stop-point 'toend)) |
20323 | 4167 (beginning-of-line) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4168 (if (looking-at "^\\.$") ; ";" is not supported yet |
20323 | 4169 (progn |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4170 ;; 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
|
4171 (cperl-postpone-fontification (point) (+ (point) 2) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4172 'face font-lock-string-face) |
20323 | 4173 (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
|
4174 (cperl-put-do-not-fontify (point) (+ (point) 2) t)) |
20323 | 4175 (message "End of format `%s' not found." name) |
4176 (or (car err-l) (setcar err-l b))) | |
4177 (forward-line) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4178 (if (> (point) max) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4179 (setq tmpend tb)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4180 (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
|
4181 ;; qq-like String or Regexp: |
20323 | 4182 ((or (match-beginning 10) (match-beginning 11)) |
4183 ;; 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
|
4184 ;; "\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>" |
20323 | 4185 ;; "\\|" |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4186 ;; "\\([?/<]\\)" ; /blah/ or ?blah? or <file*glob> |
20323 | 4187 (setq b1 (if (match-beginning 10) 10 11) |
4188 argument (buffer-substring | |
4189 (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
|
4190 b (point) ; end of qq etc |
20323 | 4191 i b |
4192 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
|
4193 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
|
4194 ;; 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
|
4195 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
|
4196 (and (memq bb (append "$@%*#_:-&>" nil)) ; $#y) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4197 (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
|
4198 ((eq bb ?\:) ; $opt::s |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4199 (eq (char-after |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4200 (- (match-beginning b1) 2)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4201 ?\:)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4202 ((eq bb ?\>) ; $foo->s |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4203 (eq (char-after |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4204 (- (match-beginning b1) 2)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4205 ?\-)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4206 ((eq bb ?\&) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4207 (not (eq (char-after ; &&m/blah/ |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4208 (- (match-beginning b1) 2)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4209 ?\&))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4210 (t t))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4211 ;; <file> or <$file> |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4212 (and (eq c ?\<) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4213 ;; 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
|
4214 (save-match-data |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4215 (looking-at |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4216 "\\$?\\([_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
|
4217 tb (match-beginning 0)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4218 (goto-char (match-beginning b1)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4219 (cperl-backward-to-noncomment (point-min)) |
20323 | 4220 (or bb |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4221 (if (eq b1 11) ; bare /blah/ or ?blah? or <foo> |
20323 | 4222 (setq argument "" |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4223 b1 nil |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4224 bb ; Not a regexp? |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4225 (not |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4226 ;; What is below: regexp-p? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4227 (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4228 (or (memq (preceding-char) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4229 (append (if (memq c '(?\? ?\<)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4230 ;; $a++ ? 1 : 2 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4231 "~{(=|&*!,;:[" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4232 "~{(=|&+-*!,;:[") nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4233 (and (eq (preceding-char) ?\}) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4234 (cperl-after-block-p (point-min))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4235 (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
|
4236 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4237 (forward-sexp -1) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4238 ;; 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
|
4239 ;; 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
|
4240 (if (eq (preceding-char) ?-) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4241 ;; -d ?foo? is a RE |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4242 (looking-at "[a-zA-Z]\\>") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4243 (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4244 (not (memq (preceding-char) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4245 '(?$ ?@ ?& ?%))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4246 (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4247 "\\(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
|
4248 (and (eq (preceding-char) ?.) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4249 (eq (char-after (- (point) 2)) ?.)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4250 (bobp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4251 ;; m|blah| ? foo : bar; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4252 (not |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4253 (and (eq c ?\?) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4254 cperl-use-syntax-table-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4255 (not (bobp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4256 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4257 (forward-char -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4258 (looking-at "\\s|")))))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4259 b (1- b)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4260 ;; s y tr m |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4261 ;; Check for $a -> y |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4262 (setq b1 (preceding-char) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4263 go (point)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4264 (if (and (eq b1 ?>) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4265 (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
|
4266 ;; Not a regexp |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4267 (setq bb t)))) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4268 (or bb |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4269 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4270 (goto-char b) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4271 (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
|
4272 (goto-char (match-end 0)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4273 (skip-chars-forward " \t\n\f")) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4274 (cond ((and (eq (following-char) ?\}) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4275 (eq b1 ?\{)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4276 ;; 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
|
4277 (goto-char (1- go)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4278 (skip-chars-backward " \t\n\f") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4279 (if (memq (preceding-char) (append "$@%&*" nil)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4280 (setq bb t) ; @{y} |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4281 (condition-case nil |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4282 (forward-sexp -1) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4283 (error nil))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4284 (if (or bb |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4285 (looking-at ; $foo -> {s} |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4286 "[$@]\\$*\\([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
|
4287 (and ; $foo[12] -> {s} |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4288 (memq (following-char) '(?\{ ?\[)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4289 (progn |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4290 (forward-sexp 1) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4291 (looking-at "\\([ \t\n]*->\\)?[ \t\n]*{")))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4292 (setq bb t) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4293 (goto-char b))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4294 ((and (eq (following-char) ?=) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4295 (eq (char-after (1+ (point))) ?\>)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4296 ;; Check for { foo => 1, s => 2 } |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4297 ;; Apparently s=> is never a substitution... |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4298 (setq bb t)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4299 ((and (eq (following-char) ?:) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4300 (eq b1 ?\{) ; Check for $ { s::bar } |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4301 (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
|
4302 (progn |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4303 (goto-char (1- go)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4304 (skip-chars-backward " \t\n\f") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4305 (memq (preceding-char) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4306 (append "$@%&*" nil)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4307 (setq bb t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4308 ((eobp) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4309 (setq bb t))))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4310 (if bb |
20323 | 4311 (goto-char i) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4312 ;; Skip whitespace and comments... |
20323 | 4313 (if (looking-at "[ \t\n\f]+\\(#[^\n]*\n[ \t\n\f]*\\)+") |
4314 (goto-char (match-end 0)) | |
4315 (skip-chars-forward " \t\n\f")) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4316 (if (> (point) b) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4317 (put-text-property b (point) 'syntax-type 'prestring)) |
20323 | 4318 ;; qtag means two-arg matcher, may be reset to |
4319 ;; 2 or 3 later if some special quoting is needed. | |
4320 ;; e1 means matching-char matcher. | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4321 (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
|
4322 ;; has 2 args |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4323 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
|
4324 ;; 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
|
4325 ;; 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
|
4326 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
|
4327 i2 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4328 st-l err-l argument) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4329 ;; 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
|
4330 ;; 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
|
4331 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
|
4332 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
|
4333 ; is with matching chars [] |
20323 | 4334 go (nth 4 i) ; There is a 1-char part after the end |
4335 i (car i) ; intermediate point | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4336 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
|
4337 ;; 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
|
4338 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
|
4339 (1- e1)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4340 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
|
4341 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
|
4342 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
|
4343 ;; If s{} (), then b/b1 are at "{", "(", e1/i after ")", "}" |
20323 | 4344 ;; Commenting \\ is dangerous, what about ( ? |
4345 (and i tail | |
4346 (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
|
4347 (setq qtag t)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4348 (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
|
4349 (looking-at "\\sw*x")) ; qr//x |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4350 (setq is-x-REx t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4351 (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
|
4352 (looking-at "\\sw*o")) ; //o |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4353 (setq is-o-REx t)) |
20323 | 4354 (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
|
4355 ;; Considered as 1arg form |
20323 | 4356 (progn |
4357 (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
|
4358 (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
|
4359 (if (or is-x-REx |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4360 ;; ignore other text properties: |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4361 (string-match "^qw$" argument)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4362 (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
|
4363 (and go |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4364 (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
|
4365 (or (eobp) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4366 (forward-char 1)))) |
20323 | 4367 (cperl-commentify b i t) |
4368 (if (looking-at "\\sw*e") ; s///e | |
4369 (progn | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4370 ;; Cache the syntax info... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4371 (setq cperl-syntax-state (cons state-point state)) |
20323 | 4372 (and |
4373 ;; silent: | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4374 (car (cperl-find-pods-heres b1 (1- (point)) t end)) |
20323 | 4375 ;; Error |
4376 (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
|
4377 (if (and tag (eq (preceding-char) ?\>)) |
20323 | 4378 (progn |
4379 (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
|
4380 (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
|
4381 (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
|
4382 (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
|
4383 (if is-x-REx |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4384 (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
|
4385 (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
|
4386 (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
|
4387 (if is-x-REx |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4388 (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
|
4389 (if qtag |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4390 (cperl-modify-syntax-type (1+ i) cperl-st-punct)) |
20323 | 4391 (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
|
4392 ;; Now: tail: if the second part is non-matching without ///e |
20323 | 4393 (if (eq (char-syntax (following-char)) ?w) |
4394 (progn | |
4395 (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
|
4396 (if tail (cperl-commentify tail (point) t)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4397 (cperl-postpone-fontification |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4398 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
|
4399 ;; 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
|
4400 ;; and highlight differently |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4401 (setq is-REx |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4402 (and (string-match "^\\([sm]?\\|qr\\)$" argument) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4403 (or (not (= (length argument) 0)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4404 (not (eq c ?\<))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4405 (if (and is-REx |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4406 (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
|
4407 ;; 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
|
4408 (save-excursion |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4409 (condition-case nil |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4410 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4411 (goto-char tb) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4412 (forward-sexp -1) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4413 (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
|
4414 (error t)))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4415 (cperl-postpone-fontification |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4416 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
|
4417 (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
|
4418 (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
|
4419 (or |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4420 (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
|
4421 (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
|
4422 (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
|
4423 (progn |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4424 (cperl-postpone-fontification |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4425 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
|
4426 (cperl-postpone-fontification |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4427 (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
|
4428 (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
|
4429 ;; Process RExen: embedded comments, charclasses and ] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4430 ;;;/\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
|
4431 ;;;/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
|
4432 ;;;/(?<=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
|
4433 ;;;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
|
4434 ;;;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
|
4435 ;;;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
|
4436 (save-excursion |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4437 (goto-char (1+ b)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4438 ;; First |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4439 (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
|
4440 (setq hairy-RE |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4441 (concat |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4442 (if is-x-REx |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4443 (if (eq (char-after b) ?\#) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4444 "\\((\\?\\\\#\\)\\|\\(\\\\#\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4445 "\\((\\?#\\)\\|\\(#\\)") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4446 ;; 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
|
4447 (if (eq (char-after b) ?\#) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4448 "\\((\\?\\\\#\\)\\(\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4449 "\\((\\?#\\)\\(\\)")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4450 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4451 "\\(\\[\\)" ; 3=[ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4452 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4453 "\\(]\\)" ; 4=] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4454 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4455 ;; 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
|
4456 (if (eq (char-after b) ?\) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4457 "\\())))\\)" ; Will never match |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4458 (if (eq (char-after b) ?? ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4459 ;;"\\((\\\\\\?\\(\\\\\\?\\)?{\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4460 "\\((\\\\\\?\\\\\\?{\\|()\\\\\\?{\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4461 "\\((\\?\\??{\\)")) ; 5= (??{ (?{ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4462 "\\|" ; 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
|
4463 "\\(" ;; XXXX 1-char variables, exc. |()\s |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4464 "[$@]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4465 "\\(" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4466 "[_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
|
4467 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4468 "{[^{}]*}" ; only one-level allowed |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4469 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4470 "[^{(|) \t\r\n\f]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4471 "\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4472 "\\(" ;;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
|
4473 "\\(" "->" "\\)?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4474 "\\[[^][]*\\]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4475 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4476 "{[^{}]*}" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4477 "\\)*" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4478 ;; XXXX: what if u is delim? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4479 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4480 "[)^|$.*?+]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4481 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4482 "{[0-9]+}" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4483 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4484 "{[0-9]+,[0-9]*}" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4485 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4486 "\\\\[luLUEQbBAzZG]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4487 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4488 "(" ; Group opener |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4489 "\\(" ; 10 group opener follower |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4490 "\\?\\((\\?\\)" ; 11: in (?(?=C)A|B) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4491 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4492 "\\?[:=!>?{]" ; "?" something |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4493 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4494 "\\?[-imsx]+[:)]" ; (?i) (?-s:.) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4495 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4496 "\\?([0-9]+)" ; (?(1)foo|bar) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4497 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4498 "\\?<[=!]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4499 ;;;"\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4500 ;;; "\\?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4501 "\\)?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4502 "\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4503 "\\|" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4504 "\\\\\\(.\\)" ; 12=\SYMBOL |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4505 )) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4506 (while |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4507 (and (< (point) (1- e)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4508 (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
|
4509 (goto-char (match-beginning 0)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4510 (setq REx-subgr-start (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4511 was-subgr (following-char)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4512 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4513 ((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
|
4514 (goto-char (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4515 (if (match-beginning 11) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4516 (goto-char (match-beginning 11))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4517 (if (>= (point) e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4518 (goto-char (1- e))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4519 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4520 (match-beginning 0) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4521 'face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4522 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4523 ((eq was-subgr ?\) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4524 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4525 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4526 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4527 (if (> (point) b) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4528 (if (if (eq (char-after b) ?? ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4529 (looking-at "(\\\\\\?") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4530 (eq (char-after (1+ (point))) ?\?)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4531 my-cperl-REx-0length-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4532 my-cperl-REx-ctl-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4533 font-lock-warning-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4534 (error font-lock-warning-face))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4535 ((eq was-subgr ?\| ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4536 my-cperl-REx-ctl-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4537 ((eq was-subgr ?\$ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4538 (if (> (point) (1+ REx-subgr-start)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4539 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4540 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4541 (match-beginning 0) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4542 'REx-interpolated |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4543 (if is-o-REx 0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4544 (if (and (eq (match-beginning 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4545 (1+ b)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4546 (eq (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4547 (1- e))) 1 t))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4548 font-lock-variable-name-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4549 my-cperl-REx-spec-char-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4550 ((memq was-subgr (append "^." nil) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4551 my-cperl-REx-spec-char-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4552 ((eq was-subgr ?\( ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4553 (if (not (match-beginning 10)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4554 my-cperl-REx-ctl-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4555 my-cperl-REx-0length-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4556 (t my-cperl-REx-0length-face))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4557 (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
|
4558 (not (string-match "(\\?[-imsx]+)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4559 (match-string 0)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4560 (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
|
4561 (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
|
4562 ((match-beginning 12) ; \SYMBOL |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4563 (forward-char 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4564 (if (>= (point) e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4565 (goto-char (1- e)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4566 ;; How many chars to not highlight: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4567 ;; 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
|
4568 ;; 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
|
4569 ;; 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
|
4570 (setq REx-subgr-start (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4571 qtag (preceding-char)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4572 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4573 (- (point) 2) (- (point) 1) 'face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4574 (if (memq qtag |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4575 (append "ghijkmoqvFHIJKMORTVY" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4576 font-lock-warning-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4577 my-cperl-REx-0length-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4578 (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
|
4579 (memq qtag (append ".])^$|*?+" nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4580 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4581 (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
|
4582 (eq qtag ?\) )) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4583 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4584 REx-subgr-start (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4585 'syntax-table cperl-st-punct)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4586 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4587 (1- (point)) (point) 'face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4588 ; \] can't appear below |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4589 (if (memq qtag (append ".]^$" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4590 'my-cperl-REx-spec-char-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4591 (if (memq qtag (append "*?+" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4592 'my-cperl-REx-0length-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4593 'my-cperl-REx-ctl-face))))) ; )| |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4594 ;; Test for arguments: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4595 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4596 ;; 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
|
4597 ;; \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
|
4598 ;; \DIGIT -> backref unless \0 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4599 ;; \DIGITs -> backref if legal |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4600 ;; otherwise up to 3 -> octal |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4601 ;; 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
|
4602 ((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
|
4603 (re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4604 "\\=[01234567]?[01234567]?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4605 (1- e) 'to-end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4606 (and (memq qtag (append "89" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4607 (re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4608 "\\=[0123456789]*" (1- e) 'to-end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4609 (and (eq qtag ?x) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4610 (re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4611 "\\=[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
|
4612 (1- e) 'to-end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4613 (and (memq qtag (append "pPN" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4614 (re-search-forward "\\={[^{}]+}\\|." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4615 (1- e) 'to-end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4616 (eq (char-syntax qtag) ?w)) |
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- REx-subgr-start) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4619 'face my-cperl-REx-length1-face)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4620 (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
|
4621 ((match-beginning 3) ; [charclass] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4622 (forward-char 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4623 (if (eq (char-after b) ?^ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4624 (and (eq (following-char) ?\\ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4625 (eq (char-after (cperl-1+ (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4626 ?^ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4627 (forward-char 2)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4628 (and (eq (following-char) ?^ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4629 (forward-char 1))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4630 (setq argument b ; continue? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4631 tag nil ; list of POSIX classes |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4632 qtag (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4633 (if (eq (char-after b) ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4634 (and (eq (following-char) ?\\ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4635 (eq (char-after (cperl-1+ (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4636 ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4637 (setq qtag (1+ qtag)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4638 (forward-char 2)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4639 (and (eq (following-char) ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4640 (forward-char 1))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4641 ;; 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
|
4642 ;; in m]]: m][\\\]\]] produces [\\]] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4643 ;;; POSIX? [:word:] [:^word:] only inside [] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4644 ;;; "\\=\\(\\\\.\\|[^][\\\\]\\|\\[:\\^?\sw+:]\\|\\[[^:]\\)*]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4645 (while |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4646 (and argument |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4647 (re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4648 (if (eq (char-after b) ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4649 "\\=\\(\\\\[^]]\\|[^]\\\\]\\)*\\\\]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4650 "\\=\\(\\\\.\\|[^]\\\\]\\)*]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4651 (1- e) 'toend)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4652 ;; 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
|
4653 (if (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4654 (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4655 (search-backward "[" argument t) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4656 (< REx-subgr-start (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4657 (not |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4658 (and ; Should work with delim = \ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4659 (eq (preceding-char) ?\\ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4660 (= (% (skip-chars-backward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4661 "\\\\") 2) 0))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4662 (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4663 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4664 ((eq (char-after b) ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4665 "\\\\*\\[:\\^?\\sw+:\\\\\\]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4666 ((eq (char-after b) ?\: ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4667 "\\\\*\\[\\\\:\\^?\\sw+\\\\:]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4668 ((eq (char-after b) ?^ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4669 "\\\\*\\[:\\(\\\\\\^\\)?\\sw+:\]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4670 ((eq (char-syntax (char-after b)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4671 ?w) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4672 (concat |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4673 "\\\\*\\[:\\(\\\\\\^\\)?\\(\\\\" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4674 (char-to-string (char-after b)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4675 "\\|\\sw\\)+:\]")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4676 (t "\\\\*\\[:\\^?\\sw*:]"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4677 (setq argument (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4678 (setq tag (cons (cons argument (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4679 tag) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4680 argument (point)) ; continue |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4681 (setq argument nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4682 (and argument |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4683 (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
|
4684 REx-subgr-start)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4685 (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
|
4686 (> (- (point) 2) REx-subgr-start)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4687 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4688 (1+ REx-subgr-start) (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4689 'syntax-table cperl-st-punct)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4690 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4691 REx-subgr-start qtag |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4692 '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
|
4693 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4694 (1- (point)) (point) 'face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4695 my-cperl-REx-spec-char-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4696 (if (eq (char-after b) ?\] ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4697 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4698 (- (point) 2) (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4699 'face my-cperl-REx-0length-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4700 (while tag |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4701 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4702 (car (car tag)) (cdr (car tag)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4703 'face my-cperl-REx-length1-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4704 (setq tag (cdr tag))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4705 (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
|
4706 ;; Now rare stuff: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4707 ((and (match-beginning 2) ; #-comment |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4708 (/= (match-beginning 2) (match-end 2))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4709 (beginning-of-line 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4710 (if (> (point) e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4711 (goto-char (1- e)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4712 ((match-beginning 4) ; character "]" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4713 (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
|
4714 (goto-char (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4715 (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
|
4716 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4717 (1- (point)) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4718 'syntax-table cperl-st-punct)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4719 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4720 (1- (point)) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4721 'face font-lock-warning-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4722 ((match-beginning 5) ; before (?{}) (??{}) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4723 (setq tag (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4724 (if (or (setq qtag |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4725 (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
|
4726 (and (>= (point) e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4727 (setq qtag "no matching `)' found")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4728 (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
|
4729 ?\} )) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4730 (setq qtag "Can't find })"))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4731 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4732 (goto-char (1- e)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4733 (message qtag)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4734 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4735 (1- tag) (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4736 'face font-lock-variable-name-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4737 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4738 REx-subgr-start (1- tag) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4739 '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
|
4740 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4741 (1- (point)) (point) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4742 '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
|
4743 (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
|
4744 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4745 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4746 (- (point) 2) (1- (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4747 'syntax-table cperl-st-cfence) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4748 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4749 (+ REx-subgr-start 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4750 (+ REx-subgr-start 3) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4751 'syntax-table cperl-st-cfence)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4752 (setq was-subgr nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4753 (t ; (?#)-comment |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4754 ;; 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
|
4755 ;; 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
|
4756 (or;;(if (eq (char-after b) ?\) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4757 ;;(re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4758 ;; "[^\\\\]\\(\\\\\\\\\\)*\\\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4759 ;; (1- e) 'toend) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4760 (search-forward ")" (1- e) 'toend) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4761 ;;) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4762 (message |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4763 "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
|
4764 REx-subgr-start)))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4765 (if (>= (point) e) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4766 (goto-char (1- e))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4767 (cond |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4768 (was-subgr |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4769 (setq REx-subgr-end (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4770 (cperl-commentify |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4771 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
|
4772 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4773 REx-subgr-start REx-subgr-end |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4774 'face font-lock-comment-face)))))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4775 (if (and is-REx is-x-REx) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4776 (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
|
4777 'syntax-subtype 'x-REx))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4778 (if i2 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4779 (progn |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4780 (cperl-postpone-fontification |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4781 (1- e1) 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
|
4782 (if (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
|
4783 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4784 (cperl-postpone-fontification |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4785 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
|
4786 (put-text-property b1 (1+ b1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4787 '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
|
4788 (if (> (point) max) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4789 (setq tmpend tb)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4790 ((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
|
4791 ;; 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
|
4792 ;;"\\<sub\\>\\(" ;12 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4793 ;; cperl-white-and-comment-rex ;13 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4794 ;; "\\([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
|
4795 ;;"\\(" 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
|
4796 ;; "\\(([^()]*)\\|:[^:]\\)\\)" ; 17:proto or attribute start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4797 (setq b1 (match-beginning 14) e1 (match-end 14)) |
20323 | 4798 (if (memq (char-after (1- b)) |
4799 '(?\$ ?\@ ?\% ?\& ?\*)) | |
4800 nil | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4801 (goto-char b) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4802 (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
|
4803 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4804 (cperl-commentify ; Prototypes; mark as string |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4805 (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
|
4806 (goto-char (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4807 ;; Now look for attributes after prototype: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4808 (forward-comment (buffer-size)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4809 (and (looking-at ":[^:]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4810 (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
|
4811 ;; treat attributes without prototype |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4812 (goto-char (match-beginning 17)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4813 (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
|
4814 ;; 1+6+2+1+1+6+1=18 extra () before this: |
20323 | 4815 ;; "\\(\\<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
|
4816 ((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
|
4817 (setq bb (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4818 ;;;(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
|
4819 (put-text-property (1- bb) bb 'syntax-table cperl-st-word) |
20323 | 4820 (goto-char bb)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4821 ;; 1+6+2+1+1+6+1+1=19 extra () before this: |
20323 | 4822 ;; "__\\(END\\|DATA\\)__" |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4823 ((match-beginning 20) ; __END__, __DATA__ |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4824 (setq bb (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4825 ;; (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
|
4826 (cperl-commentify b bb nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4827 (setq end t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4828 ;; "\\\\\\(['`\"($]\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4829 ((match-beginning 21) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4830 ;; 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
|
4831 (setq bb (match-end 0)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4832 (goto-char b) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4833 (skip-chars-backward "\\\\") |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4834 ;;;(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
|
4835 (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
|
4836 (goto-char bb)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4837 (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
|
4838 (if (> (point) stop-point) |
20323 | 4839 (progn |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4840 (if end |
20323 | 4841 (message "Garbage after __END__/__DATA__ ignored") |
4842 (message "Unbalanced syntax found while scanning") | |
4843 (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
|
4844 (goto-char stop-point)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4845 (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
|
4846 ;; 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
|
4847 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
|
4848 ;;(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
|
4849 ) |
20323 | 4850 (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
|
4851 (or non-inter |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4852 (message "Scanning for \"hard\" Perl constructions... done")))) |
20323 | 4853 (and (buffer-modified-p) |
4854 (not modified) | |
4855 (set-buffer-modified-p nil)) | |
63836
e6973993a720
(cperl-find-pods-heres): Don't gratuitously
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63518
diff
changeset
|
4856 ;; 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
|
4857 ;; 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
|
4858 ;; cperl-mode-syntax-table. |
e6973993a720
(cperl-find-pods-heres): Don't gratuitously
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63518
diff
changeset
|
4859 ;; (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
|
4860 ) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4861 (list (car err-l) overshoot))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4862 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4863 (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
|
4864 (interactive "r") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4865 (cperl-find-pods-heres min max)) |
20323 | 4866 |
4867 (defun cperl-backward-to-noncomment (lim) | |
4868 ;; 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
|
4869 ;; 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
|
4870 (let (stop p pr) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4871 (while (and (not stop) (> (point) (or lim (point-min)))) |
20323 | 4872 (skip-chars-backward " \t\n\f" lim) |
4873 (setq p (point)) | |
4874 (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
|
4875 (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
|
4876 '(pod here-doc here-doc-delim)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4877 (cperl-unwind-to-safe nil) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4878 (or (and (looking-at "^[ \t]*\\(#\\|$\\)") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4879 (not (memq pr '(string prestring)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4880 (progn (cperl-to-comment-or-eol) (bolp)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4881 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4882 (skip-chars-backward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4883 (if (< p (point)) (goto-char p)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4884 (setq stop t))))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4885 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4886 ;; Used only in `cperl-calculate-indent'... |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4887 (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
|
4888 ;; 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
|
4889 ;; 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
|
4890 (cperl-backward-to-noncomment (point-min)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4891 (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
|
4892 ; 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
|
4893 (save-excursion (cperl-after-label)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4894 (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
|
4895 (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
|
4896 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4897 (backward-sexp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4898 ;; 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
|
4899 (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
|
4900 (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
|
4901 ;; sub bless::foo {} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4902 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4903 (cperl-backward-to-noncomment (point-min)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4904 (and (eq (preceding-char) ?b) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4905 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4906 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4907 (looking-at "sub[ \t\n\f#]"))))))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4908 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4909 ;;; 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
|
4910 ;;; 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
|
4911 ;;; 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
|
4912 ;;; ${something()}, print {FH} $data. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4913 ;;; 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
|
4914 ;;; 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
|
4915 (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
|
4916 "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
|
4917 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
|
4918 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
|
4919 statement would start; thus the block in ${func()} does not count." |
20323 | 4920 (save-excursion |
4921 (condition-case nil | |
4922 (progn | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4923 (or pre-block (forward-sexp -1)) |
20323 | 4924 (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
|
4925 (or (eq (point) lim) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4926 ;; if () {} // sub f () {} // sub f :a(') {} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4927 (eq (preceding-char) ?\) ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4928 ;; label: {} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4929 (save-excursion (cperl-after-label)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4930 ;; sub :attr {} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4931 (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
|
4932 (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
|
4933 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4934 (forward-sexp -1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4935 ;; else {} but not else::func {} |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4936 (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
|
4937 (not (looking-at "\\(\\sw\\|_\\)+::"))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4938 ;; sub f {} |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4939 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4940 (cperl-backward-to-noncomment lim) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4941 (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
|
4942 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4943 (forward-sexp -1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4944 (looking-at "sub[ \t\n\f#]")))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4945 ;; 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
|
4946 (cperl-after-expr-p lim)))) |
20323 | 4947 (error nil)))) |
4948 | |
4949 (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
|
4950 "Return true if the position is good for start of expression. |
20323 | 4951 TEST is the expression to evaluate at the found position. If absent, |
4952 CHARS is a string that contains good characters to have before us (however, | |
4953 `}' 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
|
4954 (let ((lim (or lim (point-min))) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4955 stop p pr) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4956 (cperl-update-syntaxification (point) (point)) |
20323 | 4957 (save-excursion |
4958 (while (and (not stop) (> (point) lim)) | |
4959 (skip-chars-backward " \t\n\f" lim) | |
4960 (setq p (point)) | |
4961 (beginning-of-line) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4962 ;;(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
|
4963 ;; '(pod here-doc here-doc-delim)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4964 (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
|
4965 (progn |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4966 (goto-char |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4967 (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
|
4968 (beginning-of-line 0))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4969 (if (get-text-property (point) 'in-pod) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4970 (progn |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4971 (goto-char |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
4972 (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
|
4973 (beginning-of-line 0))) |
20323 | 4974 (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
|
4975 ;; Else: last iteration, or a label |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4976 (cperl-to-comment-or-eol) ; Will not move past "." after a format |
20323 | 4977 (skip-chars-backward " \t") |
4978 (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
|
4979 (setq p (point)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4980 (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
|
4981 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4982 (forward-char -1) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4983 (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
|
4984 (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
|
4985 (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
|
4986 (goto-char p) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4987 (setq stop t)))) |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
4988 (or (bobp) ; ???? Needed |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
4989 (eq (point) lim) |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
4990 (looking-at "[ \t]*__\\(END\\|DATA\\)__") ; After this anything goes |
20323 | 4991 (progn |
4992 (if test (eval test) | |
4993 (or (memq (preceding-char) (append (or chars "{;") nil)) | |
4994 (and (eq (preceding-char) ?\}) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4995 (cperl-after-block-p lim)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4996 (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
|
4997 (eq (get-text-property (point) 'syntax-type) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4998 'format))))))))) |
20323 | 4999 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5000 (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
|
5001 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5002 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5003 (while (and (or (not lim) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5004 (> (point) lim)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5005 (not (cperl-after-expr-p lim))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5006 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5007 ;; 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
|
5008 (skip-chars-backward "$@%#"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5009 (error nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5010 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5011 (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
|
5012 ;; 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
|
5013 (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
|
5014 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5015 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5016 ;; 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
|
5017 ;; 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
|
5018 ;; 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
|
5019 ;; 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
|
5020 (let ((p (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5021 (forward-sexp 1) |
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 (while (memq (preceding-char) (append "%&@$*" nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5024 (forward-char -1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5025 (or (< (point) p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5026 (cperl-after-expr-p lim)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5027 (error t)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5028 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5029 (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
|
5030 (let ((p (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5031 (condition-case nil |
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 (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
|
5034 (not (cperl-at-end-of-expr))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5035 (forward-sexp 1))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5036 (error nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5037 |
20323 | 5038 (defun cperl-backward-to-start-of-continued-exp (lim) |
5039 (if (memq (preceding-char) (append ")]}\"'`" nil)) | |
5040 (forward-sexp -1)) | |
5041 (beginning-of-line) | |
5042 (if (<= (point) lim) | |
5043 (goto-char (1+ lim))) | |
5044 (skip-chars-forward " \t")) | |
5045 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5046 (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
|
5047 ;; We assume that we are after ?\} |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5048 (and |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5049 (cperl-after-block-p lim) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5050 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5051 (forward-sexp -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5052 (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
|
5053 (or (bobp) |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
5054 (eq (point) lim) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5055 (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
|
5056 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5057 (forward-sexp -1) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5058 (not |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5059 (looking-at |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5060 "\\(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
|
5061 |
20323 | 5062 |
5063 (defun cperl-indent-exp () | |
5064 "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
|
5065 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5066 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
|
5067 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
|
5068 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5069 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
|
5070 conditional/loop constructs." |
20323 | 5071 (interactive) |
5072 (save-excursion | |
5073 (let ((tmp-end (progn (end-of-line) (point))) top done) | |
5074 (save-excursion | |
5075 (beginning-of-line) | |
5076 (while (null done) | |
5077 (setq top (point)) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5078 ;; 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
|
5079 (while (= -1 (nth 0 (parse-partial-sexp (point) tmp-end -1))) |
20323 | 5080 (setq top (point))) ; Get the outermost parenths in line |
5081 (goto-char top) | |
5082 (while (< (point) tmp-end) | |
5083 (parse-partial-sexp (point) tmp-end nil t) ; To start-sexp or eol | |
5084 (or (eolp) (forward-sexp 1))) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5085 (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
|
5086 nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5087 (if (eq ?\) (preceding-char)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5088 (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
|
5089 (setq top (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5090 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5091 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5092 (forward-sexp -2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5093 (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
|
5094 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5095 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5096 (if (looking-at "\\(my\\|local\\|our\\)\\>") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5097 (forward-sexp -1)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5098 (if (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5099 (concat "\\(\\elsif\\|if\\|unless\\|while\\|until" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5100 "\\|for\\(each\\)?\\>\\(\\(" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5101 cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5102 "\\(my\\|local\\|our\\)\\)?" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5103 cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5104 "\\$[_a-zA-Z0-9]+\\)?\\)\\>")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5105 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5106 (goto-char top) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5107 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5108 (setq top (point))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5109 (error (setq done t))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5110 (goto-char top)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5111 (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
|
5112 (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
|
5113 "\\<\\(else\\|elsif\|continue\\)\\>")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5114 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5115 (goto-char (match-end 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5116 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5117 (end-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5118 (setq tmp-end (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5119 (setq done t)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5120 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5121 (end-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5122 (setq tmp-end (point)))) |
20323 | 5123 (goto-char tmp-end) |
5124 (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
|
5125 (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
|
5126 (cperl-fix-line-spacing tmp-end)) |
20323 | 5127 (cperl-indent-region (point) tmp-end)))) |
5128 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5129 (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
|
5130 "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
|
5131 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
|
5132 (interactive) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5133 (or end |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5134 (setq end (point-max))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5135 (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
|
5136 (cperl-indent-region-fix-constructs |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5137 (or cperl-indent-region-fix-constructs 1)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5138 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
|
5139 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5140 (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
|
5141 (setq ret (point)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5142 ;; }? continue |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5143 ;; blah; } |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5144 (if (not |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5145 (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
|
5146 (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
|
5147 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
|
5148 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5149 ;; } |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5150 ;; else |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5151 (if cperl-merge-trailing-else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5152 (if (looking-at |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5153 "[ \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
|
5154 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5155 (search-forward "}") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5156 (setq p (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5157 (skip-chars-forward " \t\n") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5158 (delete-region p (point)) |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5159 (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
|
5160 (beginning-of-line))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5161 (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
|
5162 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5163 (search-forward "}") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5164 (delete-horizontal-space) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5165 (insert "\n") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5166 (setq ret (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5167 (if (cperl-indent-line parse-data) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5168 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5169 (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
|
5170 (setq ret (point))))))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5171 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5172 ;; } else |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5173 (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
|
5174 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5175 (search-forward "}") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5176 (delete-horizontal-space) |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5177 (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
|
5178 (beginning-of-line))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5179 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5180 ;; else { |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5181 (if (looking-at |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5182 "[ \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
|
5183 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5184 (forward-word 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5185 (delete-horizontal-space) |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5186 (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
|
5187 (beginning-of-line))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5188 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5189 ;; foreach my $var |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5190 (if (looking-at |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5191 "[ \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
|
5192 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5193 (forward-word 2) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5194 (delete-horizontal-space) |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5195 (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
|
5196 (beginning-of-line))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5197 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5198 ;; foreach my $var ( |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5199 (if (looking-at |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5200 "[ \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
|
5201 (progn |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
5202 (forward-sexp 3) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5203 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5204 (insert |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5205 (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
|
5206 (beginning-of-line))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5207 ;; 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
|
5208 ;; } foreach my $var () OR { |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5209 (if (looking-at |
44446
9b08deb1030e
(cperl-make-face, cperl-force-face):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43943
diff
changeset
|
5210 "[ \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
|
5211 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5212 (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
|
5213 (re-search-forward "[({]") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5214 (forward-char -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5215 (setq p (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5216 (if (eq (following-char) ?\( ) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5217 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5218 (forward-sexp 1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5219 (setq pp (point))) ; past parenth-group |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5220 ;; after `else' or nothing |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5221 (if ml ; after `else' |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5222 (skip-chars-backward " \t\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5223 (beginning-of-line)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5224 (setq pp nil)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5225 ;; Now after the sexp before the brace |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5226 ;; Multiline expr should be special |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5227 (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
|
5228 (search-forward "\n" pp t)))) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5229 (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
|
5230 (looking-at "[ \t\n]*{")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5231 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5232 (cond |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5233 ((bolp) ; Were before `{', no if/else/etc |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5234 nil) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5235 ((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
|
5236 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5237 (if (if ml |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5238 cperl-extra-newline-before-brace-multiline |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5239 cperl-extra-newline-before-brace) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5240 (progn |
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 (setq ret (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5244 (if (cperl-indent-line parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5245 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5246 (cperl-fix-line-spacing end parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5247 (setq ret (point))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5248 (insert |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5249 (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
|
5250 ((and (looking-at "[ \t]*\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5251 (not (if ml |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5252 cperl-extra-newline-before-brace-multiline |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5253 cperl-extra-newline-before-brace))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5254 (setq pp (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5255 (skip-chars-forward " \t\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5256 (delete-region pp (point)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5257 (insert |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5258 (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
|
5259 ((and (looking-at "[\t ]*{") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5260 (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
|
5261 cperl-extra-newline-before-brace)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5262 (delete-horizontal-space) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5263 (insert "\n") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5264 (setq ret (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5265 (if (cperl-indent-line parse-data) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5266 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5267 (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
|
5268 (setq ret (point)))))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5269 ;; Now we are before `{' |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5270 (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
|
5271 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5272 (skip-chars-forward " \t\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5273 (setq pp (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5274 (forward-sexp 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5275 (setq p (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5276 (goto-char pp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5277 (setq ml (search-forward "\n" p t)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5278 (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
|
5279 ;; not good: multi-line BLOCK |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5280 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5281 (goto-char (1+ pp)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5282 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5283 (insert "\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5284 (setq ret (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5285 (if (cperl-indent-line parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5286 (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
|
5287 (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5288 (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
|
5289 ;; Now check whether there is a hanging `}' |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5290 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5291 ;; } blah |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5292 (if (and |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5293 cperl-fix-hanging-brace-when-indent |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5294 have-brace |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5295 (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
|
5296 (condition-case nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5297 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5298 (up-list 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5299 (if (and (<= (point) pp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5300 (eq (preceding-char) ?\} ) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5301 (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
|
5302 t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5303 (goto-char p) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5304 nil)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5305 (error nil))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5306 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5307 (forward-char -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5308 (skip-chars-backward " \t") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5309 (if (bolp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5310 ;; `}' 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
|
5311 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5312 (cperl-indent-line parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5313 (search-forward "}") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5314 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5315 (insert "\n")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5316 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5317 (or (eq (preceding-char) ?\;) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5318 (bolp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5319 (and (eq (preceding-char) ?\} ) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5320 (cperl-after-block-p (point-min))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5321 (insert ";")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5322 (insert "\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5323 (setq ret (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5324 (if (cperl-indent-line parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5325 (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
|
5326 (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
|
5327 ret)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5328 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5329 (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
|
5330 (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
|
5331 (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
|
5332 (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
|
5333 (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
|
5334 |
20323 | 5335 (defun cperl-indent-region (start end) |
5336 "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
|
5337 Should be slow. Will not indent comment if it starts at `comment-indent' |
20323 | 5338 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
|
5339 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
|
5340 inclusive. |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5341 |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5342 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
|
5343 conditional/loop constructs." |
20323 | 5344 (interactive "r") |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5345 (cperl-update-syntaxification end end) |
20323 | 5346 (save-excursion |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5347 (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
|
5348 (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
|
5349 (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
|
5350 nil)) |
58356
4ca1b78a471f
(cperl-indent-region): Don't mind imenu-scanning-message.
Richard M. Stallman <rms@gnu.org>
parents:
58190
diff
changeset
|
5351 (pm 0) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5352 after-change-functions ; Speed it up! |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5353 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
|
5354 (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
|
5355 (goto-char start) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5356 (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
|
5357 (current-column)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5358 new-comm-indent old-comm-indent) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5359 (goto-char start) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5360 (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
|
5361 (or (bolp) (beginning-of-line 2)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5362 (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
|
5363 (setq st (point)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5364 (if (or |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5365 (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
|
5366 (and (setq comm (looking-at "[ \t]*#")) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5367 (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
|
5368 comment-column)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5369 (setq old-comm-indent nil)))) |
20323 | 5370 (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
|
5371 (not empty) |
20323 | 5372 (= (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
|
5373 (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
|
5374 (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
|
5375 cperl-st-cfence))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5376 (let ((comment-column new-comm-indent)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5377 (indent-for-comment))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5378 (progn |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5379 (setq i (cperl-indent-line indent-info)) |
20323 | 5380 (or comm |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5381 (not i) |
20323 | 5382 (progn |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5383 (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
|
5384 (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
|
5385 (if (setq old-comm-indent |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5386 (and (cperl-to-comment-or-eol) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5387 (not (memq (get-text-property (point) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5388 'syntax-type) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5389 '(pod here-doc))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5390 (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
|
5391 'syntax-table) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5392 cperl-st-cfence)) |
20323 | 5393 (current-column))) |
5394 (progn (indent-for-comment) | |
5395 (skip-chars-backward " \t") | |
5396 (skip-chars-backward "#") | |
5397 (setq new-comm-indent (current-column)))))))) | |
58492
4edc8e8a8ed6
(cperl-indent-region, cperl-imenu--create-perl-index, cperl-xsub-scan):
Richard M. Stallman <rms@gnu.org>
parents:
58356
diff
changeset
|
5398 (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
|
5399 ;; Now run the update hooks |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5400 (and after-change-functions |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5401 cperl-update-end |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5402 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5403 (goto-char cperl-update-end) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5404 (insert " ") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5405 (delete-char -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5406 (goto-char cperl-update-start) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5407 (insert " ") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5408 (delete-char -1)))))) |
20323 | 5409 |
5410 ;; Stolen from lisp-mode with a lot of improvements | |
5411 | |
5412 (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
|
5413 "Like `fill-paragraph', but handle CPerl comments. |
20323 | 5414 If any of the current line is a comment, fill the comment or the |
5415 block of it that point is in, preserving the comment's initial | |
5416 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
|
5417 ;; (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
|
5418 (let (;; Non-nil if the current line contains a comment. |
20323 | 5419 has-comment |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5420 fill-paragraph-function ; do not recurse |
20323 | 5421 ;; If has-comment, the appropriate fill-prefix for the comment. |
5422 comment-fill-prefix | |
5423 ;; Line that contains code and comment (or nil) | |
5424 start | |
5425 c spaces len dc (comment-column comment-column)) | |
5426 ;; Figure out what kind of comment we are looking at. | |
5427 (save-excursion | |
5428 (beginning-of-line) | |
5429 (cond | |
5430 | |
5431 ;; A line with nothing but a comment on it? | |
5432 ((looking-at "[ \t]*#[# \t]*") | |
5433 (setq has-comment t | |
5434 comment-fill-prefix (buffer-substring (match-beginning 0) | |
5435 (match-end 0)))) | |
5436 | |
5437 ;; A line with some code, followed by a comment? Remember that the | |
5438 ;; semi which starts the comment shouldn't be part of a string or | |
5439 ;; character. | |
5440 ((cperl-to-comment-or-eol) | |
5441 (setq has-comment t) | |
5442 (looking-at "#+[ \t]*") | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5443 (setq start (point) c (current-column) |
20323 | 5444 comment-fill-prefix |
65229
b61a0ad9cf07
(cperl-electric-lbrace, cperl-electric-keyword, cperl-electric-pod,
Juanma Barranquero <lekktu@gmail.com>
parents:
64699
diff
changeset
|
5445 (concat (make-string (current-column) ?\s) |
20323 | 5446 (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
|
5447 spaces (progn (skip-chars-backward " \t") |
20323 | 5448 (buffer-substring (point) start)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5449 dc (- c (current-column)) len (- start (point)) |
20323 | 5450 start (point-marker)) |
5451 (delete-char len) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5452 (insert (make-string dc ?-))))) ; Placeholder (to avoid splitting???) |
20323 | 5453 (if (not has-comment) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5454 (fill-paragraph justify) ; Do the usual thing outside of comment |
20323 | 5455 ;; Narrow to include only the comment, and then fill the region. |
5456 (save-restriction | |
5457 (narrow-to-region | |
5458 ;; Find the first line we should include in the region to fill. | |
5459 (if start (progn (beginning-of-line) (point)) | |
5460 (save-excursion | |
5461 (while (and (zerop (forward-line -1)) | |
5462 (looking-at "^[ \t]*#+[ \t]*[^ \t\n#]"))) | |
5463 ;; We may have gone to far. Go forward again. | |
5464 (or (looking-at "^[ \t]*#+[ \t]*[^ \t\n#]") | |
5465 (forward-line 1)) | |
5466 (point))) | |
5467 ;; Find the beginning of the first line past the region to fill. | |
5468 (save-excursion | |
5469 (while (progn (forward-line 1) | |
5470 (looking-at "^[ \t]*#+[ \t]*[^ \t\n#]"))) | |
5471 (point))) | |
5472 ;; Remove existing hashes | |
53812
80c9f33653f7
(cperl-fill-paragraph): Call fill-paragraph
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53779
diff
changeset
|
5473 (save-excursion |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5474 (goto-char (point-min)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5475 (while (progn (forward-line 1) (< (point) (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5476 (skip-chars-forward " \t") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5477 (if (looking-at "#+") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5478 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5479 (if (and (eq (point) (match-beginning 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5480 (not (eq (point) (match-end 0)))) nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5481 (error |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5482 "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
|
5483 (delete-char (- (match-end 0) (match-beginning 0))))))) |
20323 | 5484 |
5485 ;; Lines with only hashes on them can be paragraph boundaries. | |
5486 (let ((paragraph-start (concat paragraph-start "\\|^[ \t#]*$")) | |
5487 (paragraph-separate (concat paragraph-start "\\|^[ \t#]*$")) | |
5488 (fill-prefix comment-fill-prefix)) | |
5489 (fill-paragraph justify))) | |
5490 (if (and start) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5491 (progn |
20323 | 5492 (goto-char start) |
5493 (if (> dc 0) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5494 (progn (delete-char dc) (insert spaces))) |
20323 | 5495 (if (or (= (current-column) c) iteration) nil |
5496 (setq comment-column c) | |
5497 (indent-for-comment) | |
5498 ;; 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
|
5499 (cperl-fill-paragraph justify t)))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5500 t) |
20323 | 5501 |
5502 (defun cperl-do-auto-fill () | |
5503 ;; Break out if the line is short enough | |
5504 (if (> (save-excursion | |
5505 (end-of-line) | |
5506 (current-column)) | |
5507 fill-column) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5508 (let ((c (save-excursion (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5509 (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
|
5510 (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
|
5511 (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
|
5512 ;; 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
|
5513 nil |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5514 (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
|
5515 (fill-paragraph nil) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5516 (goto-char marker) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5517 ;; 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
|
5518 (if (bolp) (progn (re-search-forward "#+[ \t]*") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5519 (goto-char (match-end 0)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5520 ;; 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
|
5521 (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
|
5522 (insert " ") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5523 (backward-char 1)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5524 ;; 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
|
5525 (or (memq (preceding-char) '(?\s ?\t)) (insert " ")))))) |
20323 | 5526 |
5527 (defun cperl-imenu-addback (lst &optional isback name) | |
5528 ;; We suppose that the lst is a DAG, unless the first element only | |
5529 ;; loops back, and ISBACK is set. Thus this function cannot be | |
5530 ;; applied twice without ISBACK set. | |
5531 (cond ((not cperl-imenu-addback) lst) | |
5532 (t | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5533 (or name |
20323 | 5534 (setq name "+++BACK+++")) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5535 (mapcar (lambda (elt) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5536 (if (and (listp elt) (listp (cdr elt))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5537 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5538 ;; In the other order it goes up |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5539 ;; one level only ;-( |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5540 (setcdr elt (cons (cons name lst) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5541 (cdr elt))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5542 (cperl-imenu-addback (cdr elt) t name)))) |
20323 | 5543 (if isback (cdr lst) lst)) |
5544 lst))) | |
5545 | |
31821 | 5546 (defun cperl-imenu--create-perl-index (&optional regexp) |
20323 | 5547 (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
|
5548 (let ((index-alist '()) (index-pack-alist '()) (index-pod-alist '()) |
20323 | 5549 (index-unsorted-alist '()) (i-s-f (default-value 'imenu-sort-function)) |
5550 (index-meth-alist '()) meth | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5551 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
|
5552 (prev-pos 0) is-pack index index1 name (end-range 0) package) |
20323 | 5553 (goto-char (point-min)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5554 (cperl-update-syntaxification (point-max) (point-max)) |
20323 | 5555 ;; Search for the function |
5556 (progn ;;save-match-data | |
5557 (while (re-search-forward | |
31821 | 5558 (or regexp cperl-imenu--function-name-regexp-perl) |
20323 | 5559 nil t) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5560 ;; 2=package-group, 5=package-name 8=sub-name |
20323 | 5561 (cond |
5562 ((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
|
5563 (match-beginning 5) ; package name |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5564 ;;(eq (char-after (match-beginning 2)) ?p) ; package |
20323 | 5565 (not (save-match-data |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5566 (looking-at "[ \t\n]*;")))) ; Plain text word 'package' |
20323 | 5567 nil) |
5568 ((and | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5569 (or (match-beginning 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5570 (match-beginning 8)) ; package or sub |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5571 ;; Skip if quoted (will not skip multi-line ''-strings :-(): |
20323 | 5572 (null (get-text-property (match-beginning 1) 'syntax-table)) |
5573 (null (get-text-property (match-beginning 1) 'syntax-type)) | |
5574 (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
|
5575 (setq is-pack (match-beginning 2)) |
20323 | 5576 ;; (if (looking-at "([^()]*)[ \t\n\f]*") |
5577 ;; (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
|
5578 (setq meth nil |
20323 | 5579 p (point)) |
5580 (while (and ends-ranges (>= p (car ends-ranges))) | |
5581 ;; delete obsolete entries | |
5582 (setq ends-ranges (cdr ends-ranges) packages (cdr packages))) | |
5583 (setq package (or (car packages) "") | |
5584 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
|
5585 (if is-pack ; doing "package" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5586 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5587 (if (match-beginning 5) ; named package |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5588 (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
|
5589 (match-end 5)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5590 name (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5591 (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
|
5592 name) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5593 package (concat name "::") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5594 name (concat "package " name)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5595 ;; Support nameless packages |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5596 (setq name "package;" package "")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5597 (setq end-range |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5598 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5599 (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
|
5600 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
|
5601 packages (cons package packages))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5602 (setq is-proto |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5603 (or (eq (following-char) ?\;) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5604 (eq 0 (get-text-property (point) 'attrib-group))))) |
20323 | 5605 ;; 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
|
5606 (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
|
5607 (or is-pack |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5608 (setq name |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5609 (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
|
5610 (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
|
5611 (setq marker (make-marker)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5612 (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
|
5613 (cond (is-pack nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5614 ((string-match "[:']" name) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5615 (setq meth t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5616 ((> p end-range) nil) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5617 (t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5618 (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
|
5619 (setq index (cons name marker)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5620 (if is-pack |
20323 | 5621 (push index index-pack-alist) |
5622 (push index index-alist)) | |
5623 (if meth (push index index-meth-alist)) | |
5624 (push index index-unsorted-alist))) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5625 ((match-beginning 16) ; POD section |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5626 (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
|
5627 marker (make-marker)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5628 (set-marker marker (match-beginning 17)) |
20323 | 5629 (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
|
5630 (setq name (concat (make-string |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5631 (* 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
|
5632 ?\ ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5633 name) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5634 index (cons name marker)) |
20323 | 5635 (setq index1 (cons (concat "=" name) (cdr index))) |
5636 (push index index-pod-alist) | |
5637 (push index1 index-unsorted-alist))))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5638 (setq index-alist |
20323 | 5639 (if (default-value 'imenu-sort-function) |
5640 (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
|
5641 (nreverse index-alist))) |
20323 | 5642 (and index-pod-alist |
5643 (push (cons "+POD headers+..." | |
5644 (nreverse index-pod-alist)) | |
5645 index-alist)) | |
5646 (and (or index-pack-alist index-meth-alist) | |
5647 (let ((lst index-pack-alist) hier-list pack elt group name) | |
5648 ;; Remove "package ", reverse and uniquify. | |
5649 (while lst | |
5650 (setq elt (car lst) lst (cdr lst) name (substring (car elt) 8)) | |
5651 (if (assoc name hier-list) nil | |
5652 (setq hier-list (cons (cons name (cdr elt)) hier-list)))) | |
5653 (setq lst index-meth-alist) | |
5654 (while lst | |
5655 (setq elt (car lst) lst (cdr lst)) | |
5656 (cond ((string-match "\\(::\\|'\\)[_a-zA-Z0-9]+$" (car elt)) | |
5657 (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
|
5658 (if (setq group (assoc pack hier-list)) |
20323 | 5659 (if (listp (cdr group)) |
5660 ;; Have some functions already | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5661 (setcdr group |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5662 (cons (cons (substring |
20323 | 5663 (car elt) |
5664 (+ 2 (match-beginning 0))) | |
5665 (cdr elt)) | |
5666 (cdr group))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5667 (setcdr group (list (cons (substring |
20323 | 5668 (car elt) |
5669 (+ 2 (match-beginning 0))) | |
5670 (cdr elt))))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5671 (setq hier-list |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5672 (cons (cons pack |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5673 (list (cons (substring |
20323 | 5674 (car elt) |
5675 (+ 2 (match-beginning 0))) | |
5676 (cdr elt)))) | |
5677 hier-list)))))) | |
5678 (push (cons "+Hierarchy+..." | |
5679 hier-list) | |
5680 index-alist))) | |
5681 (and index-pack-alist | |
5682 (push (cons "+Packages+..." | |
5683 (nreverse index-pack-alist)) | |
5684 index-alist)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5685 (and (or index-pack-alist index-pod-alist |
20323 | 5686 (default-value 'imenu-sort-function)) |
5687 index-unsorted-alist | |
5688 (push (cons "+Unsorted List+..." | |
5689 (nreverse index-unsorted-alist)) | |
5690 index-alist)) | |
5691 (cperl-imenu-addback index-alist))) | |
5692 | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5693 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5694 ;; Suggested by Mark A. Hershberger |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5695 (defun cperl-outline-level () |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5696 (looking-at outline-regexp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5697 (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
|
5698 ;;;; 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
|
5699 ((match-beginning 2) 0) ; package |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5700 ((match-beginning 8) 1) ; sub |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5701 ((match-beginning 16) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5702 (- (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
|
5703 (t 5))) ; should not happen |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5704 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5705 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
5706 (defvar cperl-compilation-error-regexp-alist |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5707 ;; This look like a paranoiac regexp: could anybody find a better one? (which WORKS). |
20323 | 5708 '(("^[^\n]* \\(file\\|at\\) \\([^ \t\n]+\\) [^\n]*line \\([0-9]+\\)[\\., \n]" |
5709 2 3)) | |
5710 "Alist that specifies how to match errors in perl output.") | |
5711 | |
5712 | |
5713 (defun cperl-windowed-init () | |
5714 "Initialization under windowed version." | |
73457
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5715 (cond ((featurep 'ps-print) |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5716 (unless cperl-faces-init |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5717 (if (boundp 'font-lock-multiline) |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5718 (setq cperl-font-lock-multiline t)) |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5719 (cperl-init-faces))) |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5720 ((not cperl-faces-init) |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5721 (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
|
5722 (function |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5723 (lambda () |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5724 (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
|
5725 (progn |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5726 (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
|
5727 (if (fboundp 'eval-after-load) |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5728 (eval-after-load |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5729 "ps-print" |
0c01ec806f3e
* progmodes/cperl-mode.el (cperl-mode): Don't assume
Chong Yidong <cyd@stupidchicken.com>
parents:
73331
diff
changeset
|
5730 '(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
|
5731 |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5732 (defvar cperl-font-lock-keywords-1 nil |
31821 | 5733 "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
|
5734 (defvar cperl-font-lock-keywords nil |
31821 | 5735 "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
|
5736 (defvar cperl-font-lock-keywords-2 nil |
31821 | 5737 "Additional expressions to highlight in Perl mode. Maximal set") |
5738 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5739 (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
|
5740 (or cperl-faces-init (cperl-init-faces)) |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5741 cperl-font-lock-keywords) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5742 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5743 (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
|
5744 (or cperl-faces-init (cperl-init-faces)) |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5745 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
|
5746 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5747 (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
|
5748 (or cperl-faces-init (cperl-init-faces)) |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
5749 cperl-font-lock-keywords-2) |
20323 | 5750 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5751 (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
|
5752 ;; 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
|
5753 (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
|
5754 (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
|
5755 "Face for constant and label names")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5756 (or (boundp 'font-lock-warning-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5757 (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
|
5758 "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
|
5759 ;;(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
|
5760 ) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5761 |
20323 | 5762 (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
|
5763 (condition-case errs |
20323 | 5764 (progn |
5765 (require 'font-lock) | |
5766 (and (fboundp 'font-lock-fontify-anchored-keywords) | |
5767 (featurep 'font-lock-extra) | |
5768 (message "You have an obsolete package `font-lock-extra'. Install `choose-color'.")) | |
5769 (let (t-font-lock-keywords t-font-lock-keywords-1 font-lock-anchored) | |
5770 (if (fboundp 'font-lock-fontify-anchored-keywords) | |
5771 (setq font-lock-anchored t)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5772 (setq |
20323 | 5773 t-font-lock-keywords |
5774 (list | |
35013
587807c5e8e6
(cperl-invalid-face): Don't double-quote
Dave Love <fx@gnu.org>
parents:
32880
diff
changeset
|
5775 `("[ \t]+$" 0 ',cperl-invalid-face t) |
20323 | 5776 (cons |
5777 (concat | |
5778 "\\(^\\|[^$@%&\\]\\)\\<\\(" | |
5779 (mapconcat | |
5780 'identity | |
5781 '("if" "until" "while" "elsif" "else" "unless" "for" | |
5782 "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
|
5783 "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
|
5784 "require" "package" "eval" "my" "BEGIN" "END" "CHECK" "INIT") |
20323 | 5785 "\\|") ; Flow control |
5786 "\\)\\>") 2) ; was "\\)[ \n\t;():,\|&]" | |
5787 ; In what follows we use `type' style | |
5788 ; for overwritable builtins | |
5789 (list | |
5790 (concat | |
5791 "\\(^\\|[^$@%&\\]\\)\\<\\(" | |
5792 ;; "CORE" "__FILE__" "__LINE__" "abs" "accept" "alarm" | |
5793 ;; "and" "atan2" "bind" "binmode" "bless" "caller" | |
5794 ;; "chdir" "chmod" "chown" "chr" "chroot" "close" | |
5795 ;; "closedir" "cmp" "connect" "continue" "cos" "crypt" | |
5796 ;; "dbmclose" "dbmopen" "die" "dump" "endgrent" | |
5797 ;; "endhostent" "endnetent" "endprotoent" "endpwent" | |
5798 ;; "endservent" "eof" "eq" "exec" "exit" "exp" "fcntl" | |
5799 ;; "fileno" "flock" "fork" "formline" "ge" "getc" | |
5800 ;; "getgrent" "getgrgid" "getgrnam" "gethostbyaddr" | |
5801 ;; "gethostbyname" "gethostent" "getlogin" | |
5802 ;; "getnetbyaddr" "getnetbyname" "getnetent" | |
5803 ;; "getpeername" "getpgrp" "getppid" "getpriority" | |
5804 ;; "getprotobyname" "getprotobynumber" "getprotoent" | |
5805 ;; "getpwent" "getpwnam" "getpwuid" "getservbyname" | |
5806 ;; "getservbyport" "getservent" "getsockname" | |
5807 ;; "getsockopt" "glob" "gmtime" "gt" "hex" "index" "int" | |
5808 ;; "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
|
5809 ;; "link" "listen" "localtime" "lock" "log" "lstat" "lt" |
20323 | 5810 ;; "mkdir" "msgctl" "msgget" "msgrcv" "msgsnd" "ne" |
5811 ;; "not" "oct" "open" "opendir" "or" "ord" "pack" "pipe" | |
5812 ;; "quotemeta" "rand" "read" "readdir" "readline" | |
5813 ;; "readlink" "readpipe" "recv" "ref" "rename" "require" | |
5814 ;; "reset" "reverse" "rewinddir" "rindex" "rmdir" "seek" | |
5815 ;; "seekdir" "select" "semctl" "semget" "semop" "send" | |
5816 ;; "setgrent" "sethostent" "setnetent" "setpgrp" | |
5817 ;; "setpriority" "setprotoent" "setpwent" "setservent" | |
5818 ;; "setsockopt" "shmctl" "shmget" "shmread" "shmwrite" | |
5819 ;; "shutdown" "sin" "sleep" "socket" "socketpair" | |
5820 ;; "sprintf" "sqrt" "srand" "stat" "substr" "symlink" | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5821 ;; "syscall" "sysopen" "sysread" "system" "syswrite" "tell" |
20323 | 5822 ;; "telldir" "time" "times" "truncate" "uc" "ucfirst" |
5823 ;; "umask" "unlink" "unpack" "utime" "values" "vec" | |
5824 ;; "wait" "waitpid" "wantarray" "warn" "write" "x" "xor" | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5825 "a\\(bs\\|ccept\\|tan2\\|larm\\|nd\\)\\|" |
20323 | 5826 "b\\(in\\(d\\|mode\\)\\|less\\)\\|" |
5827 "c\\(h\\(r\\(\\|oot\\)\\|dir\\|mod\\|own\\)\\|aller\\|rypt\\|" | |
5828 "lose\\(\\|dir\\)\\|mp\\|o\\(s\\|n\\(tinue\\|nect\\)\\)\\)\\|" | |
5829 "CORE\\|d\\(ie\\|bm\\(close\\|open\\)\\|ump\\)\\|" | |
5830 "e\\(x\\(p\\|it\\|ec\\)\\|q\\|nd\\(p\\(rotoent\\|went\\)\\|" | |
5831 "hostent\\|servent\\|netent\\|grent\\)\\|of\\)\\|" | |
5832 "f\\(ileno\\|cntl\\|lock\\|or\\(k\\|mline\\)\\)\\|" | |
5833 "g\\(t\\|lob\\|mtime\\|e\\(\\|t\\(p\\(pid\\|r\\(iority\\|" | |
5834 "oto\\(byn\\(ame\\|umber\\)\\|ent\\)\\)\\|eername\\|w" | |
5835 "\\(uid\\|ent\\|nam\\)\\|grp\\)\\|host\\(by\\(addr\\|name\\)\\|" | |
5836 "ent\\)\\|s\\(erv\\(by\\(port\\|name\\)\\|ent\\)\\|" | |
5837 "ock\\(name\\|opt\\)\\)\\|c\\|login\\|net\\(by\\(addr\\|name\\)\\|" | |
5838 "ent\\)\\|gr\\(ent\\|nam\\|gid\\)\\)\\)\\)\\|" | |
5839 "hex\\|i\\(n\\(t\\|dex\\)\\|octl\\)\\|join\\|kill\\|" | |
5840 "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
|
5841 "\\(\\|ngth\\)\\|o\\(c\\(altime\\|k\\)\\|g\\)\\)\\|m\\(sg\\(rcv\\|snd\\|" |
20323 | 5842 "ctl\\|get\\)\\|kdir\\)\\|n\\(e\\|ot\\)\\|o\\(pen\\(\\|dir\\)\\|" |
5843 "r\\(\\|d\\)\\|ct\\)\\|p\\(ipe\\|ack\\)\\|quotemeta\\|" | |
5844 "r\\(index\\|and\\|mdir\\|e\\(quire\\|ad\\(pipe\\|\\|lin" | |
5845 "\\(k\\|e\\)\\|dir\\)\\|set\\|cv\\|verse\\|f\\|winddir\\|name" | |
5846 "\\)\\)\\|s\\(printf\\|qrt\\|rand\\|tat\\|ubstr\\|e\\(t\\(p\\(r" | |
5847 "\\(iority\\|otoent\\)\\|went\\|grp\\)\\|hostent\\|s\\(ervent\\|" | |
5848 "ockopt\\)\\|netent\\|grent\\)\\|ek\\(\\|dir\\)\\|lect\\|" | |
5849 "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
|
5850 "write\\|get\\)\\)\\|y\\(s\\(read\\|call\\|open\\|tem\\|write\\)\\|" |
20323 | 5851 "mlink\\)\\|in\\|leep\\|ocket\\(pair\\|\\)\\)\\|t\\(runcate\\|" |
5852 "ell\\(\\|dir\\)\\|ime\\(\\|s\\)\\)\\|u\\(c\\(\\|first\\)\\|" | |
5853 "time\\|mask\\|n\\(pack\\|link\\)\\)\\|v\\(alues\\|ec\\)\\|" | |
5854 "w\\(a\\(rn\\|it\\(pid\\|\\)\\|ntarray\\)\\|rite\\)\\|" | |
5855 "x\\(\\|or\\)\\|__\\(FILE__\\|LINE__\\|PACKAGE__\\)" | |
5856 "\\)\\>") 2 'font-lock-type-face) | |
5857 ;; In what follows we use `other' style | |
5858 ;; for nonoverwritable builtins | |
5859 ;; Somehow 's', 'm' are not auto-generated??? | |
5860 (list | |
5861 (concat | |
5862 "\\(^\\|[^$@%&\\]\\)\\<\\(" | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5863 ;; "AUTOLOAD" "BEGIN" "CHECK" "DESTROY" "END" "INIT" "__END__" "chomp" |
20323 | 5864 ;; "chop" "defined" "delete" "do" "each" "else" "elsif" |
5865 ;; "eval" "exists" "for" "foreach" "format" "goto" | |
5866 ;; "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
|
5867 ;; "no" "our" "package" "pop" "pos" "print" "printf" "push" |
20323 | 5868 ;; "q" "qq" "qw" "qx" "redo" "return" "scalar" "shift" |
5869 ;; "sort" "splice" "split" "study" "sub" "tie" "tr" | |
5870 ;; "undef" "unless" "unshift" "untie" "until" "use" | |
5871 ;; "while" "y" | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5872 "AUTOLOAD\\|BEGIN\\|CHECK\\|cho\\(p\\|mp\\)\\|d\\(e\\(fined\\|lete\\)\\|" |
20323 | 5873 "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
|
5874 "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
|
5875 "l\\(ast\\|ocal\\)\\|m\\(ap\\|y\\)\\|n\\(ext\\|o\\)\\|our\\|" |
20323 | 5876 "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
|
5877 "q\\(\\|q\\|w\\|x\\|r\\)\\|re\\(turn\\|do\\)\\|s\\(pli\\(ce\\|t\\)\\|" |
20323 | 5878 "calar\\|tudy\\|ub\\|hift\\|ort\\)\\|t\\(r\\|ie\\)\\|" |
5879 "u\\(se\\|n\\(shift\\|ti\\(l\\|e\\)\\|def\\|less\\)\\)\\|" | |
5880 "while\\|y\\|__\\(END\\|DATA\\)__" ;__DATA__ added manually | |
5881 "\\|[sm]" ; Added manually | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5882 "\\)\\>") 2 'cperl-nonoverridable-face) |
20323 | 5883 ;; (mapconcat 'identity |
5884 ;; '("#endif" "#else" "#ifdef" "#ifndef" "#if" | |
5885 ;; "#include" "#define" "#undef") | |
5886 ;; "\\|") | |
5887 '("-[rwxoRWXOezsfdlpSbctugkTBMAC]\\>\\([ \t]+_\\>\\)?" 0 | |
5888 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
|
5889 ;; This highlights declarations and definitions differenty. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5890 ;; 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
|
5891 ;; 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
|
5892 (list (concat "\\<sub" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5893 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
|
5894 "\\([^ \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
|
5895 "\\(" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5896 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
|
5897 "([^()]*)\\)?" ; prototype |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5898 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
|
5899 "[{;]") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5900 2 (if cperl-font-lock-multiline |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5901 '(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
|
5902 'font-lock-function-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5903 'font-lock-variable-name-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5904 ;; 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
|
5905 '(progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5906 (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
|
5907 (match-end 0))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5908 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5909 (+ 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
|
5910 'syntax-type 'multiline)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5911 (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
|
5912 'font-lock-function-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5913 'font-lock-variable-name-face)))) |
20323 | 5914 '("\\<\\(package\\|require\\|use\\|import\\|no\\|bootstrap\\)[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t;]" ; require A if B; |
5915 2 font-lock-function-name-face) | |
5916 '("^[ \t]*format[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t]*=[ \t]*$" | |
5917 1 font-lock-function-name-face) | |
5918 (cond ((featurep 'font-lock-extra) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5919 '("\\([]}\\\\%@>*&]\\|\\$[a-zA-Z0-9_:]*\\)[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" |
20323 | 5920 (2 font-lock-string-face t) |
5921 (0 '(restart 2 t)))) ; To highlight $a{bc}{ef} | |
5922 (font-lock-anchored | |
5923 '("\\([]}\\\\%@>*&]\\|\\$[a-zA-Z0-9_:]*\\)[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" | |
5924 (2 font-lock-string-face t) | |
5925 ("\\=[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" | |
5926 nil nil | |
5927 (1 font-lock-string-face t)))) | |
5928 (t '("\\([]}\\\\%@>*&]\\|\\$[a-zA-Z0-9_:]*\\)[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" | |
5929 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
|
5930 '("[\[ \t{,(]\\(-?[a-zA-Z0-9_:]+\\)[ \t]*=>" 1 |
20323 | 5931 font-lock-string-face t) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5932 '("^[ \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
|
5933 font-lock-constant-face) ; labels |
20323 | 5934 '("\\<\\(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
|
5935 2 font-lock-constant-face) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5936 ;; Uncomment to get perl-mode-like vars |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5937 ;;; '("[$*]{?\\(\\sw+\\)" 1 font-lock-variable-name-face) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5938 ;;; '("\\([@%]\\|\\$#\\)\\(\\sw+\\)" |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5939 ;;; (2 (cons font-lock-variable-name-face '(underline)))) |
20323 | 5940 (cond ((featurep 'font-lock-extra) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5941 '("^[ \t]*\\(my\\|local\\|our\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)\\([ \t]*,\\)?" |
20323 | 5942 (3 font-lock-variable-name-face) |
5943 (4 '(another 4 nil | |
5944 ("\\=[ \t]*,[ \t]*\\([$@%*][a-zA-Z0-9_:]+\\)\\([ \t]*,\\)?" | |
5945 (1 font-lock-variable-name-face) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5946 (2 '(restart 2 nil) nil t))) |
20323 | 5947 nil t))) ; local variables, multiple |
5948 (font-lock-anchored | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5949 ;; 1=my_etc, 2=white? 3=(+white? 4=white? 5=var |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5950 (` ((, (concat "\\<\\(my\\|local\\|our\\)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5951 cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5952 "\\((" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5953 cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5954 "\\)?\\([$@%*]\\([a-zA-Z0-9_:]+\\|[^a-zA-Z0-9_]\\)\\)")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5955 (5 (, (if cperl-font-lock-multiline |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5956 'font-lock-variable-name-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5957 '(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
|
5958 (match-beginning 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5959 'font-lock-variable-name-face)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5960 ((, (concat "\\=" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5961 cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5962 "," |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5963 cperl-maybe-white-and-comment-rex |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5964 "\\([$@%*]\\([a-zA-Z0-9_:]+\\|[^a-zA-Z0-9_]\\)\\)")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5965 ;; Bug in font-lock: limit is used not only to limit |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5966 ;; 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
|
5967 ;; facification" property. Thus we need to minimize. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5968 (, (if cperl-font-lock-multiline |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5969 '(if (match-beginning 3) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5970 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5971 (goto-char (match-beginning 3)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5972 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5973 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5974 (error |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5975 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5976 (forward-char 200) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5977 (error nil)))) ; typeahead |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5978 (1- (point))) ; report limit |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5979 (forward-char -2)) ; disable continued expr |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5980 '(if (match-beginning 3) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5981 (point-max) ; No limit for continuation |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5982 (forward-char -2)))) ; disable continued expr |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5983 (, (if cperl-font-lock-multiline |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5984 nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5985 '(progn ; Do at end |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5986 ;; "my" may be already fontified (POD), |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5987 ;; 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
|
5988 (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
|
5989 (> 2 (count-lines |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5990 cperl-font-lock-multiline-start |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5991 (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5992 nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5993 (put-text-property |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5994 (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
|
5995 'syntax-type 'multiline)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5996 (setq cperl-font-lock-multiline-start nil)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5997 (3 font-lock-variable-name-face))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
5998 (t '("^[ \t{}]*\\(my\\|local\\|our\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)" |
20323 | 5999 3 font-lock-variable-name-face))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6000 '("\\<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
|
6001 4 font-lock-variable-name-face) |
62085
7dbe52d92117
Avoid $! for font-lock-negation-char-face.
Daniel Pfeiffer <occitan@esperanto.org>
parents:
62081
diff
changeset
|
6002 ;; 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
|
6003 '("\\(?:^\\|[^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
|
6004 '("\\[\\(\\^\\)" 1 font-lock-negation-char-face prepend))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
6005 (setq |
20323 | 6006 t-font-lock-keywords-1 |
6007 (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
|
6008 ;; 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
|
6009 (or |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6010 (not cperl-xemacs-p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6011 (string< "21.1.9" emacs-version) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6012 (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
|
6013 (string< emacs-version "21.1.2"))) |
20323 | 6014 '( |
6015 ("\\(\\([@%]\\|\$#\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)" 1 | |
6016 (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
|
6017 'cperl-hash-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6018 'cperl-array-face) |
20323 | 6019 t) ; arrays and hashes |
6020 ("\\(\\([$@]+\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)[ \t]*\\([[{]\\)" | |
6021 1 | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6022 (if (= (- (match-end 2) (match-beginning 2)) 1) |
20323 | 6023 (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
|
6024 'cperl-hash-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6025 'cperl-array-face) ; arrays and hashes |
20323 | 6026 font-lock-variable-name-face) ; Just to put something |
6027 t) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6028 ("\\(@\\|\\$#\\)\\(\\$+\\([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
|
6029 (1 cperl-array-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6030 (2 font-lock-variable-name-face)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6031 ("\\(%\\)\\(\\$+\\([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
|
6032 (1 cperl-hash-face) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6033 (2 font-lock-variable-name-face)) |
20323 | 6034 ;;("\\([smy]\\|tr\\)\\([^a-z_A-Z0-9]\\)\\(\\([^\n\\]*||\\)\\)\\2") |
6035 ;;; 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
|
6036 ;;("\\(\\<\\([msy]\\|tr\\)[ \t]*\\([^ \t\na-zA-Z0-9_]\\)\\|\\(/\\)\\)" |
20323 | 6037 ;;(3 font-lock-function-name-face t t) |
6038 ;;(4 | |
6039 ;; (if (cperl-slash-is-regexp) | |
6040 ;; font-lock-function-name-face 'default) nil t)) | |
6041 ))) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6042 (if cperl-highlight-variables-indiscriminately |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6043 (setq t-font-lock-keywords-1 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6044 (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
|
6045 (list '("\\([$*]{?\\sw+\\)" 1 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6046 font-lock-variable-name-face))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
6047 (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
|
6048 (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
|
6049 (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
|
6050 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
|
6051 t-font-lock-keywords) |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
6052 cperl-font-lock-keywords cperl-font-lock-keywords-1 |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
6053 cperl-font-lock-keywords-2 (append |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6054 cperl-font-lock-keywords-1 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6055 t-font-lock-keywords-1))) |
20323 | 6056 (if (fboundp 'ps-print-buffer) (cperl-ps-print-init)) |
6057 (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
|
6058 (eval ; Avoid a warning |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6059 '(font-lock-require-faces |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6060 (list |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6061 ;; 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
|
6062 (list 'font-lock-comment-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6063 ["Firebrick" "OrangeRed" "DimGray" "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6064 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6065 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6066 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6067 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6068 (list 'font-lock-string-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6069 ["RosyBrown" "LightSalmon" "Gray50" "LightGray"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6070 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6071 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6072 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6073 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6074 (list 'font-lock-function-name-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6075 (vector |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6076 "Blue" "LightSkyBlue" "Gray50" "LightGray" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6077 (cdr (assq 'background-color ; if mono |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6078 (frame-parameters)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6079 (vector |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6080 nil nil nil nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6081 (cdr (assq 'foreground-color ; if mono |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6082 (frame-parameters)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6083 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6084 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6085 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6086 (list 'font-lock-variable-name-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6087 ["DarkGoldenrod" "LightGoldenrod" "DimGray" "Gray90"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6088 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6089 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6090 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6091 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6092 (list 'font-lock-type-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6093 ["DarkOliveGreen" "PaleGreen" "DimGray" "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6094 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6095 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6096 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6097 [nil nil t t t]) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6098 (list 'font-lock-warning-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6099 ["Pink" "Red" "Gray50" "LightGray"] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6100 ["gray20" "gray90" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6101 "gray80" "gray20"] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6102 [nil nil t t t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6103 nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6104 [nil nil t t t] |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6105 ) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6106 (list 'font-lock-constant-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6107 ["CadetBlue" "Aquamarine" "Gray50" "LightGray"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6108 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6109 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6110 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6111 [nil nil t t t]) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6112 (list 'cperl-nonoverridable-face |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6113 ["chartreuse3" ("orchid1" "orange") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6114 nil "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6115 [nil nil "gray90"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6116 [nil nil nil t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6117 [nil nil t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6118 [nil nil t t t]) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6119 (list 'cperl-array-face |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6120 ["blue" "yellow" nil "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6121 ["lightyellow2" ("navy" "os2blue" "darkgreen") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6122 "gray90"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6123 t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6124 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6125 nil) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6126 (list 'cperl-hash-face |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6127 ["red" "red" nil "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6128 ["lightyellow2" ("navy" "os2blue" "darkgreen") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6129 "gray90"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6130 t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6131 t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6132 nil)))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6133 ;; Do it the dull way, without choose-color |
20323 | 6134 (defvar cperl-guessed-background nil |
6135 "Display characteristics as guessed by cperl.") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6136 ;; (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
|
6137 ;; (defalias 'x-color-defined-p |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6138 ;; (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
|
6139 ;; ;; XEmacs >= 19.12 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6140 ;; ((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
|
6141 ;; ;; XEmacs 19.11 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6142 ;; (t 'x-valid-color-name-p)))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6143 (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
|
6144 "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
|
6145 (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
|
6146 "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
|
6147 (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
|
6148 "Face for data types") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6149 (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
|
6150 "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
|
6151 (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
|
6152 "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
|
6153 (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
|
6154 "Face for comments") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6155 (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
|
6156 "Face for function names") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6157 (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
|
6158 "Face for hashes") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6159 (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
|
6160 "Face for arrays") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6161 ;;(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
|
6162 ;;(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
|
6163 ;;(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
|
6164 ;; (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
|
6165 ;; '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
|
6166 ;; "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
|
6167 ;;(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
|
6168 ;; (defconst cperl-nonoverridable-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6169 ;; '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
|
6170 ;; "Face to use for data types from another group.")) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6171 ;;(if (not cperl-xemacs-p) nil |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6172 ;; (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
|
6173 ;; (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
|
6174 ;; '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
|
6175 ;; "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
|
6176 ;; (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
|
6177 ;; (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
|
6178 ;; '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
|
6179 ;; "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
|
6180 ;; (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
|
6181 ;; (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
|
6182 ;; '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
|
6183 ;; "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
|
6184 (if (and |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6185 (not (cperl-is-face 'cperl-array-face)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6186 (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
|
6187 (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
|
6188 (if (and |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6189 (not (cperl-is-face 'cperl-hash-face)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6190 (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
|
6191 (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
|
6192 (if (and |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6193 (not (cperl-is-face 'cperl-nonoverridable-face)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6194 (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
|
6195 (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
|
6196 ;;(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
|
6197 ;; (defconst cperl-hash-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6198 ;; '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
|
6199 ;; "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
|
6200 ;;(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
|
6201 ;; (defconst cperl-array-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6202 ;; '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
|
6203 ;; "Face to use for arrays.")) |
20323 | 6204 ;; Here we try to guess background |
6205 (let ((background | |
6206 (if (boundp 'font-lock-background-mode) | |
6207 font-lock-background-mode | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6208 'light)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6209 (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
|
6210 ;;;; (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
|
6211 ;;;; (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
|
6212 ;;;; (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
|
6213 ;;;; (face-list |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6214 ;;;; (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
|
6215 ;;;; (t |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6216 ;;;; (function (lambda (face) (boundp face)))))) |
20323 | 6217 (defvar cperl-guessed-background |
6218 (if (and (boundp 'font-lock-display-type) | |
6219 (eq font-lock-display-type 'grayscale)) | |
6220 'gray | |
6221 background) | |
6222 "Background as guessed by CPerl mode") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6223 (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
|
6224 (cperl-is-face 'font-lock-reference-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6225 (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
|
6226 (if (cperl-is-face 'font-lock-type-face) nil |
20323 | 6227 (copy-face 'default 'font-lock-type-face) |
6228 (cond | |
6229 ((eq background 'light) | |
6230 (set-face-foreground 'font-lock-type-face | |
6231 (if (x-color-defined-p "seagreen") | |
6232 "seagreen" | |
6233 "sea green"))) | |
6234 ((eq background 'dark) | |
6235 (set-face-foreground 'font-lock-type-face | |
6236 (if (x-color-defined-p "os2pink") | |
6237 "os2pink" | |
6238 "pink"))) | |
6239 (t | |
6240 (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
|
6241 (if (cperl-is-face 'cperl-nonoverridable-face) |
20323 | 6242 nil |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6243 (copy-face 'font-lock-type-face 'cperl-nonoverridable-face) |
20323 | 6244 (cond |
6245 ((eq background 'light) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6246 (set-face-foreground 'cperl-nonoverridable-face |
20323 | 6247 (if (x-color-defined-p "chartreuse3") |
6248 "chartreuse3" | |
6249 "chartreuse"))) | |
6250 ((eq background 'dark) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6251 (set-face-foreground 'cperl-nonoverridable-face |
20323 | 6252 (if (x-color-defined-p "orchid1") |
6253 "orchid1" | |
6254 "orange"))))) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6255 ;;; (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
|
6256 ;;; (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
|
6257 ;;; (cond |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6258 ;;; ((eq background 'light) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6259 ;;; (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
|
6260 ;;; (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
|
6261 ;;; "lightyellow2" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6262 ;;; (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
|
6263 ;;; "lightyellow" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6264 ;;; "light yellow")))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6265 ;;; ((eq background 'dark) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6266 ;;; (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
|
6267 ;;; (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
|
6268 ;;; "navy" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6269 ;;; (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
|
6270 ;;; "darkgreen" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6271 ;;; "dark green")))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6272 ;;; (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
|
6273 ;;; (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
|
6274 ;;; (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
|
6275 ;;; (cond |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6276 ;;; ((eq background 'light) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6277 ;;; (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
|
6278 ;;; (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
|
6279 ;;; "lightyellow2" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6280 ;;; "lightyellow"))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6281 ;;; ((eq background 'dark) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6282 ;;; (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
|
6283 ;;; (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
|
6284 ;;; "navy" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6285 ;;; (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
|
6286 ;;; "darkgreen" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6287 ;;; "dark green")))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6288 ;;; (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
|
6289 (if (cperl-is-face 'font-lock-variable-name-face) nil |
20323 | 6290 (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
|
6291 (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
|
6292 (copy-face 'italic 'font-lock-constant-face)))) |
20323 | 6293 (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
|
6294 (error (message "cperl-init-faces (ignored): %s" errs)))) |
20323 | 6295 |
6296 | |
6297 (defun cperl-ps-print-init () | |
6298 "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
|
6299 (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
|
6300 '(setq ps-bold-faces |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6301 ;; 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
|
6302 ;; font-lock-constant-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6303 (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
|
6304 ps-bold-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6305 ps-italic-faces |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6306 ;; font-lock-constant-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6307 (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
|
6308 ps-italic-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6309 ps-underlined-faces |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6310 ;; font-lock-type-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6311 (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
|
6312 ps-underlined-faces)))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6313 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6314 (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
|
6315 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6316 (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
|
6317 "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
|
6318 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
|
6319 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
|
6320 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6321 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
|
6322 (interactive) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6323 (or file |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6324 (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
|
6325 "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
|
6326 (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
|
6327 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
|
6328 (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
|
6329 (setq file nil)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6330 (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
|
6331 (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
|
6332 (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
|
6333 (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
|
6334 (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
|
6335 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6336 ;;; (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
|
6337 ;;; "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
|
6338 ;;; ;; 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
|
6339 ;;; (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
|
6340 ;;; (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
|
6341 ;;; (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
|
6342 ;;; (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
|
6343 ;;; (append '(font-lock-emphasized-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6344 ;;; cperl-array-face |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6345 ;;; font-lock-keyword-face |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6346 ;;; font-lock-variable-name-face |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6347 ;;; font-lock-constant-face |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6348 ;;; 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
|
6349 ;;; font-lock-other-emphasized-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6350 ;;; 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
|
6351 ;;; ps-bold-faces)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6352 ;;; (setq ps-italic-faces |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6353 ;;; (append '(cperl-nonoverridable-face |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6354 ;;; font-lock-constant-face |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6355 ;;; 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
|
6356 ;;; font-lock-other-emphasized-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6357 ;;; 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
|
6358 ;;; ps-italic-faces)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6359 ;;; (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
|
6360 ;;; (append '(font-lock-emphasized-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6361 ;;; 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
|
6362 ;;; font-lock-other-emphasized-face |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6363 ;;; cperl-hash-face |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6364 ;;; 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
|
6365 ;;; ps-underlined-faces)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6366 ;;; (cons 'font-lock-type-face ps-underlined-faces)) |
20323 | 6367 |
6368 | |
6369 (if (cperl-enable-font-lock) (cperl-windowed-init)) | |
6370 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6371 (defconst cperl-styles-entries |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6372 '(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
|
6373 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
|
6374 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
|
6375 cperl-merge-trailing-else |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6376 cperl-continued-statement-offset)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6377 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6378 (defconst cperl-style-examples |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6379 "##### 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
|
6380 ##### 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
|
6381 ##### cperl-continued-statement-offset |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6382 ##### 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
|
6383 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6384 ########### (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
|
6385 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6386 ### 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
|
6387 if (foo) { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6388 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6389 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6390 label: |
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 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6393 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6394 } else { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6395 stop; |
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 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6398 ### 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
|
6399 if (foo) { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6400 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6401 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6402 label: |
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 boon; |
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 } else { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6407 stop; |
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 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6410 ### 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
|
6411 if (foo) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6412 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6413 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6414 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6415 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6416 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6417 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6418 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6419 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6420 else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6421 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6422 stop; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6423 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6424 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6425 ### 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
|
6426 if (foo) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6427 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6428 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6429 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6430 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6431 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6432 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6433 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6434 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6435 else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6436 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6437 stop; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6438 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6439 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6440 ### 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
|
6441 ### 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
|
6442 if (foo) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6443 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6444 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6445 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6446 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6447 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6448 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6449 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6450 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6451 else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6452 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6453 stop; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6454 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6455 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6456 ### 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
|
6457 ### 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
|
6458 if (foo) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6459 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6460 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6461 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6462 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6463 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6464 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6465 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6466 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6467 else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6468 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6469 stop; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6470 } |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6471 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6472 ### 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
|
6473 ### 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
|
6474 if (foo) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6475 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6476 bar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6477 baz; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6478 label: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6479 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6480 boon; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6481 } |
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 else |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6484 { |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6485 stop; |
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 " |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6488 "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
|
6489 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6490 (defconst cperl-style-alist |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6491 '(("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
|
6492 (cperl-indent-level . 2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6493 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6494 (cperl-continued-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6495 (cperl-label-offset . -2) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6496 (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
|
6497 (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
|
6498 (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
|
6499 (cperl-merge-trailing-else . t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6500 |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6501 ("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
|
6502 (cperl-indent-level . 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6503 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6504 (cperl-continued-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6505 (cperl-label-offset . -4) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6506 (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
|
6507 (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
|
6508 (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
|
6509 (cperl-merge-trailing-else . t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6510 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6511 ("GNU" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6512 (cperl-indent-level . 2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6513 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6514 (cperl-continued-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6515 (cperl-label-offset . -2) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6516 (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
|
6517 (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
|
6518 (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
|
6519 (cperl-merge-trailing-else . nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6520 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6521 ("K&R" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6522 (cperl-indent-level . 5) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6523 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6524 (cperl-continued-brace-offset . -5) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6525 (cperl-label-offset . -5) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6526 (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
|
6527 ;;(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
|
6528 ;;(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
|
6529 (cperl-merge-trailing-else . nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6530 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6531 ("BSD" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6532 (cperl-indent-level . 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6533 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6534 (cperl-continued-brace-offset . -4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6535 (cperl-label-offset . -4) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6536 (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
|
6537 ;;(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
|
6538 ;;(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
|
6539 ;;(cperl-merge-trailing-else . nil) ; ??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6540 ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6541 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6542 ("C++" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6543 (cperl-indent-level . 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6544 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6545 (cperl-continued-brace-offset . -4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6546 (cperl-label-offset . -4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6547 (cperl-continued-statement-offset . 4) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6548 (cperl-extra-newline-before-brace . t) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6549 (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
|
6550 (cperl-merge-trailing-else . nil)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6551 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6552 ("Whitesmith" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6553 (cperl-indent-level . 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6554 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6555 (cperl-continued-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6556 (cperl-label-offset . -4) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6557 (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
|
6558 ;;(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
|
6559 ;;(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
|
6560 ;;(cperl-merge-trailing-else . nil) ; ??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6561 ) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6562 ("Current")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6563 "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
|
6564 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
|
6565 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6566 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
|
6567 |
20323 | 6568 (defun cperl-set-style (style) |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
6569 "Set CPerl mode variables to use one of several different indentation styles. |
20323 | 6570 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
|
6571 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
|
6572 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
|
6573 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6574 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
|
6575 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
|
6576 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6577 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
|
6578 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
|
6579 (interactive |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
6580 (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
|
6581 cperl-style-alist))) |
20323 | 6582 (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
|
6583 (or cperl-old-style |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6584 (setq cperl-old-style |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6585 (mapcar (function |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6586 (lambda (name) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6587 (cons name (eval name)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6588 cperl-styles-entries))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6589 (let ((style (cdr (assoc style cperl-style-alist))) setting str sym) |
20323 | 6590 (while style |
6591 (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
|
6592 (set (car setting) (cdr setting))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6593 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6594 (defun cperl-set-style-back () |
63518
475955d58ad4
(cperl-set-style-back): Fix spelling in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
63460
diff
changeset
|
6595 "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
|
6596 (interactive) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6597 (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
|
6598 (let (setting) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6599 (while cperl-old-style |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6600 (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
|
6601 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
|
6602 (set (car setting) (cdr setting))))) |
20323 | 6603 |
6604 (defun cperl-check-syntax () | |
6605 (interactive) | |
6606 (require 'mode-compile) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6607 (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
|
6608 (eval '(mode-compile)))) ; Avoid a warning |
20323 | 6609 |
6610 (defun cperl-info-buffer (type) | |
6611 ;; Returns buffer with documentation. Creates if missing. | |
6612 ;; If TYPE, this vars buffer. | |
6613 ;; Special care is taken to not stomp over an existing info buffer | |
6614 (let* ((bname (if type "*info-perl-var*" "*info-perl*")) | |
6615 (info (get-buffer bname)) | |
6616 (oldbuf (get-buffer "*info*"))) | |
6617 (if info info | |
6618 (save-window-excursion | |
6619 ;; Get Info running | |
6620 (require 'info) | |
6621 (cond (oldbuf | |
6622 (set-buffer oldbuf) | |
6623 (rename-buffer "*info-perl-tmp*"))) | |
6624 (save-window-excursion | |
6625 (info)) | |
6626 (Info-find-node cperl-info-page (if type "perlvar" "perlfunc")) | |
6627 (set-buffer "*info*") | |
6628 (rename-buffer bname) | |
6629 (cond (oldbuf | |
6630 (set-buffer "*info-perl-tmp*") | |
6631 (rename-buffer "*info*") | |
6632 (set-buffer bname))) | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
6633 (make-local-variable 'window-min-height) |
20323 | 6634 (setq window-min-height 2) |
6635 (current-buffer))))) | |
6636 | |
6637 (defun cperl-word-at-point (&optional p) | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
6638 "Return the word at point or at P." |
20323 | 6639 (save-excursion |
6640 (if p (goto-char p)) | |
6641 (or (cperl-word-at-point-hard) | |
6642 (progn | |
6643 (require 'etags) | |
6644 (funcall (or (and (boundp 'find-tag-default-function) | |
6645 find-tag-default-function) | |
6646 (get major-mode 'find-tag-default-function) | |
6647 ;; XEmacs 19.12 has `find-tag-default-hook'; it is | |
6648 ;; automatically used within `find-tag-default': | |
6649 'find-tag-default)))))) | |
6650 | |
6651 (defun cperl-info-on-command (command) | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
6652 "Show documentation for Perl command COMMAND in other window. |
20323 | 6653 If perl-info buffer is shown in some frame, uses this frame. |
6654 Customized by setting variables `cperl-shrink-wrap-info-frame', | |
6655 `cperl-max-help-size'." | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6656 (interactive |
20323 | 6657 (let* ((default (cperl-word-at-point)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6658 (read (read-string |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6659 (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
|
6660 default)))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6661 (list (if (equal read "") |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6662 default |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6663 read)))) |
20323 | 6664 |
6665 (let ((buffer (current-buffer)) | |
6666 (cmd-desc (concat "^" (regexp-quote command) "[^a-zA-Z_0-9]")) ; "tr///" | |
6667 pos isvar height iniheight frheight buf win fr1 fr2 iniwin not-loner | |
6668 max-height char-height buf-list) | |
6669 (if (string-match "^-[a-zA-Z]$" command) | |
6670 (setq cmd-desc "^-X[ \t\n]")) | |
6671 (setq isvar (string-match "^[$@%]" command) | |
6672 buf (cperl-info-buffer isvar) | |
6673 iniwin (selected-window) | |
6674 fr1 (window-frame iniwin)) | |
6675 (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
|
6676 (goto-char (point-min)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6677 (or isvar |
20323 | 6678 (progn (re-search-forward "^-X[ \t\n]") |
6679 (forward-line -1))) | |
6680 (if (re-search-forward cmd-desc nil t) | |
6681 (progn | |
6682 ;; Go back to beginning of the group (ex, for qq) | |
6683 (if (re-search-backward "^[ \t\n\f]") | |
6684 (forward-line 1)) | |
6685 (beginning-of-line) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6686 ;; Get some of |
20323 | 6687 (setq pos (point) |
6688 buf-list (list buf "*info-perl-var*" "*info-perl*")) | |
6689 (while (and (not win) buf-list) | |
6690 (setq win (get-buffer-window (car buf-list) t)) | |
6691 (setq buf-list (cdr buf-list))) | |
6692 (or (not win) | |
6693 (eq (window-buffer win) buf) | |
6694 (set-window-buffer win buf)) | |
6695 (and win (setq fr2 (window-frame win))) | |
6696 (if (or (not fr2) (eq fr1 fr2)) | |
6697 (pop-to-buffer buf) | |
6698 (special-display-popup-frame buf) ; Make it visible | |
6699 (select-window win)) | |
6700 (goto-char pos) ; Needed (?!). | |
6701 ;; Resize | |
6702 (setq iniheight (window-height) | |
6703 frheight (frame-height) | |
6704 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
|
6705 (cond ((if not-loner cperl-max-help-size |
20323 | 6706 cperl-shrink-wrap-info-frame) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6707 (setq height |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6708 (+ 2 |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6709 (count-lines |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6710 pos |
20323 | 6711 (save-excursion |
6712 (if (re-search-forward | |
6713 "^[ \t][^\n]*\n+\\([^ \t\n\f]\\|\\'\\)" nil t) | |
6714 (match-beginning 0) (point-max))))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6715 max-height |
20323 | 6716 (if not-loner |
6717 (/ (* (- frheight 3) cperl-max-help-size) 100) | |
6718 (setq char-height (frame-char-height)) | |
6719 ;; Non-functioning under OS/2: | |
6720 (if (eq char-height 1) (setq char-height 18)) | |
6721 ;; Title, menubar, + 2 for slack | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6722 (- (/ (x-display-pixel-height) char-height) 4))) |
20323 | 6723 (if (> height max-height) (setq height max-height)) |
6724 ;;(message "was %s doing %s" iniheight height) | |
6725 (if not-loner | |
6726 (enlarge-window (- height iniheight)) | |
6727 (set-frame-height (window-frame win) (1+ height))))) | |
6728 (set-window-start (selected-window) pos)) | |
6729 (message "No entry for %s found." command)) | |
6730 ;;(pop-to-buffer buffer) | |
6731 (select-window iniwin))) | |
6732 | |
6733 (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
|
6734 "Show documentation for Perl command at point in other window." |
20323 | 6735 (interactive) |
6736 (cperl-info-on-command (cperl-word-at-point))) | |
6737 | |
6738 (defun cperl-imenu-info-imenu-search () | |
6739 (if (looking-at "^-X[ \t\n]") nil | |
6740 (re-search-backward | |
6741 "^\n\\([-a-zA-Z_]+\\)[ \t\n]") | |
6742 (forward-line 1))) | |
6743 | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6744 (defun cperl-imenu-info-imenu-name () |
20323 | 6745 (buffer-substring |
6746 (match-beginning 1) (match-end 1))) | |
6747 | |
6748 (defun cperl-imenu-on-info () | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6749 "Shows imenu for Perl Info Buffer. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6750 Opens Perl Info buffer if needed." |
20323 | 6751 (interactive) |
6752 (let* ((buffer (current-buffer)) | |
6753 imenu-create-index-function | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6754 imenu-prev-index-position-function |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6755 imenu-extract-index-name-function |
20323 | 6756 (index-item (save-restriction |
6757 (save-window-excursion | |
6758 (set-buffer (cperl-info-buffer nil)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6759 (setq imenu-create-index-function |
20323 | 6760 'imenu-default-create-index-function |
6761 imenu-prev-index-position-function | |
6762 'cperl-imenu-info-imenu-search | |
6763 imenu-extract-index-name-function | |
6764 'cperl-imenu-info-imenu-name) | |
6765 (imenu-choose-buffer-index))))) | |
6766 (and index-item | |
6767 (progn | |
6768 (push-mark) | |
6769 (pop-to-buffer "*info-perl*") | |
6770 (cond | |
6771 ((markerp (cdr index-item)) | |
6772 (goto-char (marker-position (cdr index-item)))) | |
6773 (t | |
6774 (goto-char (cdr index-item)))) | |
6775 (set-window-start (selected-window) (point)) | |
6776 (pop-to-buffer buffer))))) | |
6777 | |
6778 (defun cperl-lineup (beg end &optional step minshift) | |
6779 "Lineup construction in a region. | |
6780 Beginning of region should be at the start of a construction. | |
6781 All first occurrences of this construction in the lines that are | |
6782 partially contained in the region are lined up at the same column. | |
6783 | |
6784 MINSHIFT is the minimal amount of space to insert before the construction. | |
6785 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
|
6786 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
|
6787 \(or `cperl-indent-level', if `cperl-lineup-step' is nil). |
20323 | 6788 Will not move the position at the start to the left." |
6789 (interactive "r") | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6790 (let (search col tcol seen b) |
20323 | 6791 (save-excursion |
6792 (goto-char end) | |
6793 (end-of-line) | |
6794 (setq end (point-marker)) | |
6795 (goto-char beg) | |
6796 (skip-chars-forward " \t\f") | |
6797 (setq beg (point-marker)) | |
6798 (indent-region beg end nil) | |
6799 (goto-char beg) | |
6800 (setq col (current-column)) | |
6801 (if (looking-at "[a-zA-Z0-9_]") | |
6802 (if (looking-at "\\<[a-zA-Z0-9_]+\\>") | |
6803 (setq search | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6804 (concat "\\<" |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6805 (regexp-quote |
20323 | 6806 (buffer-substring (match-beginning 0) |
6807 (match-end 0))) "\\>")) | |
6808 (error "Cannot line up in a middle of the word")) | |
6809 (if (looking-at "$") | |
6810 (error "Cannot line up end of line")) | |
6811 (setq search (regexp-quote (char-to-string (following-char))))) | |
6812 (setq step (or step cperl-lineup-step cperl-indent-level)) | |
6813 (or minshift (setq minshift 1)) | |
6814 (while (progn | |
6815 (beginning-of-line 2) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6816 (and (< (point) end) |
20323 | 6817 (re-search-forward search end t) |
6818 (goto-char (match-beginning 0)))) | |
6819 (setq tcol (current-column) seen t) | |
6820 (if (> tcol col) (setq col tcol))) | |
6821 (or seen | |
6822 (error "The construction to line up occurred only once")) | |
6823 (goto-char beg) | |
6824 (setq col (+ col minshift)) | |
6825 (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
|
6826 (while |
20323 | 6827 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6828 (cperl-make-indent col) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6829 (beginning-of-line 2) |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6830 (and (< (point) end) |
20323 | 6831 (re-search-forward search end t) |
6832 (goto-char (match-beginning 0)))))))) ; No body | |
6833 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6834 (defun cperl-etags (&optional add all files) ;; NOT USED??? |
20323 | 6835 "Run etags with appropriate options for Perl files. |
6836 If optional argument ALL is `recursive', will process Perl files | |
6837 in subdirectories too." | |
6838 (interactive) | |
6839 (let ((cmd "etags") | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6840 (args '("-l" "none" "-r" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6841 ;; 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
|
6842 "/\\<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
|
6843 "-r" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6844 "/\\<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
|
6845 "-r" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6846 "/\\<\\(package\\)[ \\t]*;/\\1;/")) |
20323 | 6847 res) |
6848 (if add (setq args (cons "-a" args))) | |
6849 (or files (setq files (list buffer-file-name))) | |
6850 (cond | |
6851 ((eq all 'recursive) | |
6852 ;;(error "Not implemented: recursive") | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6853 (setq args (append (list "-e" |
20323 | 6854 "sub wanted {push @ARGV, $File::Find::name if /\\.[pP][Llm]$/} |
6855 use File::Find; | |
6856 find(\\&wanted, '.'); | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6857 exec @ARGV;" |
20323 | 6858 cmd) args) |
6859 cmd "perl")) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6860 (all |
20323 | 6861 ;;(error "Not implemented: all") |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6862 (setq args (append (list "-e" |
20323 | 6863 "push @ARGV, <*.PL *.pl *.pm>; |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6864 exec @ARGV;" |
20323 | 6865 cmd) args) |
6866 cmd "perl")) | |
6867 (t | |
6868 (setq args (append args files)))) | |
6869 (setq res (apply 'call-process cmd nil nil nil args)) | |
6870 (or (eq res 0) | |
6871 (message "etags returned \"%s\"" res)))) | |
6872 | |
6873 (defun cperl-toggle-auto-newline () | |
6874 "Toggle the state of `cperl-auto-newline'." | |
6875 (interactive) | |
6876 (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
|
6877 (message "Newlines will %sbe auto-inserted now." |
20323 | 6878 (if cperl-auto-newline "" "not "))) |
6879 | |
6880 (defun cperl-toggle-abbrev () | |
6881 "Toggle the state of automatic keyword expansion in CPerl mode." | |
6882 (interactive) | |
6883 (abbrev-mode (if abbrev-mode 0 1)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6884 (message "Perl control structure will %sbe auto-inserted now." |
20323 | 6885 (if abbrev-mode "" "not "))) |
6886 | |
6887 | |
6888 (defun cperl-toggle-electric () | |
6889 "Toggle the state of parentheses doubling in CPerl mode." | |
6890 (interactive) | |
6891 (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
|
6892 (message "Parentheses will %sbe auto-doubled now." |
20323 | 6893 (if (cperl-val 'cperl-electric-parens) "" "not "))) |
6894 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6895 (defun cperl-toggle-autohelp () |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
6896 "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
|
6897 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
|
6898 (interactive) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6899 (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
|
6900 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6901 (if cperl-lazy-installed |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
6902 (cperl-lazy-unstall) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6903 (cperl-lazy-install)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6904 (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
|
6905 (if cperl-lazy-installed "" "not "))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6906 (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
|
6907 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6908 (defun cperl-toggle-construct-fix () |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6909 "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
|
6910 (interactive) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6911 (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
|
6912 (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
|
6913 nil |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6914 1)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6915 (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
|
6916 (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
|
6917 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6918 (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
|
6919 "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
|
6920 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
|
6921 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
|
6922 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6923 The message looks like this: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6924 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6925 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
|
6926 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6927 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
|
6928 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
|
6929 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
|
6930 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
|
6931 by CPerl." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6932 (interactive "P") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6933 (or arg |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6934 (setq arg (if (eq cperl-syntaxify-by-font-lock |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6935 (if backtrace 'backtrace 'message)) 0 1))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6936 (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
|
6937 (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
|
6938 (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
|
6939 (if (eq arg t) "dis" "en"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
6940 |
20323 | 6941 ;;;; Tags file creation. |
6942 | |
6943 (defvar cperl-tmp-buffer " *cperl-tmp*") | |
6944 | |
6945 (defun cperl-setup-tmp-buf () | |
6946 (set-buffer (get-buffer-create cperl-tmp-buffer)) | |
6947 (set-syntax-table cperl-mode-syntax-table) | |
6948 (buffer-disable-undo) | |
6949 (auto-fill-mode 0) | |
6950 (if cperl-use-syntax-table-text-property-for-tags | |
6951 (progn | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
6952 (make-local-variable 'parse-sexp-lookup-properties) |
20323 | 6953 ;; Do not introduce variable if not needed, we check it! |
6954 (set 'parse-sexp-lookup-properties t)))) | |
6955 | |
6956 (defun cperl-xsub-scan () | |
6957 (require 'imenu) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6958 (let ((index-alist '()) |
20323 | 6959 (prev-pos 0) index index1 name package prefix) |
6960 (goto-char (point-min)) | |
6961 ;; Search for the function | |
6962 (progn ;;save-match-data | |
6963 (while (re-search-forward | |
6964 "^\\([ \t]*MODULE\\>[^\n]*\\<PACKAGE[ \t]*=[ \t]*\\([a-zA-Z_][a-zA-Z_0-9:]*\\)\\>\\|\\([a-zA-Z_][a-zA-Z_0-9]*\\)(\\|[ \t]*BOOT:\\)" | |
6965 nil t) | |
6966 (cond | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6967 ((match-beginning 2) ; SECTION |
20323 | 6968 (setq package (buffer-substring (match-beginning 2) (match-end 2))) |
6969 (goto-char (match-beginning 0)) | |
6970 (skip-chars-forward " \t") | |
6971 (forward-char 1) | |
6972 (if (looking-at "[^\n]*\\<PREFIX[ \t]*=[ \t]*\\([a-zA-Z_][a-zA-Z_0-9]*\\)\\>") | |
6973 (setq prefix (buffer-substring (match-beginning 1) (match-end 1))) | |
6974 (setq prefix nil))) | |
6975 ((not package) nil) ; C language section | |
6976 ((match-beginning 3) ; XSUB | |
6977 (goto-char (1+ (match-beginning 3))) | |
6978 (setq index (imenu-example--name-and-position)) | |
6979 (setq name (buffer-substring (match-beginning 3) (match-end 3))) | |
6980 (if (and prefix (string-match (concat "^" prefix) name)) | |
6981 (setq name (substring name (length prefix)))) | |
6982 (cond ((string-match "::" name) nil) | |
6983 (t | |
6984 (setq index1 (cons (concat package "::" name) (cdr index))) | |
6985 (push index1 index-alist))) | |
6986 (setcar index name) | |
6987 (push index index-alist)) | |
6988 (t ; BOOT: section | |
6989 ;; (beginning-of-line) | |
6990 (setq index (imenu-example--name-and-position)) | |
6991 (setcar index (concat package "::BOOT:")) | |
6992 (push index index-alist))))) | |
6993 index-alist)) | |
6994 | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6995 (defvar cperl-unreadable-ok nil) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6996 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6997 (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
|
6998 (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
|
6999 (cperl-pod-here-fontify nil) f file) |
20323 | 7000 (save-excursion |
7001 (if b (set-buffer b) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7002 (cperl-setup-tmp-buf)) |
20323 | 7003 (erase-buffer) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7004 (condition-case err |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7005 (setq file (car (insert-file-contents ifile))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7006 (error (if cperl-unreadable-ok nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7007 (if (y-or-n-p |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7008 (format "File %s unreadable. Continue? " ifile)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7009 (setq cperl-unreadable-ok t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7010 (error "Aborting: unreadable file %s" ifile))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
7011 (if (not file) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7012 (message "Unreadable file %s" ifile) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7013 (message "Scanning file %s ..." file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7014 (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
|
7015 (not xs)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7016 (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
|
7017 (cperl-find-pods-heres nil nil noninteractive) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7018 (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
|
7019 (if xs |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7020 (setq lst (cperl-xsub-scan)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7021 (setq ind (cperl-imenu--create-perl-index)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7022 (setq lst (cdr (assoc "+Unsorted List+..." ind)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7023 (setq lst |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7024 (mapcar |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7025 (function |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7026 (lambda (elt) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7027 (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
|
7028 (goto-char (cdr elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7029 (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
|
7030 (list (car elt) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7031 (point) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7032 (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
|
7033 (buffer-substring (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7034 (goto-char (cdr elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7035 ;; After name now... |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7036 (or (eolp) (forward-char 1)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7037 (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7038 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7039 (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7040 (point)))))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7041 lst)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7042 (erase-buffer) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7043 (while lst |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7044 (setq elt (car lst) lst (cdr lst)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7045 (if elt |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7046 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7047 (insert (elt elt 3) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7048 127 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7049 (if (string-match "^package " (car elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7050 (substring (car elt) 8) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7051 (car elt) ) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7052 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7053 (number-to-string (elt elt 2)) ; Line |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7054 "," |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7055 (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
|
7056 "\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7057 (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
|
7058 (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
|
7059 (elt elt 3))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7060 ;; 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
|
7061 (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
|
7062 (match-beginning 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7063 (match-end 1)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7064 (cdr elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7065 lst)))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7066 (setq pos (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7067 (goto-char 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7068 (setq rel file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7069 ;; 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
|
7070 (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
|
7071 (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
|
7072 (setq rel (substring file (length topdir)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7073 (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
|
7074 (setq ret (buffer-substring 1 (point-max))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7075 (erase-buffer) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7076 (or noninteractive |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7077 (message "Scanning file %s finished" file)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7078 ret)))) |
20323 | 7079 |
7080 (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
|
7081 "Add to TAGS data for \"pure\" Perl files in the current directory and kids. |
20323 | 7082 Use as |
7083 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
|
7084 -f cperl-add-tags-recurse-noxs |
20323 | 7085 " |
7086 (cperl-write-tags nil nil t t nil t)) | |
7087 | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7088 (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
|
7089 "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
|
7090 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
|
7091 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
|
7092 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
|
7093 -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
|
7094 " |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7095 (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
|
7096 |
20323 | 7097 (defun cperl-add-tags-recurse () |
7098 "Add to TAGS file data for Perl files in the current directory and kids. | |
7099 Use as | |
7100 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
|
7101 -f cperl-add-tags-recurse |
20323 | 7102 " |
7103 (cperl-write-tags nil nil t t)) | |
7104 | |
7105 (defun cperl-write-tags (&optional file erase recurse dir inbuffer noxs topdir) | |
7106 ;; If INBUFFER, do not select buffer, and do not save | |
7107 ;; If ERASE is `ignore', do not erase, and do not try to delete old info. | |
7108 (require 'etags) | |
7109 (if file nil | |
7110 (setq file (if dir default-directory (buffer-file-name))) | |
7111 (if (and (not dir) (buffer-modified-p)) (error "Save buffer first!"))) | |
7112 (or topdir | |
7113 (setq topdir default-directory)) | |
7114 (let ((tags-file-name "TAGS") | |
7115 (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
|
7116 xs rel tm) |
20323 | 7117 (save-excursion |
7118 (cond (inbuffer nil) ; Already there | |
7119 ((file-exists-p tags-file-name) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7120 (if cperl-xemacs-p |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7121 (visit-tags-table-buffer) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7122 (visit-tags-table-buffer tags-file-name))) |
20323 | 7123 (t (set-buffer (find-file-noselect tags-file-name)))) |
7124 (cond | |
7125 (dir | |
7126 (cond ((eq erase 'ignore)) | |
7127 (erase | |
7128 (erase-buffer) | |
7129 (setq erase 'ignore))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
7130 (let ((files |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7131 (condition-case err |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
7132 (directory-files file t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7133 (if recurse nil cperl-scan-files-regexp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7134 t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7135 (error |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7136 (if cperl-unreadable-ok nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7137 (if (y-or-n-p |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7138 (format "Directory %s unreadable. Continue? " file)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
7139 (setq cperl-unreadable-ok t |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7140 tm nil) ; Return empty list |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7141 (error "Aborting: unreadable directory %s" file))))))) |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
7142 (mapcar (function |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7143 (lambda (file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7144 (cond |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7145 ((string-match cperl-noscan-files-regexp file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7146 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7147 ((not (file-directory-p file)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7148 (if (string-match cperl-scan-files-regexp file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7149 (cperl-write-tags file erase recurse nil t noxs topdir))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7150 ((not recurse) nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7151 (t (cperl-write-tags file erase recurse t t noxs topdir))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7152 files))) |
20323 | 7153 (t |
7154 (setq xs (string-match "\\.xs$" file)) | |
7155 (if (not (and xs noxs)) | |
7156 (progn | |
7157 (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
|
7158 (erase (erase-buffer)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7159 (t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7160 (goto-char 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7161 (setq rel file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7162 ;; 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
|
7163 (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
|
7164 (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
|
7165 (setq rel (substring file (length topdir)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7166 (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
|
7167 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7168 (search-backward "\f\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7169 (delete-region (point) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7170 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7171 (forward-char 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7172 (if (search-forward "\f\n" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7173 nil 'toend) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7174 (- (point) 2) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7175 (point-max))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7176 (goto-char (point-max))))) |
20323 | 7177 (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
|
7178 (if inbuffer nil ; Delegate to the caller |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7179 (save-buffer 0) ; No backup |
20323 | 7180 (if (fboundp 'initialize-new-tags-table) ; Do we need something special in XEmacs? |
7181 (initialize-new-tags-table)))))) | |
7182 | |
7183 (defvar cperl-tags-hier-regexp-list | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7184 (concat |
20323 | 7185 "^\\(" |
7186 "\\(package\\)\\>" | |
7187 "\\|" | |
7188 "sub\\>[^\n]+::" | |
7189 "\\|" | |
7190 "[a-zA-Z_][a-zA-Z_0-9:]*(\C-?[^\n]+::" ; XSUB? | |
7191 "\\|" | |
7192 "[ \t]*BOOT:\C-?[^\n]+::" ; BOOT section | |
7193 "\\)")) | |
7194 | |
7195 (defvar cperl-hierarchy '(() ()) | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
7196 "Global hierarchy of classes.") |
20323 | 7197 |
7198 (defun cperl-tags-hier-fill () | |
7199 ;; Suppose we are in a tag table cooked by cperl. | |
7200 (goto-char 1) | |
7201 (let (type pack name pos line chunk ord cons1 file str info fileind) | |
7202 (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
|
7203 (setq pos (match-beginning 0) |
20323 | 7204 pack (match-beginning 2)) |
7205 (beginning-of-line) | |
7206 (if (looking-at (concat | |
7207 "\\([^\n]+\\)" | |
7208 "\C-?" | |
7209 "\\([^\n]+\\)" | |
7210 "\C-a" | |
7211 "\\([0-9]+\\)" | |
7212 "," | |
7213 "\\([0-9]+\\)")) | |
7214 (progn | |
7215 (setq ;;str (buffer-substring (match-beginning 1) (match-end 1)) | |
7216 name (buffer-substring (match-beginning 2) (match-end 2)) | |
7217 ;;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
|
7218 line (buffer-substring (match-beginning 3) (match-end 3)) |
20323 | 7219 ord (if pack 1 0) |
7220 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
|
7221 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
|
7222 ;; 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
|
7223 info (cperl-etags-snarf-tag file line)) |
20323 | 7224 ;; Move back |
7225 (forward-char -1) | |
7226 ;; Make new member of hierarchy name ==> file ==> pos if needed | |
7227 (if (setq cons1 (assoc name (nth ord cperl-hierarchy))) | |
7228 ;; Name known | |
7229 (setcdr cons1 (cons (cons fileind (vector file info)) | |
7230 (cdr cons1))) | |
7231 ;; First occurrence of the name, start alist | |
7232 (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
|
7233 (if pack |
20323 | 7234 (setcar (cdr cperl-hierarchy) |
7235 (cons cons1 (nth 1 cperl-hierarchy))) | |
7236 (setcar cperl-hierarchy | |
7237 (cons cons1 (car cperl-hierarchy))))))) | |
7238 (end-of-line)))) | |
7239 | |
7240 (defun cperl-tags-hier-init (&optional update) | |
7241 "Show hierarchical menu of classes and methods. | |
7242 Finds info about classes by a scan of loaded TAGS files. | |
7243 Supposes that the TAGS files contain fully qualified function names. | |
7244 One may build such TAGS files from CPerl mode menu." | |
7245 (interactive) | |
7246 (require 'etags) | |
7247 (require 'imenu) | |
7248 (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
|
7249 (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
|
7250 (or (nthcdr 2 elt) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7251 ;; Only in one file |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7252 (setcdr elt (cdr (nth 1 elt))))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7253 pack name cons1 to l1 l2 l3 l4 b) |
20323 | 7254 ;; (setq cperl-hierarchy '(() () ())) ; Would write into '() later! |
7255 (setq cperl-hierarchy (list l1 l2 l3)) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7256 (if cperl-xemacs-p ; Not checked |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7257 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7258 (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
|
7259 ;; Does this work in XEmacs? |
20323 | 7260 (call-interactively 'visit-tags-table)) |
7261 (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
|
7262 (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
|
7263 (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
|
7264 (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
|
7265 (call-interactively 'visit-tags-table)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7266 (mapcar |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7267 (function |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7268 (lambda (tagsfile) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7269 (message "Updating list of classes... %s" tagsfile) |
20323 | 7270 (set-buffer (get-file-buffer tagsfile)) |
7271 (cperl-tags-hier-fill))) | |
7272 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
|
7273 (message "Updating list of classes... postprocessing...")) |
20323 | 7274 (mapcar remover (car cperl-hierarchy)) |
7275 (mapcar remover (nth 1 cperl-hierarchy)) | |
7276 (setq to (list nil (cons "Packages: " (nth 1 cperl-hierarchy)) | |
7277 (cons "Methods: " (car cperl-hierarchy)))) | |
7278 (cperl-tags-treeify to 1) | |
7279 (setcar (nthcdr 2 cperl-hierarchy) | |
7280 (cperl-menu-to-keymap (cons '("+++UPDATE+++" . -999) (cdr to)))) | |
7281 (message "Updating list of classes: done, requesting display...") | |
7282 ;;(cperl-imenu-addback (nth 2 cperl-hierarchy)) | |
7283 )) | |
7284 (or (nth 2 cperl-hierarchy) | |
7285 (error "No items found")) | |
7286 (setq update | |
7287 ;;; (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
|
7288 (if (if (fboundp 'display-popup-menus-p) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7289 (let ((f 'display-popup-menus-p)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7290 (funcall f)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7291 window-system) |
20323 | 7292 (x-popup-menu t (nth 2 cperl-hierarchy)) |
7293 (require 'tmm) | |
7294 (tmm-prompt (nth 2 cperl-hierarchy)))) | |
7295 (if (and update (listp update)) | |
7296 (progn (while (cdr update) (setq update (cdr update))) | |
7297 (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
|
7298 (if (vectorp update) |
20323 | 7299 (progn |
7300 (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
|
7301 (cperl-etags-goto-tag-location (elt update 1)))) |
20323 | 7302 (if (eq update -999) (cperl-tags-hier-init t))) |
7303 | |
7304 (defun cperl-tags-treeify (to level) | |
7305 ;; 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
|
7306 (let* ((regexp (concat "^\\(" (mapconcat |
20323 | 7307 'identity |
7308 (make-list level "[_a-zA-Z0-9]+") | |
7309 "::") | |
7310 "\\)\\(::\\)?")) | |
7311 (packages (cdr (nth 1 to))) | |
7312 (methods (cdr (nth 2 to))) | |
7313 l1 head tail cons1 cons2 ord writeto packs recurse | |
7314 root-packages root-functions ms many_ms same_name ps | |
7315 (move-deeper | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7316 (function |
20323 | 7317 (lambda (elt) |
7318 (cond ((and (string-match regexp (car elt)) | |
7319 (or (eq ord 1) (match-end 2))) | |
7320 (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
|
7321 tail (if (match-end 2) (substring (car elt) |
20323 | 7322 (match-end 2))) |
7323 recurse t) | |
7324 (if (setq cons1 (assoc head writeto)) nil | |
7325 ;; Need to init new head | |
7326 (setcdr writeto (cons (list head (list "Packages: ") | |
7327 (list "Methods: ")) | |
7328 (cdr writeto))) | |
7329 (setq cons1 (nth 1 writeto))) | |
7330 (setq cons2 (nth ord cons1)) ; Either packs or meths | |
7331 (setcdr cons2 (cons elt (cdr cons2)))) | |
7332 ((eq ord 2) | |
7333 (setq root-functions (cons elt root-functions))) | |
7334 (t | |
7335 (setq root-packages (cons elt root-packages)))))))) | |
7336 (setcdr to l1) ; Init to dynamic space | |
7337 (setq writeto to) | |
7338 (setq ord 1) | |
7339 (mapcar move-deeper packages) | |
7340 (setq ord 2) | |
7341 (mapcar move-deeper methods) | |
7342 (if recurse | |
7343 (mapcar (function (lambda (elt) | |
7344 (cperl-tags-treeify elt (1+ level)))) | |
7345 (cdr to))) | |
7346 ;;Now clean up leaders with one child only | |
7347 (mapcar (function (lambda (elt) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7348 (if (not (and (listp (cdr elt)) |
20323 | 7349 (eq (length elt) 2))) nil |
7350 (setcar elt (car (nth 1 elt))) | |
7351 (setcdr elt (cdr (nth 1 elt)))))) | |
7352 (cdr to)) | |
7353 ;; Sort the roots of subtrees | |
7354 (if (default-value 'imenu-sort-function) | |
7355 (setcdr to | |
7356 (sort (cdr to) (default-value 'imenu-sort-function)))) | |
7357 ;; Now add back functions removed from display | |
7358 (mapcar (function (lambda (elt) | |
7359 (setcdr to (cons elt (cdr to))))) | |
7360 (if (default-value 'imenu-sort-function) | |
7361 (nreverse | |
7362 (sort root-functions (default-value 'imenu-sort-function))) | |
7363 root-functions)) | |
7364 ;; Now add back packages removed from display | |
7365 (mapcar (function (lambda (elt) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7366 (setcdr to (cons (cons (concat "package " (car elt)) |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7367 (cdr elt)) |
20323 | 7368 (cdr to))))) |
7369 (if (default-value 'imenu-sort-function) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7370 (nreverse |
20323 | 7371 (sort root-packages (default-value 'imenu-sort-function))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7372 root-packages)))) |
20323 | 7373 |
7374 ;;;(x-popup-menu t | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7375 ;;; '(keymap "Name1" |
20323 | 7376 ;;; ("Ret1" "aa") |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7377 ;;; ("Head1" "ab" |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7378 ;;; keymap "Name2" |
20323 | 7379 ;;; ("Tail1" "x") ("Tail2" "y")))) |
7380 | |
7381 (defun cperl-list-fold (list name limit) | |
7382 (let (list1 list2 elt1 (num 0)) | |
7383 (if (<= (length list) limit) list | |
7384 (setq list1 nil list2 nil) | |
7385 (while list | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7386 (setq num (1+ num) |
20323 | 7387 elt1 (car list) |
7388 list (cdr list)) | |
7389 (if (<= num imenu-max-items) | |
7390 (setq list2 (cons elt1 list2)) | |
7391 (setq list1 (cons (cons name | |
7392 (nreverse list2)) | |
7393 list1) | |
7394 list2 (list elt1) | |
7395 num 1))) | |
7396 (nreverse (cons (cons name | |
7397 (nreverse list2)) | |
7398 list1))))) | |
7399 | |
7400 (defun cperl-menu-to-keymap (menu &optional name) | |
7401 (let (list) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7402 (cons 'keymap |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7403 (mapcar |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7404 (function |
20323 | 7405 (lambda (elt) |
7406 (cond ((listp (cdr elt)) | |
7407 (setq list (cperl-list-fold | |
7408 (cdr elt) (car elt) imenu-max-items)) | |
7409 (cons nil | |
7410 (cons (car elt) | |
7411 (cperl-menu-to-keymap list)))) | |
7412 (t | |
7413 (list (cdr elt) (car elt) t))))) ; t is needed in 19.34 | |
7414 (cperl-list-fold menu "Root" imenu-max-items))))) | |
7415 | |
7416 | |
7417 (defvar cperl-bad-style-regexp | |
7418 (mapconcat 'identity | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7419 '("[^-\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
|
7420 "[-<>=+^&|]+[^- \t\n=+<>~]") ; sign+ char |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7421 "\\|") |
20323 | 7422 "Finds places such that insertion of a whitespace may help a lot.") |
7423 | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7424 (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
|
7425 (mapconcat |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7426 'identity |
20323 | 7427 '("[^-\t <>=+]\\(--\\|\\+\\+\\)" ; var-- var++ |
7428 "[a-zA-Z0-9_][|&][a-zA-Z0-9_$]" ; abc|def abc&def are often used. | |
7429 "&[(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
|
7430 "<\\$?\\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
|
7431 "-[a-zA-Z][ \t]+[_$\"'`a-zA-Z]" ; -f file, -t STDIN |
20323 | 7432 "-[0-9]" ; -5 |
7433 "\\+\\+" ; ++var | |
7434 "--" ; --var | |
7435 ".->" ; a->b | |
7436 "->" ; a SPACE ->b | |
7437 "\\[-" ; a[-1] | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7438 "\\\\[&$@*\\\\]" ; \&func |
20323 | 7439 "^=" ; =head |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7440 "\\$." ; $| |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7441 "<<[a-zA-Z_'\"`]" ; <<FOO, <<'FOO' |
20323 | 7442 "||" |
7443 "&&" | |
7444 "[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
|
7445 "-[a-zA-Z_0-9]+[ \t]*=>" ; -option => value |
20323 | 7446 ;; Unaddressed trouble spots: = -abc, f(56, -abc) --- specialcased below |
7447 ;;"[*/+-|&<.]+=" | |
7448 ) | |
7449 "\\|") | |
7450 "If matches at the start of match found by `my-bad-c-style-regexp', | |
7451 insertion of a whitespace will not help.") | |
7452 | |
7453 (defvar found-bad) | |
7454 | |
7455 (defun cperl-find-bad-style () | |
7456 "Find places in the buffer where insertion of a whitespace may help. | |
7457 Prompts user for insertion of spaces. | |
7458 Currently it is tuned to C and Perl syntax." | |
7459 (interactive) | |
7460 (let (found-bad (p (point))) | |
7461 (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
|
7462 (goto-char (point-min)) |
20323 | 7463 (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
|
7464 (lambda (arg) (insert " ")) |
20323 | 7465 'cperl-next-bad-style |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7466 '("location" "locations" "insert a space into") |
20323 | 7467 '((?\C-r (lambda (arg) |
7468 (let ((buffer-quit-function | |
7469 'exit-recursive-edit)) | |
7470 (message "Exit with Esc Esc") | |
7471 (recursive-edit) | |
7472 t)) ; Consider acted upon | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7473 "edit, exit with Esc Esc") |
20323 | 7474 (?e (lambda (arg) |
7475 (let ((buffer-quit-function | |
7476 'exit-recursive-edit)) | |
7477 (message "Exit with Esc Esc") | |
7478 (recursive-edit) | |
7479 t)) ; Consider acted upon | |
7480 "edit, exit with Esc Esc")) | |
7481 t) | |
7482 (if found-bad (goto-char found-bad) | |
7483 (goto-char p) | |
7484 (message "No appropriate place found")))) | |
7485 | |
7486 (defun cperl-next-bad-style () | |
7487 (let (p (not-found t) (point (point)) found) | |
7488 (while (and not-found | |
7489 (re-search-forward cperl-bad-style-regexp nil 'to-end)) | |
7490 (setq p (point)) | |
7491 (goto-char (match-beginning 0)) | |
7492 (if (or | |
7493 (looking-at cperl-not-bad-style-regexp) | |
7494 ;; Check for a < -b and friends | |
7495 (and (eq (following-char) ?\-) | |
7496 (save-excursion | |
7497 (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
|
7498 (memq (preceding-char) '(?\= ?\> ?\< ?\, ?\( ?\[ ?\{)))) |
20323 | 7499 ;; Now check for syntax type |
7500 (save-match-data | |
7501 (setq found (point)) | |
7502 (beginning-of-defun) | |
7503 (let ((pps (parse-partial-sexp (point) found))) | |
7504 (or (nth 3 pps) (nth 4 pps) (nth 5 pps))))) | |
7505 (goto-char (match-end 0)) | |
7506 (goto-char (1- p)) | |
7507 (setq not-found nil | |
7508 found-bad found))) | |
7509 (not not-found))) | |
7510 | |
27248 | 7511 |
20323 | 7512 ;;; Getting help |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7513 (defvar cperl-have-help-regexp |
20323 | 7514 ;;(concat "\\(" |
7515 (mapconcat | |
7516 'identity | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7517 '("[$@%*&][0-9a-zA-Z_:]+\\([ \t]*[[{]\\)?" ; Usual variable |
20323 | 7518 "[$@]\\^[a-zA-Z]" ; Special variable |
7519 "[$@][^ \n\t]" ; Special variable | |
7520 "-[a-zA-Z]" ; File test | |
7521 "\\\\[a-zA-Z0]" ; Special chars | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7522 "^=[a-z][a-zA-Z0-9_]*" ; POD sections |
20323 | 7523 "[-!&*+,-./<=>?\\\\^|~]+" ; Operator |
7524 "[a-zA-Z_0-9:]+" ; symbol or number | |
7525 "x=" | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7526 "#!") |
20323 | 7527 ;;"\\)\\|\\(" |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7528 "\\|") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7529 ;;"\\)" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7530 ;;) |
20323 | 7531 "Matches places in the buffer we can find help for.") |
7532 | |
7533 (defvar cperl-message-on-help-error t) | |
7534 (defvar cperl-help-from-timer nil) | |
7535 | |
7536 (defun cperl-word-at-point-hard () | |
7537 ;; Does not save-excursion | |
7538 ;; Get to the something meaningful | |
7539 (or (eobp) (eolp) (forward-char 1)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7540 (re-search-backward "[-a-zA-Z0-9_:!&*+,-./<=>?\\\\^|~$%@]" |
20323 | 7541 (save-excursion (beginning-of-line) (point)) |
7542 'to-beg) | |
7543 ;; (cond | |
7544 ;; ((or (eobp) (looking-at "[][ \t\n{}();,]")) ; Not at a symbol | |
7545 ;; (skip-chars-backward " \n\t\r({[]});,") | |
7546 ;; (or (bobp) (backward-char 1)))) | |
7547 ;; Try to backtrace | |
7548 (cond | |
7549 ((looking-at "[a-zA-Z0-9_:]") ; symbol | |
7550 (skip-chars-backward "a-zA-Z0-9_:") | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7551 (cond |
20323 | 7552 ((and (eq (preceding-char) ?^) ; $^I |
7553 (eq (char-after (- (point) 2)) ?\$)) | |
7554 (forward-char -2)) | |
7555 ((memq (preceding-char) (append "*$@%&\\" nil)) ; *glob | |
7556 (forward-char -1)) | |
7557 ((and (eq (preceding-char) ?\=) | |
7558 (eq (current-column) 1)) | |
7559 (forward-char -1))) ; =head1 | |
7560 (if (and (eq (preceding-char) ?\<) | |
7561 (looking-at "\\$?[a-zA-Z0-9_:]+>")) ; <FH> | |
7562 (forward-char -1))) | |
7563 ((and (looking-at "=") (eq (preceding-char) ?x)) ; x= | |
7564 (forward-char -1)) | |
7565 ((and (looking-at "\\^") (eq (preceding-char) ?\$)) ; $^I | |
7566 (forward-char -1)) | |
7567 ((looking-at "[-!&*+,-./<=>?\\\\^|~]") | |
7568 (skip-chars-backward "-!&*+,-./<=>?\\\\^|~") | |
7569 (cond | |
7570 ((and (eq (preceding-char) ?\$) | |
7571 (not (eq (char-after (- (point) 2)) ?\$))) ; $- | |
7572 (forward-char -1)) | |
7573 ((and (eq (following-char) ?\>) | |
7574 (string-match "[a-zA-Z0-9_]" (char-to-string (preceding-char))) | |
7575 (save-excursion | |
7576 (forward-sexp -1) | |
7577 (and (eq (preceding-char) ?\<) | |
7578 (looking-at "\\$?[a-zA-Z0-9_:]+>")))) ; <FH> | |
7579 (search-backward "<")))) | |
7580 ((and (eq (following-char) ?\$) | |
7581 (eq (preceding-char) ?\<) | |
7582 (looking-at "\\$?[a-zA-Z0-9_:]+>")) ; <$fh> | |
7583 (forward-char -1))) | |
7584 (if (looking-at cperl-have-help-regexp) | |
7585 (buffer-substring (match-beginning 0) (match-end 0)))) | |
7586 | |
7587 (defun cperl-get-help () | |
7588 "Get one-line docs on the symbol at the point. | |
7589 The data for these docs is a little bit obsolete and may be in fact longer | |
7590 than a line. Your contribution to update/shorten it is appreciated." | |
7591 (interactive) | |
7592 (save-match-data ; May be called "inside" query-replace | |
7593 (save-excursion | |
7594 (let ((word (cperl-word-at-point-hard))) | |
7595 (if word | |
7596 (if (and cperl-help-from-timer ; Bail out if not in mainland | |
7597 (not (string-match "^#!\\|\\\\\\|^=" word)) ; Show help even in comments/strings. | |
7598 (or (memq (get-text-property (point) 'face) | |
7599 '(font-lock-comment-face font-lock-string-face)) | |
7600 (memq (get-text-property (point) 'syntax-type) | |
7601 '(pod here-doc format)))) | |
7602 nil | |
7603 (cperl-describe-perl-symbol word)) | |
7604 (if cperl-message-on-help-error | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7605 (message "Nothing found for %s..." |
20323 | 7606 (buffer-substring (point) (min (+ 5 (point)) (point-max)))))))))) |
7607 | |
7608 ;;; Stolen from perl-descr.el by Johan Vromans: | |
7609 | |
7610 (defvar cperl-doc-buffer " *perl-doc*" | |
7611 "Where the documentation can be found.") | |
7612 | |
7613 (defun cperl-describe-perl-symbol (val) | |
7614 "Display the documentation of symbol at point, a Perl operator." | |
7615 (let ((enable-recursive-minibuffers t) | |
7616 args-file regexp) | |
7617 (cond | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7618 ((string-match "^[&*][a-zA-Z_]" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7619 (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
|
7620 ((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
|
7621 (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
|
7622 ((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
|
7623 (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
|
7624 ((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
|
7625 (setq val "x=")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7626 ((string-match "^\\$[\C-a-\C-z]" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7627 (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
|
7628 ((string-match "^CORE::" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7629 (setq val "CORE::")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7630 ((string-match "^SUPER::" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7631 (setq val "SUPER::")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7632 ((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
|
7633 (setq val "<NAME>"))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7634 (setq regexp (concat "^" |
20323 | 7635 "\\([^a-zA-Z0-9_:]+[ \t]+\\)?" |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7636 (regexp-quote val) |
20323 | 7637 "\\([ \t([/]\\|$\\)")) |
7638 | |
7639 ;; get the buffer with the documentation text | |
7640 (cperl-switch-to-doc-buffer) | |
7641 | |
7642 ;; lookup in the doc | |
7643 (goto-char (point-min)) | |
7644 (let ((case-fold-search nil)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7645 (list |
20323 | 7646 (if (re-search-forward regexp (point-max) t) |
7647 (save-excursion | |
7648 (beginning-of-line 1) | |
7649 (let ((lnstart (point))) | |
7650 (end-of-line) | |
7651 (message "%s" (buffer-substring lnstart (point))))) | |
7652 (if cperl-message-on-help-error | |
7653 (message "No definition for %s" val))))))) | |
7654 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7655 (defvar cperl-short-docs 'please-ignore-this-line |
20323 | 7656 ;; Perl4 version was written by Johan Vromans (jvromans@squirrel.nl) |
7657 "# 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
|
7658 ... 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
|
7659 ! ... Logical negation. |
20323 | 7660 ... != ... Numeric inequality. |
7661 ... !~ ... Search pattern, substitution, or translation (negated). | |
7662 $! In numeric context: errno. In a string context: error string. | |
7663 $\" 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
|
7664 $# The output format for printed numbers. Default is %.15g or close. |
20323 | 7665 $$ Process number of this script. Changes in the fork()ed child process. |
7666 $% The current page number of the currently selected output channel. | |
7667 | |
7668 The following variables are always local to the current block: | |
7669 | |
7670 $1 Match of the 1st set of parentheses in the last match (auto-local). | |
7671 $2 Match of the 2nd set of parentheses in the last match (auto-local). | |
7672 $3 Match of the 3rd set of parentheses in the last match (auto-local). | |
7673 $4 Match of the 4th set of parentheses in the last match (auto-local). | |
7674 $5 Match of the 5th set of parentheses in the last match (auto-local). | |
7675 $6 Match of the 6th set of parentheses in the last match (auto-local). | |
7676 $7 Match of the 7th set of parentheses in the last match (auto-local). | |
7677 $8 Match of the 8th set of parentheses in the last match (auto-local). | |
7678 $9 Match of the 9th set of parentheses in the last match (auto-local). | |
7679 $& The string matched by the last pattern match (auto-local). | |
7680 $' The string after what was matched by the last match (auto-local). | |
7681 $` The string before what was matched by the last match (auto-local). | |
7682 | |
7683 $( The real gid of this process. | |
7684 $) The effective gid of this process. | |
7685 $* Deprecated: Set to 1 to do multiline matching within a string. | |
7686 $+ The last bracket matched by the last search pattern. | |
7687 $, The output field separator for the print operator. | |
7688 $- The number of lines left on the page. | |
7689 $. The current input line number of the last filehandle that was read. | |
7690 $/ 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
|
7691 $0 Name of the file containing the current perl script (read/write). |
20323 | 7692 $: String may be broken after these characters to fill ^-lines in a format. |
7693 $; Subscript separator for multi-dim array emulation. Default \"\\034\". | |
7694 $< The real uid of this process. | |
7695 $= The page length of the current output channel. Default is 60 lines. | |
7696 $> The effective uid of this process. | |
7697 $? The status returned by the last ``, pipe close or `system'. | |
7698 $@ The perl error message from the last eval or do @var{EXPR} command. | |
7699 $ARGV The name of the current file used with <> . | |
7700 $[ Deprecated: The index of the first element/char in an array/string. | |
7701 $\\ The output record separator for the print operator. | |
7702 $] The perl version string as displayed with perl -v. | |
7703 $^ The name of the current top-of-page format. | |
7704 $^A The current value of the write() accumulator for format() lines. | |
7705 $^D The value of the perl debug (-D) flags. | |
7706 $^E Information about the last system error other than that provided by $!. | |
7707 $^F The highest system file descriptor, ordinarily 2. | |
7708 $^H The current set of syntax checks enabled by `use strict'. | |
7709 $^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
|
7710 $^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
|
7711 $^M A buffer for emergency memory allocation when running out of memory. |
20323 | 7712 $^O The operating system name under which this copy of Perl was built. |
7713 $^P Internal debugging flag. | |
7714 $^T The time the script was started. Used by -A/-M/-C file tests. | |
7715 $^W True if warnings are requested (perl -w flag). | |
7716 $^X The name under which perl was invoked (argv[0] in C-speech). | |
7717 $_ The default input and pattern-searching space. | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7718 $| Auto-flush after write/print on current output channel? Default 0. |
20323 | 7719 $~ The name of the current report format. |
7720 ... % ... Modulo division. | |
7721 ... %= ... Modulo division assignment. | |
7722 %ENV Contains the current environment. | |
7723 %INC List of files that have been require-d or do-ne. | |
7724 %SIG Used to set signal handlers for various signals. | |
7725 ... & ... Bitwise and. | |
7726 ... && ... Logical and. | |
7727 ... &&= ... Logical and assignment. | |
7728 ... &= ... Bitwise and assignment. | |
7729 ... * ... Multiplication. | |
7730 ... ** ... Exponentiation. | |
7731 *NAME Glob: all objects refered by NAME. *NAM1 = *NAM2 aliases NAM1 to NAM2. | |
7732 &NAME(arg0, ...) Subroutine call. Arguments go to @_. | |
7733 ... + ... Addition. +EXPR Makes EXPR into scalar context. | |
7734 ++ Auto-increment (magical on strings). ++EXPR EXPR++ | |
7735 ... += ... Addition assignment. | |
7736 , Comma operator. | |
7737 ... - ... Subtraction. | |
7738 -- Auto-decrement (NOT magical on strings). --EXPR EXPR-- | |
7739 ... -= ... Subtraction assignment. | |
7740 -A Access time in days since script started. | |
7741 -B File is a non-text (binary) file. | |
7742 -C Inode change time in days since script started. | |
7743 -M Age in days since script started. | |
7744 -O File is owned by real uid. | |
7745 -R File is readable by real uid. | |
7746 -S File is a socket . | |
7747 -T File is a text file. | |
7748 -W File is writable by real uid. | |
7749 -X File is executable by real uid. | |
7750 -b File is a block special file. | |
7751 -c File is a character special file. | |
7752 -d File is a directory. | |
7753 -e File exists . | |
7754 -f File is a plain file. | |
7755 -g File has setgid bit set. | |
7756 -k File has sticky bit set. | |
7757 -l File is a symbolic link. | |
7758 -o File is owned by effective uid. | |
7759 -p File is a named pipe (FIFO). | |
7760 -r File is readable by effective uid. | |
7761 -s File has non-zero size. | |
7762 -t Tests if filehandle (STDIN by default) is opened to a tty. | |
7763 -u File has setuid bit set. | |
7764 -w File is writable by effective uid. | |
7765 -x File is executable by effective uid. | |
7766 -z File has zero size. | |
7767 . Concatenate strings. | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7768 .. Range (list context); flip/flop (scalar context) operator. |
20323 | 7769 .= Concatenate assignment strings |
7770 ... / ... Division. /PATTERN/ioxsmg Pattern match | |
7771 ... /= ... Division assignment. | |
7772 /PATTERN/ioxsmg Pattern match. | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7773 ... < ... Numeric less than. <pattern> Glob. See <NAME>, <> as well. |
20323 | 7774 <NAME> Reads line from filehandle NAME (a bareword or dollar-bareword). |
7775 <pattern> Glob (Unless pattern is bareword/dollar-bareword - see <NAME>). | |
7776 <> Reads line from union of files in @ARGV (= command line) and STDIN. | |
7777 ... << ... Bitwise shift left. << start of HERE-DOCUMENT. | |
7778 ... <= ... Numeric less than or equal to. | |
7779 ... <=> ... Numeric compare. | |
7780 ... = ... Assignment. | |
7781 ... == ... Numeric equality. | |
7782 ... =~ ... Search pattern, substitution, or translation | |
7783 ... > ... Numeric greater than. | |
7784 ... >= ... Numeric greater than or equal to. | |
7785 ... >> ... Bitwise shift right. | |
7786 ... >>= ... Bitwise shift right assignment. | |
7787 ... ? ... : ... Condition=if-then-else operator. ?PAT? One-time pattern match. | |
7788 ?PATTERN? One-time pattern match. | |
7789 @ARGV Command line arguments (not including the command name - see $0). | |
7790 @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
|
7791 @_ 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
|
7792 \\ Creates reference to what follows, like \\$var, or quotes non-\\w in strings. |
20323 | 7793 \\0 Octal char, e.g. \\033. |
7794 \\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
|
7795 \\L Lowercase until \\E . See also \\l, lc. |
7293b63aa3ba
(cperl-short-docs): Fix quoting
Andreas Schwab <schwab@suse.de>
parents:
68773
diff
changeset
|
7796 \\U Upcase until \\E . See also \\u, uc. |
20323 | 7797 \\Q Quote metacharacters until \\E . See also quotemeta. |
7798 \\a Alarm character (octal 007). | |
7799 \\b Backspace character (octal 010). | |
7800 \\c Control character, e.g. \\c[ . | |
7801 \\e Escape character (octal 033). | |
7802 \\f Formfeed character (octal 014). | |
7803 \\l Lowercase the next character. See also \\L and \\u, lcfirst. | |
7804 \\n Newline character (octal 012 on most systems). | |
7805 \\r Return character (octal 015 on most systems). | |
7806 \\t Tab character (octal 011). | |
7807 \\u Upcase the next character. See also \\U and \\l, ucfirst. | |
7808 \\x Hex character, e.g. \\x1b. | |
7809 ... ^ ... Bitwise exclusive or. | |
7810 __END__ Ends program source. | |
7811 __DATA__ Ends program source. | |
7812 __FILE__ Current (source) filename. | |
7813 __LINE__ Current line in current source. | |
7814 __PACKAGE__ Current package. | |
7815 ARGV Default multi-file input filehandle. <ARGV> is a synonym for <>. | |
7816 ARGVOUT Output filehandle with -i flag. | |
7817 BEGIN { ... } Immediately executed (during compilation) piece of code. | |
7818 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
|
7819 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
|
7820 INIT { ... } Pseudo-subroutine executed before the script starts running. |
20323 | 7821 DATA Input filehandle for what follows after __END__ or __DATA__. |
7822 accept(NEWSOCKET,GENERICSOCKET) | |
7823 alarm(SECONDS) | |
7824 atan2(X,Y) | |
7825 bind(SOCKET,NAME) | |
7826 binmode(FILEHANDLE) | |
7827 caller[(LEVEL)] | |
7828 chdir(EXPR) | |
7829 chmod(LIST) | |
7830 chop[(LIST|VAR)] | |
7831 chown(LIST) | |
7832 chroot(FILENAME) | |
7833 close(FILEHANDLE) | |
7834 closedir(DIRHANDLE) | |
7835 ... cmp ... String compare. | |
7836 connect(SOCKET,NAME) | |
7837 continue of { block } continue { block }. Is executed after `next' or at end. | |
7838 cos(EXPR) | |
7839 crypt(PLAINTEXT,SALT) | |
7840 dbmclose(%HASH) | |
7841 dbmopen(%HASH,DBNAME,MODE) | |
7842 defined(EXPR) | |
7843 delete($HASH{KEY}) | |
7844 die(LIST) | |
7845 do { ... }|SUBR while|until EXPR executes at least once | |
7846 do(EXPR|SUBR([LIST])) (with while|until executes at least once) | |
7847 dump LABEL | |
7848 each(%HASH) | |
7849 endgrent | |
7850 endhostent | |
7851 endnetent | |
7852 endprotoent | |
7853 endpwent | |
7854 endservent | |
7855 eof[([FILEHANDLE])] | |
7856 ... eq ... String equality. | |
7857 eval(EXPR) or eval { BLOCK } | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7858 exec([TRUENAME] ARGV0, ARGVs) or exec(SHELL_COMMAND_LINE) |
20323 | 7859 exit(EXPR) |
7860 exp(EXPR) | |
7861 fcntl(FILEHANDLE,FUNCTION,SCALAR) | |
7862 fileno(FILEHANDLE) | |
7863 flock(FILEHANDLE,OPERATION) | |
7864 for (EXPR;EXPR;EXPR) { ... } | |
7865 foreach [VAR] (@ARRAY) { ... } | |
7866 fork | |
7867 ... ge ... String greater than or equal. | |
7868 getc[(FILEHANDLE)] | |
7869 getgrent | |
7870 getgrgid(GID) | |
7871 getgrnam(NAME) | |
7872 gethostbyaddr(ADDR,ADDRTYPE) | |
7873 gethostbyname(NAME) | |
7874 gethostent | |
7875 getlogin | |
7876 getnetbyaddr(ADDR,ADDRTYPE) | |
7877 getnetbyname(NAME) | |
7878 getnetent | |
7879 getpeername(SOCKET) | |
7880 getpgrp(PID) | |
7881 getppid | |
7882 getpriority(WHICH,WHO) | |
7883 getprotobyname(NAME) | |
7884 getprotobynumber(NUMBER) | |
7885 getprotoent | |
7886 getpwent | |
7887 getpwnam(NAME) | |
7888 getpwuid(UID) | |
7889 getservbyname(NAME,PROTO) | |
7890 getservbyport(PORT,PROTO) | |
7891 getservent | |
7892 getsockname(SOCKET) | |
7893 getsockopt(SOCKET,LEVEL,OPTNAME) | |
7894 gmtime(EXPR) | |
7895 goto LABEL | |
7896 ... gt ... String greater than. | |
7897 hex(EXPR) | |
7898 if (EXPR) { ... } [ elsif (EXPR) { ... } ... ] [ else { ... } ] or EXPR if EXPR | |
7899 index(STR,SUBSTR[,OFFSET]) | |
7900 int(EXPR) | |
7901 ioctl(FILEHANDLE,FUNCTION,SCALAR) | |
7902 join(EXPR,LIST) | |
7903 keys(%HASH) | |
7904 kill(LIST) | |
7905 last [LABEL] | |
7906 ... le ... String less than or equal. | |
7907 length(EXPR) | |
7908 link(OLDFILE,NEWFILE) | |
7909 listen(SOCKET,QUEUESIZE) | |
7910 local(LIST) | |
7911 localtime(EXPR) | |
7912 log(EXPR) | |
7913 lstat(EXPR|FILEHANDLE|VAR) | |
7914 ... lt ... String less than. | |
7915 m/PATTERN/iogsmx | |
7916 mkdir(FILENAME,MODE) | |
7917 msgctl(ID,CMD,ARG) | |
7918 msgget(KEY,FLAGS) | |
7919 msgrcv(ID,VAR,SIZE,TYPE.FLAGS) | |
7920 msgsnd(ID,MSG,FLAGS) | |
7921 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
|
7922 our VAR or our (VAR1,...) Lexically enable a global variable ($V, @A, or %H). |
20323 | 7923 ... ne ... String inequality. |
7924 next [LABEL] | |
7925 oct(EXPR) | |
7926 open(FILEHANDLE[,EXPR]) | |
7927 opendir(DIRHANDLE,EXPR) | |
7928 ord(EXPR) ASCII value of the first char of the string. | |
7929 pack(TEMPLATE,LIST) | |
7930 package NAME Introduces package context. | |
7931 pipe(READHANDLE,WRITEHANDLE) Create a pair of filehandles on ends of a pipe. | |
7932 pop(ARRAY) | |
7933 print [FILEHANDLE] [(LIST)] | |
7934 printf [FILEHANDLE] (FORMAT,LIST) | |
7935 push(ARRAY,LIST) | |
7936 q/STRING/ Synonym for 'STRING' | |
7937 qq/STRING/ Synonym for \"STRING\" | |
7938 qx/STRING/ Synonym for `STRING` | |
7939 rand[(EXPR)] | |
7940 read(FILEHANDLE,SCALAR,LENGTH[,OFFSET]) | |
7941 readdir(DIRHANDLE) | |
7942 readlink(EXPR) | |
7943 recv(SOCKET,SCALAR,LEN,FLAGS) | |
7944 redo [LABEL] | |
7945 rename(OLDNAME,NEWNAME) | |
7946 require [FILENAME | PERL_VERSION] | |
7947 reset[(EXPR)] | |
7948 return(LIST) | |
7949 reverse(LIST) | |
7950 rewinddir(DIRHANDLE) | |
7951 rindex(STR,SUBSTR[,OFFSET]) | |
7952 rmdir(FILENAME) | |
7953 s/PATTERN/REPLACEMENT/gieoxsm | |
7954 scalar(EXPR) | |
7955 seek(FILEHANDLE,POSITION,WHENCE) | |
7956 seekdir(DIRHANDLE,POS) | |
7957 select(FILEHANDLE | RBITS,WBITS,EBITS,TIMEOUT) | |
7958 semctl(ID,SEMNUM,CMD,ARG) | |
7959 semget(KEY,NSEMS,SIZE,FLAGS) | |
7960 semop(KEY,...) | |
7961 send(SOCKET,MSG,FLAGS[,TO]) | |
7962 setgrent | |
7963 sethostent(STAYOPEN) | |
7964 setnetent(STAYOPEN) | |
7965 setpgrp(PID,PGRP) | |
7966 setpriority(WHICH,WHO,PRIORITY) | |
7967 setprotoent(STAYOPEN) | |
7968 setpwent | |
7969 setservent(STAYOPEN) | |
7970 setsockopt(SOCKET,LEVEL,OPTNAME,OPTVAL) | |
7971 shift[(ARRAY)] | |
7972 shmctl(ID,CMD,ARG) | |
7973 shmget(KEY,SIZE,FLAGS) | |
7974 shmread(ID,VAR,POS,SIZE) | |
7975 shmwrite(ID,STRING,POS,SIZE) | |
7976 shutdown(SOCKET,HOW) | |
7977 sin(EXPR) | |
7978 sleep[(EXPR)] | |
7979 socket(SOCKET,DOMAIN,TYPE,PROTOCOL) | |
7980 socketpair(SOCKET1,SOCKET2,DOMAIN,TYPE,PROTOCOL) | |
7981 sort [SUBROUTINE] (LIST) | |
7982 splice(ARRAY,OFFSET[,LENGTH[,LIST]]) | |
7983 split[(/PATTERN/[,EXPR[,LIMIT]])] | |
7984 sprintf(FORMAT,LIST) | |
7985 sqrt(EXPR) | |
7986 srand(EXPR) | |
7987 stat(EXPR|FILEHANDLE|VAR) | |
7988 study[(SCALAR)] | |
7989 sub [NAME [(format)]] { BODY } sub NAME [(format)]; sub [(format)] {...} | |
7990 substr(EXPR,OFFSET[,LEN]) | |
7991 symlink(OLDFILE,NEWFILE) | |
7992 syscall(LIST) | |
7993 sysread(FILEHANDLE,SCALAR,LENGTH[,OFFSET]) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
7994 system([TRUENAME] ARGV0 [,ARGV]) or system(SHELL_COMMAND_LINE) |
20323 | 7995 syswrite(FILEHANDLE,SCALAR,LENGTH[,OFFSET]) |
7996 tell[(FILEHANDLE)] | |
7997 telldir(DIRHANDLE) | |
7998 time | |
7999 times | |
8000 tr/SEARCHLIST/REPLACEMENTLIST/cds | |
8001 truncate(FILE|EXPR,LENGTH) | |
8002 umask[(EXPR)] | |
8003 undef[(EXPR)] | |
8004 unless (EXPR) { ... } [ else { ... } ] or EXPR unless EXPR | |
8005 unlink(LIST) | |
8006 unpack(TEMPLATE,EXPR) | |
8007 unshift(ARRAY,LIST) | |
8008 until (EXPR) { ... } EXPR until EXPR | |
8009 utime(LIST) | |
8010 values(%HASH) | |
8011 vec(EXPR,OFFSET,BITS) | |
8012 wait | |
8013 waitpid(PID,FLAGS) | |
8014 wantarray Returns true if the sub/eval is called in list context. | |
8015 warn(LIST) | |
8016 while (EXPR) { ... } EXPR while EXPR | |
8017 write[(EXPR|FILEHANDLE)] | |
8018 ... x ... Repeat string or array. | |
8019 x= ... Repetition assignment. | |
8020 y/SEARCHLIST/REPLACEMENTLIST/ | |
8021 ... | ... Bitwise or. | |
8022 ... || ... Logical or. | |
8023 ~ ... Unary bitwise complement. | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8024 #! OS interpreter indicator. If contains `perl', used for options, and -x. |
20323 | 8025 AUTOLOAD {...} Shorthand for `sub AUTOLOAD {...}'. |
8026 CORE:: Prefix to access builtin function if imported sub obscures it. | |
8027 SUPER:: Prefix to lookup for a method in @ISA classes. | |
8028 DESTROY Shorthand for `sub DESTROY {...}'. | |
8029 ... EQ ... Obsolete synonym of `eq'. | |
8030 ... GE ... Obsolete synonym of `ge'. | |
8031 ... GT ... Obsolete synonym of `gt'. | |
8032 ... LE ... Obsolete synonym of `le'. | |
8033 ... LT ... Obsolete synonym of `lt'. | |
8034 ... NE ... Obsolete synonym of `ne'. | |
8035 abs [ EXPR ] absolute value | |
8036 ... and ... Low-precedence synonym for &&. | |
8037 bless REFERENCE [, PACKAGE] Makes reference into an object of a package. | |
8038 chomp [LIST] Strips $/ off LIST/$_. Returns count. Special if $/ eq ''! | |
8039 chr Converts a number to char with the same ordinal. | |
8040 else Part of if/unless {BLOCK} elsif {BLOCK} else {BLOCK}. | |
8041 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
|
8042 exists $HASH{KEY} True if the key exists. |
20323 | 8043 format [NAME] = Start of output format. Ended by a single dot (.) on a line. |
8044 formline PICTURE, LIST Backdoor into \"format\" processing. | |
8045 glob EXPR Synonym of <EXPR>. | |
8046 lc [ EXPR ] Returns lowercased EXPR. | |
8047 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
|
8048 grep EXPR,LIST or grep {BLOCK} LIST Filters LIST via EXPR/BLOCK. |
20323 | 8049 map EXPR, LIST or map {BLOCK} LIST Applies EXPR/BLOCK to elts of LIST. |
8050 no PACKAGE [SYMBOL1, ...] Partial reverse for `use'. Runs `unimport' method. | |
8051 not ... Low-precedence synonym for ! - negation. | |
8052 ... or ... Low-precedence synonym for ||. | |
8053 pos STRING Set/Get end-position of the last match over this string, see \\G. | |
8054 quotemeta [ EXPR ] Quote regexp metacharacters. | |
8055 qw/WORD1 .../ Synonym of split('', 'WORD1 ...') | |
8056 readline FH Synonym of <FH>. | |
8057 readpipe CMD Synonym of `CMD`. | |
8058 ref [ EXPR ] Type of EXPR when dereferenced. | |
8059 sysopen FH, FILENAME, MODE [, PERM] (MODE is numeric, see Fcntl.) | |
8060 tie VAR, PACKAGE, LIST Hide an object behind a simple Perl variable. | |
8061 tied Returns internal object for a tied data. | |
8062 uc [ EXPR ] Returns upcased EXPR. | |
8063 ucfirst [ EXPR ] Returns EXPR with upcased first letter. | |
8064 untie VAR Unlink an object from a simple Perl variable. | |
8065 use PACKAGE [SYMBOL1, ...] Compile-time `require' with consequent `import'. | |
8066 ... xor ... Low-precedence synonym for exclusive or. | |
71304
7293b63aa3ba
(cperl-short-docs): Fix quoting
Andreas Schwab <schwab@suse.de>
parents:
68773
diff
changeset
|
8067 prototype \\&SUB Returns prototype of the function given a reference. |
20323 | 8068 =head1 Top-level heading. |
8069 =head2 Second-level heading. | |
8070 =head3 Third-level heading (is there such?). | |
8071 =over [ NUMBER ] Start list. | |
8072 =item [ TITLE ] Start new item in the list. | |
8073 =back End list. | |
8074 =cut Switch from POD to Perl. | |
8075 =pod Switch from Perl to POD. | |
8076 ") | |
8077 | |
57823
d77a1264b555
(cperl-switch-to-doc-buffer): Don't use interactive-p.
Richard M. Stallman <rms@gnu.org>
parents:
56377
diff
changeset
|
8078 (defun cperl-switch-to-doc-buffer (&optional interactive) |
20323 | 8079 "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
|
8080 (interactive "p") |
20323 | 8081 (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
|
8082 (if interactive |
20323 | 8083 (switch-to-buffer-other-window buf) |
8084 (set-buffer buf)) | |
8085 (if (= (buffer-size) 0) | |
8086 (progn | |
8087 (insert (documentation-property 'cperl-short-docs | |
8088 'variable-documentation)) | |
8089 (setq buffer-read-only t))))) | |
8090 | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8091 (defun cperl-beautify-regexp-piece (b e embed level) |
20323 | 8092 ;; b is before the starting delimiter, e before the ending |
8093 ;; e should be a marker, may be changed, but remains "correct". | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8094 ;; EMBED is nil iff we process the whole REx. |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8095 ;; 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
|
8096 ;; 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
|
8097 ;; 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
|
8098 (let (s c tmp (m (make-marker)) (m1 (make-marker)) c1 spaces inline code pos) |
20323 | 8099 (if (not embed) |
8100 (goto-char (1+ b)) | |
8101 (goto-char b) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8102 (cond ((looking-at "(\\?\\\\#") ; (?#) wrongly commented when //x-ing |
20323 | 8103 (forward-char 2) |
8104 (delete-char 1) | |
8105 (forward-char 1)) | |
8106 ((looking-at "(\\?[^a-zA-Z]") | |
8107 (forward-char 3)) | |
8108 ((looking-at "(\\?") ; (?i) | |
8109 (forward-char 2)) | |
8110 (t | |
8111 (forward-char 1)))) | |
8112 (setq c (if embed (current-indentation) (1- (current-column))) | |
8113 c1 (+ c (or cperl-regexp-indent-step cperl-indent-level))) | |
8114 (or (looking-at "[ \t]*[\n#]") | |
8115 (progn | |
8116 (insert "\n"))) | |
8117 (goto-char e) | |
8118 (beginning-of-line) | |
8119 (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
|
8120 (progn ; Something before the ending delimiter |
20323 | 8121 (goto-char e) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8122 (delete-horizontal-space) |
20323 | 8123 (insert "\n") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8124 (cperl-make-indent c) |
20323 | 8125 (set-marker e (point)))) |
8126 (goto-char b) | |
8127 (end-of-line 2) | |
8128 (while (< (point) (marker-position e)) | |
8129 (beginning-of-line) | |
8130 (setq s (point) | |
8131 inline t) | |
8132 (skip-chars-forward " \t") | |
8133 (delete-region s (point)) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8134 (cperl-make-indent c1) |
20323 | 8135 (while (and |
8136 inline | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8137 (looking-at |
20323 | 8138 (concat "\\([a-zA-Z0-9]+[^*+{?]\\)" ; 1 word |
8139 "\\|" ; Embedded variable | |
8140 "\\$\\([a-zA-Z0-9_]+\\([[{]\\)?\\|[^\n \t)|]\\)" ; 2 3 | |
8141 "\\|" ; $ ^ | |
8142 "[$^]" | |
8143 "\\|" ; simple-code simple-code*? | |
8144 "\\(\\\\.\\|[^][()#|*+?\n]\\)\\([*+{?]\\??\\)?" ; 4 5 | |
8145 "\\|" ; Class | |
8146 "\\(\\[\\)" ; 6 | |
8147 "\\|" ; Grouping | |
8148 "\\((\\(\\?\\)?\\)" ; 7 8 | |
8149 "\\|" ; | | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8150 "\\(|\\)"))) ; 9 |
20323 | 8151 (goto-char (match-end 0)) |
8152 (setq spaces t) | |
8153 (cond ((match-beginning 1) ; Alphanum word + junk | |
8154 (forward-char -1)) | |
8155 ((or (match-beginning 3) ; $ab[12] | |
8156 (and (match-beginning 5) ; X* X+ X{2,3} | |
8157 (eq (preceding-char) ?\{))) | |
8158 (forward-char -1) | |
8159 (forward-sexp 1)) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8160 ((and ; [], already syntaxified |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8161 (match-beginning 6) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8162 cperl-regexp-scan |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8163 cperl-use-syntax-table-text-property) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8164 (forward-char -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8165 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8166 (or (eq (preceding-char) ?\]) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8167 (error "[]-group not terminated")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8168 (re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8169 "\\=\\([*+?]\\|{[0-9]+\\(,[0-9]*\\)?}\\)\\??" e t)) |
20323 | 8170 ((match-beginning 6) ; [] |
8171 (setq tmp (point)) | |
8172 (if (looking-at "\\^?\\]") | |
8173 (goto-char (match-end 0))) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8174 ;; XXXX POSIX classes?! |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8175 (while (and (not pos) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8176 (re-search-forward "\\[:\\|\\]" e t)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8177 (if (eq (preceding-char) ?:) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8178 (or (re-search-forward ":\\]" e t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8179 (error "[:POSIX:]-group in []-group not terminated")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8180 (setq pos t))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8181 (or (eq (preceding-char) ?\]) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8182 (error "[]-group not terminated")) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8183 (re-search-forward |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8184 "\\=\\([*+?]\\|{[0-9]+\\(,[0-9]*\\)?}\\)\\??" e t)) |
20323 | 8185 ((match-beginning 7) ; () |
8186 (goto-char (match-beginning 0)) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8187 (setq pos (current-column)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8188 (or (eq pos c1) |
20323 | 8189 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8190 (delete-horizontal-space) |
20323 | 8191 (insert "\n") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8192 (cperl-make-indent c1))) |
20323 | 8193 (setq tmp (point)) |
8194 (forward-sexp 1) | |
8195 ;; (or (forward-sexp 1) | |
8196 ;; (progn | |
8197 ;; (goto-char tmp) | |
8198 ;; (error "()-group not terminated"))) | |
8199 (set-marker m (1- (point))) | |
8200 (set-marker m1 (point)) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8201 (if (= level 1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8202 (if (progn ; indent rigidly if multiline |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
8203 ;; 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
|
8204 ;; 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
|
8205 ;; to insertion of "\n" and " " |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8206 (goto-char tmp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8207 (search-forward "\n" m1 t)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8208 (indent-rigidly (point) m1 (- c1 pos))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8209 (setq level (1- level)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8210 (cond |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8211 ((not (match-beginning 8)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8212 (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
|
8213 ((eq (char-after (+ 2 tmp)) ?\{) ; Code |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8214 t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8215 ((eq (char-after (+ 2 tmp)) ?\() ; Conditional |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8216 (goto-char (+ 2 tmp)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8217 (forward-sexp 1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8218 (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
|
8219 ((eq (char-after (+ 2 tmp)) ?<) ; Lookbehind |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8220 (goto-char (+ 3 tmp)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8221 (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
|
8222 (t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8223 (cperl-beautify-regexp-piece tmp m t level)))) |
20323 | 8224 (goto-char m1) |
8225 (cond ((looking-at "[*+?]\\??") | |
8226 (goto-char (match-end 0))) | |
8227 ((eq (following-char) ?\{) | |
8228 (forward-sexp 1) | |
8229 (if (eq (following-char) ?\?) | |
8230 (forward-char)))) | |
8231 (skip-chars-forward " \t") | |
8232 (setq spaces nil) | |
8233 (if (looking-at "[#\n]") | |
8234 (progn | |
8235 (or (eolp) (indent-for-comment)) | |
8236 (beginning-of-line 2)) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8237 (delete-horizontal-space) |
20323 | 8238 (insert "\n")) |
8239 (end-of-line) | |
8240 (setq inline nil)) | |
8241 ((match-beginning 9) ; | | |
8242 (forward-char -1) | |
8243 (setq tmp (point)) | |
8244 (beginning-of-line) | |
8245 (if (re-search-forward "[^ \t]" tmp t) | |
8246 (progn | |
8247 (goto-char tmp) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8248 (delete-horizontal-space) |
20323 | 8249 (insert "\n")) |
8250 ;; first at line | |
8251 (delete-region (point) tmp)) | |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8252 (cperl-make-indent c) |
20323 | 8253 (forward-char 1) |
8254 (skip-chars-forward " \t") | |
8255 (setq spaces nil) | |
8256 (if (looking-at "[#\n]") | |
8257 (beginning-of-line 2) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8258 (delete-horizontal-space) |
20323 | 8259 (insert "\n")) |
8260 (end-of-line) | |
8261 (setq inline nil))) | |
8262 (or (looking-at "[ \t\n]") | |
8263 (not spaces) | |
8264 (insert " ")) | |
8265 (skip-chars-forward " \t")) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8266 (or (looking-at "[#\n]") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8267 (error "Unknown code `%s' in a regexp" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8268 (buffer-substring (point) (1+ (point))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8269 (and inline (end-of-line 2))) |
20323 | 8270 ;; Special-case the last line of group |
8271 (if (and (>= (point) (marker-position e)) | |
8272 (/= (current-indentation) c)) | |
8273 (progn | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8274 (beginning-of-line) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8275 (cperl-make-indent c))))) |
20323 | 8276 |
8277 (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
|
8278 ;; Returns position of the start |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8279 ;; XXX this is called too often! Need to cache the result! |
20323 | 8280 (save-excursion |
8281 (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
|
8282 (error "I need to have a regexp marked!")) |
20323 | 8283 ;; Find the start |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8284 (if (looking-at "\\s|") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8285 nil ; good already |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8286 (if (looking-at "\\([smy]\\|qr\\)\\s|") |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8287 (forward-char 1) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8288 (re-search-backward "\\s|"))) ; Assume it is scanned already. |
20323 | 8289 ;;(forward-char 1) |
8290 (let ((b (point)) (e (make-marker)) have-x delim (c (current-column)) | |
8291 (sub-p (eq (preceding-char) ?s)) s) | |
8292 (forward-sexp 1) | |
8293 (set-marker e (1- (point))) | |
8294 (setq delim (preceding-char)) | |
8295 (if (and sub-p (eq delim (char-after (- (point) 2)))) | |
8296 (error "Possible s/blah// - do not know how to deal with")) | |
8297 (if sub-p (forward-sexp 1)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8298 (if (looking-at "\\sw*x") |
20323 | 8299 (setq have-x t) |
8300 (insert "x")) | |
8301 ;; Protect fragile " ", "#" | |
8302 (if have-x nil | |
8303 (goto-char (1+ b)) | |
8304 (while (re-search-forward "\\(\\=\\|[^\\\\]\\)\\(\\\\\\\\\\)*[ \t\n#]" e t) ; Need to include (?#) too? | |
8305 (forward-char -1) | |
8306 (insert "\\") | |
8307 (forward-char 1))) | |
8308 b))) | |
8309 | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8310 (defun cperl-beautify-regexp (&optional deep) |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
8311 "Do it. (Experimental, may change semantics, recheck the result.) |
20323 | 8312 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
|
8313 (interactive "P") |
49516
774eed0b5c78
(cperl-beautify-level, cperl-beautify-regexp): Fix use of
Juanma Barranquero <lekktu@gmail.com>
parents:
49304
diff
changeset
|
8314 (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
|
8315 (save-excursion |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8316 (goto-char (cperl-make-regexp-x)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8317 (let ((b (point)) (e (make-marker))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8318 (forward-sexp 1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8319 (set-marker e (1- (point))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8320 (cperl-beautify-regexp-piece b e nil deep)))) |
20323 | 8321 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8322 (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
|
8323 "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
|
8324 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
|
8325 (interactive) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8326 (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
|
8327 (while (not done) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8328 (or (eq (following-char) ?\() |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8329 (search-backward "(" (1+ limit) t) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8330 (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
|
8331 (setq done |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8332 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8333 (skip-chars-backward "\\") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8334 (looking-at "\\(\\\\\\\\\\)*("))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8335 (or done (forward-char -1))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8336 |
20323 | 8337 (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
|
8338 "Find an enclosing group in regexp and contract it. |
20323 | 8339 \(Experimental, may change semantics, recheck the result.) |
8340 We suppose that the regexp is scanned already." | |
8341 (interactive) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8342 ;; (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
|
8343 (cperl-regext-to-level-start) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8344 (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
|
8345 (forward-sexp 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8346 (set-marker e (1- (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8347 (goto-char b) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8348 (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
|
8349 (cond |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8350 ((match-beginning 1) ; #-comment |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8351 (or c (setq c (current-indentation))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8352 (beginning-of-line 2) ; Skip |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8353 (cperl-make-indent c)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8354 (t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8355 (delete-char -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8356 (just-one-space)))))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8357 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8358 (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
|
8359 "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
|
8360 \(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
|
8361 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
|
8362 (interactive) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8363 (save-excursion |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8364 (condition-case nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8365 (cperl-regext-to-level-start) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8366 (error ; We are outside outermost group |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8367 (goto-char (cperl-make-regexp-x)))) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8368 (let ((b (point)) (e (make-marker)) s c) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8369 (forward-sexp 1) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8370 (set-marker e (1- (point))) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8371 (goto-char (1+ b)) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
8372 (while (re-search-forward "\\(\\\\\\\\\\)\\|(" e t) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
8373 (cond |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8374 ((match-beginning 1) ; Skip |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8375 nil) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8376 (t ; Group |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8377 (cperl-contract-level))))))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8378 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8379 (defun cperl-beautify-level (&optional deep) |
20323 | 8380 "Find an enclosing group in regexp and beautify it. |
8381 \(Experimental, may change semantics, recheck the result.) | |
8382 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
|
8383 (interactive "P") |
49516
774eed0b5c78
(cperl-beautify-level, cperl-beautify-regexp): Fix use of
Juanma Barranquero <lekktu@gmail.com>
parents:
49304
diff
changeset
|
8384 (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
|
8385 (save-excursion |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8386 (cperl-regext-to-level-start) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8387 (let ((b (point)) (e (make-marker))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8388 (forward-sexp 1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8389 (set-marker e (1- (point))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8390 (cperl-beautify-regexp-piece b e nil deep)))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8391 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8392 (defun cperl-invert-if-unless-modifiers () |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8393 "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
|
8394 \(Unfinished.)" |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8395 (interactive) ; |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8396 (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
|
8397 (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
|
8398 (and (= (char-syntax (preceding-char)) ?w) |
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 (setq pre-if (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8401 (cperl-backward-to-start-of-expr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8402 (setq pre-B (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8403 (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
|
8404 (cperl-forward-to-end-of-expr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8405 (setq post-A (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8406 (goto-char pre-if) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8407 (or (looking-at w-rex) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8408 ;; Find the position |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8409 (progn (goto-char post-A) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8410 (while (and |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8411 (not (looking-at w-rex)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8412 (> (point) pre-B)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8413 (forward-sexp -1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8414 (setq pre-if (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8415 (or (looking-at w-rex) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8416 (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
|
8417 ;; 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
|
8418 (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
|
8419 ;; First, simple part: find code boundaries |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8420 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8421 (setq post-if (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8422 (forward-sexp -2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8423 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8424 (setq post-B (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8425 (cperl-backward-to-start-of-expr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8426 (setq pre-B (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8427 (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
|
8428 (goto-char pre-if) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8429 (forward-sexp 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8430 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8431 ;; 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
|
8432 (skip-chars-backward "$@%#") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8433 (setq pre-A (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8434 (cperl-forward-to-end-of-expr) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8435 (setq post-A (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8436 (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
|
8437 ;; 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
|
8438 (skip-chars-forward " \t;") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8439 (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
|
8440 (insert "\n" B ";\n}") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8441 (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
|
8442 (delete-region pre-if post-if) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8443 (delete-region pre-B post-B) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8444 (goto-char pre-B) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8445 (insert if-string " (" A ") {") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8446 (setq post-B (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8447 (if (looking-at "[ \t]+$") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8448 (delete-horizontal-space) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8449 (if (looking-at "[ \t]*#") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8450 (cperl-indent-for-comment) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8451 (just-one-space))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8452 (forward-line 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8453 (if (looking-at "[ \t]*$") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8454 (progn ; delete line |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8455 (delete-horizontal-space) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8456 (delete-region (point) (1+ (point))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8457 (cperl-indent-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8458 (goto-char (1- post-B)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8459 (forward-sexp 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8460 (cperl-indent-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8461 (goto-char pre-B))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8462 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8463 (defun cperl-invert-if-unless () |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8464 "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
|
8465 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
|
8466 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
|
8467 the appropriate statement modifier." |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8468 (interactive) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8469 (and (= (char-syntax (preceding-char)) ?w) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8470 (forward-sexp -1)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8471 (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
|
8472 (let ((pre-if (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8473 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
|
8474 (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
|
8475 (forward-sexp 2) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8476 (setq post-A (point)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8477 (forward-sexp -1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8478 (setq pre-A (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8479 (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
|
8480 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8481 (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8482 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8483 (forward-sexp 2) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8484 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8485 (eq (following-char) ?\{ )) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8486 (error nil))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8487 (if is-block |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8488 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8489 (goto-char post-A) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8490 (forward-sexp 1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8491 (setq post-B (point)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8492 (forward-sexp -1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8493 (setq pre-B (point)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8494 (if (and (eq (following-char) ?\{ ) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8495 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8496 (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
|
8497 (eq (preceding-char) ?\) ))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8498 (if (condition-case nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8499 (progn |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8500 (goto-char post-B) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8501 (forward-sexp 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8502 (forward-sexp -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8503 (looking-at "\\<els\\(e\\|if\\)\\>")) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8504 (error nil)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8505 (error |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8506 "`%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
|
8507 (goto-char (1- post-B)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8508 (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
|
8509 (if (eq (preceding-char) ?\;) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8510 (forward-char -1)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8511 (setq end-B-code (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8512 (goto-char pre-B) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8513 (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
|
8514 (setq p (match-beginning 0) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8515 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
|
8516 state (parse-partial-sexp pre-B p)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8517 (or (nth 3 state) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8518 (nth 4 state) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8519 (nth 5 state) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8520 (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
|
8521 (goto-char (match-end 0))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8522 ;; Finally got it |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8523 (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
|
8524 (skip-chars-forward " \t\n") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8525 (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
|
8526 (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
|
8527 (or (looking-at ";?[ \t\n]*}") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8528 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8529 (skip-chars-forward "; \t\n") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8530 (setq B-comment |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8531 (buffer-substring (point) (1- post-B))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8532 (and (equal B "") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8533 (setq B "1")) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8534 (goto-char (1- post-A)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8535 (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
|
8536 (or (looking-at "[ \t\n]*)") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8537 (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
|
8538 (setq p (point)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8539 (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
|
8540 (skip-chars-forward " \t\n") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8541 (setq A (buffer-substring (point) p)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8542 (delete-region pre-B post-B) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8543 (delete-region pre-A post-A) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8544 (goto-char pre-if) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8545 (insert B " ") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8546 (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
|
8547 (just-one-space) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8548 (forward-word 1) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8549 (setq pre-A (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8550 (insert " " A ";") |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8551 (delete-horizontal-space) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8552 (setq post-B (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8553 (if (looking-at "#") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8554 (indent-for-comment)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8555 (goto-char post-B) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8556 (forward-char -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8557 (delete-horizontal-space) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8558 (goto-char pre-A) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8559 (just-one-space) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8560 (goto-char pre-if) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8561 (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
|
8562 (while (<= (point) (marker-position pre-A)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8563 (cperl-indent-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8564 (forward-line 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8565 (goto-char (marker-position pre-A)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8566 (if B-comment |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8567 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8568 (forward-line -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8569 (indent-for-comment) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8570 (goto-char (marker-position pre-A))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8571 (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
|
8572 ;; (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
|
8573 (forward-sexp -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8574 (cperl-invert-if-unless-modifiers))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8575 ;;(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
|
8576 (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
|
8577 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8578 ;;; By Anthony Foiani <afoiani@uswest.com> |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8579 ;;; Getting help on modules in C-h f ? |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8580 ;;; This is a modified version of `man'. |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8581 ;;; 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
|
8582 ;;;###autoload |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8583 (defun cperl-perldoc (word) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8584 "Run `perldoc' on WORD." |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8585 (interactive |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8586 (list (let* ((default-entry (cperl-word-at-point)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8587 (input (read-string |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8588 (format "perldoc entry%s: " |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8589 (if (string= default-entry "") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8590 "" |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8591 (format " (default %s)" default-entry)))))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8592 (if (string= input "") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8593 (if (string= default-entry "") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8594 (error "No perldoc args given") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8595 default-entry) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8596 input)))) |
41309
8c4c4027c7bd
(cperl-perldoc): Require man before binding `manual-program'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39836
diff
changeset
|
8597 (require 'man) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8598 (let* ((case-fold-search nil) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8599 (is-func (and |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8600 (string-match "^[a-z]+$" word) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8601 (string-match (concat "^" word "\\>") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8602 (documentation-property |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8603 'cperl-short-docs |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8604 'variable-documentation)))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8605 (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
|
8606 (cond |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8607 (cperl-xemacs-p |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8608 (let ((Manual-program "perldoc") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8609 (Manual-switches (if is-func (list "-f")))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8610 (manual-entry word))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8611 (t |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8612 (Man-getpage-in-background word))))) |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8613 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8614 ;;;###autoload |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8615 (defun cperl-perldoc-at-point () |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8616 "Run a `perldoc' on the word around point." |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8617 (interactive) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8618 (cperl-perldoc (cperl-word-at-point))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8619 |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8620 (defcustom pod2man-program "pod2man" |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8621 "*File name for `pod2man'." |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8622 :type 'file |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8623 :group 'cperl) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8624 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8625 ;;; 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
|
8626 (defun cperl-pod-to-manpage () |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8627 "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
|
8628 (interactive) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8629 (require 'man) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8630 (let* ((pod2man-args (concat buffer-file-name " | nroff -man ")) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8631 (bufname (concat "Man " buffer-file-name)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8632 (buffer (generate-new-buffer bufname))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8633 (save-excursion |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8634 (set-buffer buffer) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8635 (let ((process-environment (copy-sequence process-environment))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8636 ;; Prevent any attempt to use display terminal fanciness. |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8637 (setenv "TERM" "dumb") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8638 (set-process-sentinel |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8639 (start-process pod2man-program buffer "sh" "-c" |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8640 (format (cperl-pod2man-build-command) pod2man-args)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8641 'Man-bgproc-sentinel))))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8642 |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8643 ;;; Updated version by him too |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8644 (defun cperl-build-manpage () |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8645 "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
|
8646 (interactive) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8647 (require 'man) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8648 (cond |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8649 (cperl-xemacs-p |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8650 (let ((Manual-program "perldoc")) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8651 (manual-entry buffer-file-name))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8652 (t |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8653 (let* ((manual-program "perldoc")) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8654 (Man-getpage-in-background buffer-file-name))))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8655 |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8656 (defun cperl-pod2man-build-command () |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8657 "Builds the entire background manpage and cleaning command." |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8658 (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
|
8659 (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
|
8660 (while (and flist (car flist)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8661 (let ((pcom (car (car flist))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8662 (pargs (cdr (car flist)))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8663 (setq command |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8664 (concat command " | " pcom " " |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8665 (mapconcat '(lambda (phrase) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8666 (if (not (stringp phrase)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8667 (error "Malformed Man-filter-list")) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8668 phrase) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8669 pargs " "))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8670 (setq flist (cdr flist)))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
8671 command)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8672 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8673 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8674 (defun cperl-next-interpolated-REx-1 () |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8675 "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
|
8676 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
|
8677 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8678 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
|
8679 (interactive "") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8680 (cperl-next-interpolated-REx 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8681 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8682 (defun cperl-next-interpolated-REx-0 () |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8683 "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
|
8684 (interactive "") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8685 (cperl-next-interpolated-REx 0)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8686 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8687 (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
|
8688 "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
|
8689 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
|
8690 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
|
8691 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8692 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
|
8693 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
|
8694 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8695 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
|
8696 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
|
8697 (interactive "P") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8698 (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
|
8699 (or beg (setq beg (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8700 (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
|
8701 (let (pp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8702 (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
|
8703 (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
|
8704 (cperl-map-pods-heres |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8705 (function (lambda (s e p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8706 (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
|
8707 t |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8708 (setq pp s) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8709 nil))) ; nil stops |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8710 'REx-interpolated beg limit) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8711 (if pp (goto-char pp) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8712 (message "No more interpolated REx")))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8713 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8714 ;;; Initial version contributed by Trey Belew |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8715 (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
|
8716 "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
|
8717 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
|
8718 (interactive "") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8719 (cperl-pod-spell t beg end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8720 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8721 (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
|
8722 "Spell-check POD documentation. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8723 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
|
8724 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
|
8725 (interactive "P") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8726 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8727 (let (beg end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8728 (if (cperl-mark-active) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8729 (setq beg (min (mark) (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8730 end (max (mark) (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8731 (setq beg (point-min) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8732 end (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8733 (cperl-map-pods-heres (function |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8734 (lambda (s e p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8735 (if do-heres |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8736 (setq e (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8737 (goto-char e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8738 (forward-line -1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8739 (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8740 (ispell-region s e) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8741 t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8742 (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
|
8743 beg end)))) |
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 (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
|
8746 "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
|
8747 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
|
8748 function returns nil." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8749 (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
|
8750 (or prop (setq prop 'in-pod)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8751 (or s (setq s (point-min))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8752 (or end (setq end (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8753 (cperl-update-syntaxification end end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8754 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8755 (goto-char (setq pos s)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8756 (while (and cont (< pos end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8757 (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
|
8758 (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
|
8759 (and has-prop |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8760 (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
|
8761 (setq pos posend))))) |
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 ;;; Based on code by Masatake YAMATO: |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8764 (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
|
8765 "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
|
8766 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
|
8767 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
|
8768 (or pos (setq pos (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8769 (cperl-update-syntaxification pos pos) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8770 (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
|
8771 (and pod |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8772 (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
|
8773 (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
|
8774 (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
|
8775 (cons b (or e (point-max)))))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8776 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8777 (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
|
8778 "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
|
8779 POS defaults to the point." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8780 (interactive "d") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8781 (or pos (setq pos (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8782 (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
|
8783 (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
|
8784 (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
|
8785 (message |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8786 "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
|
8787 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8788 (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
|
8789 "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
|
8790 POS defaults to the point." |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8791 (interactive "d") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8792 (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
|
8793 (if p |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8794 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8795 (goto-char (car p)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8796 (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
|
8797 (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
|
8798 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8799 (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
|
8800 "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
|
8801 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
|
8802 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
|
8803 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8804 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
|
8805 (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
|
8806 (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
|
8807 (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
|
8808 (cdr (or (assq face '((bold . "B<") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8809 (italic . "I<") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8810 (bold-italic . "B<I<") |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8811 (underline . "C<"))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8812 (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
|
8813 face)))) |
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 (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
|
8816 "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
|
8817 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
|
8818 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
|
8819 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
|
8820 *Messages* buffer. |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8821 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8822 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
|
8823 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
|
8824 (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
|
8825 (or l (setq l 1)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8826 (or step (setq step 500)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8827 (or lim (setq lim 40)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8828 (let* ((timems (function (lambda () |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8829 (let ((tt (current-time))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8830 (+ (* 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
|
8831 (tt (funcall timems)) (c 0) delta tot) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8832 (goto-line l) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8833 (cperl-mode) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8834 (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
|
8835 (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
|
8836 (while (and (< c lim) (not (eobp))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8837 (forward-line step) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8838 (setq l (+ l step)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8839 (setq c (1+ c)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8840 (cperl-update-syntaxification (point) (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8841 (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
|
8842 (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
|
8843 tot)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8844 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8845 (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
|
8846 "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
|
8847 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
|
8848 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
|
8849 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
|
8850 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
|
8851 (interactive |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8852 "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
|
8853 (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
|
8854 (let ((pos (if (> window-size 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8855 (point-min) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8856 (point-max))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8857 p) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8858 (goto-char pos) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8859 (normal-mode) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8860 ;; Why needed??? With older font-locks??? |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8861 (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
|
8862 (while (if (> window-size 0) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8863 (< pos (point-max)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8864 (> pos (point-min))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8865 (setq p (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8866 (forward-line window-size) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8867 (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8868 (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
|
8869 (setq pos p)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8870 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8871 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8872 (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
|
8873 (defun cperl-lazy-unstall ()) ; Avoid a warning |
20323 | 8874 |
8875 (if (fboundp 'run-with-idle-timer) | |
8876 (progn | |
8877 (defvar cperl-help-shown nil | |
8878 "Non-nil means that the help was already shown now.") | |
8879 | |
8880 (defvar cperl-lazy-installed nil | |
8881 "Non-nil means that the lazy-help handlers are installed now.") | |
8882 | |
8883 (defun cperl-lazy-install () | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8884 "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
|
8885 Delay of auto-help controlled by `cperl-lazy-help-time'." |
20323 | 8886 (interactive) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8887 (make-local-variable 'cperl-help-shown) |
20323 | 8888 (if (and (cperl-val 'cperl-lazy-help-time) |
8889 (not cperl-lazy-installed)) | |
8890 (progn | |
8891 (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
|
8892 (run-with-idle-timer |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8893 (cperl-val 'cperl-lazy-help-time 1000000 5) |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
8894 t |
20323 | 8895 'cperl-get-help-defer) |
8896 (setq cperl-lazy-installed t)))) | |
8897 | |
8898 (defun cperl-lazy-unstall () | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
8899 "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
|
8900 Delay of auto-help controlled by `cperl-lazy-help-time'." |
20323 | 8901 (interactive) |
8902 (remove-hook 'post-command-hook 'cperl-lazy-hook) | |
8903 (cancel-function-timers 'cperl-get-help-defer) | |
8904 (setq cperl-lazy-installed nil)) | |
8905 | |
8906 (defun cperl-lazy-hook () | |
8907 (setq cperl-help-shown nil)) | |
8908 | |
8909 (defun cperl-get-help-defer () | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8910 (if (not (memq major-mode '(perl-mode cperl-mode))) nil |
20323 | 8911 (let ((cperl-message-on-help-error nil) (cperl-help-from-timer t)) |
8912 (cperl-get-help) | |
8913 (setq cperl-help-shown t)))) | |
8914 (cperl-lazy-install))) | |
8915 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8916 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8917 ;;; Plug for wrong font-lock: |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8918 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8919 (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
|
8920 (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
|
8921 (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
|
8922 before-change-functions after-change-functions |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8923 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
|
8924 (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
|
8925 (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
|
8926 (set-buffer-modified-p nil)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8927 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8928 (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
|
8929 "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
|
8930 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
|
8931 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
|
8932 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
|
8933 (save-excursion |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8934 (goto-char beg) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8935 (while (and beg |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8936 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8937 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8938 (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
|
8939 'multiline))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8940 (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
|
8941 (goto-char beg))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8942 (setq beg (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8943 (goto-char end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8944 (while (and end |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8945 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8946 (or (bolp) (condition-case nil |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8947 (forward-line 1) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8948 (error nil))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8949 (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
|
8950 'multiline))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8951 (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
|
8952 (goto-char end)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8953 (setq end (point))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8954 (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
|
8955 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8956 (defvar cperl-d-l nil) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8957 (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
|
8958 ;; Some vars for debugging only |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
8959 ;; (message "Syntaxifying...") |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8960 (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
|
8961 (istate (car cperl-syntax-state)) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8962 start from-start edebug-backtrace-buffer) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8963 (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
|
8964 (progn |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8965 (require 'edebug) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8966 (let ((f 'edebug-backtrace)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8967 (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
|
8968 (or cperl-syntax-done-to |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8969 (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
|
8970 from-start t)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8971 (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
|
8972 (not from-start)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8973 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
|
8974 ;; 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
|
8975 (min cperl-syntax-done-to (point)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8976 (goto-char start) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8977 (beginning-of-line) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8978 (setq start (point)) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8979 (and cperl-syntaxify-unwind |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8980 (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
|
8981 start (point))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8982 (and (> end start) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8983 (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
|
8984 (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
|
8985 (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
|
8986 (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
|
8987 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
|
8988 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
|
8989 nil)) ; Do not iterate |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
8990 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
8991 (defun cperl-fontify-update (end) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8992 (let ((pos (point-min)) prop posend) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8993 (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
|
8994 (while (< pos end) |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
8995 (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
|
8996 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
|
8997 (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
|
8998 (setq pos posend))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
8999 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
|
9000 |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
9001 (defun cperl-fontify-update-bad (end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
9002 ;; 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
|
9003 ;; 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
|
9004 (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
|
9005 (if prop |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
9006 (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
|
9007 (cperl-1+ pos) 'cperl-postpone) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
9008 (point-min)))) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
9009 (while (< pos end) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
9010 (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
|
9011 (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
|
9012 (setq pos posend) |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
9013 (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
|
9014 nil) ; Do not iterate |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
9015 |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
9016 ;; 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
|
9017 (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
|
9018 ;; 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
|
9019 ;; 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
|
9020 (if cperl-syntax-done-to |
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
9021 (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
|
9022 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
9023 (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
|
9024 (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
|
9025 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
|
9026 (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
|
9027 (< 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
|
9028 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
9029 (save-excursion |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
9030 (goto-char from) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
9031 (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
|
9032 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
9033 (defvar cperl-version |
73331
f21883dcffa9
Merge from upstream, upto version 5.22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73171
diff
changeset
|
9034 (let ((v "Revision: 5.22")) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
9035 (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
|
9036 (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
|
9037 "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
|
9038 |
20323 | 9039 (provide 'cperl-mode) |
9040 | |
52401 | 9041 ;;; arch-tag: 42e5b19b-e187-4537-929f-1a7408980ce6 |
20323 | 9042 ;;; cperl-mode.el ends here |