Mercurial > emacs
annotate lisp/progmodes/cperl-mode.el @ 51189:540976dbc323
Major changes for fringes and oter window elements.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Sat, 24 May 2003 21:52:57 +0000 |
parents | 25507c4ce520 |
children | 695cf19ef79e |
rev | line source |
---|---|
20323 | 1 ;;; cperl-mode.el --- Perl code editing commands for Emacs |
2 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3 ;; Copyright (C) 1985, 86, 87, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2003 |
20323 | 4 ;; Free Software Foundation, Inc. |
5 | |
6 ;; Author: Ilya Zakharevich and Bob Olson | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7 ;; Maintainer: Ilya Zakharevich <cperl@ilyaz.org> |
20323 | 8 ;; Keywords: languages, Perl |
9 | |
10 ;; This file is part of GNU Emacs. | |
11 | |
12 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
13 ;; it under the terms of the GNU General Public License as published by | |
14 ;; the Free Software Foundation; either version 2, or (at your option) | |
15 ;; any later version. | |
16 | |
17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
21 | |
22 ;; You should have received a copy of the GNU General Public License | |
23 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
25 ;; Boston, MA 02111-1307, USA. | |
26 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
27 ;;; Corrections made by Ilya Zakharevich cperl@ilyaz.org |
20323 | 28 |
29 ;;; Commentary: | |
30 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
31 ;; You can either fine-tune the bells and whistles of this mode or |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
32 ;; bulk enable them by putting |
20323 | 33 |
34 ;; (setq cperl-hairy t) | |
35 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
36 ;; in your .emacs file. (Emacs rulers do not consider it politically |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
37 ;; correct to make whistles enabled by default.) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
38 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
39 ;; DO NOT FORGET to read micro-docs (available from `Perl' menu) <<<<<< |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
40 ;; or as help on variables `cperl-tips', `cperl-problems', <<<<<< |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
41 ;; `cperl-praise', `cperl-speed'. <<<<<< |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
42 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
43 ;; The mode information (on C-h m) provides some customization help. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
44 ;; If you use font-lock feature of this mode, it is advisable to use |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
45 ;; either lazy-lock-mode or fast-lock-mode. I prefer lazy-lock. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
46 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
47 ;; Faces used now: three faces for first-class and second-class keywords |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
48 ;; and control flow words, one for each: comments, string, labels, |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
49 ;; functions definitions and packages, arrays, hashes, and variable |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
50 ;; definitions. If you do not see all these faces, your font-lock does |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
51 ;; not define them, so you need to define them manually. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
52 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
53 ;; This mode supports font-lock, imenu and mode-compile. In the |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
54 ;; hairy version font-lock is on, but you should activate imenu |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
55 ;; yourself (note that mode-compile is not standard yet). Well, you |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
56 ;; can use imenu from keyboard anyway (M-x imenu), but it is better |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
57 ;; to bind it like that: |
20323 | 58 |
59 ;; (define-key global-map [M-S-down-mouse-3] 'imenu) | |
60 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
61 ;;; Font lock bugs as of v4.32: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
62 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
63 ;; The following kinds of Perl code erroneously start strings: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
64 ;; \$` \$' \$" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
65 ;; $opt::s $opt_s $opt{s} (s => ...) /\s+.../ |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
66 ;; likewise with m, tr, y, q, qX instead of s |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
67 |
20323 | 68 ;;; Code: |
69 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
70 ;; Some macros are needed for `defcustom' |
31821 | 71 (eval-when-compile |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
72 (condition-case nil |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
73 (require 'man) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
74 (error nil)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
75 (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
|
76 (defvar cperl-can-font-lock |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
77 (or cperl-xemacs-p |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
78 (and (boundp 'emacs-major-version) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
79 (or window-system |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
80 (> emacs-major-version 20))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
81 (if cperl-can-font-lock |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
82 (require 'font-lock)) |
31821 | 83 (defvar msb-menu-cond) |
84 (defvar gud-perldb-history) | |
85 (defvar font-lock-background-mode) ; not in Emacs | |
86 (defvar font-lock-display-type) ; ditto | |
87 (defmacro cperl-is-face (arg) ; Takes quoted arg | |
88 (cond ((fboundp 'find-face) | |
89 `(find-face ,arg)) | |
90 (;;(and (fboundp 'face-list) | |
91 ;; (face-list)) | |
92 (fboundp 'face-list) | |
93 `(member ,arg (and (fboundp 'face-list) | |
94 (face-list)))) | |
95 (t | |
96 `(boundp ,arg)))) | |
97 (defmacro cperl-make-face (arg descr) ; Takes unquoted arg | |
98 (cond ((fboundp 'make-face) | |
99 `(make-face (quote ,arg))) | |
100 (t | |
44446
9b08deb1030e
(cperl-make-face, cperl-force-face):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43943
diff
changeset
|
101 `(defvar ,arg (quote ,arg) ,descr)))) |
31821 | 102 (defmacro cperl-force-face (arg descr) ; Takes unquoted arg |
103 `(progn | |
104 (or (cperl-is-face (quote ,arg)) | |
105 (cperl-make-face ,arg ,descr)) | |
106 (or (boundp (quote ,arg)) ; We use unquoted variants too | |
44446
9b08deb1030e
(cperl-make-face, cperl-force-face):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43943
diff
changeset
|
107 (defvar ,arg (quote ,arg) ,descr)))) |
31821 | 108 (if cperl-xemacs-p |
109 (defmacro cperl-etags-snarf-tag (file line) | |
26455 | 110 `(progn |
31821 | 111 (beginning-of-line 2) |
112 (list ,file ,line))) | |
113 (defmacro cperl-etags-snarf-tag (file line) | |
114 `(etags-snarf-tag))) | |
115 (if cperl-xemacs-p | |
116 (defmacro cperl-etags-goto-tag-location (elt) | |
117 ;;(progn | |
118 ;; (switch-to-buffer (get-file-buffer (elt (, elt) 0))) | |
119 ;; (set-buffer (get-file-buffer (elt (, elt) 0))) | |
120 ;; Probably will not work due to some save-excursion??? | |
121 ;; Or save-file-position? | |
122 ;; (message "Did I get to line %s?" (elt (, elt) 1)) | |
123 `(goto-line (string-to-int (elt ,elt 1)))) | |
124 ;;) | |
125 (defmacro cperl-etags-goto-tag-location (elt) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
126 `(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
|
127 |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
128 (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
|
129 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
130 (defvar cperl-can-font-lock |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
131 (or cperl-xemacs-p |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
132 (and (boundp 'emacs-major-version) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
133 (or window-system |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
134 (> emacs-major-version 20))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
135 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
136 (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
|
137 (let (answer) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
138 (while list |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
139 (or answer |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
140 (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
|
141 (null (cdr list))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
142 (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
|
143 (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
|
144 answer)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
145 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
146 (defgroup cperl nil |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
147 "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
|
148 :prefix "cperl-" |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
149 :group 'languages |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
150 :version "20.3") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
151 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
152 (defgroup cperl-indentation-details nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
153 "Indentation." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
154 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
155 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
156 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
157 (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
|
158 "Variables affected by `cperl-hairy'." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
159 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
160 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
161 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
162 (defgroup cperl-autoinsert-details nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
163 "Auto-insert tuneup." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
164 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
165 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
166 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
167 (defgroup cperl-faces nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
168 "Fontification colors." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
169 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
170 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
171 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
172 (defgroup cperl-speed nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
173 "Speed vs. validity tuneup." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
174 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
175 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
176 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
177 (defgroup cperl-help-system nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
178 "Help system tuneup." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
179 :prefix "cperl-" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
180 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
181 |
20323 | 182 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
183 (defcustom cperl-extra-newline-before-brace nil |
20323 | 184 "*Non-nil means that if, elsif, while, until, else, for, foreach |
185 and do constructs look like: | |
186 | |
187 if () | |
188 { | |
189 } | |
190 | |
191 instead of: | |
192 | |
193 if () { | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
194 }" |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
195 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
196 :group 'cperl-autoinsert-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
197 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
198 (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
|
199 cperl-extra-newline-before-brace |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
200 "*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
|
201 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
|
202 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
203 :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
|
204 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
205 (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
|
206 "*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
|
207 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
208 :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
|
209 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
210 (defcustom cperl-lineup-step nil |
20323 | 211 "*`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
|
212 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
|
213 :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
|
214 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
215 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
216 (defcustom cperl-brace-imaginary-offset 0 |
20323 | 217 "*Imagined indentation of a Perl open brace that actually follows a statement. |
218 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
|
219 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
|
220 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
221 :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
|
222 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
223 (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
|
224 "*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
|
225 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
226 :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
|
227 (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
|
228 "*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
|
229 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
230 :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
|
231 (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
|
232 "*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
|
233 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
234 :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
|
235 (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
|
236 "*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
|
237 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
238 :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
|
239 (defcustom cperl-continued-brace-offset 0 |
20323 | 240 "*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
|
241 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
|
242 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
243 :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
|
244 (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
|
245 "*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
|
246 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
247 :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
|
248 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
249 (defcustom cperl-auto-newline nil |
20323 | 250 "*Non-nil means automatically newline before and after braces, |
251 and after colons and semicolons, inserted in CPerl code. The following | |
252 \\[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
|
253 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
|
254 `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
|
255 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
256 :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
|
257 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
258 (defcustom cperl-autoindent-on-semi nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
259 "*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
|
260 Active if `cperl-auto-newline' is false." |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
261 :type 'boolean |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
262 :group 'cperl-autoinsert-details) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
263 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
264 (defcustom cperl-auto-newline-after-colon nil |
20323 | 265 "*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
|
266 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
|
267 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
268 :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
|
269 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
270 (defcustom cperl-tab-always-indent t |
20323 | 271 "*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
|
272 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
|
273 :type 'boolean |
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 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
276 (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
|
277 "*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
|
278 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
|
279 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
280 :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
|
281 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
282 (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
|
283 "*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
|
284 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
|
285 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
286 :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
|
287 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
288 (defcustom cperl-electric-parens-string "({[]})<" |
20323 | 289 "*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
|
290 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
|
291 :type 'string |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
292 :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
|
293 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
294 (defcustom cperl-electric-parens nil |
20323 | 295 "*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
|
296 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
|
297 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
298 :group 'cperl-affected-by-hairy) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
299 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
300 (defvar zmacs-regions) ; Avoid warning |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
301 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
302 (defcustom cperl-electric-parens-mark |
20323 | 303 (and window-system |
304 (or (and (boundp 'transient-mark-mode) ; For Emacs | |
305 transient-mark-mode) | |
306 (and (boundp 'zmacs-regions) ; For XEmacs | |
307 zmacs-regions))) | |
308 "*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
|
309 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
|
310 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
311 :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
|
312 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
313 (defcustom cperl-electric-linefeed nil |
20323 | 314 "*If true, LFD should be hairy in CPerl, otherwise C-c LFD is hairy. |
315 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
|
316 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
|
317 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
318 :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
|
319 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
320 (defcustom cperl-electric-keywords nil |
20323 | 321 "*Not-nil (and non-null) means keywords are electric in CPerl. |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
322 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
|
323 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
324 :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
|
325 |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
326 (defcustom cperl-electric-backspace-untabify t |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
327 "*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
|
328 :type 'boolean |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
329 :group 'cperl-autoinsert-details) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
330 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
331 (defcustom cperl-hairy nil |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
332 "*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
|
333 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
|
334 `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
|
335 `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
|
336 `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
|
337 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
338 :group 'cperl-affected-by-hairy) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
339 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
340 (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
|
341 "*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
|
342 :type 'integer |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
343 :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
|
344 |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
345 (defcustom cperl-vc-header-alist '((SCCS "($sccs) = ('%W\%' =~ /(\\d+(\\.\\d+)+)/) ;") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
346 (RCS "($rcs) = (' $Id\$ ' =~ /(\\d+(\\.\\d+)+)/) ;")) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
347 "*What to use as `vc-header-alist' in CPerl." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
348 :type '(repeat (list symbol string)) |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
349 :group 'cperl) |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
350 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
351 (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
|
352 (not |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
353 (and |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
354 (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
|
355 (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
|
356 (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
|
357 "*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
|
358 :type 'boolean |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
359 :group 'cperl) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
360 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
361 (defcustom cperl-info-on-command-no-prompt nil |
20323 | 362 "*Not-nil (and non-null) means not to prompt on C-h f. |
363 The opposite behaviour 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
|
364 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
|
365 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
366 :group 'cperl-affected-by-hairy) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
367 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
368 (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
|
369 "*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
|
370 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
|
371 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
|
372 :type '(choice (const null) boolean) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
373 :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
|
374 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
375 (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
|
376 "*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
|
377 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
|
378 :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
|
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-pod-face 'font-lock-comment-face |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
382 "*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
|
383 :type 'face |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
384 :group 'cperl-faces) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
385 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
386 (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
|
387 "*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
|
388 Font for POD headers." |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
389 :type 'face |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
390 :group 'cperl-faces) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
391 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
392 (defcustom cperl-here-face 'font-lock-string-face |
31821 | 393 "*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
|
394 :type 'face |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
395 :group 'cperl-faces) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
396 |
35013
587807c5e8e6
(cperl-invalid-face): Don't double-quote
Dave Love <fx@gnu.org>
parents:
32880
diff
changeset
|
397 (defcustom cperl-invalid-face 'underline |
31821 | 398 "*Face for highlighting trailing whitespace." |
399 :type 'face | |
35013
587807c5e8e6
(cperl-invalid-face): Don't double-quote
Dave Love <fx@gnu.org>
parents:
32880
diff
changeset
|
400 :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
|
401 :group 'cperl-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
402 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
403 (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
|
404 "*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
|
405 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
406 :group 'cperl-faces) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
407 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
408 (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
|
409 "*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
|
410 :type 'boolean |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
411 :group 'cperl-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
412 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
413 (defcustom cperl-highlight-variables-indiscriminately nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
414 "*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
|
415 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
|
416 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
|
417 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
|
418 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
|
419 :type 'boolean |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
420 :group 'cperl) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
421 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
422 (defcustom cperl-pod-here-scan t |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
423 "*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
|
424 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
|
425 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
426 :group 'cperl-speed) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
427 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
428 (defcustom cperl-regexp-scan t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
429 "*Not-nil means make marking of regular expression more thorough. |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
430 Effective only with `cperl-pod-here-scan'. Not implemented yet." |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
431 :type 'boolean |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
432 :group 'cperl-speed) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
433 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
434 (defcustom cperl-imenu-addback nil |
20323 | 435 "*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
|
436 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
|
437 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
438 :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
|
439 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
440 (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
|
441 "*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
|
442 :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
|
443 :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
|
444 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
445 (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
|
446 "*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
|
447 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
448 :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
|
449 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
450 (defcustom cperl-info-page "perl" |
20323 | 451 "*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
|
452 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
|
453 :type 'string |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
454 :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
|
455 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
456 (defcustom cperl-use-syntax-table-text-property |
20323 | 457 (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
|
458 "*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
|
459 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
460 :group 'cperl-speed) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
461 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
462 (defcustom cperl-use-syntax-table-text-property-for-tags |
20323 | 463 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
|
464 "*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
|
465 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
466 :group 'cperl-speed) |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
467 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
468 (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
|
469 "*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
|
470 :type 'regexp |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
471 :group 'cperl) |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
472 |
47334
e3cfc5df817a
(cperl-noscan-files-regexp): In addition to RCS, exclude CVS directories.
Richard M. Stallman <rms@gnu.org>
parents:
46132
diff
changeset
|
473 (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
|
474 "/\\(\\.\\.?\\|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
|
475 "*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
|
476 :type 'regexp |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
477 :group 'cperl) |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
478 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
479 (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
|
480 "*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
|
481 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
|
482 :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
|
483 :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
|
484 |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
485 (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
|
486 "*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
|
487 :type 'boolean |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
488 :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
|
489 |
26667
a11929b241ab
(cperl-under-as-char): Make nil the default value.
Richard M. Stallman <rms@gnu.org>
parents:
26455
diff
changeset
|
490 (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
|
491 "*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
|
492 :type 'boolean |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
493 :group 'cperl) |
20323 | 494 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
495 (defcustom cperl-extra-perl-args "" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
496 "*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
|
497 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
|
498 :type 'string |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
499 :group 'cperl) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
500 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
501 (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
|
502 "*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
|
503 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
504 :group 'cperl-help-system) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
505 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
506 (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
|
507 "*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
|
508 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
|
509 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
|
510 :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
|
511 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
512 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
513 (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
|
514 "*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
|
515 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
|
516 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
517 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
518 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
519 (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
|
520 "*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
|
521 when indenting a region. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
522 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
|
523 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
524 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
525 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
526 (defcustom cperl-merge-trailing-else t |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
527 "*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
|
528 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
|
529 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
530 :group 'cperl-indentation-details) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
531 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
532 (defcustom cperl-indent-parens-as-block nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
533 "*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
|
534 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
|
535 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
|
536 :type 'boolean |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
537 :group 'cperl-indentation-details) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
538 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
539 (defcustom cperl-syntaxify-by-font-lock |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
540 (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
|
541 (boundp 'parse-sexp-lookup-properties)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
542 "*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
|
543 :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
|
544 :group 'cperl-speed) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
545 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
546 (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
|
547 t |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
548 "*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
|
549 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
|
550 :type 'boolean |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
551 :group 'cperl-speed) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
552 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
553 (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
|
554 '((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
|
555 (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
|
556 (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
|
557 (font-lock-constant-face nil "LightGray" bold) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
558 (cperl-array-face nil "LightGray" bold underline) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
559 (cperl-hash-face nil "LightGray" bold italic underline) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
560 (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
|
561 (font-lock-string-face nil nil italic underline) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
562 (cperl-nonoverridable-face nil nil italic underline) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
563 (font-lock-type-face nil nil underline) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
564 (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
|
565 "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
|
566 :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
|
567 (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
|
568 (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
|
569 (repeat symbol))))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
570 :group 'cperl-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
571 |
49304
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
572 (defvar cperl-dark-background |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
573 (cperl-choose-color "navy" "os2blue" "darkgreen")) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
574 (defvar cperl-dark-foreground |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
575 (cperl-choose-color "orchid1" "orange")) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
576 |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
577 (defface cperl-nonoverridable-face |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
578 `((((class grayscale) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
579 (:background "Gray90" :slant italic :underline t)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
580 (((class grayscale) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
581 (: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
|
582 (((class color) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
583 (:foreground "chartreuse3")) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
584 (((class color) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
585 (:foreground ,cperl-dark-foreground)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
586 (t (:weight bold :underline t))) |
50788
2a3bf1afbe82
(cperl-nonoverridable-face): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
50255
diff
changeset
|
587 "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
|
588 :group 'cperl-faces) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
589 |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
590 (defface cperl-array-face |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
591 `((((class grayscale) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
592 (:background "Gray90" :weight bold)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
593 (((class grayscale) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
594 (:foreground "Gray80" :weight bold)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
595 (((class color) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
596 (:foreground "Blue" :background "lightyellow2" :weight bold)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
597 (((class color) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
598 (: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
|
599 (t (:weight bold))) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
600 "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
|
601 :group 'cperl-faces) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
602 |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
603 (defface cperl-hash-face |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
604 `((((class grayscale) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
605 (:background "Gray90" :weight bold :slant italic)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
606 (((class grayscale) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
607 (:foreground "Gray80" :weight bold :slant italic)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
608 (((class color) (background light)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
609 (: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
|
610 (((class color) (background dark)) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
611 (: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
|
612 (t (:weight bold :slant italic))) |
a9d24051c803
Don't make faces depend on window-system.
Juanma Barranquero <lekktu@gmail.com>
parents:
47334
diff
changeset
|
613 "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
|
614 :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
|
615 |
20323 | 616 |
617 | |
618 ;;; Short extra-docs. | |
619 | |
620 (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
|
621 "Get maybe newer version of this package from |
20323 | 622 ftp://ftp.math.ohio-state.edu/pub/users/ilya/emacs |
623 and/or | |
624 ftp://ftp.math.ohio-state.edu/pub/users/ilya/perl | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
625 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
|
626 patches to related files. |
20323 | 627 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
628 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
|
629 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
|
630 \(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
|
631 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
|
632 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
|
633 |
20323 | 634 Get support packages choose-color.el (or font-lock-extra.el before |
635 19.30), imenu-go.el from the same place. \(Look for other files there | |
636 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
|
637 later you should use choose-color.el *instead* of font-lock-extra.el |
20323 | 638 \(and you will not get smart highlighting in C :-(). |
639 | |
640 Note that to enable Compile choices in the menu you need to install | |
641 mode-compile.el. | |
642 | |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
643 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
|
644 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
|
645 |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
646 (defalias 'perl-mode 'cperl-mode) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
647 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
648 Get perl5-info from |
20323 | 649 $CPAN/doc/manual/info/perl-info.tar.gz |
650 older version was on | |
651 http://www.metronet.com:70/9/perlinfo/perl5/manual/perl5-info.tar.gz | |
652 | |
653 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
|
654 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
|
655 Tools/Tags submenu in Perl menu. |
20323 | 656 |
657 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
|
658 from Perl menu, or hierarchic view of imenu. The second one uses the |
20323 | 659 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
|
660 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
|
661 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
662 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
|
663 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
664 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
|
665 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
666 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
|
667 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
|
668 |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
669 \\[normal-mode] |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
670 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
671 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
|
672 |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
673 \\[load-library] cperl-mode RET |
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
674 \\[normal-mode] |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
675 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
676 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
|
677 micro-docs on what I know about CPerl problems.") |
20323 | 678 |
679 (defvar cperl-problems 'please-ignore-this-line | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
680 "Description of problems in CPerl mode. |
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
681 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
|
682 install choose-color.el, available from |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
683 ftp://ftp.math.ohio-state.edu/pub/users/ilya/emacs/ |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
684 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
685 `fill-paragraph' on a comment may leave the point behind the |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
686 paragraph. Parsing of lines with several <<EOF is not implemented |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
687 yet. |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
688 |
41351
d103d22e5b4f
(cperl-problems, cperl-tips, cperl-non-problems, cperl-praise): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
41309
diff
changeset
|
689 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
|
690 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
|
691 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
|
692 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
|
693 this respect (until 2003). |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
694 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
695 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
|
696 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
|
697 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
|
698 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
|
699 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
|
700 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
701 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
|
702 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
|
703 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
|
704 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
|
705 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
|
706 braces. |
20323 | 707 |
708 This may be confusing, since the regexp s#//#/#\; may be highlighted | |
709 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
|
710 code. Or the opposite case, when a POD section is highlighted, but |
20323 | 711 may break the indentation of the following code (though indentation |
712 should work if the balance of delimiters is not broken by POD). | |
713 | |
714 The main trick (to make $ a \"backslash\") makes constructions like | |
715 ${aaa} look like unbalanced braces. The only trick I can think of is | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
716 to insert it as $ {aaa} (legal in perl5, not in perl4). |
20323 | 717 |
718 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
|
719 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
|
720 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
721 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
|
722 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
|
723 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
|
724 and on CPAN. |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
725 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
726 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
|
727 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
|
728 via `cperl-use-syntax-table-text-property'.") |
20323 | 729 |
730 (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
|
731 "Advantages of CPerl mode. |
20323 | 732 |
733 0) It uses the newest `syntax-table' property ;-); | |
734 | |
735 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
|
736 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
|
737 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
|
738 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
739 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
|
740 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
|
741 updates syntax assist hints when you edit your script. |
20323 | 742 |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
743 2) It is generally believed to be \"the most user-friendly Emacs |
20323 | 744 package\" whatever it may mean (I doubt that the people who say similar |
745 things tried _all_ the rest of Emacs ;-), but this was not a lonely | |
746 voice); | |
747 | |
748 3) Everything is customizable, one-by-one or in a big sweep; | |
749 | |
750 4) It has many easily-accessable \"tools\": | |
751 a) Can run program, check syntax, start debugger; | |
752 b) Can lineup vertically \"middles\" of rows, like `=' in | |
753 a = b; | |
754 cc = d; | |
755 c) Can insert spaces where this impoves readability (in one | |
756 interactive sweep over the buffer); | |
757 d) Has support for imenu, including: | |
758 1) Separate unordered list of \"interesting places\"; | |
759 2) Separate TOC of POD sections; | |
760 3) Separate list of packages; | |
761 4) Hierarchical view of methods in (sub)packages; | |
762 5) and functions (by the full name - with package); | |
763 e) Has an interface to INFO docs for Perl; The interface is | |
764 very flexible, including shrink-wrapping of | |
765 documentation buffer/frame; | |
766 f) Has a builtin list of one-line explanations for perl constructs. | |
767 g) Can show these explanations if you stay long enough at the | |
768 corresponding place (or on demand); | |
769 h) Has an enhanced fontification (using 3 or 4 additional faces | |
770 comparing to font-lock - basically, different | |
771 namespaces in Perl have different colors); | |
772 i) Can construct TAGS basing on its knowledge of Perl syntax, | |
773 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
|
774 TAGS (if \"by directory\", .xs files - with C-language |
20323 | 775 bindings - are included in the scan); |
776 j) Can build a hierarchical view of classes (via imenu) basing | |
777 on generated TAGS file; | |
778 k) Has electric parentheses, electric newlines, uses Abbrev | |
779 for electric logical constructs | |
780 while () {} | |
781 with different styles of expansion (context sensitive | |
782 to be not so bothering). Electric parentheses behave | |
783 \"as they should\" in a presence of a visible region. | |
784 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
|
785 m) Can convert from |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
786 if (A) { B } |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
787 to |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
788 B if A; |
20323 | 789 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
790 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
|
791 (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
|
792 o) Highlights trailing whitespace; |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
793 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
|
794 conversion to a more readable form. |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
795 |
20323 | 796 5) The indentation engine was very smart, but most of tricks may be |
797 not needed anymore with the support for `syntax-table' property. Has | |
798 progress indicator for indentation (with `imenu' loaded). | |
799 | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
800 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
|
801 whitespace *inside* the conditional/loop constructs. |
20323 | 802 |
803 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
|
804 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
805 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
|
806 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
|
807 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
808 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
|
809 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
|
810 |
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
811 10) Uses a linear-time algorith for indentation of regions (on Emaxen with |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
812 capable syntax engines).") |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
813 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
814 (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
|
815 "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
|
816 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
|
817 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
818 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
|
819 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
|
820 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
821 *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
|
822 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
|
823 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
|
824 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
|
825 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
|
826 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
827 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
|
828 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
|
829 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
|
830 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
831 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
|
832 PODs and HERE-documents), or |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
833 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
|
834 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
|
835 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
836 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
|
837 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
838 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
|
839 `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
|
840 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
|
841 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
842 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
|
843 `cperl-pod-here-scan' |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
844 to nil. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
845 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
846 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
|
847 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
848 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
|
849 `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
|
850 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
|
851 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
|
852 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
|
853 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
|
854 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
855 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
|
856 of, say, long POD sections.") |
20323 | 857 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
858 (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
|
859 "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
|
860 |
32422 | 861 `cperl-array-face' Array names |
862 `cperl-hash-face' Hash names | |
863 `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
|
864 syntaxically to be not code |
32422 | 865 `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
|
866 2-arg operators s/y/tr/ or of RExen, |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
867 `font-lock-function-name-face' Special-cased m// and s//foo/, _ as |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
868 a target of a file tests, file tests, |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
869 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
|
870 (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
|
871 package names (when recognized), format names |
32422 | 872 `font-lock-keyword-face' Control flow switch constructs, declarators |
873 `cperl-nonoverridable-face' Non-overridable keywords, modifiers of RExen | |
874 `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
|
875 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
|
876 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
|
877 as string literals |
32422 | 878 `font-lock-type-face' Overridable keywords |
879 `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
|
880 hash names, POD headers/item names |
32422 | 881 `cperl-invalid-face' Trailing whitespace |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
882 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
883 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
|
884 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
|
885 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
|
886 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
|
887 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
888 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
|
889 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
|
890 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
891 \(Not finished.)") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
892 |
20323 | 893 |
894 | |
895 ;;; Portability stuff: | |
896 | |
897 (defmacro cperl-define-key (emacs-key definition &optional xemacs-key) | |
26455 | 898 `(define-key cperl-mode-map |
899 ,(if xemacs-key | |
900 `(if cperl-xemacs-p ,xemacs-key ,emacs-key) | |
901 emacs-key) | |
902 ,definition)) | |
20323 | 903 |
904 (defvar cperl-del-back-ch | |
905 (car (append (where-is-internal 'delete-backward-char) | |
906 (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
|
907 "Character generated by key bound to `delete-backward-char'.") |
20323 | 908 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
909 (and (vectorp cperl-del-back-ch) (= (length cperl-del-back-ch) 1) |
20323 | 910 (setq cperl-del-back-ch (aref cperl-del-back-ch 0))) |
911 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
912 (defun cperl-mark-active () (mark)) ; Avoid undefined warning |
20323 | 913 (if cperl-xemacs-p |
914 (progn | |
915 ;; "Active regions" are on: use region only if active | |
916 ;; "Active regions" are off: use region unconditionally | |
917 (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
|
918 (if zmacs-regions (mark) t))) |
20323 | 919 (defun cperl-use-region-p () |
920 (if transient-mark-mode mark-active t)) | |
921 (defun cperl-mark-active () mark-active)) | |
922 | |
923 (defsubst cperl-enable-font-lock () | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
924 cperl-can-font-lock) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
925 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
926 (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
|
927 (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
|
928 |
20323 | 929 (if (boundp 'unread-command-events) |
930 (if cperl-xemacs-p | |
931 (defun cperl-putback-char (c) ; XEmacs >= 19.12 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
932 (setq unread-command-events (list (eval '(character-to-event c)))))) |
20323 | 933 (defun cperl-putback-char (c) ; XEmacs <= 19.11 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
934 (set 'unread-command-event (eval '(character-to-event c))))) ; Avoid warnings |
20323 | 935 |
936 (or (fboundp 'uncomment-region) | |
937 (defun uncomment-region (beg end) | |
938 (interactive "r") | |
939 (comment-region beg end -1))) | |
940 | |
941 (defvar cperl-do-not-fontify | |
942 (if (string< emacs-version "19.30") | |
943 'fontified | |
944 'lazy-lock) | |
945 "Text property which inhibits refontification.") | |
946 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
947 (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
|
948 ;; 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
|
949 (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
|
950 nil |
20323 | 951 (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
|
952 to cperl-do-not-fontify t))) |
20323 | 953 |
20961
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
954 (defcustom cperl-mode-hook nil |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
955 "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
|
956 :type 'hook |
79530a618cd3
Commented out line 471 (miniperl entry in interpreter-mode-alist)
Stephen Eglen <stephen@gnu.org>
parents:
20953
diff
changeset
|
957 :group 'cperl) |
20323 | 958 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
959 (defvar cperl-syntax-state nil) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
960 (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
|
961 (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
|
962 (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
|
963 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
964 ;; Make customization possible "in reverse" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
965 (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
|
966 (cond |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
967 ((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
|
968 (cperl-hairy (or hairy t)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
969 (t (symbol-value symbol)))) |
20323 | 970 |
971 ;;; Probably it is too late to set these guys already, but it can help later: | |
972 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
973 ;;;(and cperl-clobber-mode-lists |
20323 | 974 ;;;(setq auto-mode-alist |
975 ;;; (append '(("\\.\\([pP][Llm]\\|al\\)$" . perl-mode)) auto-mode-alist )) | |
976 ;;;(and (boundp 'interpreter-mode-alist) | |
977 ;;; (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
|
978 ;;; '(("miniperl" . perl-mode)))))) |
31821 | 979 (eval-when-compile |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
980 (mapcar (lambda (p) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
981 (condition-case nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
982 (require p) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
983 (error nil))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
984 '(imenu easymenu etags timer man info)) |
31821 | 985 (if (fboundp 'ps-extend-face-list) |
986 (defmacro cperl-ps-extend-face-list (arg) | |
987 `(ps-extend-face-list ,arg)) | |
988 (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
|
989 `(error "This version of Emacs has no `ps-extend-face-list'"))) |
31821 | 990 ;; Calling `cperl-enable-font-lock' below doesn't compile on XEmacs, |
991 ;; macros instead of defsubsts don't work on Emacs, so we do the | |
992 ;; expansion manually. Any other suggestions? | |
993 (require 'cl)) | |
20323 | 994 |
995 (defvar cperl-mode-abbrev-table nil | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
996 "Abbrev table in use in CPerl mode buffers.") |
20323 | 997 |
998 (add-hook 'edit-var-mode-alist '(perl-mode (regexp . "^cperl-"))) | |
999 | |
1000 (defvar cperl-mode-map () "Keymap used in CPerl mode.") | |
1001 | |
1002 (if cperl-mode-map nil | |
1003 (setq cperl-mode-map (make-sparse-keymap)) | |
1004 (cperl-define-key "{" 'cperl-electric-lbrace) | |
1005 (cperl-define-key "[" 'cperl-electric-paren) | |
1006 (cperl-define-key "(" 'cperl-electric-paren) | |
1007 (cperl-define-key "<" 'cperl-electric-paren) | |
1008 (cperl-define-key "}" 'cperl-electric-brace) | |
1009 (cperl-define-key "]" 'cperl-electric-rparen) | |
1010 (cperl-define-key ")" 'cperl-electric-rparen) | |
1011 (cperl-define-key ";" 'cperl-electric-semi) | |
1012 (cperl-define-key ":" 'cperl-electric-terminator) | |
1013 (cperl-define-key "\C-j" 'newline-and-indent) | |
1014 (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
|
1015 (cperl-define-key "\C-c\C-t" 'cperl-invert-if-unless) |
20323 | 1016 (cperl-define-key "\C-c\C-a" 'cperl-toggle-auto-newline) |
1017 (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
|
1018 (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
|
1019 (cperl-define-key "\C-c\C-f" 'auto-fill-mode) |
20323 | 1020 (cperl-define-key "\C-c\C-e" 'cperl-toggle-electric) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1021 (cperl-define-key "\C-c\C-ha" 'cperl-toggle-autohelp) |
20323 | 1022 (cperl-define-key "\e\C-q" 'cperl-indent-exp) ; Usually not bound |
1023 (cperl-define-key [?\C-\M-\|] 'cperl-lineup | |
1024 [(control meta |)]) | |
1025 ;;(cperl-define-key "\M-q" 'cperl-fill-paragraph) | |
1026 ;;(cperl-define-key "\e;" 'cperl-indent-for-comment) | |
1027 (cperl-define-key "\177" 'cperl-electric-backspace) | |
1028 (cperl-define-key "\t" 'cperl-indent-command) | |
1029 ;; 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
|
1030 (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
|
1031 [(control c) (control h) F]) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1032 (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
|
1033 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1034 (cperl-define-key "\C-hf" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1035 ;;(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
|
1036 'cperl-info-on-command |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1037 [(control h) f]) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1038 (cperl-define-key "\C-hv" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1039 ;;(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
|
1040 '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
|
1041 [(control h) v]) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1042 (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
|
1043 ;;(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
|
1044 (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
|
1045 [(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
|
1046 (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
|
1047 ;;(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
|
1048 (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
|
1049 [(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
|
1050 (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
|
1051 [(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
|
1052 (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
|
1053 ;;(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
|
1054 'cperl-get-help |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1055 [(control c) (control h) v])) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1056 (if (and cperl-xemacs-p |
20323 | 1057 (<= emacs-minor-version 11) (<= emacs-major-version 19)) |
1058 (progn | |
1059 ;; substitute-key-definition is usefulness-deenhanced... | |
1060 (cperl-define-key "\M-q" 'cperl-fill-paragraph) | |
1061 (cperl-define-key "\e;" 'cperl-indent-for-comment) | |
1062 (cperl-define-key "\e\C-\\" 'cperl-indent-region)) | |
1063 (substitute-key-definition | |
1064 'indent-sexp 'cperl-indent-exp | |
1065 cperl-mode-map global-map) | |
1066 (substitute-key-definition | |
1067 'fill-paragraph 'cperl-fill-paragraph | |
1068 cperl-mode-map global-map) | |
1069 (substitute-key-definition | |
1070 'indent-region 'cperl-indent-region | |
1071 cperl-mode-map global-map) | |
1072 (substitute-key-definition | |
1073 'indent-for-comment 'cperl-indent-for-comment | |
1074 cperl-mode-map global-map))) | |
1075 | |
1076 (defvar cperl-menu) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1077 (defvar cperl-lazy-installed) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1078 (defvar cperl-old-style nil) |
20323 | 1079 (condition-case nil |
1080 (progn | |
1081 (require 'easymenu) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1082 (easy-menu-define |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1083 cperl-menu cperl-mode-map "Menu for CPerl mode" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1084 '("Perl" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1085 ["Beginning of function" beginning-of-defun t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1086 ["End of function" end-of-defun t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1087 ["Mark function" mark-defun t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1088 ["Indent expression" cperl-indent-exp t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1089 ["Fill paragraph/comment" cperl-fill-paragraph t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1090 "----" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1091 ["Line up a construction" cperl-lineup (cperl-use-region-p)] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1092 ["Invert if/unless/while etc" cperl-invert-if-unless t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1093 ("Regexp" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1094 ["Beautify" cperl-beautify-regexp |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1095 cperl-use-syntax-table-text-property] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1096 ["Beautify one level deep" (cperl-beautify-regexp 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1097 cperl-use-syntax-table-text-property] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1098 ["Beautify a group" cperl-beautify-level |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1099 cperl-use-syntax-table-text-property] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1100 ["Beautify a group one level deep" (cperl-beautify-level 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1101 cperl-use-syntax-table-text-property] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1102 ["Contract a group" cperl-contract-level |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1103 cperl-use-syntax-table-text-property] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1104 ["Contract groups" cperl-contract-levels |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1105 cperl-use-syntax-table-text-property]) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1106 ["Refresh \"hard\" constructions" cperl-find-pods-heres t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1107 "----" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1108 ["Indent region" cperl-indent-region (cperl-use-region-p)] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1109 ["Comment region" cperl-comment-region (cperl-use-region-p)] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1110 ["Uncomment region" cperl-uncomment-region (cperl-use-region-p)] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1111 "----" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1112 ["Run" mode-compile (fboundp 'mode-compile)] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1113 ["Kill" mode-compile-kill (and (fboundp 'mode-compile-kill) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1114 (get-buffer "*compilation*"))] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1115 ["Next error" next-error (get-buffer "*compilation*")] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1116 ["Check syntax" cperl-check-syntax (fboundp 'mode-compile)] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1117 "----" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1118 ["Debugger" cperl-db t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1119 "----" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1120 ("Tools" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1121 ["Imenu" imenu (fboundp 'imenu)] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1122 ["Insert spaces if needed" cperl-find-bad-style t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1123 ["Class Hierarchy from TAGS" cperl-tags-hier-init t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1124 ;;["Update classes" (cperl-tags-hier-init t) tags-table-list] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1125 ["CPerl pretty print (exprmntl)" cperl-ps-print |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1126 (fboundp 'ps-extend-face-list)] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1127 ["Imenu on info" cperl-imenu-on-info (featurep 'imenu)] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1128 ("Tags" |
20323 | 1129 ;;; ["Create tags for current file" cperl-etags t] |
1130 ;;; ["Add tags for current file" (cperl-etags t) t] | |
1131 ;;; ["Create tags for Perl files in directory" (cperl-etags nil t) t] | |
1132 ;;; ["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
|
1133 ;;; ["Create tags for Perl files in (sub)directories" |
20323 | 1134 ;;; (cperl-etags nil 'recursive) t] |
1135 ;;; ["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
|
1136 ;;; (cperl-etags t 'recursive) t]) |
20323 | 1137 ;;;; 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
|
1138 ["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
|
1139 ["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
|
1140 ["Create tags for Perl files in directory" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1141 (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
|
1142 ["Add tags for Perl files in directory" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1143 (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
|
1144 ["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
|
1145 (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
|
1146 ["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
|
1147 (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
|
1148 ("Perl docs" |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
1149 ["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
|
1150 (fboundp 'imenu-go-find-at-position)] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1151 ["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
|
1152 ["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
|
1153 ["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
|
1154 ["Perldoc" cperl-perldoc t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1155 ["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
|
1156 ["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
|
1157 ["Auto-help on" cperl-lazy-install |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1158 (and (fboundp 'run-with-idle-timer) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1159 (not cperl-lazy-installed))] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1160 ["Auto-help off" cperl-lazy-unstall |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1161 (and (fboundp 'run-with-idle-timer) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1162 cperl-lazy-installed)]) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1163 ("Toggle..." |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1164 ["Auto newline" cperl-toggle-auto-newline t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1165 ["Electric parens" cperl-toggle-electric t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1166 ["Electric keywords" cperl-toggle-abbrev t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1167 ["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
|
1168 ["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
|
1169 ["Auto fill" auto-fill-mode t]) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1170 ("Indent styles..." |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1171 ["CPerl" (cperl-set-style "CPerl") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1172 ["PerlStyle" (cperl-set-style "PerlStyle") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1173 ["GNU" (cperl-set-style "GNU") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1174 ["C++" (cperl-set-style "C++") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1175 ["FSF" (cperl-set-style "FSF") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1176 ["BSD" (cperl-set-style "BSD") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1177 ["Whitesmith" (cperl-set-style "Whitesmith") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1178 ["Current" (cperl-set-style "Current") t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1179 ["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
|
1180 ("Micro-docs" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1181 ["Tips" (describe-variable 'cperl-tips) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1182 ["Problems" (describe-variable 'cperl-problems) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1183 ["Speed" (describe-variable 'cperl-speed) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1184 ["Praise" (describe-variable 'cperl-praise) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1185 ["Faces" (describe-variable 'cperl-tips-faces) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1186 ["CPerl mode" (describe-function 'cperl-mode) t] |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1187 ["CPerl version" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1188 (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
|
1189 cperl-version) t])))) |
20323 | 1190 (error nil)) |
1191 | |
1192 (autoload 'c-macro-expand "cmacexp" | |
1193 "Display the result of expanding all C macros occurring in the region. | |
1194 The expansion is entirely correct because it uses the C preprocessor." | |
1195 t) | |
1196 | |
43943
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1197 (defvar cperl-imenu--function-name-regexp-perl |
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1198 (concat |
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1199 "^\\(" |
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1200 "[ \t]*\\(sub\\|package\\)[ \t\n]+\\([a-zA-Z_0-9:']+\\)[ \t]*\\(([^()]*)[ \t]*\\)?" |
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1201 "\\|" |
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1202 "=head\\([12]\\)[ \t]+\\([^\n]+\\)$" |
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1203 "\\)")) |
5ef08437e801
(cperl-imenu--function-name-regexp-perl):
Richard M. Stallman <rms@gnu.org>
parents:
43899
diff
changeset
|
1204 |
43899
2b9c79cd9ecb
(cperl-outline-regexp): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
43688
diff
changeset
|
1205 (defvar cperl-outline-regexp |
2b9c79cd9ecb
(cperl-outline-regexp): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
43688
diff
changeset
|
1206 (concat cperl-imenu--function-name-regexp-perl "\\|" "\\`")) |
2b9c79cd9ecb
(cperl-outline-regexp): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
43688
diff
changeset
|
1207 |
20323 | 1208 (defvar cperl-mode-syntax-table nil |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
1209 "Syntax table in use in CPerl mode buffers.") |
20323 | 1210 |
1211 (defvar cperl-string-syntax-table nil | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
1212 "Syntax table in use in CPerl mode string-like chunks.") |
20323 | 1213 |
1214 (if cperl-mode-syntax-table | |
1215 () | |
1216 (setq cperl-mode-syntax-table (make-syntax-table)) | |
1217 (modify-syntax-entry ?\\ "\\" cperl-mode-syntax-table) | |
1218 (modify-syntax-entry ?/ "." cperl-mode-syntax-table) | |
1219 (modify-syntax-entry ?* "." cperl-mode-syntax-table) | |
1220 (modify-syntax-entry ?+ "." cperl-mode-syntax-table) | |
1221 (modify-syntax-entry ?- "." cperl-mode-syntax-table) | |
1222 (modify-syntax-entry ?= "." cperl-mode-syntax-table) | |
1223 (modify-syntax-entry ?% "." cperl-mode-syntax-table) | |
1224 (modify-syntax-entry ?< "." cperl-mode-syntax-table) | |
1225 (modify-syntax-entry ?> "." cperl-mode-syntax-table) | |
1226 (modify-syntax-entry ?& "." cperl-mode-syntax-table) | |
1227 (modify-syntax-entry ?$ "\\" cperl-mode-syntax-table) | |
1228 (modify-syntax-entry ?\n ">" cperl-mode-syntax-table) | |
1229 (modify-syntax-entry ?# "<" cperl-mode-syntax-table) | |
1230 (modify-syntax-entry ?' "\"" cperl-mode-syntax-table) | |
1231 (modify-syntax-entry ?` "\"" cperl-mode-syntax-table) | |
1232 (if cperl-under-as-char | |
1233 (modify-syntax-entry ?_ "w" cperl-mode-syntax-table)) | |
1234 (modify-syntax-entry ?: "_" cperl-mode-syntax-table) | |
1235 (modify-syntax-entry ?| "." cperl-mode-syntax-table) | |
1236 (setq cperl-string-syntax-table (copy-syntax-table cperl-mode-syntax-table)) | |
1237 (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
|
1238 (modify-syntax-entry ?# "." cperl-string-syntax-table)) ; (?# comment ) |
20323 | 1239 |
1240 | |
1241 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1242 (defvar cperl-faces-init nil) |
20323 | 1243 ;; Fix for msb.el |
1244 (defvar cperl-msb-fixed nil) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1245 (defvar cperl-use-major-mode 'cperl-mode) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1246 |
20323 | 1247 ;;;###autoload |
1248 (defun cperl-mode () | |
1249 "Major mode for editing Perl code. | |
1250 Expression and list commands understand all C brackets. | |
1251 Tab indents for Perl code. | |
1252 Paragraphs are separated by blank lines only. | |
1253 Delete converts tabs to spaces as it moves back. | |
1254 | |
1255 Various characters in Perl almost always come in pairs: {}, (), [], | |
1256 sometimes <>. When the user types the first, she gets the second as | |
1257 well, with optional special formatting done on {}. (Disabled by | |
1258 default.) You can always quote (with \\[quoted-insert]) the left | |
1259 \"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
|
1260 since most the time you mean \"less\". CPerl mode tries to guess |
20323 | 1261 whether you want to type pair <>, and inserts is if it |
1262 appropriate. You can set `cperl-electric-parens-string' to the string that | |
1263 contains the parenths from the above list you want to be electrical. | |
1264 Electricity of parenths is controlled by `cperl-electric-parens'. | |
1265 You may also set `cperl-electric-parens-mark' to have electric parens | |
1266 look for active mark and \"embrace\" a region if possible.' | |
1267 | |
1268 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
|
1269 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1270 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
|
1271 for, foreach, formy and foreachmy. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1272 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1273 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
|
1274 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1275 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
|
1276 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
|
1277 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
|
1278 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
|
1279 } { } 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
|
1280 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
|
1281 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
|
1282 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
|
1283 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
|
1284 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1285 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
|
1286 |
20323 | 1287 bite if angry; |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1288 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1289 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
|
1290 `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
|
1291 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
|
1292 to nil.) |
20323 | 1293 |
1294 \\[cperl-linefeed] is a convenience replacement for typing carriage | |
1295 return. It places you in the next line with proper indentation, or if | |
1296 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
|
1297 |
20323 | 1298 foreach (@lines) {print; print} |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1299 |
20323 | 1300 and you are on a boundary of a statement inside braces, it will |
1301 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
|
1302 appropriately indented blank line. If you need a usual |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1303 `newline-and-indent' behaviour, it is on \\[newline-and-indent], |
20323 | 1304 see documentation on `cperl-electric-linefeed'. |
1305 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1306 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
|
1307 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1308 if (A) { B } |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1309 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1310 into |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1311 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1312 B if A; |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1313 |
20323 | 1314 \\{cperl-mode-map} |
1315 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1316 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
|
1317 \(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
|
1318 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
|
1319 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
|
1320 \(see also `cperl-electric-parens-mark' and `cperl-electric-parens'), |
20323 | 1321 setting `cperl-electric-keywords' enables electric expansion of |
1322 control structures in CPerl. `cperl-electric-linefeed' governs which | |
1323 one of two linefeed behavior is preferable. You can enable all these | |
1324 options simultaneously (recommended mode of use) by setting | |
1325 `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
|
1326 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
|
1327 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
|
1328 consequent \\[cperl-electric-backspace]. |
20323 | 1329 |
1330 If your site has perl5 documentation in info format, you can use commands | |
1331 \\[cperl-info-on-current-command] and \\[cperl-info-on-command] to access it. | |
1332 These keys run commands `cperl-info-on-current-command' and | |
1333 `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
|
1334 `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
|
1335 \(in turn affected by `cperl-hairy'). |
20323 | 1336 |
1337 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
|
1338 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
|
1339 man via menu. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1340 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1341 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
|
1342 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
|
1343 `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
|
1344 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
|
1345 menu, or via \\[cperl-toggle-autohelp]. Requires `run-with-idle-timer'. |
20323 | 1346 |
1347 Use \\[cperl-lineup] to vertically lineup some construction - put the | |
1348 beginning of the region at the start of construction, and make region | |
1349 span the needed amount of lines. | |
1350 | |
1351 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
|
1352 `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
|
1353 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
|
1354 for indentation too, otherwise they are used for highlighting only. |
20323 | 1355 |
1356 Variables controlling indentation style: | |
1357 `cperl-tab-always-indent' | |
1358 Non-nil means TAB in CPerl mode should always reindent the current line, | |
1359 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
|
1360 `cperl-indent-left-aligned-comments' |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1361 Non-nil means that the comment starting in leftmost column should indent. |
20323 | 1362 `cperl-auto-newline' |
1363 Non-nil means automatically newline before and after braces, | |
1364 and after colons and semicolons, inserted in Perl code. The following | |
1365 \\[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
|
1366 Insertion after colons requires both this variable and |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1367 `cperl-auto-newline-after-colon' set. |
20323 | 1368 `cperl-auto-newline-after-colon' |
1369 Non-nil means automatically newline even after colons. | |
1370 Subject to `cperl-auto-newline' setting. | |
1371 `cperl-indent-level' | |
1372 Indentation of Perl statements within surrounding block. | |
1373 The surrounding block's indentation is the indentation | |
1374 of the line on which the open-brace appears. | |
1375 `cperl-continued-statement-offset' | |
1376 Extra indentation given to a substatement, such as the | |
1377 then-clause of an if, or body of a while, or just a statement continuation. | |
1378 `cperl-continued-brace-offset' | |
1379 Extra indentation given to a brace that starts a substatement. | |
1380 This is in addition to `cperl-continued-statement-offset'. | |
1381 `cperl-brace-offset' | |
1382 Extra indentation for line if it starts with an open brace. | |
1383 `cperl-brace-imaginary-offset' | |
1384 An open brace following other text is treated as if it the line started | |
1385 this far to the right of the actual line indentation. | |
1386 `cperl-label-offset' | |
1387 Extra indentation for line that is a label. | |
1388 `cperl-min-label-indent' | |
1389 Minimal indentation for line that is a label. | |
1390 | |
1391 Settings for K&R and BSD indentation styles are | |
1392 `cperl-indent-level' 5 8 | |
1393 `cperl-continued-statement-offset' 5 8 | |
1394 `cperl-brace-offset' -5 -8 | |
1395 `cperl-label-offset' -5 -8 | |
1396 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1397 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
|
1398 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
|
1399 \\[cperl-set-style-back] to restore the memorized preexisting values |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1400 \(both available from menu). |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1401 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1402 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
|
1403 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
|
1404 `cperl-brace-offset'+`cperl-continued-statement-offset'. |
20323 | 1405 |
1406 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
|
1407 with no args. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1408 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1409 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
|
1410 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
|
1411 `cperl-praise', `cperl-speed'." |
20323 | 1412 (interactive) |
1413 (kill-all-local-variables) | |
1414 (use-local-map cperl-mode-map) | |
1415 (if (cperl-val 'cperl-electric-linefeed) | |
1416 (progn | |
1417 (local-set-key "\C-J" 'cperl-linefeed) | |
1418 (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
|
1419 (if (and |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1420 (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
|
1421 (cperl-val 'cperl-info-on-command-no-prompt)) |
20323 | 1422 (progn |
1423 ;; don't clobber the backspace binding: | |
1424 (cperl-define-key "\C-hf" 'cperl-info-on-current-command [(control h) f]) | |
1425 (cperl-define-key "\C-c\C-hf" 'cperl-info-on-command | |
1426 [(control c) (control h) f]))) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1427 (setq major-mode cperl-use-major-mode) |
20323 | 1428 (setq mode-name "CPerl") |
1429 (if (not cperl-mode-abbrev-table) | |
1430 (let ((prev-a-c abbrevs-changed)) | |
1431 (define-abbrev-table 'cperl-mode-abbrev-table '( | |
1432 ("if" "if" cperl-electric-keyword 0) | |
1433 ("elsif" "elsif" cperl-electric-keyword 0) | |
1434 ("while" "while" cperl-electric-keyword 0) | |
1435 ("until" "until" cperl-electric-keyword 0) | |
1436 ("unless" "unless" cperl-electric-keyword 0) | |
1437 ("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
|
1438 ("continue" "continue" cperl-electric-else 0) |
20323 | 1439 ("for" "for" cperl-electric-keyword 0) |
1440 ("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
|
1441 ("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
|
1442 ("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
|
1443 ("do" "do" cperl-electric-keyword 0) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1444 ("=pod" "=pod" cperl-electric-pod 0) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1445 ("=over" "=over" cperl-electric-pod 0) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1446 ("=head1" "=head1" cperl-electric-pod 0) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1447 ("=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
|
1448 ("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
|
1449 ("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
|
1450 ("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
|
1451 ("head2" "head2" cperl-electric-pod 0))) |
20323 | 1452 (setq abbrevs-changed prev-a-c))) |
1453 (setq local-abbrev-table cperl-mode-abbrev-table) | |
1454 (abbrev-mode (if (cperl-val 'cperl-electric-keywords) 1 0)) | |
1455 (set-syntax-table cperl-mode-syntax-table) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1456 (make-local-variable 'outline-regexp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1457 ;; (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
|
1458 (setq outline-regexp cperl-outline-regexp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1459 (make-local-variable 'outline-level) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1460 (setq outline-level 'cperl-outline-level) |
20323 | 1461 (make-local-variable 'paragraph-start) |
1462 (setq paragraph-start (concat "^$\\|" page-delimiter)) | |
1463 (make-local-variable 'paragraph-separate) | |
1464 (setq paragraph-separate paragraph-start) | |
1465 (make-local-variable 'paragraph-ignore-fill-prefix) | |
1466 (setq paragraph-ignore-fill-prefix t) | |
1467 (make-local-variable 'indent-line-function) | |
1468 (setq indent-line-function 'cperl-indent-line) | |
1469 (make-local-variable 'require-final-newline) | |
1470 (setq require-final-newline t) | |
1471 (make-local-variable 'comment-start) | |
1472 (setq comment-start "# ") | |
1473 (make-local-variable 'comment-end) | |
1474 (setq comment-end "") | |
1475 (make-local-variable 'comment-column) | |
1476 (setq comment-column cperl-comment-column) | |
1477 (make-local-variable 'comment-start-skip) | |
1478 (setq comment-start-skip "#+ *") | |
1479 (make-local-variable 'defun-prompt-regexp) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1480 (setq defun-prompt-regexp "^[ \t]*sub[ \t]+\\([^ \t\n{(;]+\\)\\([ \t]*([^()]*)[ \t]*\\)?[ \t]*") |
20323 | 1481 (make-local-variable 'comment-indent-function) |
1482 (setq comment-indent-function 'cperl-comment-indent) | |
1483 (make-local-variable 'parse-sexp-ignore-comments) | |
1484 (setq parse-sexp-ignore-comments t) | |
1485 (make-local-variable 'indent-region-function) | |
1486 (setq indent-region-function 'cperl-indent-region) | |
1487 ;;(setq auto-fill-function 'cperl-do-auto-fill) ; Need to switch on and off! | |
1488 (make-local-variable 'imenu-create-index-function) | |
1489 (setq imenu-create-index-function | |
31821 | 1490 (function cperl-imenu--create-perl-index)) |
20323 | 1491 (make-local-variable 'imenu-sort-function) |
1492 (setq imenu-sort-function nil) | |
1493 (make-local-variable 'vc-header-alist) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1494 (set 'vc-header-alist cperl-vc-header-alist) ; Avoid warning |
20323 | 1495 (make-local-variable 'font-lock-defaults) |
1496 (setq font-lock-defaults | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1497 (cond |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1498 ((string< emacs-version "19.30") |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
1499 '(cperl-font-lock-keywords-2)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1500 ((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
|
1501 '((cperl-font-lock-keywords |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
1502 cperl-font-lock-keywords-1 |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
1503 cperl-font-lock-keywords-2))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1504 (t |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1505 '((cperl-load-font-lock-keywords |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1506 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
|
1507 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
|
1508 (make-local-variable 'cperl-syntax-state) |
20323 | 1509 (if cperl-use-syntax-table-text-property |
1510 (progn | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
1511 (make-local-variable 'parse-sexp-lookup-properties) |
20323 | 1512 ;; 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
|
1513 (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
|
1514 ;; Fix broken font-lock: |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1515 (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
|
1516 (set 'font-lock-unfontify-region-function |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1517 'font-lock-default-unfontify-region)) |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
1518 (make-local-variable 'font-lock-unfontify-region-function) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1519 (set 'font-lock-unfontify-region-function ; not present with old Emacs |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1520 '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
|
1521 (make-local-variable 'cperl-syntax-done-to) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1522 ;; Another bug: unless font-lock-syntactic-keywords, font-lock |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1523 ;; ignores syntax-table text-property. (t) is a hack |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1524 ;; to make font-lock think that font-lock-syntactic-keywords |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1525 ;; are defined |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
1526 (make-local-variable 'font-lock-syntactic-keywords) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1527 (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
|
1528 (if cperl-syntaxify-by-font-lock |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1529 '(t (cperl-fontify-syntaxically)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1530 '(t))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1531 (make-local-variable 'cperl-old-style) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1532 (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
|
1533 (set (make-local-variable 'normal-auto-fill-function) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1534 'cperl-do-auto-fill) ; RMS has it as #'cperl-do-auto-fill ??? |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1535 (or (fboundp 'cperl-old-auto-fill-mode) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1536 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1537 (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
|
1538 (defun auto-fill-mode (&optional arg) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1539 (interactive "P") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1540 (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
|
1541 (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
|
1542 (setq auto-fill-function 'cperl-do-auto-fill)))))) |
20323 | 1543 (if (cperl-enable-font-lock) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1544 (if (cperl-val 'cperl-font-lock) |
20323 | 1545 (progn (or cperl-faces-init (cperl-init-faces)) |
1546 (font-lock-mode 1)))) | |
1547 (and (boundp 'msb-menu-cond) | |
1548 (not cperl-msb-fixed) | |
1549 (cperl-msb-fix)) | |
1550 (if (featurep 'easymenu) | |
22392
7300e6ab99d2
(cperl-problems): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
22391
diff
changeset
|
1551 (easy-menu-add cperl-menu)) ; A NOP in Emacs. |
20323 | 1552 (run-hooks 'cperl-mode-hook) |
1553 ;; After hooks since fontification will break this | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1554 (if cperl-pod-here-scan |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1555 (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
|
1556 (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
|
1557 (cperl-find-pods-heres))))) |
20323 | 1558 |
1559 ;; Fix for perldb - make default reasonable | |
1560 (defun cperl-db () | |
1561 (interactive) | |
1562 (require 'gud) | |
1563 (perldb (read-from-minibuffer "Run perldb (like this): " | |
1564 (if (consp gud-perldb-history) | |
1565 (car gud-perldb-history) | |
1566 (concat "perl " ;;(file-name-nondirectory | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1567 ;; I have problems |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1568 ;; in OS/2 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1569 ;; otherwise |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1570 (buffer-file-name))) |
20323 | 1571 nil nil |
1572 '(gud-perldb-history . 1)))) | |
1573 | |
1574 (defun cperl-msb-fix () | |
1575 ;; Adds perl files to msb menu, supposes that msb is already loaded | |
1576 (setq cperl-msb-fixed t) | |
1577 (let* ((l (length msb-menu-cond)) | |
1578 (last (nth (1- l) msb-menu-cond)) | |
1579 (precdr (nthcdr (- l 2) msb-menu-cond)) ; cdr of this is last | |
1580 (handle (1- (nth 1 last)))) | |
1581 (setcdr precdr (list | |
1582 (list | |
36602
4bcc2745d610
(cperl-msb-fix, cperl-get-help-defer):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36601
diff
changeset
|
1583 '(memq major-mode '(cperl-mode perl-mode)) |
20323 | 1584 handle |
1585 "Perl Files (%d)") | |
1586 last)))) | |
1587 | |
1588 ;; This is used by indent-for-comment | |
1589 ;; to decide how much to indent a comment in CPerl code | |
1590 ;; based on its context. Do fallback if comment is found wrong. | |
1591 | |
1592 (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
|
1593 (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
|
1594 (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
|
1595 (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
|
1596 (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
|
1597 (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
|
1598 (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
|
1599 |
20323 | 1600 |
1601 (defun cperl-comment-indent () | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1602 (let ((p (point)) (c (current-column)) was phony) |
20323 | 1603 (if (looking-at "^#") 0 ; Existing comment at bol stays there. |
1604 ;; Wrong comment found | |
1605 (save-excursion | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1606 (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
|
1607 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
|
1608 cperl-st-cfence)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1609 (if phony |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1610 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1611 (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
|
1612 (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
|
1613 (forward-char -1)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1614 (setq was nil))) |
20323 | 1615 (if (= (point) p) |
1616 (progn | |
1617 (skip-chars-backward " \t") | |
1618 (max (1+ (current-column)) ; Else indent at comment column | |
1619 comment-column)) | |
1620 (if was nil | |
1621 (insert comment-start) | |
1622 (backward-char (length comment-start))) | |
1623 (setq cperl-wrong-comment t) | |
1624 (indent-to comment-column 1) ; Indent minimum 1 | |
1625 c))))) ; except leave at least one space. | |
1626 | |
1627 ;;;(defun cperl-comment-indent-fallback () | |
1628 ;;; "Is called if the standard comment-search procedure fails. | |
1629 ;;;Point is at start of real comment." | |
1630 ;;; (let ((c (current-column)) target cnt prevc) | |
1631 ;;; (if (= c comment-column) nil | |
1632 ;;; (setq cnt (skip-chars-backward "[ \t]")) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1633 ;;; (setq target (max (1+ (setq prevc |
20323 | 1634 ;;; (current-column))) ; Else indent at comment column |
1635 ;;; comment-column)) | |
1636 ;;; (if (= c comment-column) nil | |
1637 ;;; (delete-backward-char cnt) | |
1638 ;;; (while (< prevc target) | |
1639 ;;; (insert "\t") | |
1640 ;;; (setq prevc (current-column))) | |
1641 ;;; (if (> prevc target) (progn (delete-char -1) (setq prevc (current-column)))) | |
1642 ;;; (while (< prevc target) | |
1643 ;;; (insert " ") | |
1644 ;;; (setq prevc (current-column))))))) | |
1645 | |
1646 (defun cperl-indent-for-comment () | |
1647 "Substitute for `indent-for-comment' in CPerl." | |
1648 (interactive) | |
1649 (let (cperl-wrong-comment) | |
1650 (indent-for-comment) | |
1651 (if cperl-wrong-comment | |
1652 (progn (cperl-to-comment-or-eol) | |
1653 (forward-char (length comment-start)))))) | |
1654 | |
1655 (defun cperl-comment-region (b e arg) | |
1656 "Comment or uncomment each line in the region in CPerl mode. | |
1657 See `comment-region'." | |
1658 (interactive "r\np") | |
1659 (let ((comment-start "#")) | |
1660 (comment-region b e arg))) | |
1661 | |
1662 (defun cperl-uncomment-region (b e arg) | |
1663 "Uncomment or comment each line in the region in CPerl mode. | |
1664 See `comment-region'." | |
1665 (interactive "r\np") | |
1666 (let ((comment-start "#")) | |
1667 (comment-region b e (- arg)))) | |
1668 | |
1669 (defvar cperl-brace-recursing nil) | |
1670 | |
1671 (defun cperl-electric-brace (arg &optional only-before) | |
1672 "Insert character and correct line's indentation. | |
1673 If ONLY-BEFORE and `cperl-auto-newline', will insert newline before the | |
1674 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
|
1675 char is \"{\", insert extra newline before only if |
20323 | 1676 `cperl-extra-newline-before-brace'." |
1677 (interactive "P") | |
1678 (let (insertpos | |
1679 (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
|
1680 (cperl-mark-active) |
20323 | 1681 (< (mark) (point))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1682 (mark) |
20323 | 1683 nil))) |
1684 (if (and other-end | |
1685 (not cperl-brace-recursing) | |
1686 (cperl-val 'cperl-electric-parens) | |
1687 (>= (save-excursion (cperl-to-comment-or-eol) (point)) (point))) | |
1688 ;; Need to insert a matching pair | |
1689 (progn | |
1690 (save-excursion | |
1691 (setq insertpos (point-marker)) | |
1692 (goto-char other-end) | |
1693 (setq last-command-char ?\{) | |
1694 (cperl-electric-lbrace arg insertpos)) | |
1695 (forward-char 1)) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1696 ;; 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
|
1697 (if (and (eq last-command-char ?\}) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1698 (not |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1699 (condition-case nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1700 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1701 (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
|
1702 ;;(cperl-after-block-p (point-min)) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1703 (or (cperl-after-expr-p nil "{;)") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1704 ;; after sub, else, continue |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1705 (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
|
1706 (error nil)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1707 ;; Just insert the guy |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1708 (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
|
1709 (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
|
1710 (eolp) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1711 (or (and (null only-before) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1712 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1713 (skip-chars-backward " \t") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1714 (bolp))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1715 (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
|
1716 ;; 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
|
1717 ;; 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
|
1718 (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
|
1719 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1720 (skip-chars-backward " \t") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1721 (eq (preceding-char) ?\)))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1722 (if cperl-auto-newline |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1723 (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
|
1724 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1725 (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
|
1726 (cperl-indent-line) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1727 (if cperl-auto-newline |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1728 (setq insertpos (1- (point)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1729 (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
|
1730 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1731 (newline) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1732 (cperl-indent-line))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1733 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1734 (if insertpos (progn (goto-char insertpos) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1735 (search-forward (make-string |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1736 1 last-command-char)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1737 (setq insertpos (1- (point))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1738 (delete-char -1)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1739 (if insertpos |
20323 | 1740 (save-excursion |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1741 (goto-char insertpos) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1742 (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
|
1743 (self-insert-command (prefix-numeric-value arg))))))) |
20323 | 1744 |
1745 (defun cperl-electric-lbrace (arg &optional end) | |
1746 "Insert character, correct line's indentation, correct quoting by space." | |
1747 (interactive "P") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1748 (let ((cperl-brace-recursing t) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1749 (cperl-auto-newline cperl-auto-newline) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1750 (other-end (or end |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1751 (if (and cperl-electric-parens-mark |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1752 (cperl-mark-active) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1753 (> (mark) (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1754 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1755 (goto-char (mark)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1756 (point-marker)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1757 nil))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1758 pos after) |
20323 | 1759 (and (cperl-val 'cperl-electric-lbrace-space) |
1760 (eq (preceding-char) ?$) | |
1761 (save-excursion | |
1762 (skip-chars-backward "$") | |
1763 (looking-at "\\(\\$\\$\\)*\\$\\([^\\$]\\|$\\)")) | |
1764 (insert ?\ )) | |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
1765 ;; Check whether we are in comment |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1766 (if (and |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
1767 (save-excursion |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
1768 (beginning-of-line) |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
1769 (not (looking-at "[ \t]*#"))) |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
1770 (cperl-after-expr-p nil "{;)")) |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
1771 nil |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
1772 (setq cperl-auto-newline nil)) |
20323 | 1773 (cperl-electric-brace arg) |
1774 (and (cperl-val 'cperl-electric-parens) | |
1775 (eq last-command-char ?{) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1776 (memq last-command-char |
20323 | 1777 (append cperl-electric-parens-string nil)) |
1778 (or (if other-end (goto-char (marker-position other-end))) | |
1779 t) | |
1780 (setq last-command-char ?} pos (point)) | |
1781 (progn (cperl-electric-brace arg t) | |
1782 (goto-char pos))))) | |
1783 | |
1784 (defun cperl-electric-paren (arg) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1785 "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
|
1786 See `cperl-electric-parens'." |
20323 | 1787 (interactive "P") |
1788 (let ((beg (save-excursion (beginning-of-line) (point))) | |
1789 (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
|
1790 (cperl-mark-active) |
20323 | 1791 (> (mark) (point))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1792 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1793 (goto-char (mark)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1794 (point-marker)) |
20323 | 1795 nil))) |
1796 (if (and (cperl-val 'cperl-electric-parens) | |
1797 (memq last-command-char | |
1798 (append cperl-electric-parens-string nil)) | |
1799 (>= (save-excursion (cperl-to-comment-or-eol) (point)) (point)) | |
1800 ;;(not (save-excursion (search-backward "#" beg t))) | |
1801 (if (eq last-command-char ?<) | |
1802 (progn | |
1803 (and abbrev-mode ; later it is too late, may be after `for' | |
1804 (expand-abbrev)) | |
1805 (cperl-after-expr-p nil "{;(,:=")) | |
1806 1)) | |
1807 (progn | |
1808 (self-insert-command (prefix-numeric-value arg)) | |
1809 (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
|
1810 (insert (make-string |
20323 | 1811 (prefix-numeric-value arg) |
1812 (cdr (assoc last-command-char '((?{ .?}) | |
1813 (?[ . ?]) | |
1814 (?( . ?)) | |
1815 (?< . ?>)))))) | |
1816 (forward-char (- (prefix-numeric-value arg)))) | |
1817 (self-insert-command (prefix-numeric-value arg))))) | |
1818 | |
1819 (defun cperl-electric-rparen (arg) | |
1820 "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
|
1821 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
|
1822 Affected by `cperl-electric-parens'." |
20323 | 1823 (interactive "P") |
1824 (let ((beg (save-excursion (beginning-of-line) (point))) | |
1825 (other-end (if (and cperl-electric-parens-mark | |
1826 (cperl-val 'cperl-electric-parens) | |
1827 (memq last-command-char | |
1828 (append cperl-electric-parens-string nil)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1829 (cperl-mark-active) |
20323 | 1830 (< (mark) (point))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1831 (mark) |
20323 | 1832 nil)) |
1833 p) | |
1834 (if (and other-end | |
1835 (cperl-val 'cperl-electric-parens) | |
1836 (memq last-command-char '( ?\) ?\] ?\} ?\> )) | |
1837 (>= (save-excursion (cperl-to-comment-or-eol) (point)) (point)) | |
1838 ;;(not (save-excursion (search-backward "#" beg t))) | |
1839 ) | |
1840 (progn | |
1841 (self-insert-command (prefix-numeric-value arg)) | |
1842 (setq p (point)) | |
1843 (if other-end (goto-char other-end)) | |
1844 (insert (make-string | |
1845 (prefix-numeric-value arg) | |
1846 (cdr (assoc last-command-char '((?\} . ?\{) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1847 (?\] . ?\[) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1848 (?\) . ?\() |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1849 (?\> . ?\<)))))) |
20323 | 1850 (goto-char (1+ p))) |
1851 (self-insert-command (prefix-numeric-value arg))))) | |
1852 | |
1853 (defun cperl-electric-keyword () | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1854 "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
|
1855 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
|
1856 to nil." |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1857 (let ((beg (save-excursion (beginning-of-line) (point))) |
20323 | 1858 (dollar (and (eq last-command-char ?$) |
1859 (eq this-command 'self-insert-command))) | |
49850
0bdcd08034e1
(cperl-electric-keyword, cperl-electric-pod, cperl-do-auto-fill): Fix character
Juanma Barranquero <lekktu@gmail.com>
parents:
49789
diff
changeset
|
1860 (delete (and (memq last-command-char '(?\ ?\n ?\t ?\f)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1861 (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
|
1862 my do) |
20323 | 1863 (and (save-excursion |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1864 (condition-case nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1865 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1866 (backward-sexp 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1867 (setq do (looking-at "do\\>"))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1868 (error nil)) |
20323 | 1869 (cperl-after-expr-p nil "{;:")) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1870 (save-excursion |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1871 (not |
20323 | 1872 (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
|
1873 "[#\"'`]\\|\\<q\\(\\|[wqxr]\\)\\>" |
20323 | 1874 beg t))) |
1875 (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
|
1876 (or |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1877 (looking-at "=cut") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1878 (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
|
1879 (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
|
1880 'syntax-type) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1881 'pod)))))) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1882 (save-excursion (forward-sexp -1) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1883 (not (memq (following-char) (append "$@%&*" nil)))) |
20323 | 1884 (progn |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1885 (and (eq (preceding-char) ?y) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1886 (progn ; "foreachmy" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1887 (forward-char -2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1888 (insert " ") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1889 (forward-char 2) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1890 (setq my t dollar t |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1891 delete |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1892 (memq this-command '(self-insert-command newline))))) |
20323 | 1893 (and dollar (insert " $")) |
1894 (cperl-indent-line) | |
1895 ;;(insert " () {\n}") | |
1896 (cond | |
1897 (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
|
1898 (insert (if do "\n" " ()\n")) |
20323 | 1899 (insert "{") |
1900 (cperl-indent-line) | |
1901 (insert "\n") | |
1902 (cperl-indent-line) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1903 (insert "\n}") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1904 (and do (insert " while ();"))) |
20323 | 1905 (t |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
1906 (insert (if do " {\n} while ();" " () {\n}")))) |
20323 | 1907 (or (looking-at "[ \t]\\|$") (insert " ")) |
1908 (cperl-indent-line) | |
1909 (if dollar (progn (search-backward "$") | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1910 (if my |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1911 (forward-char 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1912 (delete-char 1))) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1913 (search-backward ")") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1914 (if (eq last-command-char ?\() |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1915 (progn ; Avoid "if (())" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1916 (delete-backward-char 1) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
1917 (delete-backward-char -1)))) |
20323 | 1918 (if delete |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1919 (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
|
1920 (if cperl-message-electric-keyword |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1921 (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
|
1922 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1923 (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
|
1924 "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
|
1925 (or pos (setq pos (point))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1926 (if (looking-at "\n") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1927 (forward-char 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1928 (insert "\n")) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1929 (if (> n 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1930 (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
|
1931 (goto-char pos))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1932 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1933 (defun cperl-electric-pod () |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1934 "Insert a POD chunk appropriate after a =POD directive." |
49850
0bdcd08034e1
(cperl-electric-keyword, cperl-electric-pod, cperl-do-auto-fill): Fix character
Juanma Barranquero <lekktu@gmail.com>
parents:
49789
diff
changeset
|
1935 (let ((delete (and (memq last-command-char '(?\ ?\n ?\t ?\f)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1936 (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
|
1937 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
|
1938 (and (save-excursion |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1939 (forward-word -1) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
1940 (and |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1941 (eq (preceding-char) ?=) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1942 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1943 (setq head1 (looking-at "head1\\>[ \t]*$")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1944 (setq over (and (looking-at "over\\>[ \t]*$") |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1945 (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
|
1946 (forward-char -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1947 (bolp)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1948 (or |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
1949 (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
|
1950 (cperl-after-expr-p nil "{;:") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1951 (and (re-search-backward |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
1952 ;; "\\(\\`\n?\\|\n\n\\)=\\sw+" |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
1953 "\\(\\`\n?\\|^\n\\)=\\sw+" |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1954 (point-min) t) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1955 (not (or |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1956 (looking-at "=cut") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1957 (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
|
1958 (not (eq (get-text-property (point) 'syntax-type) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1959 'pod))))))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1960 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1961 (save-excursion |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1962 (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
|
1963 (or notlast |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1964 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1965 (insert "\n\n=cut") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1966 (cperl-ensure-newlines 2) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1967 (forward-word -2) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
1968 (if (and head1 |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
1969 (not |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1970 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1971 (forward-char -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1972 (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
|
1973 nil t)))) ; Only one |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
1974 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1975 (forward-word 1) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1976 (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
|
1977 (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
|
1978 p (point)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
1979 (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
|
1980 " - \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
|
1981 "=head1 DESCRIPTION") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1982 (cperl-ensure-newlines 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1983 (goto-char p) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1984 (forward-word 2) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1985 (end-of-line) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1986 (setq really-delete t)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1987 (forward-word 1)))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1988 (if over |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1989 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1990 (setq p (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1991 (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
|
1992 "=back") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1993 (cperl-ensure-newlines 2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1994 (goto-char p) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
1995 (forward-word 1) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1996 (end-of-line) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1997 (setq really-delete t))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
1998 (if (and delete really-delete) |
20323 | 1999 (cperl-putback-char cperl-del-back-ch)))))) |
2000 | |
2001 (defun cperl-electric-else () | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2002 "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
|
2003 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
|
2004 to nil." |
20323 | 2005 (let ((beg (save-excursion (beginning-of-line) (point)))) |
2006 (and (save-excursion | |
2007 (backward-sexp 1) | |
2008 (cperl-after-expr-p nil "{;:")) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2009 (save-excursion |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2010 (not |
20323 | 2011 (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
|
2012 "[#\"'`]\\|\\<q\\(\\|[wqxr]\\)\\>" |
20323 | 2013 beg t))) |
2014 (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
|
2015 (looking-at "=cut") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2016 (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
|
2017 (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
|
2018 'syntax-type) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2019 'pod))))) |
20323 | 2020 (progn |
2021 (cperl-indent-line) | |
2022 ;;(insert " {\n\n}") | |
2023 (cond | |
2024 (cperl-extra-newline-before-brace | |
2025 (insert "\n") | |
2026 (insert "{") | |
2027 (cperl-indent-line) | |
2028 (insert "\n\n}")) | |
2029 (t | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2030 (insert " {\n\n}"))) |
20323 | 2031 (or (looking-at "[ \t]\\|$") (insert " ")) |
2032 (cperl-indent-line) | |
2033 (forward-line -1) | |
2034 (cperl-indent-line) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2035 (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
|
2036 (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
|
2037 (if cperl-message-electric-keyword |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2038 (message "Precede char by C-q to avoid expansion")))))) |
20323 | 2039 |
2040 (defun cperl-linefeed () | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2041 "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
|
2042 If in POD, insert appropriate lines." |
20323 | 2043 (interactive) |
2044 (let ((beg (save-excursion (beginning-of-line) (point))) | |
2045 (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
|
2046 (pos (point)) start over cut res) |
20323 | 2047 (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
|
2048 ; i.e., on a boundary and inside "{...}" |
20323 | 2049 (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
|
2050 (>= (point) pos)) ; Not in a comment |
20323 | 2051 (or (save-excursion |
2052 (skip-chars-backward " \t" beg) | |
2053 (forward-char -1) | |
2054 (looking-at "[;{]")) ; After { or ; + spaces | |
2055 (looking-at "[ \t]*}") ; Before } | |
2056 (re-search-forward "\\=[ \t]*;" end t)) ; Before spaces + ; | |
2057 (save-excursion | |
2058 (and | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2059 (eq (car (parse-partial-sexp pos end -1)) -1) |
20323 | 2060 ; Leave the level of parens |
2061 (looking-at "[,; \t]*\\($\\|#\\)") ; Comma to allow anon subr | |
2062 ; Are at end | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2063 (cperl-after-block-p (point-min)) |
20323 | 2064 (progn |
2065 (backward-sexp 1) | |
2066 (setq start (point-marker)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2067 (<= start pos))))) ; Redundant? Are after the |
20323 | 2068 ; start of parens group. |
2069 (progn | |
2070 (skip-chars-backward " \t") | |
2071 (or (memq (preceding-char) (append ";{" nil)) | |
2072 (insert ";")) | |
2073 (insert "\n") | |
2074 (forward-line -1) | |
2075 (cperl-indent-line) | |
2076 (goto-char start) | |
2077 (or (looking-at "{[ \t]*$") ; If there is a statement | |
2078 ; before, move it to separate line | |
2079 (progn | |
2080 (forward-char 1) | |
2081 (insert "\n") | |
2082 (cperl-indent-line))) | |
2083 (forward-line 1) ; We are on the target line | |
2084 (cperl-indent-line) | |
2085 (beginning-of-line) | |
2086 (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
|
2087 ; after, move it to separate line |
20323 | 2088 (progn |
2089 (end-of-line) | |
2090 (search-backward "}" beg) | |
2091 (skip-chars-backward " \t") | |
2092 (or (memq (preceding-char) (append ";{" nil)) | |
2093 (insert ";")) | |
2094 (insert "\n") | |
2095 (cperl-indent-line) | |
2096 (forward-line -1))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2097 (forward-line -1) ; We are on the line before target |
20323 | 2098 (end-of-line) |
2099 (newline-and-indent)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2100 (end-of-line) ; else - no splitting |
20323 | 2101 (cond |
2102 ((and (looking-at "\n[ \t]*{$") | |
2103 (save-excursion | |
2104 (skip-chars-backward " \t") | |
2105 (eq (preceding-char) ?\)))) ; Probably if () {} group | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2106 ; with an extra newline. |
20323 | 2107 (forward-line 2) |
2108 (cperl-indent-line)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2109 ((save-excursion ; In POD header |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2110 (forward-paragraph -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2111 ;; (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
|
2112 ;; 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
|
2113 (if (looking-at "\\(\\`\n?\\|\n\\)=\\sw+") |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2114 (progn |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2115 (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
|
2116 (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
|
2117 t))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2118 (if (and over |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2119 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2120 (forward-paragraph -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2121 (forward-word 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2122 (setq pos (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2123 (setq cut (buffer-substring (point) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2124 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2125 (end-of-line) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2126 (point)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2127 (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
|
2128 (point))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2129 (setq res (expand-abbrev)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2130 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2131 (goto-char pos) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2132 (insert cut)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2133 res)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2134 nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2135 (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
|
2136 (forward-line 2))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2137 ((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
|
2138 (cperl-ensure-newlines 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2139 (forward-line 2)) |
20323 | 2140 ((looking-at "\n[ \t]*$") ; Next line is empty - use it. |
2141 (forward-line 1) | |
2142 (cperl-indent-line)) | |
2143 (t | |
2144 (newline-and-indent)))))) | |
2145 | |
2146 (defun cperl-electric-semi (arg) | |
2147 "Insert character and correct line's indentation." | |
2148 (interactive "P") | |
2149 (if cperl-auto-newline | |
2150 (cperl-electric-terminator arg) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2151 (self-insert-command (prefix-numeric-value arg)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2152 (if cperl-autoindent-on-semi |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2153 (cperl-indent-line)))) |
20323 | 2154 |
2155 (defun cperl-electric-terminator (arg) | |
2156 "Insert character and correct line's indentation." | |
2157 (interactive "P") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2158 (let ((end (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2159 (auto (and cperl-auto-newline |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2160 (or (not (eq last-command-char ?:)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2161 cperl-auto-newline-after-colon))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2162 insertpos) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2163 (if (and ;;(not arg) |
20323 | 2164 (eolp) |
2165 (not (save-excursion | |
2166 (beginning-of-line) | |
2167 (skip-chars-forward " \t") | |
2168 (or | |
2169 ;; Ignore in comment lines | |
2170 (= (following-char) ?#) | |
2171 ;; Colon is special only after a label | |
2172 ;; So quickly rule out most other uses of colon | |
2173 ;; and do no indentation for them. | |
2174 (and (eq last-command-char ?:) | |
2175 (save-excursion | |
2176 (forward-word 1) | |
2177 (skip-chars-forward " \t") | |
2178 (and (< (point) end) | |
2179 (progn (goto-char (- end 1)) | |
2180 (not (looking-at ":")))))) | |
2181 (progn | |
2182 (beginning-of-defun) | |
2183 (let ((pps (parse-partial-sexp (point) end))) | |
2184 (or (nth 3 pps) (nth 4 pps) (nth 5 pps)))))))) | |
2185 (progn | |
2186 (self-insert-command (prefix-numeric-value arg)) | |
2187 ;;(forward-char -1) | |
2188 (if auto (setq insertpos (point-marker))) | |
2189 ;;(forward-char 1) | |
2190 (cperl-indent-line) | |
2191 (if auto | |
2192 (progn | |
2193 (newline) | |
2194 (cperl-indent-line))) | |
2195 (save-excursion | |
2196 (if insertpos (goto-char (1- (marker-position insertpos))) | |
2197 (forward-char -1)) | |
2198 (delete-char 1)))) | |
2199 (if insertpos | |
2200 (save-excursion | |
2201 (goto-char insertpos) | |
2202 (self-insert-command (prefix-numeric-value arg))) | |
2203 (self-insert-command (prefix-numeric-value arg))))) | |
2204 | |
2205 (defun cperl-electric-backspace (arg) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2206 "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
|
2207 key. Will untabify if `cperl-electric-backspace-untabify' is non-nil." |
20323 | 2208 (interactive "p") |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2209 (if (and cperl-auto-newline |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2210 (memq last-command '(cperl-electric-semi |
20323 | 2211 cperl-electric-terminator |
2212 cperl-electric-lbrace)) | |
2213 (memq (preceding-char) '(?\ ?\t ?\n))) | |
2214 (let (p) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2215 (if (eq last-command 'cperl-electric-lbrace) |
20323 | 2216 (skip-chars-forward " \t\n")) |
2217 (setq p (point)) | |
2218 (skip-chars-backward " \t\n") | |
2219 (delete-region (point) p)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2220 (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
|
2221 ;; 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
|
2222 (setq this-command 'cperl-electric-else-really)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2223 (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
|
2224 (eq last-command 'cperl-electric-else-really) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2225 (memq (preceding-char) '(?\ ?\t ?\n))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2226 (let (p) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2227 (skip-chars-forward " \t\n") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2228 (setq p (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2229 (skip-chars-backward " \t\n") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2230 (delete-region (point) p)) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2231 (if cperl-electric-backspace-untabify |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2232 (backward-delete-char-untabify arg) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2233 (delete-backward-char arg))))) |
20323 | 2234 |
50255
a716a67fdf9d
(cperl-electric-backspace): Add delete-selection property.
Kim F. Storm <storm@cua.dk>
parents:
49919
diff
changeset
|
2235 (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
|
2236 |
20323 | 2237 (defun cperl-inside-parens-p () |
2238 (condition-case () | |
2239 (save-excursion | |
2240 (save-restriction | |
2241 (narrow-to-region (point) | |
2242 (progn (beginning-of-defun) (point))) | |
2243 (goto-char (point-max)) | |
2244 (= (char-after (or (scan-lists (point) -1 1) (point-min))) ?\())) | |
2245 (error nil))) | |
2246 | |
2247 (defun cperl-indent-command (&optional whole-exp) | |
2248 "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
|
2249 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
|
2250 line. Otherwise, indent the current line only if point is at the left margin |
20323 | 2251 or in the line's indentation; otherwise insert a tab. |
2252 | |
2253 A numeric argument, regardless of its value, | |
2254 means indent rigidly all the lines of the expression starting after point | |
2255 so that this line becomes properly indented. | |
2256 The relative indentation among the lines of the expression are preserved." | |
2257 (interactive "P") | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2258 (cperl-update-syntaxification (point) (point)) |
20323 | 2259 (if whole-exp |
2260 ;; If arg, always indent this line as Perl | |
2261 ;; and shift remaining lines of expression the same amount. | |
2262 (let ((shift-amt (cperl-indent-line)) | |
2263 beg end) | |
2264 (save-excursion | |
2265 (if cperl-tab-always-indent | |
2266 (beginning-of-line)) | |
2267 (setq beg (point)) | |
2268 (forward-sexp 1) | |
2269 (setq end (point)) | |
2270 (goto-char beg) | |
2271 (forward-line 1) | |
2272 (setq beg (point))) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2273 (if (and shift-amt (> end beg)) |
20323 | 2274 (indent-code-rigidly beg end shift-amt "#"))) |
2275 (if (and (not cperl-tab-always-indent) | |
2276 (save-excursion | |
2277 (skip-chars-backward " \t") | |
2278 (not (bolp)))) | |
2279 (insert-tab) | |
2280 (cperl-indent-line)))) | |
2281 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2282 (defun cperl-indent-line (&optional parse-data) |
20323 | 2283 "Indent current line as Perl code. |
2284 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
|
2285 (let ((case-fold-search nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2286 (pos (- (point-max) (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2287 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
|
2288 (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
|
2289 i indent) |
20323 | 2290 (beginning-of-line) |
2291 (setq beg (point)) | |
2292 (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
|
2293 (setq indent (current-indentation) i nil)) |
20323 | 2294 ;;((eq indent t) ; Never? |
2295 ;; (setq indent (cperl-calculate-indent-within-comment))) | |
2296 ;;((looking-at "[ \t]*#") | |
2297 ;; (setq indent 0)) | |
2298 (t | |
2299 (skip-chars-forward " \t") | |
2300 (if (listp indent) (setq indent (car indent))) | |
2301 (cond ((looking-at "[A-Za-z_][A-Za-z_0-9]*:[^:]") | |
2302 (and (> indent 0) | |
2303 (setq indent (max cperl-min-label-indent | |
2304 (+ indent cperl-label-offset))))) | |
2305 ((= (following-char) ?}) | |
2306 (setq indent (- indent cperl-indent-level))) | |
2307 ((memq (following-char) '(?\) ?\])) ; To line up with opening paren. | |
2308 (setq indent (+ indent cperl-close-paren-offset))) | |
2309 ((= (following-char) ?{) | |
2310 (setq indent (+ indent cperl-brace-offset)))))) | |
2311 (skip-chars-forward " \t") | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2312 (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
|
2313 (if (or (not shift-amt) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2314 (zerop shift-amt)) |
20323 | 2315 (if (> (- (point-max) pos) (point)) |
2316 (goto-char (- (point-max) pos))) | |
2317 (delete-region beg (point)) | |
2318 (indent-to indent) | |
2319 ;; If initial point was within line's indentation, | |
2320 ;; position after the indentation. Else stay at same point in text. | |
2321 (if (> (- (point-max) pos) (point)) | |
2322 (goto-char (- (point-max) pos)))) | |
2323 shift-amt)) | |
2324 | |
2325 (defun cperl-after-label () | |
2326 ;; Returns true if the point is after label. Does not do save-excursion. | |
2327 (and (eq (preceding-char) ?:) | |
2328 (memq (char-syntax (char-after (- (point) 2))) | |
2329 '(?w ?_)) | |
2330 (progn | |
2331 (backward-sexp) | |
2332 (looking-at "[a-zA-Z_][a-zA-Z0-9_]*:[^:]")))) | |
2333 | |
2334 (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
|
2335 ;; 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
|
2336 ;; 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
|
2337 ;; 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
|
2338 ;; 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
|
2339 ;; 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
|
2340 ;; which contains START. |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2341 ;; PRESTART is the position basing on which START was found. |
20323 | 2342 (save-excursion |
2343 (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
|
2344 (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
|
2345 (<= parse-start start-point)) |
20323 | 2346 (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
|
2347 (beginning-of-defun) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2348 (setq start-state nil)) |
20323 | 2349 (setq prestart (point)) |
2350 (if start-state nil | |
2351 ;; Try to go out, if sub is not on the outermost level | |
2352 (while (< (point) start-point) | |
2353 (setq start (point) parse-start start depth nil | |
2354 state (parse-partial-sexp start start-point -1)) | |
2355 (if (> (car state) -1) nil | |
2356 ;; The current line could start like }}}, so the indentation | |
2357 ;; corresponds to a different level than what we reached | |
2358 (setq depth t) | |
2359 (beginning-of-line 2))) ; Go to the next line. | |
2360 (if start (goto-char start))) ; Not at the start of file | |
2361 (setq start (point)) | |
2362 (or state (setq state (parse-partial-sexp start start-point -1 nil start-state))) | |
2363 (list start state depth prestart)))) | |
2364 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2365 (defun cperl-block-p () ; Do not C-M-q ! One string contains ";" ! |
20323 | 2366 ;; Positions is before ?\{. Checks whether it starts a block. |
2367 ;; No save-excursion! | |
2368 (cperl-backward-to-noncomment (point-min)) | |
2369 (or (memq (preceding-char) (append ";){}$@&%\C-@" nil)) ; Or label! \C-@ at bobp | |
2370 ; Label may be mixed up with `$blah :' | |
2371 (save-excursion (cperl-after-label)) | |
2372 (and (memq (char-syntax (preceding-char)) '(?w ?_)) | |
2373 (progn | |
2374 (backward-sexp) | |
2375 ;; Need take into account `bless', `return', `tr',... | |
2376 (or (and (looking-at "[a-zA-Z0-9_:]+[ \t\n\f]*[{#]") ; Method call syntax | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2377 (not (looking-at "\\(bless\\|return\\|q[wqrx]?\\|tr\\|[smy]\\)\\>"))) |
20323 | 2378 (progn |
2379 (skip-chars-backward " \t\n\f") | |
2380 (and (memq (char-syntax (preceding-char)) '(?w ?_)) | |
2381 (progn | |
2382 (backward-sexp) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2383 (looking-at |
20323 | 2384 "sub[ \t]+[a-zA-Z0-9_:]+[ \t\n\f]*\\(([^()]*)[ \t\n\f]*\\)?[#{]"))))))))) |
2385 | |
2386 (defvar cperl-look-for-prop '((pod in-pod) (here-doc-delim here-doc-group))) | |
2387 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2388 (defun cperl-calculate-indent (&optional parse-data) ; was parse-start |
20323 | 2389 "Return appropriate indentation for current line as Perl code. |
2390 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
|
2391 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
|
2392 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2393 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
|
2394 and closing parentheses and brackets." |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2395 (cperl-update-syntaxification (point) (point)) |
20323 | 2396 (save-excursion |
2397 (if (or | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2398 (and (memq (get-text-property (point) 'syntax-type) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2399 '(pod here-doc here-doc-delim format)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2400 (not (get-text-property (point) 'indentable))) |
20323 | 2401 ;; before start of POD - whitespace found since do not have 'pod! |
2402 (and (looking-at "[ \t]*\n=") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2403 (error "Spaces before POD section!")) |
20323 | 2404 (and (not cperl-indent-left-aligned-comments) |
2405 (looking-at "^#"))) | |
2406 nil | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2407 (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2408 (let ((indent-point (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2409 (char-after (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2410 (skip-chars-forward " \t") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2411 (following-char))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2412 (in-pod (get-text-property (point) 'in-pod)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2413 (pre-indent-point (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2414 p prop look-prop is-block delim) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2415 (cond |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2416 (in-pod |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2417 ;; In the verbatim part, probably code example. What to do??? |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2418 ) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2419 (t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2420 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2421 ;; Not in POD |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2422 (cperl-backward-to-noncomment nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2423 (setq p (max (point-min) (1- (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2424 prop (get-text-property p 'syntax-type) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2425 look-prop (or (nth 1 (assoc prop cperl-look-for-prop)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2426 'syntax-type)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2427 (if (memq prop '(pod here-doc format here-doc-delim)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2428 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2429 (goto-char (or (previous-single-property-change p look-prop) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2430 (point-min))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2431 (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2432 (setq pre-indent-point (point))))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2433 (goto-char pre-indent-point) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2434 (let* ((case-fold-search nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2435 (s-s (cperl-get-state (car parse-data) (nth 1 parse-data))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2436 (start (or (nth 2 parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2437 (nth 0 s-s))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2438 (state (nth 1 s-s)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2439 (containing-sexp (car (cdr state))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2440 old-indent) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2441 (if (and |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2442 ;;containing-sexp ;; We are buggy at toplevel :-( |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2443 parse-data) |
20323 | 2444 (progn |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2445 (setcar parse-data pre-indent-point) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2446 (setcar (cdr parse-data) state) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2447 (or (nth 2 parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2448 (setcar (cddr parse-data) start)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2449 ;; Before this point: end of statement |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2450 (setq old-indent (nth 3 parse-data)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2451 (cond ((get-text-property (point) 'indentable) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2452 ;; indent to just after the surrounding open, |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2453 ;; skip blanks if we do not close the expression. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2454 (goto-char (1+ (previous-single-property-change (point) 'indentable))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2455 (or (memq char-after (append ")]}" nil)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2456 (looking-at "[ \t]*\\(#\\|$\\)") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2457 (skip-chars-forward " \t")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2458 (current-column)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2459 ((or (nth 3 state) (nth 4 state)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2460 ;; return nil or t if should not change this line |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2461 (nth 4 state)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2462 ;; XXXX Do we need to special-case this? |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2463 ((null containing-sexp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2464 ;; Line is at top level. May be data or function definition, |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2465 ;; or may be function argument declaration. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2466 ;; Indent like the previous top level line |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2467 ;; unless that ends in a closeparen without semicolon, |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2468 ;; in which case this line is the first argument decl. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2469 (skip-chars-forward " \t") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2470 (+ (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2471 (goto-char start) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2472 (- (current-indentation) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2473 (if (nth 2 s-s) cperl-indent-level 0))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2474 (if (= char-after ?{) cperl-continued-brace-offset 0) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2475 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2476 (cperl-backward-to-noncomment (or old-indent (point-min))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2477 ;; Look at previous line that's at column 0 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2478 ;; to determine whether we are in top-level decls |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2479 ;; or function's arg decls. Set basic-indent accordingly. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2480 ;; Now add a little if this is a continuation line. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2481 (if (or (bobp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2482 (eq (point) old-indent) ; old-indent was at comment |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2483 (eq (preceding-char) ?\;) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2484 ;; Had ?\) too |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2485 (and (eq (preceding-char) ?\}) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2486 (cperl-after-block-and-statement-beg |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2487 (point-min))) ; Was start - too close |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2488 (memq char-after (append ")]}" nil)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2489 (and (eq (preceding-char) ?\:) ; label |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2490 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2491 (forward-sexp -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2492 (skip-chars-backward " \t") |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2493 (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*[ \t]*:"))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2494 (get-text-property (point) 'first-format-line)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2495 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2496 (if (and parse-data |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2497 (not (eq char-after ?\C-j))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2498 (setcdr (cddr parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2499 (list pre-indent-point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2500 0) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2501 cperl-continued-statement-offset)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2502 ((not |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2503 (or (setq is-block |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2504 (and (setq delim (= (char-after containing-sexp) ?{)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2505 (save-excursion ; Is it a hash? |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2506 (goto-char containing-sexp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2507 (cperl-block-p)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2508 cperl-indent-parens-as-block)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2509 ;; group is an expression, not a block: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2510 ;; indent to just after the surrounding open parens, |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2511 ;; skip blanks if we do not close the expression. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2512 (goto-char (1+ containing-sexp)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2513 (or (memq char-after |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2514 (append (if delim "}" ")]}") nil)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2515 (looking-at "[ \t]*\\(#\\|$\\)") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2516 (skip-chars-forward " \t")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2517 (+ (current-column) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2518 (if (and delim |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2519 (eq char-after ?\})) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2520 ;; Correct indentation of trailing ?\} |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2521 (+ cperl-indent-level cperl-close-paren-offset) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2522 0))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2523 ;;; ((and (/= (char-after containing-sexp) ?{) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2524 ;;; (not cperl-indent-parens-as-block)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2525 ;;; ;; line is expression, not statement: |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2526 ;;; ;; indent to just after the surrounding open, |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2527 ;;; ;; skip blanks if we do not close the expression. |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2528 ;;; (goto-char (1+ containing-sexp)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2529 ;;; (or (memq char-after (append ")]}" nil)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2530 ;;; (looking-at "[ \t]*\\(#\\|$\\)") |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2531 ;;; (skip-chars-forward " \t")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2532 ;;; (current-column)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2533 ;;; ((progn |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2534 ;;; ;; Containing-expr starts with \{. Check whether it is a hash. |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2535 ;;; (goto-char containing-sexp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2536 ;;; (and (not (cperl-block-p)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2537 ;;; (not cperl-indent-parens-as-block))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2538 ;;; (goto-char (1+ containing-sexp)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2539 ;;; (or (eq char-after ?\}) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2540 ;;; (looking-at "[ \t]*\\(#\\|$\\)") |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2541 ;;; (skip-chars-forward " \t")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2542 ;;; (+ (current-column) ; Correct indentation of trailing ?\} |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2543 ;;; (if (eq char-after ?\}) (+ cperl-indent-level |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
2544 ;;; cperl-close-paren-offset) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2545 ;;; 0))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2546 (t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2547 ;; Statement level. Is it a continuation or a new statement? |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2548 ;; Find previous non-comment character. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2549 (goto-char pre-indent-point) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2550 (cperl-backward-to-noncomment containing-sexp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2551 ;; Back up over label lines, since they don't |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2552 ;; affect whether our line is a continuation. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2553 ;; (Had \, too) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2554 (while ;;(or (eq (preceding-char) ?\,) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2555 (and (eq (preceding-char) ?:) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2556 (or ;;(eq (char-after (- (point) 2)) ?\') ; ???? |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2557 (memq (char-syntax (char-after (- (point) 2))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2558 '(?w ?_)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2559 ;;) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2560 (if (eq (preceding-char) ?\,) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2561 ;; Will go to beginning of line, essentially. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2562 ;; Will ignore embedded sexpr XXXX. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2563 (cperl-backward-to-start-of-continued-exp containing-sexp)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2564 (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2565 (cperl-backward-to-noncomment containing-sexp)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2566 ;; Now we get the answer. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2567 (if (not (or (eq (1- (point)) containing-sexp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2568 (memq (preceding-char) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2569 (append (if is-block " ;{" " ,;{") '(nil))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2570 (and (eq (preceding-char) ?\}) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2571 (cperl-after-block-and-statement-beg |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2572 containing-sexp)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2573 (get-text-property (point) 'first-format-line))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2574 ;; This line is continuation of preceding line's statement; |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2575 ;; indent `cperl-continued-statement-offset' more than the |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2576 ;; previous line of the statement. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2577 ;; |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2578 ;; There might be a label on this line, just |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2579 ;; consider it bad style and ignore it. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2580 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2581 (cperl-backward-to-start-of-continued-exp containing-sexp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2582 (+ (if (memq char-after (append "}])" nil)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2583 0 ; Closing parenth |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2584 cperl-continued-statement-offset) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2585 (if (or is-block |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2586 (not delim) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2587 (not (eq char-after ?\}))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2588 0 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2589 ;; Now it is a hash reference |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2590 (+ cperl-indent-level cperl-close-paren-offset)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2591 (if (looking-at "\\w+[ \t]*:") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2592 (if (> (current-indentation) cperl-min-label-indent) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2593 (- (current-indentation) cperl-label-offset) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2594 ;; Do not move `parse-data', this should |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2595 ;; be quick anyway (this comment comes |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2596 ;; from different location): |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2597 (cperl-calculate-indent)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2598 (current-column)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2599 (if (eq char-after ?\{) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2600 cperl-continued-brace-offset 0))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2601 ;; This line starts a new statement. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2602 ;; Position following last unclosed open. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2603 (goto-char containing-sexp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2604 ;; Is line first statement after an open-brace? |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2605 (or |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2606 ;; If no, find that first statement and indent like |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2607 ;; it. If the first statement begins with label, do |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2608 ;; not believe when the indentation of the label is too |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2609 ;; small. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2610 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2611 (forward-char 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2612 (setq old-indent (current-indentation)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2613 (let ((colon-line-end 0)) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2614 (while |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2615 (progn (skip-chars-forward " \t\n") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2616 (looking-at "#\\|[a-zA-Z0-9_$]*:[^:]\\|=[a-zA-Z]")) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2617 ;; Skip over comments and labels following openbrace. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2618 (cond ((= (following-char) ?\#) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2619 (forward-line 1)) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2620 ((= (following-char) ?\=) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2621 (goto-char |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2622 (or (next-single-property-change (point) 'in-pod) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
2623 (point-max)))) ; do not loop if no syntaxification |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2624 ;; label: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2625 (t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2626 (save-excursion (end-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2627 (setq colon-line-end (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2628 (search-forward ":")))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2629 ;; The first following code counts |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2630 ;; if it is before the line we want to indent. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2631 (and (< (point) indent-point) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2632 (if (> colon-line-end (point)) ; After label |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2633 (if (> (current-indentation) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2634 cperl-min-label-indent) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2635 (- (current-indentation) cperl-label-offset) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2636 ;; Do not believe: `max' is involved |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2637 (+ old-indent cperl-indent-level)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2638 (current-column))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2639 ;; If no previous statement, |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2640 ;; indent it relative to line brace is on. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2641 ;; For open brace in column zero, don't let statement |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2642 ;; start there too. If cperl-indent-level is zero, |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2643 ;; use cperl-brace-offset + cperl-continued-statement-offset instead. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2644 ;; For open-braces not the first thing in a line, |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2645 ;; add in cperl-brace-imaginary-offset. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2646 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2647 ;; If first thing on a line: ????? |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2648 (+ (if (and (bolp) (zerop cperl-indent-level)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2649 (+ cperl-brace-offset cperl-continued-statement-offset) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2650 cperl-indent-level) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2651 (if (or is-block |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2652 (not delim) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2653 (not (eq char-after ?\}))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2654 0 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2655 ;; Now it is a hash reference |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2656 (+ cperl-indent-level cperl-close-paren-offset)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2657 ;; Move back over whitespace before the openbrace. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2658 ;; If openbrace is not first nonwhite thing on the line, |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2659 ;; add the cperl-brace-imaginary-offset. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2660 (progn (skip-chars-backward " \t") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2661 (if (bolp) 0 cperl-brace-imaginary-offset)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2662 ;; If the openbrace is preceded by a parenthesized exp, |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2663 ;; move to the beginning of that; |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2664 ;; possibly a different line |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2665 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2666 (if (eq (preceding-char) ?\)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2667 (forward-sexp -1)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2668 ;; In the case it starts a subroutine, indent with |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2669 ;; respect to `sub', not with respect to the |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2670 ;; first thing on the line, say in the case of |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2671 ;; anonymous sub in a hash. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2672 ;; |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2673 (skip-chars-backward " \t") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2674 (if (and (eq (preceding-char) ?b) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2675 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2676 (forward-sexp -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2677 (looking-at "sub\\>")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2678 (setq old-indent |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2679 (nth 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2680 (parse-partial-sexp |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2681 (save-excursion (beginning-of-line) (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2682 (point))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2683 (progn (goto-char (1+ old-indent)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2684 (skip-chars-forward " \t") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2685 (current-column)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2686 ;; Get initial indentation of the line we are on. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2687 ;; If line starts with label, calculate label indentation |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2688 (if (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2689 (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2690 (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*:[^:]")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2691 (if (> (current-indentation) cperl-min-label-indent) |
20323 | 2692 (- (current-indentation) cperl-label-offset) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2693 ;; Do not move `parse-data', this should |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2694 ;; be quick anyway: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2695 (cperl-calculate-indent)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2696 (current-indentation)))))))))))))) |
20323 | 2697 |
2698 (defvar cperl-indent-alist | |
2699 '((string nil) | |
2700 (comment nil) | |
2701 (toplevel 0) | |
2702 (toplevel-after-parenth 2) | |
2703 (toplevel-continued 2) | |
2704 (expression 1)) | |
2705 "Alist of indentation rules for CPerl mode. | |
2706 The values mean: | |
2707 nil: do not indent; | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2708 number: add this amount of indentation. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2709 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2710 Not finished, not used.") |
20323 | 2711 |
2712 (defun cperl-where-am-i (&optional parse-start start-state) | |
2713 ;; Unfinished | |
2714 "Return a list of lists ((TYPE POS)...) of good points before the point. | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2715 POS may be nil if it is hard to find, say, when TYPE is `string' or `comment'. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2716 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
2717 Not finished, not used." |
20323 | 2718 (save-excursion |
2719 (let* ((start-point (point)) | |
2720 (s-s (cperl-get-state)) | |
2721 (start (nth 0 s-s)) | |
2722 (state (nth 1 s-s)) | |
2723 (prestart (nth 3 s-s)) | |
2724 (containing-sexp (car (cdr state))) | |
2725 (case-fold-search nil) | |
2726 (res (list (list 'parse-start start) (list 'parse-prestart prestart)))) | |
2727 (cond ((nth 3 state) ; In string | |
2728 (setq res (cons (list 'string nil (nth 3 state)) res))) ; What started string | |
2729 ((nth 4 state) ; In comment | |
2730 (setq res (cons '(comment) res))) | |
2731 ((null containing-sexp) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2732 ;; Line is at top level. |
20323 | 2733 ;; Indent like the previous top level line |
2734 ;; unless that ends in a closeparen without semicolon, | |
2735 ;; in which case this line is the first argument decl. | |
2736 (cperl-backward-to-noncomment (or parse-start (point-min))) | |
2737 ;;(skip-chars-backward " \t\f\n") | |
2738 (cond | |
2739 ((or (bobp) | |
2740 (memq (preceding-char) (append ";}" nil))) | |
2741 (setq res (cons (list 'toplevel start) res))) | |
2742 ((eq (preceding-char) ?\) ) | |
2743 (setq res (cons (list 'toplevel-after-parenth start) res))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2744 (t |
20323 | 2745 (setq res (cons (list 'toplevel-continued start) res))))) |
2746 ((/= (char-after containing-sexp) ?{) | |
2747 ;; line is expression, not statement: | |
2748 ;; indent to just after the surrounding open. | |
2749 ;; skip blanks if we do not close the expression. | |
2750 (setq res (cons (list 'expression-blanks | |
2751 (progn | |
2752 (goto-char (1+ containing-sexp)) | |
2753 (or (looking-at "[ \t]*\\(#\\|$\\)") | |
2754 (skip-chars-forward " \t")) | |
2755 (point))) | |
2756 (cons (list 'expression containing-sexp) res)))) | |
2757 ((progn | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2758 ;; Containing-expr starts with \{. Check whether it is a hash. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2759 (goto-char containing-sexp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2760 (not (cperl-block-p))) |
20323 | 2761 (setq res (cons (list 'expression-blanks |
2762 (progn | |
2763 (goto-char (1+ containing-sexp)) | |
2764 (or (looking-at "[ \t]*\\(#\\|$\\)") | |
2765 (skip-chars-forward " \t")) | |
2766 (point))) | |
2767 (cons (list 'expression containing-sexp) res)))) | |
2768 (t | |
2769 ;; Statement level. | |
2770 (setq res (cons (list 'in-block containing-sexp) res)) | |
2771 ;; Is it a continuation or a new statement? | |
2772 ;; Find previous non-comment character. | |
2773 (cperl-backward-to-noncomment containing-sexp) | |
2774 ;; Back up over label lines, since they don't | |
2775 ;; affect whether our line is a continuation. | |
2776 ;; Back up comma-delimited lines too ????? | |
2777 (while (or (eq (preceding-char) ?\,) | |
2778 (save-excursion (cperl-after-label))) | |
2779 (if (eq (preceding-char) ?\,) | |
2780 ;; Will go to beginning of line, essentially | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2781 ;; Will ignore embedded sexpr XXXX. |
20323 | 2782 (cperl-backward-to-start-of-continued-exp containing-sexp)) |
2783 (beginning-of-line) | |
2784 (cperl-backward-to-noncomment containing-sexp)) | |
2785 ;; Now we get the answer. | |
2786 (if (not (memq (preceding-char) (append ";}{" '(nil)))) ; Was ?\, | |
2787 ;; This line is continuation of preceding line's statement. | |
2788 (list (list 'statement-continued containing-sexp)) | |
2789 ;; This line starts a new statement. | |
2790 ;; Position following last unclosed open. | |
2791 (goto-char containing-sexp) | |
2792 ;; Is line first statement after an open-brace? | |
2793 (or | |
2794 ;; If no, find that first statement and indent like | |
2795 ;; it. If the first statement begins with label, do | |
2796 ;; not believe when the indentation of the label is too | |
2797 ;; small. | |
2798 (save-excursion | |
2799 (forward-char 1) | |
2800 (let ((colon-line-end 0)) | |
2801 (while (progn (skip-chars-forward " \t\n" start-point) | |
2802 (and (< (point) start-point) | |
2803 (looking-at | |
2804 "#\\|[a-zA-Z_][a-zA-Z0-9_]*:[^:]"))) | |
2805 ;; Skip over comments and labels following openbrace. | |
2806 (cond ((= (following-char) ?\#) | |
2807 ;;(forward-line 1) | |
2808 (end-of-line)) | |
2809 ;; label: | |
2810 (t | |
2811 (save-excursion (end-of-line) | |
2812 (setq colon-line-end (point))) | |
2813 (search-forward ":")))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2814 ;; Now at the point, after label, or at start |
20323 | 2815 ;; of first statement in the block. |
2816 (and (< (point) start-point) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2817 (if (> colon-line-end (point)) |
20323 | 2818 ;; Before statement after label |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2819 (if (> (current-indentation) |
20323 | 2820 cperl-min-label-indent) |
2821 (list (list 'label-in-block (point))) | |
2822 ;; Do not believe: `max' is involved | |
2823 (list | |
2824 (list 'label-in-block-min-indent (point)))) | |
2825 ;; Before statement | |
2826 (list 'statement-in-block (point)))))) | |
2827 ;; If no previous statement, | |
2828 ;; indent it relative to line brace is on. | |
2829 ;; For open brace in column zero, don't let statement | |
2830 ;; start there too. If cperl-indent-level is zero, | |
2831 ;; use cperl-brace-offset + cperl-continued-statement-offset instead. | |
2832 ;; For open-braces not the first thing in a line, | |
2833 ;; add in cperl-brace-imaginary-offset. | |
2834 | |
2835 ;; If first thing on a line: ????? | |
2836 (+ (if (and (bolp) (zerop cperl-indent-level)) | |
2837 (+ cperl-brace-offset cperl-continued-statement-offset) | |
2838 cperl-indent-level) | |
2839 ;; Move back over whitespace before the openbrace. | |
2840 ;; If openbrace is not first nonwhite thing on the line, | |
2841 ;; add the cperl-brace-imaginary-offset. | |
2842 (progn (skip-chars-backward " \t") | |
2843 (if (bolp) 0 cperl-brace-imaginary-offset)) | |
2844 ;; If the openbrace is preceded by a parenthesized exp, | |
2845 ;; move to the beginning of that; | |
2846 ;; possibly a different line | |
2847 (progn | |
2848 (if (eq (preceding-char) ?\)) | |
2849 (forward-sexp -1)) | |
2850 ;; Get initial indentation of the line we are on. | |
2851 ;; If line starts with label, calculate label indentation | |
2852 (if (save-excursion | |
2853 (beginning-of-line) | |
2854 (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*:[^:]")) | |
2855 (if (> (current-indentation) cperl-min-label-indent) | |
2856 (- (current-indentation) cperl-label-offset) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2857 (cperl-calculate-indent)) |
20323 | 2858 (current-indentation)))))))) |
2859 res))) | |
2860 | |
2861 (defun cperl-calculate-indent-within-comment () | |
2862 "Return the indentation amount for line, assuming that | |
2863 the current line is to be regarded as part of a block comment." | |
2864 (let (end star-start) | |
2865 (save-excursion | |
2866 (beginning-of-line) | |
2867 (skip-chars-forward " \t") | |
2868 (setq end (point)) | |
2869 (and (= (following-char) ?#) | |
2870 (forward-line -1) | |
2871 (cperl-to-comment-or-eol) | |
2872 (setq end (point))) | |
2873 (goto-char end) | |
2874 (current-column)))) | |
2875 | |
2876 | |
2877 (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
|
2878 "Go to position before comment on the current line, or to end of line. |
20323 | 2879 Returns true if comment is found." |
2880 (let (state stop-in cpoint (lim (progn (end-of-line) (point)))) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2881 (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2882 (if (or |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2883 (eq (get-text-property (point) 'syntax-type) 'pod) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2884 (re-search-forward "\\=[ \t]*\\(#\\|$\\)" lim t)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2885 (if (eq (preceding-char) ?\#) (progn (backward-char 1) t)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2886 ;; Else |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2887 (while (not stop-in) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2888 (setq state (parse-partial-sexp (point) lim nil nil nil t)) |
20323 | 2889 ; stop at comment |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2890 ;; 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
|
2891 (if (nth 4 state) ; After `#'; |
20323 | 2892 ; (nth 2 state) can be |
2893 ; beginning of m,s,qq and so | |
2894 ; on | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2895 (if (nth 2 state) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2896 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2897 (setq cpoint (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2898 (goto-char (nth 2 state)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2899 (cond |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2900 ((looking-at "\\(s\\|tr\\)\\>") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2901 (or (re-search-forward |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2902 "\\=\\w+[ \t]*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2903 lim 'move) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2904 (setq stop-in t))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2905 ((looking-at "\\(m\\|q\\([qxwr]\\)?\\)\\>") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2906 (or (re-search-forward |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2907 "\\=\\w+[ \t]*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*#" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2908 lim 'move) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2909 (setq stop-in t))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2910 (t ; It was fair comment |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2911 (setq stop-in t) ; Finish |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2912 (goto-char (1- cpoint))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2913 (setq stop-in t) ; Finish |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2914 (forward-char -1)) |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
2915 (setq stop-in t))) ; Finish |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
2916 (nth 4 state)))) |
20323 | 2917 |
2918 (defsubst cperl-1- (p) | |
2919 (max (point-min) (1- p))) | |
2920 | |
2921 (defsubst cperl-1+ (p) | |
2922 (min (point-max) (1+ p))) | |
2923 | |
2924 (defsubst cperl-modify-syntax-type (at how) | |
2925 (if (< at (point-max)) | |
2926 (progn | |
2927 (put-text-property at (1+ at) 'syntax-table how) | |
2928 (put-text-property at (1+ at) 'rear-nonsticky t)))) | |
2929 | |
2930 (defun cperl-protect-defun-start (s e) | |
2931 ;; C code looks for "^\\s(" to skip comment backward in "hard" situations | |
2932 (save-excursion | |
2933 (goto-char s) | |
2934 (while (re-search-forward "^\\s(" e 'to-end) | |
2935 (put-text-property (1- (point)) (point) 'syntax-table cperl-st-punct)))) | |
2936 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2937 (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
|
2938 (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
|
2939 (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
|
2940 nil |
20323 | 2941 ;; We suppose that e is _after_ the end of construction, as after eol. |
2942 (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
|
2943 (if (> bb (- e 2)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2944 ;; one-char string/comment?! |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2945 (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
|
2946 (cperl-modify-syntax-type bb string) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2947 (cperl-modify-syntax-type (1- e) string)) |
20323 | 2948 (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
|
2949 (put-text-property (1+ bb) (1- e) |
20323 | 2950 '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
|
2951 (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
|
2952 ;; Fontify |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2953 (or noface |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2954 (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
|
2955 (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
|
2956 'font-lock-comment-face))))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2957 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2958 (defvar cperl-starters '(( ?\( . ?\) ) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2959 ( ?\[ . ?\] ) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2960 ( ?\{ . ?\} ) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2961 ( ?\< . ?\> ))) |
20323 | 2962 |
2963 (defun cperl-forward-re (lim end is-2arg set-st st-l err-l argument | |
2964 &optional ostart oend) | |
2965 ;; Works *before* syntax recognition is done | |
2966 ;; May modify syntax-type text property if the situation is too hard | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
2967 (let (b starter ender st i i2 go-forward reset-st) |
20323 | 2968 (skip-chars-forward " \t") |
2969 ;; ender means matching-char matcher. | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
2970 (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
|
2971 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
|
2972 ender (cdr (assoc starter cperl-starters))) |
20323 | 2973 ;; What if starter == ?\\ ???? |
2974 (if set-st | |
2975 (if (car st-l) | |
2976 (setq st (car st-l)) | |
2977 (setcar st-l (make-syntax-table)) | |
2978 (setq i 0 st (car st-l)) | |
2979 (while (< i 256) | |
2980 (modify-syntax-entry i "." st) | |
2981 (setq i (1+ i))) | |
2982 (modify-syntax-entry ?\\ "\\" st))) | |
2983 (setq set-st t) | |
2984 ;; Whether we have an intermediate point | |
2985 (setq i nil) | |
2986 ;; Prepare the syntax table: | |
2987 (and set-st | |
2988 (if (not ender) ; m/blah/, s/x//, s/x/y/ | |
2989 (modify-syntax-entry starter "$" st) | |
2990 (modify-syntax-entry starter (concat "(" (list ender)) st) | |
2991 (modify-syntax-entry ender (concat ")" (list starter)) st))) | |
2992 (condition-case bb | |
2993 (progn | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
2994 ;; 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
|
2995 ;; is recognized the same as $, so we need to check this manually. |
20323 | 2996 (if (and (eq starter (char-after (cperl-1+ b))) |
2997 (not ender)) | |
2998 ;; $ has TeXish matching rules, so $$ equiv $... | |
2999 (forward-char 2) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3000 (setq reset-st (syntax-table)) |
20323 | 3001 (set-syntax-table st) |
3002 (forward-sexp 1) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3003 (if (<= (point) (1+ b)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3004 (error "Unfinished regular expression")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3005 (set-syntax-table reset-st) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3006 (setq reset-st nil) |
20323 | 3007 ;; Now the problem is with m;blah;; |
3008 (and (not ender) | |
3009 (eq (preceding-char) | |
3010 (char-after (- (point) 2))) | |
3011 (save-excursion | |
3012 (forward-char -2) | |
3013 (= 0 (% (skip-chars-backward "\\\\") 2))) | |
3014 (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
|
3015 ;; Now we are after the first part. |
20323 | 3016 (and is-2arg ; Have trailing part |
3017 (not ender) | |
3018 (eq (following-char) starter) ; Empty trailing part | |
3019 (progn | |
3020 (or (eq (char-syntax (following-char)) ?.) | |
3021 ;; Make trailing letter into punctuation | |
3022 (cperl-modify-syntax-type (point) cperl-st-punct)) | |
3023 (setq is-2arg nil go-forward t))) ; Ignore the tail | |
3024 (if is-2arg ; Not number => have second part | |
3025 (progn | |
3026 (setq i (point) i2 i) | |
3027 (if ender | |
3028 (if (memq (following-char) '(?\ ?\t ?\n ?\f)) | |
3029 (progn | |
3030 (if (looking-at "[ \t\n\f]+\\(#[^\n]*\n[ \t\n\f]*\\)+") | |
3031 (goto-char (match-end 0)) | |
3032 (skip-chars-forward " \t\n\f")) | |
3033 (setq i2 (point)))) | |
3034 (forward-char -1)) | |
3035 (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
|
3036 (if ender (modify-syntax-entry ender "." st)) |
20323 | 3037 (setq set-st nil) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3038 (setq ender (cperl-forward-re lim end nil t st-l err-l |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3039 argument starter ender) |
20323 | 3040 ender (nth 2 ender))))) |
3041 (error (goto-char lim) | |
3042 (setq set-st nil) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3043 (if reset-st |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3044 (set-syntax-table reset-st)) |
20323 | 3045 (or end |
3046 (message | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3047 "End of `%s%s%c ... %c' string/RE not found: %s" |
20323 | 3048 argument |
3049 (if ostart (format "%c ... %c" ostart (or oend ostart)) "") | |
3050 starter (or ender starter) bb) | |
3051 (or (car err-l) (setcar err-l b))))) | |
3052 (if set-st | |
3053 (progn | |
3054 (modify-syntax-entry starter (if (eq starter ?\\) "\\" ".") st) | |
3055 (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
|
3056 ;; 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
|
3057 ;; 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
|
3058 ;; 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
|
3059 ;; starter: the starting delimiter of the first arg |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3060 ;; go-forward: has 2 args, and the second part is empty |
20323 | 3061 (list i i2 ender starter go-forward))) |
3062 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3063 (defvar font-lock-string-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3064 ;;(defvar font-lock-reference-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3065 (defvar font-lock-constant-face) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3066 (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
|
3067 ;; 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
|
3068 (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
|
3069 (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
|
3070 (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
|
3071 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3072 ;;; 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
|
3073 ;;; recognized locally) are marked: |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3074 ;; a) PODs: |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3075 ;; 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
|
3076 ;; 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
|
3077 ;; 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
|
3078 ;; b) HEREs: |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3079 ;; 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
|
3080 ;; 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
|
3081 ;; 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
|
3082 ;; c) FORMATs: |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3083 ;; 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
|
3084 ;; 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
|
3085 ;; 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
|
3086 ;; 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
|
3087 ;; part between `q' and the first marker is marked `syntax-type' ==> `prestring' |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3088 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3089 (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
|
3090 ;; 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
|
3091 (let ((pos (point)) opos) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3092 (setq opos pos) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3093 (while (and pos (get-text-property pos 'syntax-type)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3094 (setq pos (previous-single-property-change pos 'syntax-type)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3095 (if pos |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3096 (if before |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3097 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3098 (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
|
3099 (beginning-of-line) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3100 (setq pos (point))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3101 (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
|
3102 ;; 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
|
3103 (goto-char (point-min)))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3104 ;; Skip empty lines |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3105 (and (looking-at "\n*=") |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3106 (/= 0 (skip-chars-backward "\n")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3107 (forward-char)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3108 (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
|
3109 (if end |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3110 ;; Do the same for end, going small steps |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3111 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3112 (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
|
3113 (setq pos end |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3114 end (next-single-property-change end 'syntax-type))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3115 (or end pos))))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3116 |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3117 (defvar cperl-nonoverridable-face) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3118 (defvar font-lock-function-name-face) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3119 (defvar font-lock-comment-face) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3120 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3121 (defun cperl-find-pods-heres (&optional min max non-inter end ignore-max) |
20323 | 3122 "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
|
3123 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
|
3124 the sections using `cperl-pod-head-face', `cperl-pod-face', |
20323 | 3125 `cperl-here-face'." |
3126 (interactive) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3127 (or min (setq min (point-min) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3128 cperl-syntax-state nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3129 cperl-syntax-done-to min)) |
20323 | 3130 (or max (setq max (point-max))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3131 (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
|
3132 face head-face here-face b e bb tag qtag b1 e1 argument i c tail tb |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3133 is-REx is-x-REx REx-comment-start REx-comment-end was-comment i2 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3134 (case-fold-search nil) (inhibit-read-only t) (buffer-undo-list t) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3135 (modified (buffer-modified-p)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3136 (after-change-functions nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3137 (use-syntax-state (and cperl-syntax-state |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3138 (>= min (car cperl-syntax-state)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3139 (state-point (if use-syntax-state |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3140 (car cperl-syntax-state) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3141 (point-min))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3142 (state (if use-syntax-state |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3143 (cdr cperl-syntax-state))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3144 ;; (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
|
3145 (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
|
3146 ;; Somehow font-lock may be not loaded yet... |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3147 (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
|
3148 font-lock-string-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3149 'font-lock-string-face)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3150 (font-lock-constant-face (if (boundp 'font-lock-constant-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3151 font-lock-constant-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3152 'font-lock-constant-face)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3153 (font-lock-function-name-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3154 (if (boundp 'font-lock-function-name-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3155 font-lock-function-name-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3156 'font-lock-function-name-face)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3157 (font-lock-comment-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3158 (if (boundp 'font-lock-comment-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3159 font-lock-comment-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3160 'font-lock-comment-face)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3161 (cperl-nonoverridable-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3162 (if (boundp 'cperl-nonoverridable-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3163 cperl-nonoverridable-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3164 'cperl-nonoverridable-face)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3165 (stop-point (if ignore-max |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3166 (point-max) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3167 max)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3168 (search |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3169 (concat |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3170 "\\(\\`\n?\\|^\n\\)=" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3171 "\\|" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3172 ;; One extra () before this: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3173 "<<" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3174 "\\(" ; 1 + 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3175 ;; First variant "BLAH" or just ``. |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3176 "[ \t]*" ; Yes, whitespace is allowed! |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3177 "\\([\"'`]\\)" ; 2 + 1 = 3 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3178 "\\([^\"'`\n]*\\)" ; 3 + 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3179 "\\3" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3180 "\\|" |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3181 ;; 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
|
3182 "\\\\?\\(\\([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
|
3183 ;; 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
|
3184 ;; "\\([^= \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
|
3185 "\\(\\)" ; To preserve count of pars :-( 6 + 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3186 "\\)" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3187 "\\|" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3188 ;; 1+6 extra () before this: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3189 "^[ \t]*\\(format\\)[ \t]*\\([a-zA-Z0-9_]+\\)?[ \t]*=[ \t]*$" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3190 (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
|
3191 (concat |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3192 "\\|" |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3193 ;; 1+6+2=9 extra () before this: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3194 "\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3195 "\\|" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3196 ;; 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
|
3197 "\\([?/<]\\)" ; /blah/ or ?blah? or <file*glob> |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3198 "\\|" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3199 ;; 1+6+2+1+1=11 extra () before this: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3200 "\\<sub\\>[ \t]*\\([a-zA-Z_:'0-9]+[ \t]*\\)?\\(([^()]*)\\)" |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3201 "\\|" |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3202 ;; 1+6+2+1+1+2=13 extra () before this: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3203 "\\$\\(['{]\\)" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3204 "\\|" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3205 ;; 1+6+2+1+1+2+1=14 extra () before this: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3206 "\\(\\<sub[ \t\n\f]+\\|[&*$@%]\\)[a-zA-Z0-9_]*'" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3207 ;; 1+6+2+1+1+2+1+1=15 extra () before this: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3208 "\\|" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3209 "__\\(END\\|DATA\\)__" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3210 ;; 1+6+2+1+1+2+1+1+1=16 extra () before this: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3211 "\\|" |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3212 "\\\\\\(['`\"($]\\)") |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3213 "")))) |
20323 | 3214 (unwind-protect |
3215 (progn | |
3216 (save-excursion | |
3217 (or non-inter | |
3218 (message "Scanning for \"hard\" Perl constructions...")) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3219 (and cperl-pod-here-fontify |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3220 ;; 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
|
3221 (setq face cperl-pod-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3222 head-face cperl-pod-head-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3223 here-face cperl-here-face)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3224 (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
|
3225 '(syntax-type t in-pod t syntax-table t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3226 cperl-postpone t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3227 syntax-subtype t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3228 rear-nonsticky t |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3229 here-doc-group t |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3230 first-format-line t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3231 indentable t)) |
20323 | 3232 ;; Need to remove face as well... |
3233 (goto-char min) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3234 (and (eq system-type 'emx) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3235 (looking-at "extproc[ \t]") ; Analogue of #! |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3236 (cperl-commentify min |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3237 (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
|
3238 nil)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3239 (while (and |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3240 (< (point) max) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3241 (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
|
3242 (setq tmpend nil) ; Valid for most cases |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3243 (cond |
20323 | 3244 ((match-beginning 1) ; POD section |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3245 ;; "\\(\\`\n?\\|^\n\\)=" |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3246 (if (looking-at "cut\\>") |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3247 (if ignore-max |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3248 nil ; Doing a chunk only |
20323 | 3249 (message "=cut is not preceded by a POD section") |
3250 (or (car err-l) (setcar err-l (point)))) | |
3251 (beginning-of-line) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3252 |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3253 (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
|
3254 bb b |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3255 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
|
3256 b1 nil) ; error condition |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3257 ;; 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
|
3258 ;; 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
|
3259 (or (re-search-forward "^\n=cut\\>" stop-point 'toend) |
20323 | 3260 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3261 (goto-char b) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3262 (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
|
3263 (progn |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3264 (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
|
3265 (setq b1 t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3266 (or (car err-l) (setcar err-l b)))))) |
20323 | 3267 (beginning-of-line 2) ; An empty line after =cut is not POD! |
3268 (setq e (point)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3269 (and (> e max) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3270 (progn |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3271 (remove-text-properties |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3272 max e '(syntax-type t in-pod t syntax-table t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3273 cperl-postpone t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3274 syntax-subtype t |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3275 here-doc-group t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3276 rear-nonsticky t |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3277 first-format-line t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3278 indentable t)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3279 (setq tmpend tb))) |
20323 | 3280 (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
|
3281 (put-text-property b e 'syntax-type 'in-pod) |
20323 | 3282 (goto-char b) |
3283 (while (re-search-forward "\n\n[ \t]" e t) | |
3284 ;; We start 'pod 1 char earlier to include the preceding line | |
3285 (beginning-of-line) | |
3286 (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
|
3287 (cperl-put-do-not-fontify b (point) t) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3288 ;; mark the non-literal parts as PODs |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3289 (if cperl-pod-here-fontify |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3290 (cperl-postpone-fontification b (point) 'face face t)) |
20323 | 3291 (re-search-forward "\n\n[^ \t\f\n]" e 'toend) |
3292 (beginning-of-line) | |
3293 (setq b (point))) | |
3294 (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
|
3295 (cperl-put-do-not-fontify (point) e t) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3296 (if cperl-pod-here-fontify |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3297 (progn |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3298 ;; mark the non-literal parts as PODs |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3299 (cperl-postpone-fontification (point) e 'face face t) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3300 (goto-char bb) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3301 (if (looking-at |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3302 "=[a-zA-Z0-9_]+\\>[ \t]*\\(\\(\n?[^\n]\\)+\\)$") |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3303 ;; mark the headers |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3304 (cperl-postpone-fontification |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3305 (match-beginning 1) (match-end 1) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3306 'face head-face)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3307 (while (re-search-forward |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3308 ;; One paragraph |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3309 "^\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
|
3310 e 'toend) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3311 ;; mark the headers |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3312 (cperl-postpone-fontification |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3313 (match-beginning 1) (match-end 1) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
3314 'face head-face)))) |
20323 | 3315 (cperl-commentify bb e nil) |
3316 (goto-char e) | |
3317 (or (eq e (point-max)) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3318 (forward-char -1)))) ; Prepare for immediate POD start. |
20323 | 3319 ;; Here document |
3320 ;; We do only one here-per-line | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3321 ;; ;; One extra () before this: |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3322 ;;"<<" |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3323 ;; "\\(" ; 1 + 1 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3324 ;; ;; First variant "BLAH" or just ``. |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3325 ;; "[ \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
|
3326 ;; "\\([\"'`]\\)" ; 2 + 1 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3327 ;; "\\([^\"'`\n]*\\)" ; 3 + 1 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3328 ;; "\\3" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3329 ;; "\\|" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3330 ;; ;; 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
|
3331 ;; "\\\\?\\(\\([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
|
3332 ;; ;; 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
|
3333 ;; ;; "\\([^= \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
|
3334 ;; "\\(\\)" ; 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
|
3335 ;; "\\)" |
20323 | 3336 ((match-beginning 2) ; 1 + 1 |
3337 ;; Abort in comment: | |
3338 (setq b (point)) | |
3339 (setq state (parse-partial-sexp state-point b nil nil state) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3340 state-point b |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3341 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
|
3342 i (or (nth 3 state) (nth 4 state))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3343 (if i |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3344 (setq c t) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3345 (setq c (and |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3346 (match-beginning 5) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3347 (not (match-beginning 6)) ; Empty |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3348 (looking-at |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3349 "[ \t]*[=0-9$@%&(]")))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3350 (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
|
3351 nil ; Skip it. |
20323 | 3352 (if (match-beginning 5) ;4 + 1 |
3353 (setq b1 (match-beginning 5) ; 4 + 1 | |
3354 e1 (match-end 5)) ; 4 + 1 | |
3355 (setq b1 (match-beginning 4) ; 3 + 1 | |
3356 e1 (match-end 4))) ; 3 + 1 | |
3357 (setq tag (buffer-substring b1 e1) | |
3358 qtag (regexp-quote tag)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3359 (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
|
3360 ;; Highlight the starting delimiter |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3361 (cperl-postpone-fontification b1 e1 '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
|
3362 (cperl-put-do-not-fontify b1 e1 t))) |
20323 | 3363 (forward-line) |
3364 (setq b (point)) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3365 ;; 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
|
3366 ;; 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
|
3367 (or (and (re-search-forward (concat "^" qtag "$") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3368 stop-point 'toend) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3369 (eq (following-char) ?\n)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3370 (progn ; Pretend we matched at the end |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3371 (goto-char (point-max)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3372 (re-search-forward "\\'") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3373 (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
|
3374 (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
|
3375 (if cperl-pod-here-fontify |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3376 (progn |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3377 ;; Highlight the ending delimiter |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3378 (cperl-postpone-fontification (match-beginning 0) (match-end 0) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3379 'face font-lock-constant-face) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3380 (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
|
3381 ;; Highlight the HERE-DOC |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3382 (cperl-postpone-fontification b (match-beginning 0) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3383 'face here-face))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3384 (setq e1 (cperl-1+ (match-end 0))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3385 (put-text-property b (match-beginning 0) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3386 'syntax-type 'here-doc) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3387 (put-text-property (match-beginning 0) e1 |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3388 'syntax-type 'here-doc-delim) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3389 (put-text-property b e1 |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3390 'here-doc-group t) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3391 (cperl-commentify b e1 nil) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3392 (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
|
3393 (if (> e1 max) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3394 (setq tmpend tb)))) |
20323 | 3395 ;; format |
3396 ((match-beginning 8) | |
3397 ;; 1+6=7 extra () before this: | |
3398 ;;"^[ \t]*\\(format\\)[ \t]*\\([a-zA-Z0-9_]+\\)?[ \t]*=[ \t]*$" | |
3399 (setq b (point) | |
3400 name (if (match-beginning 8) ; 7 + 1 | |
3401 (buffer-substring (match-beginning 8) ; 7 + 1 | |
3402 (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
|
3403 "") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3404 tb (match-beginning 0)) |
20323 | 3405 (setq argument nil) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3406 (put-text-property (save-excursion |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3407 (beginning-of-line) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3408 (point)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3409 b 'first-format-line 't) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3410 (if cperl-pod-here-fontify |
20323 | 3411 (while (and (eq (forward-line) 0) |
3412 (not (looking-at "^[.;]$"))) | |
3413 (cond | |
3414 ((looking-at "^#")) ; Skip comments | |
3415 ((and argument ; Skip argument multi-lines | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3416 (looking-at "^[ \t]*{")) |
20323 | 3417 (forward-sexp 1) |
3418 (setq argument nil)) | |
3419 (argument ; Skip argument lines | |
3420 (setq argument nil)) | |
3421 (t ; Format line | |
3422 (setq b1 (point)) | |
3423 (setq argument (looking-at "^[^\n]*[@^]")) | |
3424 (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
|
3425 ;; Highlight the format line |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3426 (cperl-postpone-fontification b1 (point) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3427 'face font-lock-string-face) |
20323 | 3428 (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
|
3429 (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
|
3430 ;; 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
|
3431 ;; 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
|
3432 (re-search-forward "^[.;]$" stop-point 'toend)) |
20323 | 3433 (beginning-of-line) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3434 (if (looking-at "^\\.$") ; ";" is not supported yet |
20323 | 3435 (progn |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3436 ;; 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
|
3437 (cperl-postpone-fontification (point) (+ (point) 2) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3438 'face font-lock-string-face) |
20323 | 3439 (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
|
3440 (cperl-put-do-not-fontify (point) (+ (point) 2) t)) |
20323 | 3441 (message "End of format `%s' not found." name) |
3442 (or (car err-l) (setcar err-l b))) | |
3443 (forward-line) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3444 (if (> (point) max) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3445 (setq tmpend tb)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3446 (put-text-property b (point) 'syntax-type 'format)) |
20323 | 3447 ;; Regexp: |
3448 ((or (match-beginning 10) (match-beginning 11)) | |
3449 ;; 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
|
3450 ;; "\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>" |
20323 | 3451 ;; "\\|" |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3452 ;; "\\([?/<]\\)" ; /blah/ or ?blah? or <file*glob> |
20323 | 3453 (setq b1 (if (match-beginning 10) 10 11) |
3454 argument (buffer-substring | |
3455 (match-beginning b1) (match-end b1)) | |
3456 b (point) | |
3457 i b | |
3458 c (char-after (match-beginning b1)) | |
3459 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
|
3460 ;; 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
|
3461 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
|
3462 (and (memq bb (append "$@%*#_:-&>" nil)) ; $#y) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3463 (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
|
3464 ((eq bb ?\:) ; $opt::s |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3465 (eq (char-after |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3466 (- (match-beginning b1) 2)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3467 ?\:)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3468 ((eq bb ?\>) ; $foo->s |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3469 (eq (char-after |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3470 (- (match-beginning b1) 2)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3471 ?\-)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3472 ((eq bb ?\&) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3473 (not (eq (char-after ; &&m/blah/ |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3474 (- (match-beginning b1) 2)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3475 ?\&))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3476 (t t))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3477 ;; <file> or <$file> |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3478 (and (eq c ?\<) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3479 ;; 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
|
3480 (save-match-data |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3481 (looking-at |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3482 "\\$?\\([_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
|
3483 tb (match-beginning 0)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3484 (goto-char (match-beginning b1)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3485 (cperl-backward-to-noncomment (point-min)) |
20323 | 3486 (or bb |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3487 (if (eq b1 11) ; bare /blah/ or ?blah? or <foo> |
20323 | 3488 (setq argument "" |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3489 b1 nil |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3490 bb ; Not a regexp? |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3491 (progn |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3492 (not |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3493 ;; What is below: regexp-p? |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3494 (and |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3495 (or (memq (preceding-char) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3496 (append (if (memq c '(?\? ?\<)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3497 ;; $a++ ? 1 : 2 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3498 "~{(=|&*!,;:" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3499 "~{(=|&+-*!,;:") nil)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3500 (and (eq (preceding-char) ?\}) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3501 (cperl-after-block-p (point-min))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3502 (and (eq (char-syntax (preceding-char)) ?w) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3503 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3504 (forward-sexp -1) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3505 ;; 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
|
3506 ;; functions/builtins which expect an argument, but ... |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3507 (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
|
3508 ;; -d ?foo? is a RE |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3509 (looking-at "[a-zA-Z]\\>") |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
3510 (and |
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
3511 (not (memq (preceding-char) |
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
3512 '(?$ ?@ ?& ?%))) |
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
3513 (looking-at |
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
3514 "\\(while\\|if\\|unless\\|until\\|and\\|or\\|not\\|xor\\|split\\|grep\\|map\\|print\\)\\>"))))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3515 (and (eq (preceding-char) ?.) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3516 (eq (char-after (- (point) 2)) ?.)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3517 (bobp)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3518 ;; m|blah| ? foo : bar; |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3519 (not |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3520 (and (eq c ?\?) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3521 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
|
3522 (not (bobp)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3523 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3524 (forward-char -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3525 (looking-at "\\s|"))))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3526 b (1- b)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3527 ;; s y tr m |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3528 ;; Check for $a -> y |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3529 (setq b1 (preceding-char) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3530 go (point)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3531 (if (and (eq b1 ?>) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3532 (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
|
3533 ;; Not a regexp |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3534 (setq bb t)))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3535 (or bb (setq state (parse-partial-sexp |
20323 | 3536 state-point b nil nil state) |
3537 state-point b)) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3538 (setq bb (or bb (nth 3 state) (nth 4 state))) |
20323 | 3539 (goto-char b) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3540 (or bb |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3541 (progn |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3542 (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
|
3543 (goto-char (match-end 0)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3544 (skip-chars-forward " \t\n\f")) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3545 (cond ((and (eq (following-char) ?\}) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3546 (eq b1 ?\{)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3547 ;; 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
|
3548 (goto-char (1- go)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3549 (skip-chars-backward " \t\n\f") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3550 (if (memq (preceding-char) (append "$@%&*" nil)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3551 (setq bb t) ; @{y} |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3552 (condition-case nil |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3553 (forward-sexp -1) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3554 (error nil))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3555 (if (or bb |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3556 (looking-at ; $foo -> {s} |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3557 "[$@]\\$*\\([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
|
3558 (and ; $foo[12] -> {s} |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3559 (memq (following-char) '(?\{ ?\[)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3560 (progn |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3561 (forward-sexp 1) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3562 (looking-at "\\([ \t\n]*->\\)?[ \t\n]*{")))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3563 (setq bb t) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3564 (goto-char b))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3565 ((and (eq (following-char) ?=) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3566 (eq (char-after (1+ (point))) ?\>)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3567 ;; Check for { foo => 1, s => 2 } |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3568 ;; Apparently s=> is never a substitution... |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3569 (setq bb t)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3570 ((and (eq (following-char) ?:) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3571 (eq b1 ?\{) ; Check for $ { s::bar } |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3572 (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
|
3573 (progn |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3574 (goto-char (1- go)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3575 (skip-chars-backward " \t\n\f") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3576 (memq (preceding-char) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3577 (append "$@%&*" nil)))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3578 (setq bb t))))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3579 (if bb |
20323 | 3580 (goto-char i) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3581 ;; Skip whitespace and comments... |
20323 | 3582 (if (looking-at "[ \t\n\f]+\\(#[^\n]*\n[ \t\n\f]*\\)+") |
3583 (goto-char (match-end 0)) | |
3584 (skip-chars-forward " \t\n\f")) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3585 (if (> (point) b) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3586 (put-text-property b (point) 'syntax-type 'prestring)) |
20323 | 3587 ;; qtag means two-arg matcher, may be reset to |
3588 ;; 2 or 3 later if some special quoting is needed. | |
3589 ;; e1 means matching-char matcher. | |
3590 (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
|
3591 ;; has 2 args |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3592 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
|
3593 ;; 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
|
3594 ;; 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
|
3595 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
|
3596 i2 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3597 t st-l err-l argument) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3598 ;; Note that if `go', then it is considered as 1-arg |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3599 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
|
3600 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
|
3601 ; is with matching chars [] |
20323 | 3602 go (nth 4 i) ; There is a 1-char part after the end |
3603 i (car i) ; intermediate point | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3604 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
|
3605 ;; 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
|
3606 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
|
3607 (1- e1)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3608 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
|
3609 qtag nil ; need to preserve backslashitis |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3610 is-x-REx nil) ; REx has //x modifier |
20323 | 3611 ;; Commenting \\ is dangerous, what about ( ? |
3612 (and i tail | |
3613 (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
|
3614 (setq qtag t)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3615 (if (looking-at "\\sw*x") ; qr//x |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3616 (setq is-x-REx t)) |
20323 | 3617 (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
|
3618 ;; Considered as 1arg form |
20323 | 3619 (progn |
3620 (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
|
3621 (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
|
3622 (if (or is-x-REx |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3623 ;; ignore other text properties: |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3624 (string-match "^qw$" argument)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3625 (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
|
3626 (and go |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3627 (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
|
3628 (or (eobp) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3629 (forward-char 1)))) |
20323 | 3630 (cperl-commentify b i t) |
3631 (if (looking-at "\\sw*e") ; s///e | |
3632 (progn | |
3633 (and | |
3634 ;; silent: | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3635 (cperl-find-pods-heres b1 (1- (point)) t end) |
20323 | 3636 ;; Error |
3637 (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
|
3638 (if (and tag (eq (preceding-char) ?\>)) |
20323 | 3639 (progn |
3640 (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
|
3641 (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
|
3642 (put-text-property b i 'syntax-type 'string) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3643 (if is-x-REx |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3644 (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
|
3645 (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
|
3646 (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
|
3647 (if is-x-REx |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3648 (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
|
3649 (if qtag |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3650 (cperl-modify-syntax-type (1+ i) cperl-st-punct)) |
20323 | 3651 (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
|
3652 ;; Now: tail: if the second part is non-matching without ///e |
20323 | 3653 (if (eq (char-syntax (following-char)) ?w) |
3654 (progn | |
3655 (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
|
3656 (if tail (cperl-commentify tail (point) t)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3657 (cperl-postpone-fontification |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3658 e1 (point) '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
|
3659 ;; 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
|
3660 ;; and highlight differently |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3661 (setq is-REx |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3662 (and (string-match "^\\([sm]?\\|qr\\)$" argument) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3663 (or (not (= (length argument) 0)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3664 (not (eq c ?\<))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3665 (if (and is-REx |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3666 (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
|
3667 ;; 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
|
3668 (save-excursion |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3669 (condition-case nil |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3670 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3671 (goto-char tb) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3672 (forward-sexp -1) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3673 (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
|
3674 (error t)))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3675 (cperl-postpone-fontification |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3676 b e '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
|
3677 (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
|
3678 (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
|
3679 (or |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3680 (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
|
3681 (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
|
3682 (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
|
3683 (progn |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3684 (cperl-postpone-fontification |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3685 b (cperl-1+ b) 'face font-lock-constant-face) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3686 (cperl-postpone-fontification |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3687 (1- e) e 'face font-lock-constant-face))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3688 (if (and is-REx cperl-regexp-scan) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3689 ;; Process RExen better |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3690 (save-excursion |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3691 (goto-char (1+ b)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3692 (while |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3693 (and (< (point) e) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3694 (re-search-forward |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3695 (if is-x-REx |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3696 (if (eq (char-after b) ?\#) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3697 "\\((\\?\\\\#\\)\\|\\(\\\\#\\)" |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3698 "\\((\\?#\\)\\|\\(#\\)") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3699 (if (eq (char-after b) ?\#) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3700 "\\((\\?\\\\#\\)" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3701 "\\((\\?#\\)")) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3702 (1- e) 'to-end)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3703 (goto-char (match-beginning 0)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3704 (setq REx-comment-start (point) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3705 was-comment t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3706 (if (save-excursion |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3707 (and |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3708 ;; XXX not working if outside delimiter is # |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3709 (eq (preceding-char) ?\\) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3710 (= (% (skip-chars-backward "$\\\\") 2) -1))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3711 ;; Not a comment, avoid loop: |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3712 (progn (setq was-comment nil) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3713 (forward-char 1)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3714 (if (match-beginning 2) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3715 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3716 (beginning-of-line 2) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3717 (if (> (point) e) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3718 (goto-char (1- e)))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3719 ;; Works also if the outside delimiters are (). |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3720 (or (search-forward ")" (1- e) 'toend) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3721 (message |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3722 "Couldn't find end of (?#...)-comment in a REx, pos=%s" |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3723 REx-comment-start)))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3724 (if (>= (point) e) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3725 (goto-char (1- e))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3726 (if was-comment |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3727 (progn |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3728 (setq REx-comment-end (point)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3729 (cperl-commentify |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3730 REx-comment-start REx-comment-end nil) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3731 (cperl-postpone-fontification |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3732 REx-comment-start REx-comment-end |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3733 'face font-lock-comment-face)))))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3734 (if (and is-REx is-x-REx) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3735 (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
|
3736 '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
|
3737 (if i2 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3738 (progn |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3739 (cperl-postpone-fontification |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3740 (1- e1) e1 '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
|
3741 (if (assoc (char-after b) cperl-starters) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3742 (cperl-postpone-fontification |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3743 b1 (1+ b1) '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
|
3744 (if (> (point) max) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3745 (setq tmpend tb)))) |
20323 | 3746 ((match-beginning 13) ; sub with prototypes |
3747 (setq b (match-beginning 0)) | |
3748 (if (memq (char-after (1- b)) | |
3749 '(?\$ ?\@ ?\% ?\& ?\*)) | |
3750 nil | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3751 (setq state (parse-partial-sexp |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3752 state-point b nil nil state) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3753 state-point b) |
20323 | 3754 (if (or (nth 3 state) (nth 4 state)) |
3755 nil | |
3756 ;; Mark as string | |
3757 (cperl-commentify (match-beginning 13) (match-end 13) t)) | |
3758 (goto-char (match-end 0)))) | |
3759 ;; 1+6+2+1+1+2=13 extra () before this: | |
3760 ;; "\\$\\(['{]\\)" | |
3761 ((and (match-beginning 14) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3762 (eq (preceding-char) ?\')) ; $' |
20323 | 3763 (setq b (1- (point)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3764 state (parse-partial-sexp |
20323 | 3765 state-point (1- b) nil nil state) |
3766 state-point (1- b)) | |
3767 (if (nth 3 state) ; in string | |
3768 (cperl-modify-syntax-type (1- b) cperl-st-punct)) | |
3769 (goto-char (1+ b))) | |
3770 ;; 1+6+2+1+1+2=13 extra () before this: | |
3771 ;; "\\$\\(['{]\\)" | |
3772 ((match-beginning 14) ; ${ | |
3773 (setq bb (match-beginning 0)) | |
3774 (cperl-modify-syntax-type bb cperl-st-punct)) | |
3775 ;; 1+6+2+1+1+2+1=14 extra () before this: | |
3776 ;; "\\(\\<sub[ \t\n\f]+\\|[&*$@%]\\)[a-zA-Z0-9_]*'") | |
3777 ((match-beginning 15) ; old $abc'efg syntax | |
3778 (setq bb (match-end 0) | |
3779 b (match-beginning 0) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3780 state (parse-partial-sexp |
20323 | 3781 state-point b nil nil state) |
3782 state-point b) | |
3783 (if (nth 3 state) ; in string | |
3784 nil | |
3785 (put-text-property (1- bb) bb 'syntax-table cperl-st-word)) | |
3786 (goto-char bb)) | |
3787 ;; 1+6+2+1+1+2+1+1=15 extra () before this: | |
3788 ;; "__\\(END\\|DATA\\)__" | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3789 ((match-beginning 16) ; __END__, __DATA__ |
20323 | 3790 (setq bb (match-end 0) |
3791 b (match-beginning 0) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3792 state (parse-partial-sexp |
20323 | 3793 state-point b nil nil state) |
3794 state-point b) | |
3795 (if (or (nth 3 state) (nth 4 state)) | |
3796 nil | |
3797 ;; (put-text-property b (1+ bb) 'syntax-type 'pod) ; Cheat | |
3798 (cperl-commentify b bb nil) | |
3799 (setq end t)) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3800 (goto-char bb)) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3801 ((match-beginning 17) ; "\\\\\\(['`\"($]\\)" |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3802 ;; Trailing backslash ==> non-quoting outside string/comment |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3803 (setq bb (match-end 0) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3804 b (match-beginning 0)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3805 (goto-char b) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3806 (skip-chars-backward "\\\\") |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3807 ;;;(setq i2 (= (% (skip-chars-backward "\\\\") 2) -1)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
3808 (setq state (parse-partial-sexp |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3809 state-point b nil nil state) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3810 state-point b) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3811 (if (or (nth 3 state) (nth 4 state) ) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3812 nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3813 (cperl-modify-syntax-type b cperl-st-punct)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3814 (goto-char bb)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
3815 (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
|
3816 (if (> (point) stop-point) |
20323 | 3817 (progn |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3818 (if end |
20323 | 3819 (message "Garbage after __END__/__DATA__ ignored") |
3820 (message "Unbalanced syntax found while scanning") | |
3821 (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
|
3822 (goto-char stop-point)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3823 (setq cperl-syntax-state (cons state-point state) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3824 cperl-syntax-done-to (or tmpend (max (point) max)))) |
20323 | 3825 (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
|
3826 (or non-inter |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3827 (message "Scanning for \"hard\" Perl constructions... done")))) |
20323 | 3828 (and (buffer-modified-p) |
3829 (not modified) | |
3830 (set-buffer-modified-p nil)) | |
3831 (set-syntax-table cperl-mode-syntax-table)) | |
3832 (car err-l))) | |
3833 | |
3834 (defun cperl-backward-to-noncomment (lim) | |
3835 ;; Stops at lim or after non-whitespace that is not in comment | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3836 (let (stop p pr) |
20323 | 3837 (while (and (not stop) (> (point) (or lim 1))) |
3838 (skip-chars-backward " \t\n\f" lim) | |
3839 (setq p (point)) | |
3840 (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
|
3841 (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
|
3842 '(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
|
3843 (cperl-unwind-to-safe nil) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3844 (or (looking-at "^[ \t]*\\(#\\|$\\)") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3845 (progn (cperl-to-comment-or-eol) (bolp)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3846 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3847 (skip-chars-backward " \t") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3848 (if (< p (point)) (goto-char p)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3849 (setq stop t))))))) |
20323 | 3850 |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3851 (defun cperl-after-block-p (lim &optional pre-block) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3852 "Return true if the preceeding } ends a block or a following { starts one. |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3853 Would not look before LIM. If PRE-BLOCK is nil checks preceeding }. |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3854 otherwise following {." |
20323 | 3855 ;; We suppose that the preceding char is }. |
3856 (save-excursion | |
3857 (condition-case nil | |
3858 (progn | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3859 (or pre-block (forward-sexp -1)) |
20323 | 3860 (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
|
3861 (or (eq (point) lim) |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
3862 (eq (preceding-char) ?\) ) ; if () {} sub f () {} |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3863 (if (eq (char-syntax (preceding-char)) ?w) ; else {} |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3864 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3865 (forward-sexp -1) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3866 (or (looking-at "\\(else\\|continue\\|grep\\|map\\|BEGIN\\|END\\|CHECK\\|INIT\\)\\>") |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3867 ;; sub f {} |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3868 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3869 (cperl-backward-to-noncomment lim) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3870 (and (eq (char-syntax (preceding-char)) ?w) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3871 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3872 (forward-sexp -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3873 (looking-at "sub\\>")))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3874 (cperl-after-expr-p lim)))) |
20323 | 3875 (error nil)))) |
3876 | |
3877 (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
|
3878 "Return true if the position is good for start of expression. |
20323 | 3879 TEST is the expression to evaluate at the found position. If absent, |
3880 CHARS is a string that contains good characters to have before us (however, | |
3881 `}' 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
|
3882 (let ((lim (or lim (point-min))) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3883 stop p pr) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3884 (cperl-update-syntaxification (point) (point)) |
20323 | 3885 (save-excursion |
3886 (while (and (not stop) (> (point) lim)) | |
3887 (skip-chars-backward " \t\n\f" lim) | |
3888 (setq p (point)) | |
3889 (beginning-of-line) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3890 ;;(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
|
3891 ;; '(pod here-doc here-doc-delim)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3892 (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
|
3893 (progn |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3894 (goto-char |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3895 (previous-single-property-change (point) 'here-doc-group)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3896 (beginning-of-line 0))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3897 (if (get-text-property (point) 'in-pod) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3898 (progn |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3899 (goto-char |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3900 (previous-single-property-change (point) 'in-pod)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3901 (beginning-of-line 0))) |
20323 | 3902 (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
|
3903 ;; Else: last iteration, or a label |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3904 (cperl-to-comment-or-eol) ; Will not move past "." after a format |
20323 | 3905 (skip-chars-backward " \t") |
3906 (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
|
3907 (setq p (point)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3908 (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
|
3909 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3910 (forward-char -1) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3911 (skip-chars-backward " \t\n\f" lim) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3912 (eq (char-syntax (preceding-char)) ?w))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3913 (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
|
3914 (goto-char p) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3915 (setq stop t)))) |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
3916 (or (bobp) ; ???? Needed |
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
3917 (eq (point) lim) |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
3918 (looking-at "[ \t]*__\\(END\\|DATA\\)__") ; After this anything goes |
20323 | 3919 (progn |
3920 (if test (eval test) | |
3921 (or (memq (preceding-char) (append (or chars "{;") nil)) | |
3922 (and (eq (preceding-char) ?\}) | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3923 (cperl-after-block-p lim)) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3924 (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
|
3925 (eq (get-text-property (point) 'syntax-type) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
3926 'format))))))))) |
20323 | 3927 |
3928 (defun cperl-backward-to-start-of-continued-exp (lim) | |
3929 (if (memq (preceding-char) (append ")]}\"'`" nil)) | |
3930 (forward-sexp -1)) | |
3931 (beginning-of-line) | |
3932 (if (<= (point) lim) | |
3933 (goto-char (1+ lim))) | |
3934 (skip-chars-forward " \t")) | |
3935 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3936 (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
|
3937 ;; We assume that we are after ?\} |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3938 (and |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3939 (cperl-after-block-p lim) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3940 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3941 (forward-sexp -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3942 (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
|
3943 (or (bobp) |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
3944 (eq (point) lim) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3945 (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
|
3946 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3947 (forward-sexp -1) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3948 (not |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3949 (looking-at |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3950 "\\(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
|
3951 |
20323 | 3952 |
3953 (defun cperl-indent-exp () | |
3954 "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
|
3955 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3956 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
|
3957 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
|
3958 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3959 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
|
3960 conditional/loop constructs." |
20323 | 3961 (interactive) |
3962 (save-excursion | |
3963 (let ((tmp-end (progn (end-of-line) (point))) top done) | |
3964 (save-excursion | |
3965 (beginning-of-line) | |
3966 (while (null done) | |
3967 (setq top (point)) | |
3968 (while (= (nth 0 (parse-partial-sexp (point) tmp-end | |
3969 -1)) -1) | |
3970 (setq top (point))) ; Get the outermost parenths in line | |
3971 (goto-char top) | |
3972 (while (< (point) tmp-end) | |
3973 (parse-partial-sexp (point) tmp-end nil t) ; To start-sexp or eol | |
3974 (or (eolp) (forward-sexp 1))) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3975 (if (> (point) tmp-end) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3976 (save-excursion |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3977 (end-of-line) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3978 (setq tmp-end (point))) |
20323 | 3979 (setq done t))) |
3980 (goto-char tmp-end) | |
3981 (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
|
3982 (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
|
3983 (cperl-fix-line-spacing tmp-end)) |
20323 | 3984 (cperl-indent-region (point) tmp-end)))) |
3985 | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
3986 (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
|
3987 "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
|
3988 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
|
3989 (interactive) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3990 (or end |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3991 (setq end (point-max))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3992 (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
|
3993 (cperl-indent-region-fix-constructs |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3994 (or cperl-indent-region-fix-constructs 1)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
3995 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
|
3996 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
3997 (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
|
3998 (setq ret (point)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
3999 ;; }? continue |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4000 ;; blah; } |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4001 (if (not |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4002 (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
|
4003 (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
|
4004 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
|
4005 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4006 ;; } |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4007 ;; else |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4008 (if (and cperl-merge-trailing-else |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4009 (looking-at |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4010 "[ \t]*}[ \t]*\n[ \t\n]*\\(els\\(e\\|if\\)\\|continue\\)\\>")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4011 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4012 (search-forward "}") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4013 (setq p (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4014 (skip-chars-forward " \t\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4015 (delete-region p (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4016 (insert (make-string cperl-indent-region-fix-constructs ?\ )) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4017 (beginning-of-line))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4018 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4019 ;; } else |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4020 (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
|
4021 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4022 (search-forward "}") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4023 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4024 (insert (make-string cperl-indent-region-fix-constructs ?\ )) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4025 (beginning-of-line))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4026 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4027 ;; else { |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4028 (if (looking-at |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4029 "[ \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
|
4030 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4031 (forward-word 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4032 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4033 (insert (make-string cperl-indent-region-fix-constructs ?\ )) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4034 (beginning-of-line))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4035 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4036 ;; foreach my $var |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4037 (if (looking-at |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4038 "[ \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
|
4039 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4040 (forward-word 2) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4041 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4042 (insert (make-string cperl-indent-region-fix-constructs ?\ )) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4043 (beginning-of-line))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4044 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4045 ;; foreach my $var ( |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4046 (if (looking-at |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4047 "[ \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
|
4048 (progn |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
4049 (forward-sexp 3) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4050 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4051 (insert |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4052 (make-string cperl-indent-region-fix-constructs ?\ )) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4053 (beginning-of-line))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4054 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4055 ;; } foreach my $var () { |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4056 (if (looking-at |
44446
9b08deb1030e
(cperl-make-face, cperl-force-face):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43943
diff
changeset
|
4057 "[ \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
|
4058 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4059 (setq ml (match-beginning 8)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4060 (re-search-forward "[({]") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4061 (forward-char -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4062 (setq p (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4063 (if (eq (following-char) ?\( ) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4064 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4065 (forward-sexp 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4066 (setq pp (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4067 ;; after `else' or nothing |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4068 (if ml ; after `else' |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4069 (skip-chars-backward " \t\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4070 (beginning-of-line)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4071 (setq pp nil)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4072 ;; Now after the sexp before the brace |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4073 ;; Multiline expr should be special |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4074 (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
|
4075 (search-forward "\n" pp t)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4076 (if (and (or (not pp) (< pp end)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4077 (looking-at "[ \t\n]*{")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4078 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4079 (cond |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4080 ((bolp) ; Were before `{', no if/else/etc |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4081 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4082 ((looking-at "\\(\t*\\| [ \t]+\\){") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4083 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4084 (if (if ml |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4085 cperl-extra-newline-before-brace-multiline |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4086 cperl-extra-newline-before-brace) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4087 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4088 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4089 (insert "\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4090 (setq ret (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4091 (if (cperl-indent-line parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4092 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4093 (cperl-fix-line-spacing end parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4094 (setq ret (point))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4095 (insert |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4096 (make-string cperl-indent-region-fix-constructs ?\ )))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4097 ((and (looking-at "[ \t]*\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4098 (not (if ml |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4099 cperl-extra-newline-before-brace-multiline |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4100 cperl-extra-newline-before-brace))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4101 (setq pp (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4102 (skip-chars-forward " \t\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4103 (delete-region pp (point)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4104 (insert |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4105 (make-string cperl-indent-region-fix-constructs ?\ )))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4106 ;; Now we are before `{' |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4107 (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
|
4108 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4109 (skip-chars-forward " \t\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4110 (setq pp (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4111 (forward-sexp 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4112 (setq p (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4113 (goto-char pp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4114 (setq ml (search-forward "\n" p t)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4115 (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
|
4116 ;; not good: multi-line BLOCK |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4117 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4118 (goto-char (1+ pp)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4119 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4120 (insert "\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4121 (setq ret (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4122 (if (cperl-indent-line parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4123 (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
|
4124 (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4125 (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
|
4126 ;; Now check whether there is a hanging `}' |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4127 ;; Looking at: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4128 ;; } blah |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4129 (if (and |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4130 cperl-fix-hanging-brace-when-indent |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4131 have-brace |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4132 (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
|
4133 (condition-case nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4134 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4135 (up-list 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4136 (if (and (<= (point) pp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4137 (eq (preceding-char) ?\} ) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4138 (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
|
4139 t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4140 (goto-char p) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4141 nil)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4142 (error nil))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4143 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4144 (forward-char -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4145 (skip-chars-backward " \t") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4146 (if (bolp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4147 ;; `}' 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
|
4148 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4149 (cperl-indent-line parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4150 (search-forward "}") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4151 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4152 (insert "\n")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4153 (delete-horizontal-space) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4154 (or (eq (preceding-char) ?\;) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4155 (bolp) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4156 (and (eq (preceding-char) ?\} ) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4157 (cperl-after-block-p (point-min))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4158 (insert ";")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4159 (insert "\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4160 (setq ret (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4161 (if (cperl-indent-line parse-data) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4162 (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
|
4163 (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
|
4164 ret)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4165 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4166 (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
|
4167 (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
|
4168 (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
|
4169 (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
|
4170 (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
|
4171 |
20323 | 4172 (defun cperl-indent-region (start end) |
4173 "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
|
4174 Should be slow. Will not indent comment if it starts at `comment-indent' |
20323 | 4175 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
|
4176 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
|
4177 inclusive. |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4178 |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4179 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
|
4180 conditional/loop constructs." |
20323 | 4181 (interactive "r") |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4182 (cperl-update-syntaxification end end) |
20323 | 4183 (save-excursion |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4184 (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
|
4185 (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
|
4186 (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
|
4187 nil)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4188 (pm 0) (imenu-scanning-message "Indenting... (%3d%%)") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4189 after-change-functions ; Speed it up! |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4190 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
|
4191 (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
|
4192 (goto-char start) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4193 (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
|
4194 (current-column)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4195 new-comm-indent old-comm-indent) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4196 (goto-char start) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4197 (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
|
4198 (or (bolp) (beginning-of-line 2)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4199 (or (fboundp 'imenu-progress-message) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4200 (message "Indenting... For feedback load `imenu'...")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4201 (while (and (<= (point) end) (not (eobp))) ; bol to check start |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4202 (and (fboundp 'imenu-progress-message) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4203 (imenu-progress-message |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4204 pm (/ (* 100 (- (point) start)) (- end start -1)))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4205 (setq st (point)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4206 (if (or |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4207 (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
|
4208 (and (setq comm (looking-at "[ \t]*#")) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4209 (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
|
4210 comment-column)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4211 (setq old-comm-indent nil)))) |
20323 | 4212 (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
|
4213 (not empty) |
20323 | 4214 (= (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
|
4215 (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
|
4216 (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
|
4217 cperl-st-cfence))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4218 (let ((comment-column new-comm-indent)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4219 (indent-for-comment))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4220 (progn |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4221 (setq i (cperl-indent-line indent-info)) |
20323 | 4222 (or comm |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4223 (not i) |
20323 | 4224 (progn |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4225 (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
|
4226 (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
|
4227 (if (setq old-comm-indent |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4228 (and (cperl-to-comment-or-eol) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4229 (not (memq (get-text-property (point) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4230 'syntax-type) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4231 '(pod here-doc))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4232 (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
|
4233 'syntax-table) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4234 cperl-st-cfence)) |
20323 | 4235 (current-column))) |
4236 (progn (indent-for-comment) | |
4237 (skip-chars-backward " \t") | |
4238 (skip-chars-backward "#") | |
4239 (setq new-comm-indent (current-column)))))))) | |
4240 (beginning-of-line 2)) | |
4241 (if (fboundp 'imenu-progress-message) | |
4242 (imenu-progress-message pm 100) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4243 (message nil))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4244 ;; Now run the update hooks |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4245 (and after-change-functions |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4246 cperl-update-end |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4247 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4248 (goto-char cperl-update-end) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4249 (insert " ") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4250 (delete-char -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4251 (goto-char cperl-update-start) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4252 (insert " ") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4253 (delete-char -1)))))) |
20323 | 4254 |
4255 ;; Stolen from lisp-mode with a lot of improvements | |
4256 | |
4257 (defun cperl-fill-paragraph (&optional justify iteration) | |
4258 "Like \\[fill-paragraph], but handle CPerl comments. | |
4259 If any of the current line is a comment, fill the comment or the | |
4260 block of it that point is in, preserving the comment's initial | |
4261 indentation and initial hashes. Behaves usually outside of comment." | |
4262 (interactive "P") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4263 (let (;; Non-nil if the current line contains a comment. |
20323 | 4264 has-comment |
4265 | |
4266 ;; If has-comment, the appropriate fill-prefix for the comment. | |
4267 comment-fill-prefix | |
4268 ;; Line that contains code and comment (or nil) | |
4269 start | |
4270 c spaces len dc (comment-column comment-column)) | |
4271 ;; Figure out what kind of comment we are looking at. | |
4272 (save-excursion | |
4273 (beginning-of-line) | |
4274 (cond | |
4275 | |
4276 ;; A line with nothing but a comment on it? | |
4277 ((looking-at "[ \t]*#[# \t]*") | |
4278 (setq has-comment t | |
4279 comment-fill-prefix (buffer-substring (match-beginning 0) | |
4280 (match-end 0)))) | |
4281 | |
4282 ;; A line with some code, followed by a comment? Remember that the | |
4283 ;; semi which starts the comment shouldn't be part of a string or | |
4284 ;; character. | |
4285 ((cperl-to-comment-or-eol) | |
4286 (setq has-comment t) | |
4287 (looking-at "#+[ \t]*") | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4288 (setq start (point) c (current-column) |
20323 | 4289 comment-fill-prefix |
4290 (concat (make-string (current-column) ?\ ) | |
4291 (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
|
4292 spaces (progn (skip-chars-backward " \t") |
20323 | 4293 (buffer-substring (point) start)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4294 dc (- c (current-column)) len (- start (point)) |
20323 | 4295 start (point-marker)) |
4296 (delete-char len) | |
4297 (insert (make-string dc ?-))))) | |
4298 (if (not has-comment) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4299 (fill-paragraph justify) ; Do the usual thing outside of comment |
20323 | 4300 ;; Narrow to include only the comment, and then fill the region. |
4301 (save-restriction | |
4302 (narrow-to-region | |
4303 ;; Find the first line we should include in the region to fill. | |
4304 (if start (progn (beginning-of-line) (point)) | |
4305 (save-excursion | |
4306 (while (and (zerop (forward-line -1)) | |
4307 (looking-at "^[ \t]*#+[ \t]*[^ \t\n#]"))) | |
4308 ;; We may have gone to far. Go forward again. | |
4309 (or (looking-at "^[ \t]*#+[ \t]*[^ \t\n#]") | |
4310 (forward-line 1)) | |
4311 (point))) | |
4312 ;; Find the beginning of the first line past the region to fill. | |
4313 (save-excursion | |
4314 (while (progn (forward-line 1) | |
4315 (looking-at "^[ \t]*#+[ \t]*[^ \t\n#]"))) | |
4316 (point))) | |
4317 ;; Remove existing hashes | |
4318 (goto-char (point-min)) | |
4319 (while (progn (forward-line 1) (< (point) (point-max))) | |
4320 (skip-chars-forward " \t") | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4321 (and (looking-at "#+") |
20323 | 4322 (delete-char (- (match-end 0) (match-beginning 0))))) |
4323 | |
4324 ;; Lines with only hashes on them can be paragraph boundaries. | |
4325 (let ((paragraph-start (concat paragraph-start "\\|^[ \t#]*$")) | |
4326 (paragraph-separate (concat paragraph-start "\\|^[ \t#]*$")) | |
4327 (fill-prefix comment-fill-prefix)) | |
4328 (fill-paragraph justify))) | |
4329 (if (and start) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4330 (progn |
20323 | 4331 (goto-char start) |
4332 (if (> dc 0) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4333 (progn (delete-char dc) (insert spaces))) |
20323 | 4334 (if (or (= (current-column) c) iteration) nil |
4335 (setq comment-column c) | |
4336 (indent-for-comment) | |
4337 ;; Repeat once more, flagging as iteration | |
4338 (cperl-fill-paragraph justify t))))))) | |
4339 | |
4340 (defun cperl-do-auto-fill () | |
4341 ;; Break out if the line is short enough | |
4342 (if (> (save-excursion | |
4343 (end-of-line) | |
4344 (current-column)) | |
4345 fill-column) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4346 (let ((c (save-excursion (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4347 (cperl-to-comment-or-eol) (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4348 (s (memq (following-char) '(?\ ?\t))) marker) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4349 (if (>= c (point)) nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4350 (setq marker (point-marker)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4351 (cperl-fill-paragraph) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4352 (goto-char marker) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4353 ;; 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
|
4354 (if (bolp) (progn (re-search-forward "#+[ \t]*") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4355 (goto-char (match-end 0)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4356 ;; Following space could have gone: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4357 (if (or (not s) (memq (following-char) '(?\ ?\t))) nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4358 (insert " ") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4359 (backward-char 1)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4360 ;; Previous space could have gone: |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4361 (or (memq (preceding-char) '(?\ ?\t)) (insert " ")))))) |
20323 | 4362 |
4363 (defun cperl-imenu-addback (lst &optional isback name) | |
4364 ;; We suppose that the lst is a DAG, unless the first element only | |
4365 ;; loops back, and ISBACK is set. Thus this function cannot be | |
4366 ;; applied twice without ISBACK set. | |
4367 (cond ((not cperl-imenu-addback) lst) | |
4368 (t | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4369 (or name |
20323 | 4370 (setq name "+++BACK+++")) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4371 (mapcar (lambda (elt) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4372 (if (and (listp elt) (listp (cdr elt))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4373 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4374 ;; In the other order it goes up |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4375 ;; one level only ;-( |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4376 (setcdr elt (cons (cons name lst) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4377 (cdr elt))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4378 (cperl-imenu-addback (cdr elt) t name)))) |
20323 | 4379 (if isback (cdr lst) lst)) |
4380 lst))) | |
4381 | |
31821 | 4382 (defun cperl-imenu--create-perl-index (&optional regexp) |
20323 | 4383 (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
|
4384 (let ((index-alist '()) (index-pack-alist '()) (index-pod-alist '()) |
20323 | 4385 (index-unsorted-alist '()) (i-s-f (default-value 'imenu-sort-function)) |
4386 (index-meth-alist '()) meth | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4387 packages ends-ranges p marker |
20323 | 4388 (prev-pos 0) char fchar index index1 name (end-range 0) package) |
4389 (goto-char (point-min)) | |
4390 (if noninteractive | |
4391 (message "Scanning Perl for index") | |
4392 (imenu-progress-message prev-pos 0)) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4393 (cperl-update-syntaxification (point-max) (point-max)) |
20323 | 4394 ;; Search for the function |
4395 (progn ;;save-match-data | |
4396 (while (re-search-forward | |
31821 | 4397 (or regexp cperl-imenu--function-name-regexp-perl) |
20323 | 4398 nil t) |
4399 (or noninteractive | |
4400 (imenu-progress-message prev-pos)) | |
4401 (cond | |
4402 ((and ; Skip some noise if building tags | |
4403 (match-beginning 2) ; package or sub | |
4404 (eq (char-after (match-beginning 2)) ?p) ; package | |
4405 (not (save-match-data | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4406 (looking-at "[ \t\n]*;")))) ; Plain text word 'package' |
20323 | 4407 nil) |
4408 ((and | |
4409 (match-beginning 2) ; package or sub | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4410 ;; Skip if quoted (will not skip multi-line ''-strings :-(): |
20323 | 4411 (null (get-text-property (match-beginning 1) 'syntax-table)) |
4412 (null (get-text-property (match-beginning 1) 'syntax-type)) | |
4413 (null (get-text-property (match-beginning 1) 'in-pod))) | |
4414 (save-excursion | |
4415 (goto-char (match-beginning 2)) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4416 (setq fchar (following-char))) |
20323 | 4417 ;; (if (looking-at "([^()]*)[ \t\n\f]*") |
4418 ;; (goto-char (match-end 0))) ; Messes what follows | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4419 (setq char (following-char) ; ?\; for "sub foo () ;" |
20323 | 4420 meth nil |
4421 p (point)) | |
4422 (while (and ends-ranges (>= p (car ends-ranges))) | |
4423 ;; delete obsolete entries | |
4424 (setq ends-ranges (cdr ends-ranges) packages (cdr packages))) | |
4425 (setq package (or (car packages) "") | |
4426 end-range (or (car ends-ranges) 0)) | |
4427 (if (eq fchar ?p) | |
4428 (setq name (buffer-substring (match-beginning 3) (match-end 3)) | |
4429 name (progn | |
4430 (set-text-properties 0 (length name) nil name) | |
4431 name) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4432 package (concat name "::") |
20323 | 4433 name (concat "package " name) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4434 end-range |
20323 | 4435 (save-excursion |
4436 (parse-partial-sexp (point) (point-max) -1) (point)) | |
4437 ends-ranges (cons end-range ends-ranges) | |
4438 packages (cons package packages))) | |
4439 ;; ) | |
4440 ;; Skip this function name if it is a prototype declaration. | |
4441 (if (and (eq fchar ?s) (eq char ?\;)) nil | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4442 (setq name (buffer-substring (match-beginning 3) (match-end 3)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4443 marker (make-marker)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4444 (set-text-properties 0 (length name) nil name) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4445 (set-marker marker (match-end 3)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4446 (if (eq fchar ?p) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4447 (setq name (concat "package " name)) |
20323 | 4448 (cond ((string-match "[:']" name) |
4449 (setq meth t)) | |
4450 ((> p end-range) nil) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4451 (t |
20323 | 4452 (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
|
4453 (setq index (cons name marker)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4454 (if (eq fchar ?p) |
20323 | 4455 (push index index-pack-alist) |
4456 (push index index-alist)) | |
4457 (if meth (push index index-meth-alist)) | |
4458 (push index index-unsorted-alist))) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4459 ((match-beginning 5) ; POD section |
20323 | 4460 ;; (beginning-of-line) |
4461 (setq index (imenu-example--name-and-position) | |
4462 name (buffer-substring (match-beginning 6) (match-end 6))) | |
4463 (set-text-properties 0 (length name) nil name) | |
4464 (if (eq (char-after (match-beginning 5)) ?2) | |
4465 (setq name (concat " " name))) | |
4466 (setcar index name) | |
4467 (setq index1 (cons (concat "=" name) (cdr index))) | |
4468 (push index index-pod-alist) | |
4469 (push index1 index-unsorted-alist))))) | |
4470 (or noninteractive | |
4471 (imenu-progress-message prev-pos 100)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4472 (setq index-alist |
20323 | 4473 (if (default-value 'imenu-sort-function) |
4474 (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
|
4475 (nreverse index-alist))) |
20323 | 4476 (and index-pod-alist |
4477 (push (cons "+POD headers+..." | |
4478 (nreverse index-pod-alist)) | |
4479 index-alist)) | |
4480 (and (or index-pack-alist index-meth-alist) | |
4481 (let ((lst index-pack-alist) hier-list pack elt group name) | |
4482 ;; Remove "package ", reverse and uniquify. | |
4483 (while lst | |
4484 (setq elt (car lst) lst (cdr lst) name (substring (car elt) 8)) | |
4485 (if (assoc name hier-list) nil | |
4486 (setq hier-list (cons (cons name (cdr elt)) hier-list)))) | |
4487 (setq lst index-meth-alist) | |
4488 (while lst | |
4489 (setq elt (car lst) lst (cdr lst)) | |
4490 (cond ((string-match "\\(::\\|'\\)[_a-zA-Z0-9]+$" (car elt)) | |
4491 (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
|
4492 (if (setq group (assoc pack hier-list)) |
20323 | 4493 (if (listp (cdr group)) |
4494 ;; Have some functions already | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4495 (setcdr group |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4496 (cons (cons (substring |
20323 | 4497 (car elt) |
4498 (+ 2 (match-beginning 0))) | |
4499 (cdr elt)) | |
4500 (cdr group))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4501 (setcdr group (list (cons (substring |
20323 | 4502 (car elt) |
4503 (+ 2 (match-beginning 0))) | |
4504 (cdr elt))))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4505 (setq hier-list |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4506 (cons (cons pack |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4507 (list (cons (substring |
20323 | 4508 (car elt) |
4509 (+ 2 (match-beginning 0))) | |
4510 (cdr elt)))) | |
4511 hier-list)))))) | |
4512 (push (cons "+Hierarchy+..." | |
4513 hier-list) | |
4514 index-alist))) | |
4515 (and index-pack-alist | |
4516 (push (cons "+Packages+..." | |
4517 (nreverse index-pack-alist)) | |
4518 index-alist)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4519 (and (or index-pack-alist index-pod-alist |
20323 | 4520 (default-value 'imenu-sort-function)) |
4521 index-unsorted-alist | |
4522 (push (cons "+Unsorted List+..." | |
4523 (nreverse index-unsorted-alist)) | |
4524 index-alist)) | |
4525 (cperl-imenu-addback index-alist))) | |
4526 | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4527 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4528 ;; Suggested by Mark A. Hershberger |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4529 (defun cperl-outline-level () |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4530 (looking-at outline-regexp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4531 (cond ((not (match-beginning 1)) 0) ; beginning-of-file |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4532 ((match-beginning 2) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4533 (if (eq (char-after (match-beginning 2)) ?p) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4534 0 ; package |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4535 1)) ; sub |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4536 ((match-beginning 5) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4537 (if (eq (char-after (match-beginning 5)) ?1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4538 1 ; head1 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4539 2)) ; head2 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4540 (t 3))) ; should not happen |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4541 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4542 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4543 (defvar cperl-compilation-error-regexp-alist |
20323 | 4544 ;; This look like a paranoiac regexp: could anybody find a better one? (which WORK). |
4545 '(("^[^\n]* \\(file\\|at\\) \\([^ \t\n]+\\) [^\n]*line \\([0-9]+\\)[\\., \n]" | |
4546 2 3)) | |
4547 "Alist that specifies how to match errors in perl output.") | |
4548 | |
4549 (if (fboundp 'eval-after-load) | |
4550 (eval-after-load | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4551 "mode-compile" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4552 '(setq perl-compilation-error-regexp-alist |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4553 cperl-compilation-error-regexp-alist))) |
20323 | 4554 |
4555 | |
4556 (defun cperl-windowed-init () | |
4557 "Initialization under windowed version." | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4558 (if (or (featurep 'ps-print) cperl-faces-init) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4559 ;; Need to init anyway: |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4560 (or cperl-faces-init (cperl-init-faces)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4561 (add-hook 'font-lock-mode-hook |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4562 (function |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4563 (lambda () |
36602
4bcc2745d610
(cperl-msb-fix, cperl-get-help-defer):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36601
diff
changeset
|
4564 (if (memq major-mode '(perl-mode cperl-mode)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4565 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4566 (or cperl-faces-init (cperl-init-faces))))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4567 (if (fboundp 'eval-after-load) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4568 (eval-after-load |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4569 "ps-print" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4570 '(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
|
4571 |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
4572 (defvar cperl-font-lock-keywords-1 nil |
31821 | 4573 "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
|
4574 (defvar cperl-font-lock-keywords nil |
31821 | 4575 "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
|
4576 (defvar cperl-font-lock-keywords-2 nil |
31821 | 4577 "Additional expressions to highlight in Perl mode. Maximal set") |
4578 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4579 (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
|
4580 (or cperl-faces-init (cperl-init-faces)) |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
4581 cperl-font-lock-keywords) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4582 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4583 (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
|
4584 (or cperl-faces-init (cperl-init-faces)) |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
4585 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
|
4586 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
4587 (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
|
4588 (or cperl-faces-init (cperl-init-faces)) |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
4589 cperl-font-lock-keywords-2) |
20323 | 4590 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4591 (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
|
4592 ;; 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
|
4593 (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
|
4594 (cperl-force-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
|
4595 "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
|
4596 ;;(setq 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
|
4597 )) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4598 |
20323 | 4599 (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
|
4600 (condition-case errs |
20323 | 4601 (progn |
4602 (require 'font-lock) | |
4603 (and (fboundp 'font-lock-fontify-anchored-keywords) | |
4604 (featurep 'font-lock-extra) | |
4605 (message "You have an obsolete package `font-lock-extra'. Install `choose-color'.")) | |
4606 (let (t-font-lock-keywords t-font-lock-keywords-1 font-lock-anchored) | |
4607 (if (fboundp 'font-lock-fontify-anchored-keywords) | |
4608 (setq font-lock-anchored t)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4609 (setq |
20323 | 4610 t-font-lock-keywords |
4611 (list | |
35013
587807c5e8e6
(cperl-invalid-face): Don't double-quote
Dave Love <fx@gnu.org>
parents:
32880
diff
changeset
|
4612 `("[ \t]+$" 0 ',cperl-invalid-face t) |
20323 | 4613 (cons |
4614 (concat | |
4615 "\\(^\\|[^$@%&\\]\\)\\<\\(" | |
4616 (mapconcat | |
4617 'identity | |
4618 '("if" "until" "while" "elsif" "else" "unless" "for" | |
4619 "foreach" "continue" "exit" "die" "last" "goto" "next" | |
4620 "redo" "return" "local" "exec" "sub" "do" "dump" "use" | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4621 "require" "package" "eval" "my" "BEGIN" "END" "CHECK" "INIT") |
20323 | 4622 "\\|") ; Flow control |
4623 "\\)\\>") 2) ; was "\\)[ \n\t;():,\|&]" | |
4624 ; In what follows we use `type' style | |
4625 ; for overwritable builtins | |
4626 (list | |
4627 (concat | |
4628 "\\(^\\|[^$@%&\\]\\)\\<\\(" | |
4629 ;; "CORE" "__FILE__" "__LINE__" "abs" "accept" "alarm" | |
4630 ;; "and" "atan2" "bind" "binmode" "bless" "caller" | |
4631 ;; "chdir" "chmod" "chown" "chr" "chroot" "close" | |
4632 ;; "closedir" "cmp" "connect" "continue" "cos" "crypt" | |
4633 ;; "dbmclose" "dbmopen" "die" "dump" "endgrent" | |
4634 ;; "endhostent" "endnetent" "endprotoent" "endpwent" | |
4635 ;; "endservent" "eof" "eq" "exec" "exit" "exp" "fcntl" | |
4636 ;; "fileno" "flock" "fork" "formline" "ge" "getc" | |
4637 ;; "getgrent" "getgrgid" "getgrnam" "gethostbyaddr" | |
4638 ;; "gethostbyname" "gethostent" "getlogin" | |
4639 ;; "getnetbyaddr" "getnetbyname" "getnetent" | |
4640 ;; "getpeername" "getpgrp" "getppid" "getpriority" | |
4641 ;; "getprotobyname" "getprotobynumber" "getprotoent" | |
4642 ;; "getpwent" "getpwnam" "getpwuid" "getservbyname" | |
4643 ;; "getservbyport" "getservent" "getsockname" | |
4644 ;; "getsockopt" "glob" "gmtime" "gt" "hex" "index" "int" | |
4645 ;; "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
|
4646 ;; "link" "listen" "localtime" "lock" "log" "lstat" "lt" |
20323 | 4647 ;; "mkdir" "msgctl" "msgget" "msgrcv" "msgsnd" "ne" |
4648 ;; "not" "oct" "open" "opendir" "or" "ord" "pack" "pipe" | |
4649 ;; "quotemeta" "rand" "read" "readdir" "readline" | |
4650 ;; "readlink" "readpipe" "recv" "ref" "rename" "require" | |
4651 ;; "reset" "reverse" "rewinddir" "rindex" "rmdir" "seek" | |
4652 ;; "seekdir" "select" "semctl" "semget" "semop" "send" | |
4653 ;; "setgrent" "sethostent" "setnetent" "setpgrp" | |
4654 ;; "setpriority" "setprotoent" "setpwent" "setservent" | |
4655 ;; "setsockopt" "shmctl" "shmget" "shmread" "shmwrite" | |
4656 ;; "shutdown" "sin" "sleep" "socket" "socketpair" | |
4657 ;; "sprintf" "sqrt" "srand" "stat" "substr" "symlink" | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4658 ;; "syscall" "sysopen" "sysread" "system" "syswrite" "tell" |
20323 | 4659 ;; "telldir" "time" "times" "truncate" "uc" "ucfirst" |
4660 ;; "umask" "unlink" "unpack" "utime" "values" "vec" | |
4661 ;; "wait" "waitpid" "wantarray" "warn" "write" "x" "xor" | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4662 "a\\(bs\\|ccept\\|tan2\\|larm\\|nd\\)\\|" |
20323 | 4663 "b\\(in\\(d\\|mode\\)\\|less\\)\\|" |
4664 "c\\(h\\(r\\(\\|oot\\)\\|dir\\|mod\\|own\\)\\|aller\\|rypt\\|" | |
4665 "lose\\(\\|dir\\)\\|mp\\|o\\(s\\|n\\(tinue\\|nect\\)\\)\\)\\|" | |
4666 "CORE\\|d\\(ie\\|bm\\(close\\|open\\)\\|ump\\)\\|" | |
4667 "e\\(x\\(p\\|it\\|ec\\)\\|q\\|nd\\(p\\(rotoent\\|went\\)\\|" | |
4668 "hostent\\|servent\\|netent\\|grent\\)\\|of\\)\\|" | |
4669 "f\\(ileno\\|cntl\\|lock\\|or\\(k\\|mline\\)\\)\\|" | |
4670 "g\\(t\\|lob\\|mtime\\|e\\(\\|t\\(p\\(pid\\|r\\(iority\\|" | |
4671 "oto\\(byn\\(ame\\|umber\\)\\|ent\\)\\)\\|eername\\|w" | |
4672 "\\(uid\\|ent\\|nam\\)\\|grp\\)\\|host\\(by\\(addr\\|name\\)\\|" | |
4673 "ent\\)\\|s\\(erv\\(by\\(port\\|name\\)\\|ent\\)\\|" | |
4674 "ock\\(name\\|opt\\)\\)\\|c\\|login\\|net\\(by\\(addr\\|name\\)\\|" | |
4675 "ent\\)\\|gr\\(ent\\|nam\\|gid\\)\\)\\)\\)\\|" | |
4676 "hex\\|i\\(n\\(t\\|dex\\)\\|octl\\)\\|join\\|kill\\|" | |
4677 "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
|
4678 "\\(\\|ngth\\)\\|o\\(c\\(altime\\|k\\)\\|g\\)\\)\\|m\\(sg\\(rcv\\|snd\\|" |
20323 | 4679 "ctl\\|get\\)\\|kdir\\)\\|n\\(e\\|ot\\)\\|o\\(pen\\(\\|dir\\)\\|" |
4680 "r\\(\\|d\\)\\|ct\\)\\|p\\(ipe\\|ack\\)\\|quotemeta\\|" | |
4681 "r\\(index\\|and\\|mdir\\|e\\(quire\\|ad\\(pipe\\|\\|lin" | |
4682 "\\(k\\|e\\)\\|dir\\)\\|set\\|cv\\|verse\\|f\\|winddir\\|name" | |
4683 "\\)\\)\\|s\\(printf\\|qrt\\|rand\\|tat\\|ubstr\\|e\\(t\\(p\\(r" | |
4684 "\\(iority\\|otoent\\)\\|went\\|grp\\)\\|hostent\\|s\\(ervent\\|" | |
4685 "ockopt\\)\\|netent\\|grent\\)\\|ek\\(\\|dir\\)\\|lect\\|" | |
4686 "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
|
4687 "write\\|get\\)\\)\\|y\\(s\\(read\\|call\\|open\\|tem\\|write\\)\\|" |
20323 | 4688 "mlink\\)\\|in\\|leep\\|ocket\\(pair\\|\\)\\)\\|t\\(runcate\\|" |
4689 "ell\\(\\|dir\\)\\|ime\\(\\|s\\)\\)\\|u\\(c\\(\\|first\\)\\|" | |
4690 "time\\|mask\\|n\\(pack\\|link\\)\\)\\|v\\(alues\\|ec\\)\\|" | |
4691 "w\\(a\\(rn\\|it\\(pid\\|\\)\\|ntarray\\)\\|rite\\)\\|" | |
4692 "x\\(\\|or\\)\\|__\\(FILE__\\|LINE__\\|PACKAGE__\\)" | |
4693 "\\)\\>") 2 'font-lock-type-face) | |
4694 ;; In what follows we use `other' style | |
4695 ;; for nonoverwritable builtins | |
4696 ;; Somehow 's', 'm' are not auto-generated??? | |
4697 (list | |
4698 (concat | |
4699 "\\(^\\|[^$@%&\\]\\)\\<\\(" | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4700 ;; "AUTOLOAD" "BEGIN" "CHECK" "DESTROY" "END" "INIT" "__END__" "chomp" |
20323 | 4701 ;; "chop" "defined" "delete" "do" "each" "else" "elsif" |
4702 ;; "eval" "exists" "for" "foreach" "format" "goto" | |
4703 ;; "grep" "if" "keys" "last" "local" "map" "my" "next" | |
4704 ;; "no" "package" "pop" "pos" "print" "printf" "push" | |
4705 ;; "q" "qq" "qw" "qx" "redo" "return" "scalar" "shift" | |
4706 ;; "sort" "splice" "split" "study" "sub" "tie" "tr" | |
4707 ;; "undef" "unless" "unshift" "untie" "until" "use" | |
4708 ;; "while" "y" | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4709 "AUTOLOAD\\|BEGIN\\|CHECK\\|cho\\(p\\|mp\\)\\|d\\(e\\(fined\\|lete\\)\\|" |
20323 | 4710 "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
|
4711 "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
|
4712 "l\\(ast\\|ocal\\)\\|m\\(ap\\|y\\)\\|n\\(ext\\|o\\)\\|our\\|" |
20323 | 4713 "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
|
4714 "q\\(\\|q\\|w\\|x\\|r\\)\\|re\\(turn\\|do\\)\\|s\\(pli\\(ce\\|t\\)\\|" |
20323 | 4715 "calar\\|tudy\\|ub\\|hift\\|ort\\)\\|t\\(r\\|ie\\)\\|" |
4716 "u\\(se\\|n\\(shift\\|ti\\(l\\|e\\)\\|def\\|less\\)\\)\\|" | |
4717 "while\\|y\\|__\\(END\\|DATA\\)__" ;__DATA__ added manually | |
4718 "\\|[sm]" ; Added manually | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4719 "\\)\\>") 2 'cperl-nonoverridable-face) |
20323 | 4720 ;; (mapconcat 'identity |
4721 ;; '("#endif" "#else" "#ifdef" "#ifndef" "#if" | |
4722 ;; "#include" "#define" "#undef") | |
4723 ;; "\\|") | |
4724 '("-[rwxoRWXOezsfdlpSbctugkTBMAC]\\>\\([ \t]+_\\>\\)?" 0 | |
4725 font-lock-function-name-face keep) ; Not very good, triggers at "[a-z]" | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4726 '("\\<sub[ \t]+\\([^ \t{;()]+\\)[ \t]*\\(([^()]*)[ \t]*\\)?[#{\n]" 1 |
20323 | 4727 font-lock-function-name-face) |
4728 '("\\<\\(package\\|require\\|use\\|import\\|no\\|bootstrap\\)[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t;]" ; require A if B; | |
4729 2 font-lock-function-name-face) | |
4730 '("^[ \t]*format[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t]*=[ \t]*$" | |
4731 1 font-lock-function-name-face) | |
4732 (cond ((featurep 'font-lock-extra) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4733 '("\\([]}\\\\%@>*&]\\|\\$[a-zA-Z0-9_:]*\\)[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" |
20323 | 4734 (2 font-lock-string-face t) |
4735 (0 '(restart 2 t)))) ; To highlight $a{bc}{ef} | |
4736 (font-lock-anchored | |
4737 '("\\([]}\\\\%@>*&]\\|\\$[a-zA-Z0-9_:]*\\)[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" | |
4738 (2 font-lock-string-face t) | |
4739 ("\\=[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" | |
4740 nil nil | |
4741 (1 font-lock-string-face t)))) | |
4742 (t '("\\([]}\\\\%@>*&]\\|\\$[a-zA-Z0-9_:]*\\)[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" | |
4743 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
|
4744 '("[\[ \t{,(]\\(-?[a-zA-Z0-9_:]+\\)[ \t]*=>" 1 |
20323 | 4745 font-lock-string-face t) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4746 '("^[ \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
|
4747 font-lock-constant-face) ; labels |
20323 | 4748 '("\\<\\(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
|
4749 2 font-lock-constant-face) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4750 ;; Uncomment to get perl-mode-like vars |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4751 ;;; '("[$*]{?\\(\\sw+\\)" 1 font-lock-variable-name-face) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4752 ;;; '("\\([@%]\\|\\$#\\)\\(\\sw+\\)" |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4753 ;;; (2 (cons font-lock-variable-name-face '(underline)))) |
20323 | 4754 (cond ((featurep 'font-lock-extra) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4755 '("^[ \t]*\\(my\\|local\\|our\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)\\([ \t]*,\\)?" |
20323 | 4756 (3 font-lock-variable-name-face) |
4757 (4 '(another 4 nil | |
4758 ("\\=[ \t]*,[ \t]*\\([$@%*][a-zA-Z0-9_:]+\\)\\([ \t]*,\\)?" | |
4759 (1 font-lock-variable-name-face) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4760 (2 '(restart 2 nil) nil t))) |
20323 | 4761 nil t))) ; local variables, multiple |
4762 (font-lock-anchored | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4763 '("^[ \t{}]*\\(my\\|local\\|our\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)" |
20323 | 4764 (3 font-lock-variable-name-face) |
4765 ("\\=[ \t]*,[ \t]*\\([$@%*][a-zA-Z0-9_:]+\\)" | |
4766 nil nil | |
4767 (1 font-lock-variable-name-face)))) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4768 (t '("^[ \t{}]*\\(my\\|local\\our\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)" |
20323 | 4769 3 font-lock-variable-name-face))) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4770 '("\\<for\\(each\\)?\\([ \t]+\\(my\\|local\\|our\\)\\)?[ \t]*\\(\\$[a-zA-Z_][a-zA-Z_0-9]*\\)[ \t]*(" |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4771 4 font-lock-variable-name-face))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4772 (setq |
20323 | 4773 t-font-lock-keywords-1 |
4774 (and (fboundp 'turn-on-font-lock) ; Check for newer font-lock | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4775 (not cperl-xemacs-p) ; not yet as of XEmacs 19.12 |
20323 | 4776 '( |
4777 ("\\(\\([@%]\\|\$#\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)" 1 | |
4778 (if (eq (char-after (match-beginning 2)) ?%) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4779 cperl-hash-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4780 cperl-array-face) |
20323 | 4781 t) ; arrays and hashes |
4782 ("\\(\\([$@]+\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)[ \t]*\\([[{]\\)" | |
4783 1 | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4784 (if (= (- (match-end 2) (match-beginning 2)) 1) |
20323 | 4785 (if (eq (char-after (match-beginning 3)) ?{) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4786 cperl-hash-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4787 cperl-array-face) ; arrays and hashes |
20323 | 4788 font-lock-variable-name-face) ; Just to put something |
4789 t) | |
4790 ;;("\\([smy]\\|tr\\)\\([^a-z_A-Z0-9]\\)\\(\\([^\n\\]*||\\)\\)\\2") | |
4791 ;;; 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
|
4792 ;;("\\(\\<\\([msy]\\|tr\\)[ \t]*\\([^ \t\na-zA-Z0-9_]\\)\\|\\(/\\)\\)" |
20323 | 4793 ;;(3 font-lock-function-name-face t t) |
4794 ;;(4 | |
4795 ;; (if (cperl-slash-is-regexp) | |
4796 ;; font-lock-function-name-face 'default) nil t)) | |
4797 ))) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4798 (if cperl-highlight-variables-indiscriminately |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4799 (setq t-font-lock-keywords-1 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4800 (append t-font-lock-keywords-1 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4801 (list '("[$*]{?\\(\\sw+\\)" 1 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4802 font-lock-variable-name-face))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
4803 (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
|
4804 (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
|
4805 (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
|
4806 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
|
4807 t-font-lock-keywords) |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
4808 cperl-font-lock-keywords cperl-font-lock-keywords-1 |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
4809 cperl-font-lock-keywords-2 (append |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4810 cperl-font-lock-keywords-1 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
4811 t-font-lock-keywords-1))) |
20323 | 4812 (if (fboundp 'ps-print-buffer) (cperl-ps-print-init)) |
4813 (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
|
4814 (eval ; Avoid a warning |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4815 '(font-lock-require-faces |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4816 (list |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4817 ;; 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
|
4818 (list 'font-lock-comment-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4819 ["Firebrick" "OrangeRed" "DimGray" "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4820 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4821 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4822 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4823 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4824 (list 'font-lock-string-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4825 ["RosyBrown" "LightSalmon" "Gray50" "LightGray"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4826 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4827 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4828 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4829 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4830 (list 'font-lock-function-name-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4831 (vector |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4832 "Blue" "LightSkyBlue" "Gray50" "LightGray" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4833 (cdr (assq 'background-color ; if mono |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4834 (frame-parameters)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4835 (vector |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4836 nil nil nil nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4837 (cdr (assq 'foreground-color ; if mono |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4838 (frame-parameters)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4839 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4840 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4841 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4842 (list 'font-lock-variable-name-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4843 ["DarkGoldenrod" "LightGoldenrod" "DimGray" "Gray90"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4844 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4845 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4846 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4847 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4848 (list 'font-lock-type-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4849 ["DarkOliveGreen" "PaleGreen" "DimGray" "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4850 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4851 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4852 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4853 [nil nil t t t]) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4854 (list 'font-lock-constant-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4855 ["CadetBlue" "Aquamarine" "Gray50" "LightGray"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4856 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4857 [nil nil t t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4858 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4859 [nil nil t t t]) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4860 (list 'cperl-nonoverridable-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4861 ["chartreuse3" ("orchid1" "orange") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4862 nil "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4863 [nil nil "gray90"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4864 [nil nil nil t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4865 [nil nil t t] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4866 [nil nil t t t]) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4867 (list 'cperl-array-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4868 ["blue" "yellow" nil "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4869 ["lightyellow2" ("navy" "os2blue" "darkgreen") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4870 "gray90"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4871 t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4872 nil |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4873 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4874 (list 'cperl-hash-face |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4875 ["red" "red" nil "Gray80"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4876 ["lightyellow2" ("navy" "os2blue" "darkgreen") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4877 "gray90"] |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4878 t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4879 t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4880 nil)))) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4881 ;; Do it the dull way, without choose-color |
20323 | 4882 (defvar cperl-guessed-background nil |
4883 "Display characteristics as guessed by cperl.") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4884 ;; (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
|
4885 ;; (defalias 'x-color-defined-p |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4886 ;; (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
|
4887 ;; ;; XEmacs >= 19.12 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4888 ;; ((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
|
4889 ;; ;; XEmacs 19.11 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4890 ;; (t 'x-valid-color-name-p)))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4891 (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
|
4892 "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
|
4893 (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
|
4894 "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
|
4895 (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
|
4896 "Face for data types") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4897 (cperl-force-face cperl-nonoverridable-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4898 "Face 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
|
4899 (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
|
4900 "Face for comments") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4901 (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
|
4902 "Face for function names") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4903 (cperl-force-face cperl-hash-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4904 "Face for hashes") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4905 (cperl-force-face cperl-array-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4906 "Face for arrays") |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4907 ;;(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
|
4908 ;;(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
|
4909 ;;(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
|
4910 ;; (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
|
4911 ;; '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
|
4912 ;; "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
|
4913 ;;(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
|
4914 ;; (defconst cperl-nonoverridable-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4915 ;; 'cperl-nonoverridable-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4916 ;; "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
|
4917 ;;(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
|
4918 ;; (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
|
4919 ;; (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
|
4920 ;; '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
|
4921 ;; "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
|
4922 ;; (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
|
4923 ;; (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
|
4924 ;; '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
|
4925 ;; "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
|
4926 ;; (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
|
4927 ;; (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
|
4928 ;; '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
|
4929 ;; "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
|
4930 (if (and |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4931 (not (cperl-is-face 'cperl-array-face)) |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4932 (cperl-is-face 'font-lock-emphasized-face)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4933 (copy-face 'font-lock-emphasized-face 'cperl-array-face)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4934 (if (and |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4935 (not (cperl-is-face 'cperl-hash-face)) |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4936 (cperl-is-face 'font-lock-other-emphasized-face)) |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4937 (copy-face 'font-lock-other-emphasized-face |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4938 'cperl-hash-face)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4939 (if (and |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4940 (not (cperl-is-face 'cperl-nonoverridable-face)) |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4941 (cperl-is-face 'font-lock-other-type-face)) |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4942 (copy-face 'font-lock-other-type-face |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4943 'cperl-nonoverridable-face)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4944 ;;(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
|
4945 ;; (defconst cperl-hash-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4946 ;; 'cperl-hash-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4947 ;; "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
|
4948 ;;(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
|
4949 ;; (defconst cperl-array-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4950 ;; 'cperl-array-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4951 ;; "Face to use for arrays.")) |
20323 | 4952 ;; Here we try to guess background |
4953 (let ((background | |
4954 (if (boundp 'font-lock-background-mode) | |
4955 font-lock-background-mode | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
4956 'light)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4957 (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
|
4958 ;;;; (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
|
4959 ;;;; (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
|
4960 ;;;; (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
|
4961 ;;;; (face-list |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4962 ;;;; (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
|
4963 ;;;; (t |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4964 ;;;; (function (lambda (face) (boundp face)))))) |
20323 | 4965 (defvar cperl-guessed-background |
4966 (if (and (boundp 'font-lock-display-type) | |
4967 (eq font-lock-display-type 'grayscale)) | |
4968 'gray | |
4969 background) | |
4970 "Background as guessed by CPerl mode") | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4971 (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
|
4972 (cperl-is-face 'font-lock-reference-face) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
4973 (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
|
4974 (if (cperl-is-face 'font-lock-type-face) nil |
20323 | 4975 (copy-face 'default 'font-lock-type-face) |
4976 (cond | |
4977 ((eq background 'light) | |
4978 (set-face-foreground 'font-lock-type-face | |
4979 (if (x-color-defined-p "seagreen") | |
4980 "seagreen" | |
4981 "sea green"))) | |
4982 ((eq background 'dark) | |
4983 (set-face-foreground 'font-lock-type-face | |
4984 (if (x-color-defined-p "os2pink") | |
4985 "os2pink" | |
4986 "pink"))) | |
4987 (t | |
4988 (set-face-background 'font-lock-type-face "gray90")))) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4989 (if (cperl-is-face 'cperl-nonoverridable-face) |
20323 | 4990 nil |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4991 (copy-face 'font-lock-type-face 'cperl-nonoverridable-face) |
20323 | 4992 (cond |
4993 ((eq background 'light) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4994 (set-face-foreground 'cperl-nonoverridable-face |
20323 | 4995 (if (x-color-defined-p "chartreuse3") |
4996 "chartreuse3" | |
4997 "chartreuse"))) | |
4998 ((eq background 'dark) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
4999 (set-face-foreground 'cperl-nonoverridable-face |
20323 | 5000 (if (x-color-defined-p "orchid1") |
5001 "orchid1" | |
5002 "orange"))))) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5003 ;;; (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
|
5004 ;;; (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
|
5005 ;;; (cond |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5006 ;;; ((eq background 'light) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5007 ;;; (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
|
5008 ;;; (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
|
5009 ;;; "lightyellow2" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5010 ;;; (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
|
5011 ;;; "lightyellow" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5012 ;;; "light yellow")))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5013 ;;; ((eq background 'dark) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5014 ;;; (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
|
5015 ;;; (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
|
5016 ;;; "navy" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5017 ;;; (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
|
5018 ;;; "darkgreen" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5019 ;;; "dark green")))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5020 ;;; (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
|
5021 ;;; (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
|
5022 ;;; (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
|
5023 ;;; (cond |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5024 ;;; ((eq background 'light) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5025 ;;; (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
|
5026 ;;; (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
|
5027 ;;; "lightyellow2" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5028 ;;; "lightyellow"))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5029 ;;; ((eq background 'dark) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5030 ;;; (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
|
5031 ;;; (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
|
5032 ;;; "navy" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5033 ;;; (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
|
5034 ;;; "darkgreen" |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5035 ;;; "dark green")))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5036 ;;; (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
|
5037 (if (cperl-is-face 'font-lock-variable-name-face) nil |
20323 | 5038 (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
|
5039 (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
|
5040 (copy-face 'italic 'font-lock-constant-face)))) |
20323 | 5041 (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
|
5042 (error (message "cperl-init-faces (ignored): %s" errs)))) |
20323 | 5043 |
5044 | |
5045 (defun cperl-ps-print-init () | |
5046 "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
|
5047 (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
|
5048 '(setq ps-bold-faces |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5049 ;; 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
|
5050 ;; 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
|
5051 (append '(cperl-array-face |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5052 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
|
5053 ps-bold-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5054 ps-italic-faces |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5055 ;; 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
|
5056 (append '(cperl-nonoverridable-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5057 cperl-hash-face) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5058 ps-italic-faces) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5059 ps-underlined-faces |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5060 ;; 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
|
5061 (append '(cperl-array-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5062 cperl-hash-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5063 underline |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5064 cperl-nonoverridable-face) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5065 ps-underlined-faces)))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5066 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5067 (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
|
5068 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5069 (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
|
5070 "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
|
5071 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
|
5072 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
|
5073 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5074 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
|
5075 (interactive) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5076 (or file |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5077 (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
|
5078 "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
|
5079 (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
|
5080 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
|
5081 (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
|
5082 (setq file nil)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5083 (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
|
5084 (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
|
5085 (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
|
5086 (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
|
5087 (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
|
5088 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5089 ;;; (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
|
5090 ;;; "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
|
5091 ;;; ;; 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
|
5092 ;;; (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
|
5093 ;;; (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
|
5094 ;;; (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
|
5095 ;;; (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
|
5096 ;;; (append '(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
|
5097 ;;; cperl-array-face |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5098 ;;; font-lock-keyword-face |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5099 ;;; font-lock-variable-name-face |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5100 ;;; font-lock-constant-face |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5101 ;;; 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
|
5102 ;;; font-lock-other-emphasized-face |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5103 ;;; 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
|
5104 ;;; ps-bold-faces)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5105 ;;; (setq ps-italic-faces |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5106 ;;; (append '(cperl-nonoverridable-face |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5107 ;;; font-lock-constant-face |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5108 ;;; 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
|
5109 ;;; 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
|
5110 ;;; cperl-hash-face) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5111 ;;; ps-italic-faces)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5112 ;;; (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
|
5113 ;;; (append '(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
|
5114 ;;; cperl-array-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5115 ;;; 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
|
5116 ;;; cperl-hash-face |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5117 ;;; cperl-nonoverridable-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
|
5118 ;;; ps-underlined-faces)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5119 ;;; (cons 'font-lock-type-face ps-underlined-faces)) |
20323 | 5120 |
5121 | |
5122 (if (cperl-enable-font-lock) (cperl-windowed-init)) | |
5123 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5124 (defconst cperl-styles-entries |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5125 '(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
|
5126 cperl-label-offset cperl-extra-newline-before-brace |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
5127 cperl-merge-trailing-else |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5128 cperl-continued-statement-offset)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5129 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5130 (defconst cperl-style-alist |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5131 '(("CPerl" ; =GNU without extra-newline-before-brace |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5132 (cperl-indent-level . 2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5133 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5134 (cperl-continued-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5135 (cperl-label-offset . -2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5136 (cperl-extra-newline-before-brace . nil) |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
5137 (cperl-merge-trailing-else . t) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5138 (cperl-continued-statement-offset . 2)) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5139 ("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
|
5140 (cperl-indent-level . 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5141 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5142 (cperl-continued-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5143 (cperl-label-offset . -4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5144 (cperl-extra-newline-before-brace . nil) |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
5145 (cperl-merge-trailing-else . t) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5146 (cperl-continued-statement-offset . 4)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5147 ("GNU" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5148 (cperl-indent-level . 2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5149 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5150 (cperl-continued-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5151 (cperl-label-offset . -2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5152 (cperl-extra-newline-before-brace . t) |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
5153 (cperl-merge-trailing-else . nil) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5154 (cperl-continued-statement-offset . 2)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5155 ("K&R" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5156 (cperl-indent-level . 5) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5157 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5158 (cperl-continued-brace-offset . -5) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5159 (cperl-label-offset . -5) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5160 ;;(cperl-extra-newline-before-brace . nil) ; ??? |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
5161 (cperl-merge-trailing-else . nil) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5162 (cperl-continued-statement-offset . 5)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5163 ("BSD" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5164 (cperl-indent-level . 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5165 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5166 (cperl-continued-brace-offset . -4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5167 (cperl-label-offset . -4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5168 ;;(cperl-extra-newline-before-brace . nil) ; ??? |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5169 (cperl-continued-statement-offset . 4)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5170 ("C++" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5171 (cperl-indent-level . 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5172 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5173 (cperl-continued-brace-offset . -4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5174 (cperl-label-offset . -4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5175 (cperl-continued-statement-offset . 4) |
22391
680733ae3334
Second half of changes in version 1.4.
Richard M. Stallman <rms@gnu.org>
parents:
22390
diff
changeset
|
5176 (cperl-merge-trailing-else . nil) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5177 (cperl-extra-newline-before-brace . t)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5178 ("Current") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5179 ("Whitesmith" |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5180 (cperl-indent-level . 4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5181 (cperl-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5182 (cperl-continued-brace-offset . 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5183 (cperl-label-offset . -4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5184 ;;(cperl-extra-newline-before-brace . nil) ; ??? |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5185 (cperl-continued-statement-offset . 4))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5186 "(Experimental) list of variables to set to get a particular indentation style. |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5187 Should be used via `cperl-set-style' or via Perl menu.") |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5188 |
20323 | 5189 (defun cperl-set-style (style) |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
5190 "Set CPerl mode variables to use one of several different indentation styles. |
20323 | 5191 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
|
5192 The list of styles is in `cperl-style-alist', available styles |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5193 are GNU, K&R, BSD, C++ and Whitesmith. |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5194 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5195 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
|
5196 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
|
5197 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5198 Chosing \"Current\" style will not change style, so this may be used for |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5199 side-effect of memorizing only." |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5200 (interactive |
50859
25507c4ce520
(cperl-lineup): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50788
diff
changeset
|
5201 (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
|
5202 cperl-style-alist))) |
20323 | 5203 (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
|
5204 (or cperl-old-style |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5205 (setq cperl-old-style |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5206 (mapcar (function |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5207 (lambda (name) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5208 (cons name (eval name)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5209 cperl-styles-entries))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5210 (let ((style (cdr (assoc style cperl-style-alist))) setting str sym) |
20323 | 5211 (while style |
5212 (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
|
5213 (set (car setting) (cdr setting))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5214 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5215 (defun cperl-set-style-back () |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5216 "Restore a style memorised by `cperl-set-style'." |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5217 (interactive) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5218 (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
|
5219 (let (setting) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5220 (while cperl-old-style |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5221 (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
|
5222 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
|
5223 (set (car setting) (cdr setting))))) |
20323 | 5224 |
5225 (defun cperl-check-syntax () | |
5226 (interactive) | |
5227 (require 'mode-compile) | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5228 (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
|
5229 (eval '(mode-compile)))) ; Avoid a warning |
20323 | 5230 |
5231 (defun cperl-info-buffer (type) | |
5232 ;; Returns buffer with documentation. Creates if missing. | |
5233 ;; If TYPE, this vars buffer. | |
5234 ;; Special care is taken to not stomp over an existing info buffer | |
5235 (let* ((bname (if type "*info-perl-var*" "*info-perl*")) | |
5236 (info (get-buffer bname)) | |
5237 (oldbuf (get-buffer "*info*"))) | |
5238 (if info info | |
5239 (save-window-excursion | |
5240 ;; Get Info running | |
5241 (require 'info) | |
5242 (cond (oldbuf | |
5243 (set-buffer oldbuf) | |
5244 (rename-buffer "*info-perl-tmp*"))) | |
5245 (save-window-excursion | |
5246 (info)) | |
5247 (Info-find-node cperl-info-page (if type "perlvar" "perlfunc")) | |
5248 (set-buffer "*info*") | |
5249 (rename-buffer bname) | |
5250 (cond (oldbuf | |
5251 (set-buffer "*info-perl-tmp*") | |
5252 (rename-buffer "*info*") | |
5253 (set-buffer bname))) | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
5254 (make-local-variable 'window-min-height) |
20323 | 5255 (setq window-min-height 2) |
5256 (current-buffer))))) | |
5257 | |
5258 (defun cperl-word-at-point (&optional p) | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
5259 "Return the word at point or at P." |
20323 | 5260 (save-excursion |
5261 (if p (goto-char p)) | |
5262 (or (cperl-word-at-point-hard) | |
5263 (progn | |
5264 (require 'etags) | |
5265 (funcall (or (and (boundp 'find-tag-default-function) | |
5266 find-tag-default-function) | |
5267 (get major-mode 'find-tag-default-function) | |
5268 ;; XEmacs 19.12 has `find-tag-default-hook'; it is | |
5269 ;; automatically used within `find-tag-default': | |
5270 'find-tag-default)))))) | |
5271 | |
5272 (defun cperl-info-on-command (command) | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
5273 "Show documentation for Perl command COMMAND in other window. |
20323 | 5274 If perl-info buffer is shown in some frame, uses this frame. |
5275 Customized by setting variables `cperl-shrink-wrap-info-frame', | |
5276 `cperl-max-help-size'." | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5277 (interactive |
20323 | 5278 (let* ((default (cperl-word-at-point)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5279 (read (read-string |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5280 (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
|
5281 default)))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5282 (list (if (equal read "") |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5283 default |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5284 read)))) |
20323 | 5285 |
5286 (let ((buffer (current-buffer)) | |
5287 (cmd-desc (concat "^" (regexp-quote command) "[^a-zA-Z_0-9]")) ; "tr///" | |
5288 pos isvar height iniheight frheight buf win fr1 fr2 iniwin not-loner | |
5289 max-height char-height buf-list) | |
5290 (if (string-match "^-[a-zA-Z]$" command) | |
5291 (setq cmd-desc "^-X[ \t\n]")) | |
5292 (setq isvar (string-match "^[$@%]" command) | |
5293 buf (cperl-info-buffer isvar) | |
5294 iniwin (selected-window) | |
5295 fr1 (window-frame iniwin)) | |
5296 (set-buffer buf) | |
5297 (beginning-of-buffer) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5298 (or isvar |
20323 | 5299 (progn (re-search-forward "^-X[ \t\n]") |
5300 (forward-line -1))) | |
5301 (if (re-search-forward cmd-desc nil t) | |
5302 (progn | |
5303 ;; Go back to beginning of the group (ex, for qq) | |
5304 (if (re-search-backward "^[ \t\n\f]") | |
5305 (forward-line 1)) | |
5306 (beginning-of-line) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5307 ;; Get some of |
20323 | 5308 (setq pos (point) |
5309 buf-list (list buf "*info-perl-var*" "*info-perl*")) | |
5310 (while (and (not win) buf-list) | |
5311 (setq win (get-buffer-window (car buf-list) t)) | |
5312 (setq buf-list (cdr buf-list))) | |
5313 (or (not win) | |
5314 (eq (window-buffer win) buf) | |
5315 (set-window-buffer win buf)) | |
5316 (and win (setq fr2 (window-frame win))) | |
5317 (if (or (not fr2) (eq fr1 fr2)) | |
5318 (pop-to-buffer buf) | |
5319 (special-display-popup-frame buf) ; Make it visible | |
5320 (select-window win)) | |
5321 (goto-char pos) ; Needed (?!). | |
5322 ;; Resize | |
5323 (setq iniheight (window-height) | |
5324 frheight (frame-height) | |
5325 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
|
5326 (cond ((if not-loner cperl-max-help-size |
20323 | 5327 cperl-shrink-wrap-info-frame) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5328 (setq height |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5329 (+ 2 |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5330 (count-lines |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5331 pos |
20323 | 5332 (save-excursion |
5333 (if (re-search-forward | |
5334 "^[ \t][^\n]*\n+\\([^ \t\n\f]\\|\\'\\)" nil t) | |
5335 (match-beginning 0) (point-max))))) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5336 max-height |
20323 | 5337 (if not-loner |
5338 (/ (* (- frheight 3) cperl-max-help-size) 100) | |
5339 (setq char-height (frame-char-height)) | |
5340 ;; Non-functioning under OS/2: | |
5341 (if (eq char-height 1) (setq char-height 18)) | |
5342 ;; Title, menubar, + 2 for slack | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5343 (- (/ (x-display-pixel-height) char-height) 4))) |
20323 | 5344 (if (> height max-height) (setq height max-height)) |
5345 ;;(message "was %s doing %s" iniheight height) | |
5346 (if not-loner | |
5347 (enlarge-window (- height iniheight)) | |
5348 (set-frame-height (window-frame win) (1+ height))))) | |
5349 (set-window-start (selected-window) pos)) | |
5350 (message "No entry for %s found." command)) | |
5351 ;;(pop-to-buffer buffer) | |
5352 (select-window iniwin))) | |
5353 | |
5354 (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
|
5355 "Show documentation for Perl command at point in other window." |
20323 | 5356 (interactive) |
5357 (cperl-info-on-command (cperl-word-at-point))) | |
5358 | |
5359 (defun cperl-imenu-info-imenu-search () | |
5360 (if (looking-at "^-X[ \t\n]") nil | |
5361 (re-search-backward | |
5362 "^\n\\([-a-zA-Z_]+\\)[ \t\n]") | |
5363 (forward-line 1))) | |
5364 | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5365 (defun cperl-imenu-info-imenu-name () |
20323 | 5366 (buffer-substring |
5367 (match-beginning 1) (match-end 1))) | |
5368 | |
5369 (defun cperl-imenu-on-info () | |
5370 (interactive) | |
5371 (let* ((buffer (current-buffer)) | |
5372 imenu-create-index-function | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5373 imenu-prev-index-position-function |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5374 imenu-extract-index-name-function |
20323 | 5375 (index-item (save-restriction |
5376 (save-window-excursion | |
5377 (set-buffer (cperl-info-buffer nil)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5378 (setq imenu-create-index-function |
20323 | 5379 'imenu-default-create-index-function |
5380 imenu-prev-index-position-function | |
5381 'cperl-imenu-info-imenu-search | |
5382 imenu-extract-index-name-function | |
5383 'cperl-imenu-info-imenu-name) | |
5384 (imenu-choose-buffer-index))))) | |
5385 (and index-item | |
5386 (progn | |
5387 (push-mark) | |
5388 (pop-to-buffer "*info-perl*") | |
5389 (cond | |
5390 ((markerp (cdr index-item)) | |
5391 (goto-char (marker-position (cdr index-item)))) | |
5392 (t | |
5393 (goto-char (cdr index-item)))) | |
5394 (set-window-start (selected-window) (point)) | |
5395 (pop-to-buffer buffer))))) | |
5396 | |
5397 (defun cperl-lineup (beg end &optional step minshift) | |
5398 "Lineup construction in a region. | |
5399 Beginning of region should be at the start of a construction. | |
5400 All first occurrences of this construction in the lines that are | |
5401 partially contained in the region are lined up at the same column. | |
5402 | |
5403 MINSHIFT is the minimal amount of space to insert before the construction. | |
5404 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
|
5405 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
|
5406 \(or `cperl-indent-level', if `cperl-lineup-step' is nil). |
20323 | 5407 Will not move the position at the start to the left." |
5408 (interactive "r") | |
5409 (let (search col tcol seen b e) | |
5410 (save-excursion | |
5411 (goto-char end) | |
5412 (end-of-line) | |
5413 (setq end (point-marker)) | |
5414 (goto-char beg) | |
5415 (skip-chars-forward " \t\f") | |
5416 (setq beg (point-marker)) | |
5417 (indent-region beg end nil) | |
5418 (goto-char beg) | |
5419 (setq col (current-column)) | |
5420 (if (looking-at "[a-zA-Z0-9_]") | |
5421 (if (looking-at "\\<[a-zA-Z0-9_]+\\>") | |
5422 (setq search | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5423 (concat "\\<" |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5424 (regexp-quote |
20323 | 5425 (buffer-substring (match-beginning 0) |
5426 (match-end 0))) "\\>")) | |
5427 (error "Cannot line up in a middle of the word")) | |
5428 (if (looking-at "$") | |
5429 (error "Cannot line up end of line")) | |
5430 (setq search (regexp-quote (char-to-string (following-char))))) | |
5431 (setq step (or step cperl-lineup-step cperl-indent-level)) | |
5432 (or minshift (setq minshift 1)) | |
5433 (while (progn | |
5434 (beginning-of-line 2) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5435 (and (< (point) end) |
20323 | 5436 (re-search-forward search end t) |
5437 (goto-char (match-beginning 0)))) | |
5438 (setq tcol (current-column) seen t) | |
5439 (if (> tcol col) (setq col tcol))) | |
5440 (or seen | |
5441 (error "The construction to line up occurred only once")) | |
5442 (goto-char beg) | |
5443 (setq col (+ col minshift)) | |
5444 (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
|
5445 (while |
20323 | 5446 (progn |
5447 (setq e (point)) | |
5448 (skip-chars-backward " \t") | |
5449 (delete-region (point) e) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5450 (indent-to-column col) ;(make-string (- col (current-column)) ?\ )) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5451 (beginning-of-line 2) |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5452 (and (< (point) end) |
20323 | 5453 (re-search-forward search end t) |
5454 (goto-char (match-beginning 0)))))))) ; No body | |
5455 | |
5456 (defun cperl-etags (&optional add all files) | |
5457 "Run etags with appropriate options for Perl files. | |
5458 If optional argument ALL is `recursive', will process Perl files | |
5459 in subdirectories too." | |
5460 (interactive) | |
5461 (let ((cmd "etags") | |
5462 (args '("-l" "none" "-r" "/\\<\\(package\\|sub\\)[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)[ \\t]*\\(([^()]*)[ \t]*\\)?\\([{#]\\|$\\)\\)/\\4/")) | |
5463 res) | |
5464 (if add (setq args (cons "-a" args))) | |
5465 (or files (setq files (list buffer-file-name))) | |
5466 (cond | |
5467 ((eq all 'recursive) | |
5468 ;;(error "Not implemented: recursive") | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5469 (setq args (append (list "-e" |
20323 | 5470 "sub wanted {push @ARGV, $File::Find::name if /\\.[pP][Llm]$/} |
5471 use File::Find; | |
5472 find(\\&wanted, '.'); | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5473 exec @ARGV;" |
20323 | 5474 cmd) args) |
5475 cmd "perl")) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5476 (all |
20323 | 5477 ;;(error "Not implemented: all") |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5478 (setq args (append (list "-e" |
20323 | 5479 "push @ARGV, <*.PL *.pl *.pm>; |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5480 exec @ARGV;" |
20323 | 5481 cmd) args) |
5482 cmd "perl")) | |
5483 (t | |
5484 (setq args (append args files)))) | |
5485 (setq res (apply 'call-process cmd nil nil nil args)) | |
5486 (or (eq res 0) | |
5487 (message "etags returned \"%s\"" res)))) | |
5488 | |
5489 (defun cperl-toggle-auto-newline () | |
5490 "Toggle the state of `cperl-auto-newline'." | |
5491 (interactive) | |
5492 (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
|
5493 (message "Newlines will %sbe auto-inserted now." |
20323 | 5494 (if cperl-auto-newline "" "not "))) |
5495 | |
5496 (defun cperl-toggle-abbrev () | |
5497 "Toggle the state of automatic keyword expansion in CPerl mode." | |
5498 (interactive) | |
5499 (abbrev-mode (if abbrev-mode 0 1)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5500 (message "Perl control structure will %sbe auto-inserted now." |
20323 | 5501 (if abbrev-mode "" "not "))) |
5502 | |
5503 | |
5504 (defun cperl-toggle-electric () | |
5505 "Toggle the state of parentheses doubling in CPerl mode." | |
5506 (interactive) | |
5507 (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
|
5508 (message "Parentheses will %sbe auto-doubled now." |
20323 | 5509 (if (cperl-val 'cperl-electric-parens) "" "not "))) |
5510 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5511 (defun cperl-toggle-autohelp () |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
5512 "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
|
5513 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
|
5514 (interactive) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5515 (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
|
5516 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5517 (if cperl-lazy-installed |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
5518 (cperl-lazy-unstall) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5519 (cperl-lazy-install)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5520 (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
|
5521 (if cperl-lazy-installed "" "not "))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5522 (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
|
5523 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5524 (defun cperl-toggle-construct-fix () |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
5525 "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
|
5526 (interactive) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5527 (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
|
5528 (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
|
5529 nil |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5530 1)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5531 (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
|
5532 (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
|
5533 |
20323 | 5534 ;;;; Tags file creation. |
5535 | |
5536 (defvar cperl-tmp-buffer " *cperl-tmp*") | |
5537 | |
5538 (defun cperl-setup-tmp-buf () | |
5539 (set-buffer (get-buffer-create cperl-tmp-buffer)) | |
5540 (set-syntax-table cperl-mode-syntax-table) | |
5541 (buffer-disable-undo) | |
5542 (auto-fill-mode 0) | |
5543 (if cperl-use-syntax-table-text-property-for-tags | |
5544 (progn | |
36601
2a84d5417fbd
(cperl-mode): Set major-mode to cperl-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35013
diff
changeset
|
5545 (make-local-variable 'parse-sexp-lookup-properties) |
20323 | 5546 ;; Do not introduce variable if not needed, we check it! |
5547 (set 'parse-sexp-lookup-properties t)))) | |
5548 | |
5549 (defun cperl-xsub-scan () | |
5550 (require 'imenu) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5551 (let ((index-alist '()) |
20323 | 5552 (prev-pos 0) index index1 name package prefix) |
5553 (goto-char (point-min)) | |
5554 (if noninteractive | |
5555 (message "Scanning XSUB for index") | |
5556 (imenu-progress-message prev-pos 0)) | |
5557 ;; Search for the function | |
5558 (progn ;;save-match-data | |
5559 (while (re-search-forward | |
5560 "^\\([ \t]*MODULE\\>[^\n]*\\<PACKAGE[ \t]*=[ \t]*\\([a-zA-Z_][a-zA-Z_0-9:]*\\)\\>\\|\\([a-zA-Z_][a-zA-Z_0-9]*\\)(\\|[ \t]*BOOT:\\)" | |
5561 nil t) | |
5562 (or noninteractive | |
5563 (imenu-progress-message prev-pos)) | |
5564 (cond | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5565 ((match-beginning 2) ; SECTION |
20323 | 5566 (setq package (buffer-substring (match-beginning 2) (match-end 2))) |
5567 (goto-char (match-beginning 0)) | |
5568 (skip-chars-forward " \t") | |
5569 (forward-char 1) | |
5570 (if (looking-at "[^\n]*\\<PREFIX[ \t]*=[ \t]*\\([a-zA-Z_][a-zA-Z_0-9]*\\)\\>") | |
5571 (setq prefix (buffer-substring (match-beginning 1) (match-end 1))) | |
5572 (setq prefix nil))) | |
5573 ((not package) nil) ; C language section | |
5574 ((match-beginning 3) ; XSUB | |
5575 (goto-char (1+ (match-beginning 3))) | |
5576 (setq index (imenu-example--name-and-position)) | |
5577 (setq name (buffer-substring (match-beginning 3) (match-end 3))) | |
5578 (if (and prefix (string-match (concat "^" prefix) name)) | |
5579 (setq name (substring name (length prefix)))) | |
5580 (cond ((string-match "::" name) nil) | |
5581 (t | |
5582 (setq index1 (cons (concat package "::" name) (cdr index))) | |
5583 (push index1 index-alist))) | |
5584 (setcar index name) | |
5585 (push index index-alist)) | |
5586 (t ; BOOT: section | |
5587 ;; (beginning-of-line) | |
5588 (setq index (imenu-example--name-and-position)) | |
5589 (setcar index (concat package "::BOOT:")) | |
5590 (push index index-alist))))) | |
5591 (or noninteractive | |
5592 (imenu-progress-message prev-pos 100)) | |
5593 index-alist)) | |
5594 | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5595 (defvar cperl-unreadable-ok nil) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5596 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5597 (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
|
5598 (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
|
5599 (cperl-pod-here-fontify nil) f file) |
20323 | 5600 (save-excursion |
5601 (if b (set-buffer b) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5602 (cperl-setup-tmp-buf)) |
20323 | 5603 (erase-buffer) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5604 (condition-case err |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5605 (setq file (car (insert-file-contents ifile))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5606 (error (if cperl-unreadable-ok nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5607 (if (y-or-n-p |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5608 (format "File %s unreadable. Continue? " ifile)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5609 (setq cperl-unreadable-ok t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5610 (error "Aborting: unreadable file %s" ifile))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
5611 (if (not file) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5612 (message "Unreadable file %s" ifile) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5613 (message "Scanning file %s ..." file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5614 (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
|
5615 (not xs)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5616 (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
|
5617 (cperl-find-pods-heres nil nil noninteractive) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5618 (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
|
5619 (if xs |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5620 (setq lst (cperl-xsub-scan)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5621 (setq ind (cperl-imenu--create-perl-index)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5622 (setq lst (cdr (assoc "+Unsorted List+..." ind)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5623 (setq lst |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5624 (mapcar |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5625 (function |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5626 (lambda (elt) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5627 (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
|
5628 (goto-char (cdr elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5629 (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
|
5630 (list (car elt) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5631 (point) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5632 (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
|
5633 (buffer-substring (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5634 (goto-char (cdr elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5635 ;; After name now... |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5636 (or (eolp) (forward-char 1)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5637 (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5638 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5639 (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5640 (point)))))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5641 lst)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5642 (erase-buffer) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5643 (while lst |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5644 (setq elt (car lst) lst (cdr lst)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5645 (if elt |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5646 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5647 (insert (elt elt 3) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5648 127 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5649 (if (string-match "^package " (car elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5650 (substring (car elt) 8) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5651 (car elt) ) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5652 1 |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5653 (number-to-string (elt elt 2)) ; Line |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5654 "," |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5655 (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
|
5656 "\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5657 (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
|
5658 (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
|
5659 (elt elt 3))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5660 ;; 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
|
5661 (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
|
5662 (match-beginning 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5663 (match-end 1)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5664 (cdr elt)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5665 lst)))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5666 (setq pos (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5667 (goto-char 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5668 (setq rel file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5669 ;; 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
|
5670 (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
|
5671 (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
|
5672 (setq rel (substring file (length topdir)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5673 (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
|
5674 (setq ret (buffer-substring 1 (point-max))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5675 (erase-buffer) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5676 (or noninteractive |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5677 (message "Scanning file %s finished" file)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5678 ret)))) |
20323 | 5679 |
5680 (defun cperl-add-tags-recurse-noxs () | |
5681 "Add to TAGS data for Perl and XSUB files in the current directory and kids. | |
5682 Use as | |
5683 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
|
5684 -f cperl-add-tags-recurse |
20323 | 5685 " |
5686 (cperl-write-tags nil nil t t nil t)) | |
5687 | |
5688 (defun cperl-add-tags-recurse () | |
5689 "Add to TAGS file data for Perl files in the current directory and kids. | |
5690 Use as | |
5691 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
|
5692 -f cperl-add-tags-recurse |
20323 | 5693 " |
5694 (cperl-write-tags nil nil t t)) | |
5695 | |
5696 (defun cperl-write-tags (&optional file erase recurse dir inbuffer noxs topdir) | |
5697 ;; If INBUFFER, do not select buffer, and do not save | |
5698 ;; If ERASE is `ignore', do not erase, and do not try to delete old info. | |
5699 (require 'etags) | |
5700 (if file nil | |
5701 (setq file (if dir default-directory (buffer-file-name))) | |
5702 (if (and (not dir) (buffer-modified-p)) (error "Save buffer first!"))) | |
5703 (or topdir | |
5704 (setq topdir default-directory)) | |
5705 (let ((tags-file-name "TAGS") | |
5706 (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
|
5707 xs rel tm) |
20323 | 5708 (save-excursion |
5709 (cond (inbuffer nil) ; Already there | |
5710 ((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
|
5711 (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
|
5712 (visit-tags-table-buffer) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5713 (visit-tags-table-buffer tags-file-name))) |
20323 | 5714 (t (set-buffer (find-file-noselect tags-file-name)))) |
5715 (cond | |
5716 (dir | |
5717 (cond ((eq erase 'ignore)) | |
5718 (erase | |
5719 (erase-buffer) | |
5720 (setq erase 'ignore))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
5721 (let ((files |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5722 (condition-case err |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
5723 (directory-files file t |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5724 (if recurse nil cperl-scan-files-regexp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5725 t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5726 (error |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5727 (if cperl-unreadable-ok nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5728 (if (y-or-n-p |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5729 (format "Directory %s unreadable. Continue? " file)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
5730 (setq cperl-unreadable-ok t |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5731 tm nil) ; Return empty list |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
5732 (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
|
5733 (mapcar (function |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5734 (lambda (file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5735 (cond |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5736 ((string-match cperl-noscan-files-regexp file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5737 nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5738 ((not (file-directory-p file)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5739 (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
|
5740 (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
|
5741 ((not recurse) nil) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5742 (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
|
5743 files))) |
20323 | 5744 (t |
5745 (setq xs (string-match "\\.xs$" file)) | |
5746 (if (not (and xs noxs)) | |
5747 (progn | |
5748 (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
|
5749 (erase (erase-buffer)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5750 (t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5751 (goto-char 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5752 (setq rel file) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5753 ;; 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
|
5754 (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
|
5755 (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
|
5756 (setq rel (substring file (length topdir)))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5757 (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
|
5758 (progn |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5759 (search-backward "\f\n") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5760 (delete-region (point) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5761 (save-excursion |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5762 (forward-char 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5763 (if (search-forward "\f\n" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5764 nil 'toend) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5765 (- (point) 2) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5766 (point-max))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5767 (goto-char (point-max))))) |
20323 | 5768 (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
|
5769 (if inbuffer nil ; Delegate to the caller |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5770 (save-buffer 0) ; No backup |
20323 | 5771 (if (fboundp 'initialize-new-tags-table) ; Do we need something special in XEmacs? |
5772 (initialize-new-tags-table)))))) | |
5773 | |
5774 (defvar cperl-tags-hier-regexp-list | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5775 (concat |
20323 | 5776 "^\\(" |
5777 "\\(package\\)\\>" | |
5778 "\\|" | |
5779 "sub\\>[^\n]+::" | |
5780 "\\|" | |
5781 "[a-zA-Z_][a-zA-Z_0-9:]*(\C-?[^\n]+::" ; XSUB? | |
5782 "\\|" | |
5783 "[ \t]*BOOT:\C-?[^\n]+::" ; BOOT section | |
5784 "\\)")) | |
5785 | |
5786 (defvar cperl-hierarchy '(() ()) | |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
5787 "Global hierarchy of classes.") |
20323 | 5788 |
5789 (defun cperl-tags-hier-fill () | |
5790 ;; Suppose we are in a tag table cooked by cperl. | |
5791 (goto-char 1) | |
5792 (let (type pack name pos line chunk ord cons1 file str info fileind) | |
5793 (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
|
5794 (setq pos (match-beginning 0) |
20323 | 5795 pack (match-beginning 2)) |
5796 (beginning-of-line) | |
5797 (if (looking-at (concat | |
5798 "\\([^\n]+\\)" | |
5799 "\C-?" | |
5800 "\\([^\n]+\\)" | |
5801 "\C-a" | |
5802 "\\([0-9]+\\)" | |
5803 "," | |
5804 "\\([0-9]+\\)")) | |
5805 (progn | |
5806 (setq ;;str (buffer-substring (match-beginning 1) (match-end 1)) | |
5807 name (buffer-substring (match-beginning 2) (match-end 2)) | |
5808 ;;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
|
5809 line (buffer-substring (match-beginning 3) (match-end 3)) |
20323 | 5810 ord (if pack 1 0) |
5811 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
|
5812 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
|
5813 ;; 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
|
5814 info (cperl-etags-snarf-tag file line)) |
20323 | 5815 ;; Move back |
5816 (forward-char -1) | |
5817 ;; Make new member of hierarchy name ==> file ==> pos if needed | |
5818 (if (setq cons1 (assoc name (nth ord cperl-hierarchy))) | |
5819 ;; Name known | |
5820 (setcdr cons1 (cons (cons fileind (vector file info)) | |
5821 (cdr cons1))) | |
5822 ;; First occurrence of the name, start alist | |
5823 (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
|
5824 (if pack |
20323 | 5825 (setcar (cdr cperl-hierarchy) |
5826 (cons cons1 (nth 1 cperl-hierarchy))) | |
5827 (setcar cperl-hierarchy | |
5828 (cons cons1 (car cperl-hierarchy))))))) | |
5829 (end-of-line)))) | |
5830 | |
5831 (defun cperl-tags-hier-init (&optional update) | |
5832 "Show hierarchical menu of classes and methods. | |
5833 Finds info about classes by a scan of loaded TAGS files. | |
5834 Supposes that the TAGS files contain fully qualified function names. | |
5835 One may build such TAGS files from CPerl mode menu." | |
5836 (interactive) | |
5837 (require 'etags) | |
5838 (require 'imenu) | |
5839 (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
|
5840 (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
|
5841 (or (nthcdr 2 elt) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5842 ;; Only in one file |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5843 (setcdr elt (cdr (nth 1 elt))))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5844 pack name cons1 to l1 l2 l3 l4 b) |
20323 | 5845 ;; (setq cperl-hierarchy '(() () ())) ; Would write into '() later! |
5846 (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
|
5847 (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
|
5848 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5849 (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
|
5850 ;; Does this work in XEmacs? |
20323 | 5851 (call-interactively 'visit-tags-table)) |
5852 (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
|
5853 (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
|
5854 (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
|
5855 (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
|
5856 (call-interactively 'visit-tags-table)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5857 (mapcar |
20323 | 5858 (function |
5859 (lambda (tagsfile) | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
5860 (message "Updating list of classes... %s" tagsfile) |
20323 | 5861 (set-buffer (get-file-buffer tagsfile)) |
5862 (cperl-tags-hier-fill))) | |
5863 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
|
5864 (message "Updating list of classes... postprocessing...")) |
20323 | 5865 (mapcar remover (car cperl-hierarchy)) |
5866 (mapcar remover (nth 1 cperl-hierarchy)) | |
5867 (setq to (list nil (cons "Packages: " (nth 1 cperl-hierarchy)) | |
5868 (cons "Methods: " (car cperl-hierarchy)))) | |
5869 (cperl-tags-treeify to 1) | |
5870 (setcar (nthcdr 2 cperl-hierarchy) | |
5871 (cperl-menu-to-keymap (cons '("+++UPDATE+++" . -999) (cdr to)))) | |
5872 (message "Updating list of classes: done, requesting display...") | |
5873 ;;(cperl-imenu-addback (nth 2 cperl-hierarchy)) | |
5874 )) | |
5875 (or (nth 2 cperl-hierarchy) | |
5876 (error "No items found")) | |
5877 (setq update | |
5878 ;;; (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
|
5879 (if (if (fboundp 'display-popup-menus-p) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5880 (let ((f 'display-popup-menus-p)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5881 (funcall f)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
5882 window-system) |
20323 | 5883 (x-popup-menu t (nth 2 cperl-hierarchy)) |
5884 (require 'tmm) | |
5885 (tmm-prompt (nth 2 cperl-hierarchy)))) | |
5886 (if (and update (listp update)) | |
5887 (progn (while (cdr update) (setq update (cdr update))) | |
5888 (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
|
5889 (if (vectorp update) |
20323 | 5890 (progn |
5891 (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
|
5892 (cperl-etags-goto-tag-location (elt update 1)))) |
20323 | 5893 (if (eq update -999) (cperl-tags-hier-init t))) |
5894 | |
5895 (defun cperl-tags-treeify (to level) | |
5896 ;; 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
|
5897 (let* ((regexp (concat "^\\(" (mapconcat |
20323 | 5898 'identity |
5899 (make-list level "[_a-zA-Z0-9]+") | |
5900 "::") | |
5901 "\\)\\(::\\)?")) | |
5902 (packages (cdr (nth 1 to))) | |
5903 (methods (cdr (nth 2 to))) | |
5904 l1 head tail cons1 cons2 ord writeto packs recurse | |
5905 root-packages root-functions ms many_ms same_name ps | |
5906 (move-deeper | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5907 (function |
20323 | 5908 (lambda (elt) |
5909 (cond ((and (string-match regexp (car elt)) | |
5910 (or (eq ord 1) (match-end 2))) | |
5911 (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
|
5912 tail (if (match-end 2) (substring (car elt) |
20323 | 5913 (match-end 2))) |
5914 recurse t) | |
5915 (if (setq cons1 (assoc head writeto)) nil | |
5916 ;; Need to init new head | |
5917 (setcdr writeto (cons (list head (list "Packages: ") | |
5918 (list "Methods: ")) | |
5919 (cdr writeto))) | |
5920 (setq cons1 (nth 1 writeto))) | |
5921 (setq cons2 (nth ord cons1)) ; Either packs or meths | |
5922 (setcdr cons2 (cons elt (cdr cons2)))) | |
5923 ((eq ord 2) | |
5924 (setq root-functions (cons elt root-functions))) | |
5925 (t | |
5926 (setq root-packages (cons elt root-packages)))))))) | |
5927 (setcdr to l1) ; Init to dynamic space | |
5928 (setq writeto to) | |
5929 (setq ord 1) | |
5930 (mapcar move-deeper packages) | |
5931 (setq ord 2) | |
5932 (mapcar move-deeper methods) | |
5933 (if recurse | |
5934 (mapcar (function (lambda (elt) | |
5935 (cperl-tags-treeify elt (1+ level)))) | |
5936 (cdr to))) | |
5937 ;;Now clean up leaders with one child only | |
5938 (mapcar (function (lambda (elt) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5939 (if (not (and (listp (cdr elt)) |
20323 | 5940 (eq (length elt) 2))) nil |
5941 (setcar elt (car (nth 1 elt))) | |
5942 (setcdr elt (cdr (nth 1 elt)))))) | |
5943 (cdr to)) | |
5944 ;; Sort the roots of subtrees | |
5945 (if (default-value 'imenu-sort-function) | |
5946 (setcdr to | |
5947 (sort (cdr to) (default-value 'imenu-sort-function)))) | |
5948 ;; Now add back functions removed from display | |
5949 (mapcar (function (lambda (elt) | |
5950 (setcdr to (cons elt (cdr to))))) | |
5951 (if (default-value 'imenu-sort-function) | |
5952 (nreverse | |
5953 (sort root-functions (default-value 'imenu-sort-function))) | |
5954 root-functions)) | |
5955 ;; Now add back packages removed from display | |
5956 (mapcar (function (lambda (elt) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5957 (setcdr to (cons (cons (concat "package " (car elt)) |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5958 (cdr elt)) |
20323 | 5959 (cdr to))))) |
5960 (if (default-value 'imenu-sort-function) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5961 (nreverse |
20323 | 5962 (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
|
5963 root-packages)))) |
20323 | 5964 |
5965 ;;;(x-popup-menu t | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5966 ;;; '(keymap "Name1" |
20323 | 5967 ;;; ("Ret1" "aa") |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5968 ;;; ("Head1" "ab" |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5969 ;;; keymap "Name2" |
20323 | 5970 ;;; ("Tail1" "x") ("Tail2" "y")))) |
5971 | |
5972 (defun cperl-list-fold (list name limit) | |
5973 (let (list1 list2 elt1 (num 0)) | |
5974 (if (<= (length list) limit) list | |
5975 (setq list1 nil list2 nil) | |
5976 (while list | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5977 (setq num (1+ num) |
20323 | 5978 elt1 (car list) |
5979 list (cdr list)) | |
5980 (if (<= num imenu-max-items) | |
5981 (setq list2 (cons elt1 list2)) | |
5982 (setq list1 (cons (cons name | |
5983 (nreverse list2)) | |
5984 list1) | |
5985 list2 (list elt1) | |
5986 num 1))) | |
5987 (nreverse (cons (cons name | |
5988 (nreverse list2)) | |
5989 list1))))) | |
5990 | |
5991 (defun cperl-menu-to-keymap (menu &optional name) | |
5992 (let (list) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5993 (cons 'keymap |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5994 (mapcar |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
5995 (function |
20323 | 5996 (lambda (elt) |
5997 (cond ((listp (cdr elt)) | |
5998 (setq list (cperl-list-fold | |
5999 (cdr elt) (car elt) imenu-max-items)) | |
6000 (cons nil | |
6001 (cons (car elt) | |
6002 (cperl-menu-to-keymap list)))) | |
6003 (t | |
6004 (list (cdr elt) (car elt) t))))) ; t is needed in 19.34 | |
6005 (cperl-list-fold menu "Root" imenu-max-items))))) | |
6006 | |
6007 | |
6008 (defvar cperl-bad-style-regexp | |
6009 (mapconcat 'identity | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6010 '("[^-\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
|
6011 "[-<>=+^&|]+[^- \t\n=+<>~]") ; sign+ char |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6012 "\\|") |
20323 | 6013 "Finds places such that insertion of a whitespace may help a lot.") |
6014 | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6015 (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
|
6016 (mapconcat |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6017 'identity |
20323 | 6018 '("[^-\t <>=+]\\(--\\|\\+\\+\\)" ; var-- var++ |
6019 "[a-zA-Z0-9_][|&][a-zA-Z0-9_$]" ; abc|def abc&def are often used. | |
6020 "&[(a-zA-Z0-9_$]" ; &subroutine &(var->field) | |
6021 "<\\$?\\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
|
6022 "-[a-zA-Z][ \t]+[_$\"'`a-zA-Z]" ; -f file, -t STDIN |
20323 | 6023 "-[0-9]" ; -5 |
6024 "\\+\\+" ; ++var | |
6025 "--" ; --var | |
6026 ".->" ; a->b | |
6027 "->" ; a SPACE ->b | |
6028 "\\[-" ; a[-1] | |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6029 "\\\\[&$@*\\\\]" ; \&func |
20323 | 6030 "^=" ; =head |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6031 "\\$." ; $| |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
6032 "<<[a-zA-Z_'\"`]" ; <<FOO, <<'FOO' |
20323 | 6033 "||" |
6034 "&&" | |
6035 "[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
|
6036 "-[a-zA-Z_0-9]+[ \t]*=>" ; -option => value |
20323 | 6037 ;; Unaddressed trouble spots: = -abc, f(56, -abc) --- specialcased below |
6038 ;;"[*/+-|&<.]+=" | |
6039 ) | |
6040 "\\|") | |
6041 "If matches at the start of match found by `my-bad-c-style-regexp', | |
6042 insertion of a whitespace will not help.") | |
6043 | |
6044 (defvar found-bad) | |
6045 | |
6046 (defun cperl-find-bad-style () | |
6047 "Find places in the buffer where insertion of a whitespace may help. | |
6048 Prompts user for insertion of spaces. | |
6049 Currently it is tuned to C and Perl syntax." | |
6050 (interactive) | |
6051 (let (found-bad (p (point))) | |
6052 (setq last-nonmenu-event 13) ; To disable popup | |
6053 (beginning-of-buffer) | |
6054 (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
|
6055 (lambda (arg) (insert " ")) |
20323 | 6056 'cperl-next-bad-style |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6057 '("location" "locations" "insert a space into") |
20323 | 6058 '((?\C-r (lambda (arg) |
6059 (let ((buffer-quit-function | |
6060 'exit-recursive-edit)) | |
6061 (message "Exit with Esc Esc") | |
6062 (recursive-edit) | |
6063 t)) ; Consider acted upon | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6064 "edit, exit with Esc Esc") |
20323 | 6065 (?e (lambda (arg) |
6066 (let ((buffer-quit-function | |
6067 'exit-recursive-edit)) | |
6068 (message "Exit with Esc Esc") | |
6069 (recursive-edit) | |
6070 t)) ; Consider acted upon | |
6071 "edit, exit with Esc Esc")) | |
6072 t) | |
6073 (if found-bad (goto-char found-bad) | |
6074 (goto-char p) | |
6075 (message "No appropriate place found")))) | |
6076 | |
6077 (defun cperl-next-bad-style () | |
6078 (let (p (not-found t) (point (point)) found) | |
6079 (while (and not-found | |
6080 (re-search-forward cperl-bad-style-regexp nil 'to-end)) | |
6081 (setq p (point)) | |
6082 (goto-char (match-beginning 0)) | |
6083 (if (or | |
6084 (looking-at cperl-not-bad-style-regexp) | |
6085 ;; Check for a < -b and friends | |
6086 (and (eq (following-char) ?\-) | |
6087 (save-excursion | |
6088 (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
|
6089 (memq (preceding-char) '(?\= ?\> ?\< ?\, ?\( ?\[ ?\{)))) |
20323 | 6090 ;; Now check for syntax type |
6091 (save-match-data | |
6092 (setq found (point)) | |
6093 (beginning-of-defun) | |
6094 (let ((pps (parse-partial-sexp (point) found))) | |
6095 (or (nth 3 pps) (nth 4 pps) (nth 5 pps))))) | |
6096 (goto-char (match-end 0)) | |
6097 (goto-char (1- p)) | |
6098 (setq not-found nil | |
6099 found-bad found))) | |
6100 (not not-found))) | |
6101 | |
27248 | 6102 |
20323 | 6103 ;;; Getting help |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6104 (defvar cperl-have-help-regexp |
20323 | 6105 ;;(concat "\\(" |
6106 (mapconcat | |
6107 'identity | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6108 '("[$@%*&][0-9a-zA-Z_:]+\\([ \t]*[[{]\\)?" ; Usual variable |
20323 | 6109 "[$@]\\^[a-zA-Z]" ; Special variable |
6110 "[$@][^ \n\t]" ; Special variable | |
6111 "-[a-zA-Z]" ; File test | |
6112 "\\\\[a-zA-Z0]" ; Special chars | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6113 "^=[a-z][a-zA-Z0-9_]*" ; POD sections |
20323 | 6114 "[-!&*+,-./<=>?\\\\^|~]+" ; Operator |
6115 "[a-zA-Z_0-9:]+" ; symbol or number | |
6116 "x=" | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6117 "#!") |
20323 | 6118 ;;"\\)\\|\\(" |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6119 "\\|") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6120 ;;"\\)" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6121 ;;) |
20323 | 6122 "Matches places in the buffer we can find help for.") |
6123 | |
6124 (defvar cperl-message-on-help-error t) | |
6125 (defvar cperl-help-from-timer nil) | |
6126 | |
6127 (defun cperl-word-at-point-hard () | |
6128 ;; Does not save-excursion | |
6129 ;; Get to the something meaningful | |
6130 (or (eobp) (eolp) (forward-char 1)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6131 (re-search-backward "[-a-zA-Z0-9_:!&*+,-./<=>?\\\\^|~$%@]" |
20323 | 6132 (save-excursion (beginning-of-line) (point)) |
6133 'to-beg) | |
6134 ;; (cond | |
6135 ;; ((or (eobp) (looking-at "[][ \t\n{}();,]")) ; Not at a symbol | |
6136 ;; (skip-chars-backward " \n\t\r({[]});,") | |
6137 ;; (or (bobp) (backward-char 1)))) | |
6138 ;; Try to backtrace | |
6139 (cond | |
6140 ((looking-at "[a-zA-Z0-9_:]") ; symbol | |
6141 (skip-chars-backward "a-zA-Z0-9_:") | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6142 (cond |
20323 | 6143 ((and (eq (preceding-char) ?^) ; $^I |
6144 (eq (char-after (- (point) 2)) ?\$)) | |
6145 (forward-char -2)) | |
6146 ((memq (preceding-char) (append "*$@%&\\" nil)) ; *glob | |
6147 (forward-char -1)) | |
6148 ((and (eq (preceding-char) ?\=) | |
6149 (eq (current-column) 1)) | |
6150 (forward-char -1))) ; =head1 | |
6151 (if (and (eq (preceding-char) ?\<) | |
6152 (looking-at "\\$?[a-zA-Z0-9_:]+>")) ; <FH> | |
6153 (forward-char -1))) | |
6154 ((and (looking-at "=") (eq (preceding-char) ?x)) ; x= | |
6155 (forward-char -1)) | |
6156 ((and (looking-at "\\^") (eq (preceding-char) ?\$)) ; $^I | |
6157 (forward-char -1)) | |
6158 ((looking-at "[-!&*+,-./<=>?\\\\^|~]") | |
6159 (skip-chars-backward "-!&*+,-./<=>?\\\\^|~") | |
6160 (cond | |
6161 ((and (eq (preceding-char) ?\$) | |
6162 (not (eq (char-after (- (point) 2)) ?\$))) ; $- | |
6163 (forward-char -1)) | |
6164 ((and (eq (following-char) ?\>) | |
6165 (string-match "[a-zA-Z0-9_]" (char-to-string (preceding-char))) | |
6166 (save-excursion | |
6167 (forward-sexp -1) | |
6168 (and (eq (preceding-char) ?\<) | |
6169 (looking-at "\\$?[a-zA-Z0-9_:]+>")))) ; <FH> | |
6170 (search-backward "<")))) | |
6171 ((and (eq (following-char) ?\$) | |
6172 (eq (preceding-char) ?\<) | |
6173 (looking-at "\\$?[a-zA-Z0-9_:]+>")) ; <$fh> | |
6174 (forward-char -1))) | |
6175 (if (looking-at cperl-have-help-regexp) | |
6176 (buffer-substring (match-beginning 0) (match-end 0)))) | |
6177 | |
6178 (defun cperl-get-help () | |
6179 "Get one-line docs on the symbol at the point. | |
6180 The data for these docs is a little bit obsolete and may be in fact longer | |
6181 than a line. Your contribution to update/shorten it is appreciated." | |
6182 (interactive) | |
6183 (save-match-data ; May be called "inside" query-replace | |
6184 (save-excursion | |
6185 (let ((word (cperl-word-at-point-hard))) | |
6186 (if word | |
6187 (if (and cperl-help-from-timer ; Bail out if not in mainland | |
6188 (not (string-match "^#!\\|\\\\\\|^=" word)) ; Show help even in comments/strings. | |
6189 (or (memq (get-text-property (point) 'face) | |
6190 '(font-lock-comment-face font-lock-string-face)) | |
6191 (memq (get-text-property (point) 'syntax-type) | |
6192 '(pod here-doc format)))) | |
6193 nil | |
6194 (cperl-describe-perl-symbol word)) | |
6195 (if cperl-message-on-help-error | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6196 (message "Nothing found for %s..." |
20323 | 6197 (buffer-substring (point) (min (+ 5 (point)) (point-max)))))))))) |
6198 | |
6199 ;;; Stolen from perl-descr.el by Johan Vromans: | |
6200 | |
6201 (defvar cperl-doc-buffer " *perl-doc*" | |
6202 "Where the documentation can be found.") | |
6203 | |
6204 (defun cperl-describe-perl-symbol (val) | |
6205 "Display the documentation of symbol at point, a Perl operator." | |
6206 (let ((enable-recursive-minibuffers t) | |
6207 args-file regexp) | |
6208 (cond | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6209 ((string-match "^[&*][a-zA-Z_]" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6210 (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
|
6211 ((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
|
6212 (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
|
6213 ((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
|
6214 (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
|
6215 ((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
|
6216 (setq val "x=")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6217 ((string-match "^\\$[\C-a-\C-z]" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6218 (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
|
6219 ((string-match "^CORE::" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6220 (setq val "CORE::")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6221 ((string-match "^SUPER::" val) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6222 (setq val "SUPER::")) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6223 ((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
|
6224 (setq val "<NAME>"))) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6225 (setq regexp (concat "^" |
20323 | 6226 "\\([^a-zA-Z0-9_:]+[ \t]+\\)?" |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6227 (regexp-quote val) |
20323 | 6228 "\\([ \t([/]\\|$\\)")) |
6229 | |
6230 ;; get the buffer with the documentation text | |
6231 (cperl-switch-to-doc-buffer) | |
6232 | |
6233 ;; lookup in the doc | |
6234 (goto-char (point-min)) | |
6235 (let ((case-fold-search nil)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6236 (list |
20323 | 6237 (if (re-search-forward regexp (point-max) t) |
6238 (save-excursion | |
6239 (beginning-of-line 1) | |
6240 (let ((lnstart (point))) | |
6241 (end-of-line) | |
6242 (message "%s" (buffer-substring lnstart (point))))) | |
6243 (if cperl-message-on-help-error | |
6244 (message "No definition for %s" val))))))) | |
6245 | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6246 (defvar cperl-short-docs 'please-ignore-this-line |
20323 | 6247 ;; Perl4 version was written by Johan Vromans (jvromans@squirrel.nl) |
6248 "# 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
|
6249 ... 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
|
6250 ! ... Logical negation. |
20323 | 6251 ... != ... Numeric inequality. |
6252 ... !~ ... Search pattern, substitution, or translation (negated). | |
6253 $! In numeric context: errno. In a string context: error string. | |
6254 $\" 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
|
6255 $# The output format for printed numbers. Default is %.15g or close. |
20323 | 6256 $$ Process number of this script. Changes in the fork()ed child process. |
6257 $% The current page number of the currently selected output channel. | |
6258 | |
6259 The following variables are always local to the current block: | |
6260 | |
6261 $1 Match of the 1st set of parentheses in the last match (auto-local). | |
6262 $2 Match of the 2nd set of parentheses in the last match (auto-local). | |
6263 $3 Match of the 3rd set of parentheses in the last match (auto-local). | |
6264 $4 Match of the 4th set of parentheses in the last match (auto-local). | |
6265 $5 Match of the 5th set of parentheses in the last match (auto-local). | |
6266 $6 Match of the 6th set of parentheses in the last match (auto-local). | |
6267 $7 Match of the 7th set of parentheses in the last match (auto-local). | |
6268 $8 Match of the 8th set of parentheses in the last match (auto-local). | |
6269 $9 Match of the 9th set of parentheses in the last match (auto-local). | |
6270 $& The string matched by the last pattern match (auto-local). | |
6271 $' The string after what was matched by the last match (auto-local). | |
6272 $` The string before what was matched by the last match (auto-local). | |
6273 | |
6274 $( The real gid of this process. | |
6275 $) The effective gid of this process. | |
6276 $* Deprecated: Set to 1 to do multiline matching within a string. | |
6277 $+ The last bracket matched by the last search pattern. | |
6278 $, The output field separator for the print operator. | |
6279 $- The number of lines left on the page. | |
6280 $. The current input line number of the last filehandle that was read. | |
6281 $/ 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
|
6282 $0 Name of the file containing the current perl script (read/write). |
20323 | 6283 $: String may be broken after these characters to fill ^-lines in a format. |
6284 $; Subscript separator for multi-dim array emulation. Default \"\\034\". | |
6285 $< The real uid of this process. | |
6286 $= The page length of the current output channel. Default is 60 lines. | |
6287 $> The effective uid of this process. | |
6288 $? The status returned by the last ``, pipe close or `system'. | |
6289 $@ The perl error message from the last eval or do @var{EXPR} command. | |
6290 $ARGV The name of the current file used with <> . | |
6291 $[ Deprecated: The index of the first element/char in an array/string. | |
6292 $\\ The output record separator for the print operator. | |
6293 $] The perl version string as displayed with perl -v. | |
6294 $^ The name of the current top-of-page format. | |
6295 $^A The current value of the write() accumulator for format() lines. | |
6296 $^D The value of the perl debug (-D) flags. | |
6297 $^E Information about the last system error other than that provided by $!. | |
6298 $^F The highest system file descriptor, ordinarily 2. | |
6299 $^H The current set of syntax checks enabled by `use strict'. | |
6300 $^I The value of the in-place edit extension (perl -i option). | |
6301 $^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
|
6302 $^M A buffer for emergency memory allocation when running out of memory. |
20323 | 6303 $^O The operating system name under which this copy of Perl was built. |
6304 $^P Internal debugging flag. | |
6305 $^T The time the script was started. Used by -A/-M/-C file tests. | |
6306 $^W True if warnings are requested (perl -w flag). | |
6307 $^X The name under which perl was invoked (argv[0] in C-speech). | |
6308 $_ The default input and pattern-searching space. | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6309 $| Auto-flush after write/print on current output channel? Default 0. |
20323 | 6310 $~ The name of the current report format. |
6311 ... % ... Modulo division. | |
6312 ... %= ... Modulo division assignment. | |
6313 %ENV Contains the current environment. | |
6314 %INC List of files that have been require-d or do-ne. | |
6315 %SIG Used to set signal handlers for various signals. | |
6316 ... & ... Bitwise and. | |
6317 ... && ... Logical and. | |
6318 ... &&= ... Logical and assignment. | |
6319 ... &= ... Bitwise and assignment. | |
6320 ... * ... Multiplication. | |
6321 ... ** ... Exponentiation. | |
6322 *NAME Glob: all objects refered by NAME. *NAM1 = *NAM2 aliases NAM1 to NAM2. | |
6323 &NAME(arg0, ...) Subroutine call. Arguments go to @_. | |
6324 ... + ... Addition. +EXPR Makes EXPR into scalar context. | |
6325 ++ Auto-increment (magical on strings). ++EXPR EXPR++ | |
6326 ... += ... Addition assignment. | |
6327 , Comma operator. | |
6328 ... - ... Subtraction. | |
6329 -- Auto-decrement (NOT magical on strings). --EXPR EXPR-- | |
6330 ... -= ... Subtraction assignment. | |
6331 -A Access time in days since script started. | |
6332 -B File is a non-text (binary) file. | |
6333 -C Inode change time in days since script started. | |
6334 -M Age in days since script started. | |
6335 -O File is owned by real uid. | |
6336 -R File is readable by real uid. | |
6337 -S File is a socket . | |
6338 -T File is a text file. | |
6339 -W File is writable by real uid. | |
6340 -X File is executable by real uid. | |
6341 -b File is a block special file. | |
6342 -c File is a character special file. | |
6343 -d File is a directory. | |
6344 -e File exists . | |
6345 -f File is a plain file. | |
6346 -g File has setgid bit set. | |
6347 -k File has sticky bit set. | |
6348 -l File is a symbolic link. | |
6349 -o File is owned by effective uid. | |
6350 -p File is a named pipe (FIFO). | |
6351 -r File is readable by effective uid. | |
6352 -s File has non-zero size. | |
6353 -t Tests if filehandle (STDIN by default) is opened to a tty. | |
6354 -u File has setuid bit set. | |
6355 -w File is writable by effective uid. | |
6356 -x File is executable by effective uid. | |
6357 -z File has zero size. | |
6358 . Concatenate strings. | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
6359 .. Range (list context); flip/flop (scalar context) operator. |
20323 | 6360 .= Concatenate assignment strings |
6361 ... / ... Division. /PATTERN/ioxsmg Pattern match | |
6362 ... /= ... Division assignment. | |
6363 /PATTERN/ioxsmg Pattern match. | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
6364 ... < ... Numeric less than. <pattern> Glob. See <NAME>, <> as well. |
20323 | 6365 <NAME> Reads line from filehandle NAME (a bareword or dollar-bareword). |
6366 <pattern> Glob (Unless pattern is bareword/dollar-bareword - see <NAME>). | |
6367 <> Reads line from union of files in @ARGV (= command line) and STDIN. | |
6368 ... << ... Bitwise shift left. << start of HERE-DOCUMENT. | |
6369 ... <= ... Numeric less than or equal to. | |
6370 ... <=> ... Numeric compare. | |
6371 ... = ... Assignment. | |
6372 ... == ... Numeric equality. | |
6373 ... =~ ... Search pattern, substitution, or translation | |
6374 ... > ... Numeric greater than. | |
6375 ... >= ... Numeric greater than or equal to. | |
6376 ... >> ... Bitwise shift right. | |
6377 ... >>= ... Bitwise shift right assignment. | |
6378 ... ? ... : ... Condition=if-then-else operator. ?PAT? One-time pattern match. | |
6379 ?PATTERN? One-time pattern match. | |
6380 @ARGV Command line arguments (not including the command name - see $0). | |
6381 @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
|
6382 @_ Parameter array for subroutines; result of split() unless in list context. |
20323 | 6383 \\ Creates reference to what follows, like \$var, or quotes non-\w in strings. |
6384 \\0 Octal char, e.g. \\033. | |
6385 \\E Case modification terminator. See \\Q, \\L, and \\U. | |
6386 \\L Lowercase until \\E . See also \l, lc. | |
6387 \\U Upcase until \\E . See also \u, uc. | |
6388 \\Q Quote metacharacters until \\E . See also quotemeta. | |
6389 \\a Alarm character (octal 007). | |
6390 \\b Backspace character (octal 010). | |
6391 \\c Control character, e.g. \\c[ . | |
6392 \\e Escape character (octal 033). | |
6393 \\f Formfeed character (octal 014). | |
6394 \\l Lowercase the next character. See also \\L and \\u, lcfirst. | |
6395 \\n Newline character (octal 012 on most systems). | |
6396 \\r Return character (octal 015 on most systems). | |
6397 \\t Tab character (octal 011). | |
6398 \\u Upcase the next character. See also \\U and \\l, ucfirst. | |
6399 \\x Hex character, e.g. \\x1b. | |
6400 ... ^ ... Bitwise exclusive or. | |
6401 __END__ Ends program source. | |
6402 __DATA__ Ends program source. | |
6403 __FILE__ Current (source) filename. | |
6404 __LINE__ Current line in current source. | |
6405 __PACKAGE__ Current package. | |
6406 ARGV Default multi-file input filehandle. <ARGV> is a synonym for <>. | |
6407 ARGVOUT Output filehandle with -i flag. | |
6408 BEGIN { ... } Immediately executed (during compilation) piece of code. | |
6409 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
|
6410 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
|
6411 INIT { ... } Pseudo-subroutine executed before the script starts running. |
20323 | 6412 DATA Input filehandle for what follows after __END__ or __DATA__. |
6413 accept(NEWSOCKET,GENERICSOCKET) | |
6414 alarm(SECONDS) | |
6415 atan2(X,Y) | |
6416 bind(SOCKET,NAME) | |
6417 binmode(FILEHANDLE) | |
6418 caller[(LEVEL)] | |
6419 chdir(EXPR) | |
6420 chmod(LIST) | |
6421 chop[(LIST|VAR)] | |
6422 chown(LIST) | |
6423 chroot(FILENAME) | |
6424 close(FILEHANDLE) | |
6425 closedir(DIRHANDLE) | |
6426 ... cmp ... String compare. | |
6427 connect(SOCKET,NAME) | |
6428 continue of { block } continue { block }. Is executed after `next' or at end. | |
6429 cos(EXPR) | |
6430 crypt(PLAINTEXT,SALT) | |
6431 dbmclose(%HASH) | |
6432 dbmopen(%HASH,DBNAME,MODE) | |
6433 defined(EXPR) | |
6434 delete($HASH{KEY}) | |
6435 die(LIST) | |
6436 do { ... }|SUBR while|until EXPR executes at least once | |
6437 do(EXPR|SUBR([LIST])) (with while|until executes at least once) | |
6438 dump LABEL | |
6439 each(%HASH) | |
6440 endgrent | |
6441 endhostent | |
6442 endnetent | |
6443 endprotoent | |
6444 endpwent | |
6445 endservent | |
6446 eof[([FILEHANDLE])] | |
6447 ... eq ... String equality. | |
6448 eval(EXPR) or eval { BLOCK } | |
6449 exec(LIST) | |
6450 exit(EXPR) | |
6451 exp(EXPR) | |
6452 fcntl(FILEHANDLE,FUNCTION,SCALAR) | |
6453 fileno(FILEHANDLE) | |
6454 flock(FILEHANDLE,OPERATION) | |
6455 for (EXPR;EXPR;EXPR) { ... } | |
6456 foreach [VAR] (@ARRAY) { ... } | |
6457 fork | |
6458 ... ge ... String greater than or equal. | |
6459 getc[(FILEHANDLE)] | |
6460 getgrent | |
6461 getgrgid(GID) | |
6462 getgrnam(NAME) | |
6463 gethostbyaddr(ADDR,ADDRTYPE) | |
6464 gethostbyname(NAME) | |
6465 gethostent | |
6466 getlogin | |
6467 getnetbyaddr(ADDR,ADDRTYPE) | |
6468 getnetbyname(NAME) | |
6469 getnetent | |
6470 getpeername(SOCKET) | |
6471 getpgrp(PID) | |
6472 getppid | |
6473 getpriority(WHICH,WHO) | |
6474 getprotobyname(NAME) | |
6475 getprotobynumber(NUMBER) | |
6476 getprotoent | |
6477 getpwent | |
6478 getpwnam(NAME) | |
6479 getpwuid(UID) | |
6480 getservbyname(NAME,PROTO) | |
6481 getservbyport(PORT,PROTO) | |
6482 getservent | |
6483 getsockname(SOCKET) | |
6484 getsockopt(SOCKET,LEVEL,OPTNAME) | |
6485 gmtime(EXPR) | |
6486 goto LABEL | |
6487 ... gt ... String greater than. | |
6488 hex(EXPR) | |
6489 if (EXPR) { ... } [ elsif (EXPR) { ... } ... ] [ else { ... } ] or EXPR if EXPR | |
6490 index(STR,SUBSTR[,OFFSET]) | |
6491 int(EXPR) | |
6492 ioctl(FILEHANDLE,FUNCTION,SCALAR) | |
6493 join(EXPR,LIST) | |
6494 keys(%HASH) | |
6495 kill(LIST) | |
6496 last [LABEL] | |
6497 ... le ... String less than or equal. | |
6498 length(EXPR) | |
6499 link(OLDFILE,NEWFILE) | |
6500 listen(SOCKET,QUEUESIZE) | |
6501 local(LIST) | |
6502 localtime(EXPR) | |
6503 log(EXPR) | |
6504 lstat(EXPR|FILEHANDLE|VAR) | |
6505 ... lt ... String less than. | |
6506 m/PATTERN/iogsmx | |
6507 mkdir(FILENAME,MODE) | |
6508 msgctl(ID,CMD,ARG) | |
6509 msgget(KEY,FLAGS) | |
6510 msgrcv(ID,VAR,SIZE,TYPE.FLAGS) | |
6511 msgsnd(ID,MSG,FLAGS) | |
6512 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
|
6513 our VAR or our (VAR1,...) Lexically enable a global variable ($V, @A, or %H). |
20323 | 6514 ... ne ... String inequality. |
6515 next [LABEL] | |
6516 oct(EXPR) | |
6517 open(FILEHANDLE[,EXPR]) | |
6518 opendir(DIRHANDLE,EXPR) | |
6519 ord(EXPR) ASCII value of the first char of the string. | |
6520 pack(TEMPLATE,LIST) | |
6521 package NAME Introduces package context. | |
6522 pipe(READHANDLE,WRITEHANDLE) Create a pair of filehandles on ends of a pipe. | |
6523 pop(ARRAY) | |
6524 print [FILEHANDLE] [(LIST)] | |
6525 printf [FILEHANDLE] (FORMAT,LIST) | |
6526 push(ARRAY,LIST) | |
6527 q/STRING/ Synonym for 'STRING' | |
6528 qq/STRING/ Synonym for \"STRING\" | |
6529 qx/STRING/ Synonym for `STRING` | |
6530 rand[(EXPR)] | |
6531 read(FILEHANDLE,SCALAR,LENGTH[,OFFSET]) | |
6532 readdir(DIRHANDLE) | |
6533 readlink(EXPR) | |
6534 recv(SOCKET,SCALAR,LEN,FLAGS) | |
6535 redo [LABEL] | |
6536 rename(OLDNAME,NEWNAME) | |
6537 require [FILENAME | PERL_VERSION] | |
6538 reset[(EXPR)] | |
6539 return(LIST) | |
6540 reverse(LIST) | |
6541 rewinddir(DIRHANDLE) | |
6542 rindex(STR,SUBSTR[,OFFSET]) | |
6543 rmdir(FILENAME) | |
6544 s/PATTERN/REPLACEMENT/gieoxsm | |
6545 scalar(EXPR) | |
6546 seek(FILEHANDLE,POSITION,WHENCE) | |
6547 seekdir(DIRHANDLE,POS) | |
6548 select(FILEHANDLE | RBITS,WBITS,EBITS,TIMEOUT) | |
6549 semctl(ID,SEMNUM,CMD,ARG) | |
6550 semget(KEY,NSEMS,SIZE,FLAGS) | |
6551 semop(KEY,...) | |
6552 send(SOCKET,MSG,FLAGS[,TO]) | |
6553 setgrent | |
6554 sethostent(STAYOPEN) | |
6555 setnetent(STAYOPEN) | |
6556 setpgrp(PID,PGRP) | |
6557 setpriority(WHICH,WHO,PRIORITY) | |
6558 setprotoent(STAYOPEN) | |
6559 setpwent | |
6560 setservent(STAYOPEN) | |
6561 setsockopt(SOCKET,LEVEL,OPTNAME,OPTVAL) | |
6562 shift[(ARRAY)] | |
6563 shmctl(ID,CMD,ARG) | |
6564 shmget(KEY,SIZE,FLAGS) | |
6565 shmread(ID,VAR,POS,SIZE) | |
6566 shmwrite(ID,STRING,POS,SIZE) | |
6567 shutdown(SOCKET,HOW) | |
6568 sin(EXPR) | |
6569 sleep[(EXPR)] | |
6570 socket(SOCKET,DOMAIN,TYPE,PROTOCOL) | |
6571 socketpair(SOCKET1,SOCKET2,DOMAIN,TYPE,PROTOCOL) | |
6572 sort [SUBROUTINE] (LIST) | |
6573 splice(ARRAY,OFFSET[,LENGTH[,LIST]]) | |
6574 split[(/PATTERN/[,EXPR[,LIMIT]])] | |
6575 sprintf(FORMAT,LIST) | |
6576 sqrt(EXPR) | |
6577 srand(EXPR) | |
6578 stat(EXPR|FILEHANDLE|VAR) | |
6579 study[(SCALAR)] | |
6580 sub [NAME [(format)]] { BODY } sub NAME [(format)]; sub [(format)] {...} | |
6581 substr(EXPR,OFFSET[,LEN]) | |
6582 symlink(OLDFILE,NEWFILE) | |
6583 syscall(LIST) | |
6584 sysread(FILEHANDLE,SCALAR,LENGTH[,OFFSET]) | |
6585 system(LIST) | |
6586 syswrite(FILEHANDLE,SCALAR,LENGTH[,OFFSET]) | |
6587 tell[(FILEHANDLE)] | |
6588 telldir(DIRHANDLE) | |
6589 time | |
6590 times | |
6591 tr/SEARCHLIST/REPLACEMENTLIST/cds | |
6592 truncate(FILE|EXPR,LENGTH) | |
6593 umask[(EXPR)] | |
6594 undef[(EXPR)] | |
6595 unless (EXPR) { ... } [ else { ... } ] or EXPR unless EXPR | |
6596 unlink(LIST) | |
6597 unpack(TEMPLATE,EXPR) | |
6598 unshift(ARRAY,LIST) | |
6599 until (EXPR) { ... } EXPR until EXPR | |
6600 utime(LIST) | |
6601 values(%HASH) | |
6602 vec(EXPR,OFFSET,BITS) | |
6603 wait | |
6604 waitpid(PID,FLAGS) | |
6605 wantarray Returns true if the sub/eval is called in list context. | |
6606 warn(LIST) | |
6607 while (EXPR) { ... } EXPR while EXPR | |
6608 write[(EXPR|FILEHANDLE)] | |
6609 ... x ... Repeat string or array. | |
6610 x= ... Repetition assignment. | |
6611 y/SEARCHLIST/REPLACEMENTLIST/ | |
6612 ... | ... Bitwise or. | |
6613 ... || ... Logical or. | |
6614 ~ ... Unary bitwise complement. | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6615 #! OS interpreter indicator. If contains `perl', used for options, and -x. |
20323 | 6616 AUTOLOAD {...} Shorthand for `sub AUTOLOAD {...}'. |
6617 CORE:: Prefix to access builtin function if imported sub obscures it. | |
6618 SUPER:: Prefix to lookup for a method in @ISA classes. | |
6619 DESTROY Shorthand for `sub DESTROY {...}'. | |
6620 ... EQ ... Obsolete synonym of `eq'. | |
6621 ... GE ... Obsolete synonym of `ge'. | |
6622 ... GT ... Obsolete synonym of `gt'. | |
6623 ... LE ... Obsolete synonym of `le'. | |
6624 ... LT ... Obsolete synonym of `lt'. | |
6625 ... NE ... Obsolete synonym of `ne'. | |
6626 abs [ EXPR ] absolute value | |
6627 ... and ... Low-precedence synonym for &&. | |
6628 bless REFERENCE [, PACKAGE] Makes reference into an object of a package. | |
6629 chomp [LIST] Strips $/ off LIST/$_. Returns count. Special if $/ eq ''! | |
6630 chr Converts a number to char with the same ordinal. | |
6631 else Part of if/unless {BLOCK} elsif {BLOCK} else {BLOCK}. | |
6632 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
|
6633 exists $HASH{KEY} True if the key exists. |
20323 | 6634 format [NAME] = Start of output format. Ended by a single dot (.) on a line. |
6635 formline PICTURE, LIST Backdoor into \"format\" processing. | |
6636 glob EXPR Synonym of <EXPR>. | |
6637 lc [ EXPR ] Returns lowercased EXPR. | |
6638 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
|
6639 grep EXPR,LIST or grep {BLOCK} LIST Filters LIST via EXPR/BLOCK. |
20323 | 6640 map EXPR, LIST or map {BLOCK} LIST Applies EXPR/BLOCK to elts of LIST. |
6641 no PACKAGE [SYMBOL1, ...] Partial reverse for `use'. Runs `unimport' method. | |
6642 not ... Low-precedence synonym for ! - negation. | |
6643 ... or ... Low-precedence synonym for ||. | |
6644 pos STRING Set/Get end-position of the last match over this string, see \\G. | |
6645 quotemeta [ EXPR ] Quote regexp metacharacters. | |
6646 qw/WORD1 .../ Synonym of split('', 'WORD1 ...') | |
6647 readline FH Synonym of <FH>. | |
6648 readpipe CMD Synonym of `CMD`. | |
6649 ref [ EXPR ] Type of EXPR when dereferenced. | |
6650 sysopen FH, FILENAME, MODE [, PERM] (MODE is numeric, see Fcntl.) | |
6651 tie VAR, PACKAGE, LIST Hide an object behind a simple Perl variable. | |
6652 tied Returns internal object for a tied data. | |
6653 uc [ EXPR ] Returns upcased EXPR. | |
6654 ucfirst [ EXPR ] Returns EXPR with upcased first letter. | |
6655 untie VAR Unlink an object from a simple Perl variable. | |
6656 use PACKAGE [SYMBOL1, ...] Compile-time `require' with consequent `import'. | |
6657 ... xor ... Low-precedence synonym for exclusive or. | |
6658 prototype \&SUB Returns prototype of the function given a reference. | |
6659 =head1 Top-level heading. | |
6660 =head2 Second-level heading. | |
6661 =head3 Third-level heading (is there such?). | |
6662 =over [ NUMBER ] Start list. | |
6663 =item [ TITLE ] Start new item in the list. | |
6664 =back End list. | |
6665 =cut Switch from POD to Perl. | |
6666 =pod Switch from Perl to POD. | |
6667 ") | |
6668 | |
6669 (defun cperl-switch-to-doc-buffer () | |
6670 "Go to the perl documentation buffer and insert the documentation." | |
6671 (interactive) | |
6672 (let ((buf (get-buffer-create cperl-doc-buffer))) | |
6673 (if (interactive-p) | |
6674 (switch-to-buffer-other-window buf) | |
6675 (set-buffer buf)) | |
6676 (if (= (buffer-size) 0) | |
6677 (progn | |
6678 (insert (documentation-property 'cperl-short-docs | |
6679 'variable-documentation)) | |
6680 (setq buffer-read-only t))))) | |
6681 | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6682 (defun cperl-beautify-regexp-piece (b e embed level) |
20323 | 6683 ;; b is before the starting delimiter, e before the ending |
6684 ;; 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
|
6685 ;; EMBED is nil iff we process the whole REx. |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6686 ;; The REx is guarantied to have //x |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6687 ;; 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
|
6688 ;; 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
|
6689 (let (s c tmp (m (make-marker)) (m1 (make-marker)) c1 spaces inline code pos) |
20323 | 6690 (if (not embed) |
6691 (goto-char (1+ b)) | |
6692 (goto-char b) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6693 (cond ((looking-at "(\\?\\\\#") ; (?#) wrongly commented when //x-ing |
20323 | 6694 (forward-char 2) |
6695 (delete-char 1) | |
6696 (forward-char 1)) | |
6697 ((looking-at "(\\?[^a-zA-Z]") | |
6698 (forward-char 3)) | |
6699 ((looking-at "(\\?") ; (?i) | |
6700 (forward-char 2)) | |
6701 (t | |
6702 (forward-char 1)))) | |
6703 (setq c (if embed (current-indentation) (1- (current-column))) | |
6704 c1 (+ c (or cperl-regexp-indent-step cperl-indent-level))) | |
6705 (or (looking-at "[ \t]*[\n#]") | |
6706 (progn | |
6707 (insert "\n"))) | |
6708 (goto-char e) | |
6709 (beginning-of-line) | |
6710 (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
|
6711 (progn ; Something before the ending delimiter |
20323 | 6712 (goto-char e) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6713 (delete-horizontal-space) |
20323 | 6714 (insert "\n") |
6715 (indent-to-column c) | |
6716 (set-marker e (point)))) | |
6717 (goto-char b) | |
6718 (end-of-line 2) | |
6719 (while (< (point) (marker-position e)) | |
6720 (beginning-of-line) | |
6721 (setq s (point) | |
6722 inline t) | |
6723 (skip-chars-forward " \t") | |
6724 (delete-region s (point)) | |
6725 (indent-to-column c1) | |
6726 (while (and | |
6727 inline | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6728 (looking-at |
20323 | 6729 (concat "\\([a-zA-Z0-9]+[^*+{?]\\)" ; 1 word |
6730 "\\|" ; Embedded variable | |
6731 "\\$\\([a-zA-Z0-9_]+\\([[{]\\)?\\|[^\n \t)|]\\)" ; 2 3 | |
6732 "\\|" ; $ ^ | |
6733 "[$^]" | |
6734 "\\|" ; simple-code simple-code*? | |
6735 "\\(\\\\.\\|[^][()#|*+?\n]\\)\\([*+{?]\\??\\)?" ; 4 5 | |
6736 "\\|" ; Class | |
6737 "\\(\\[\\)" ; 6 | |
6738 "\\|" ; Grouping | |
6739 "\\((\\(\\?\\)?\\)" ; 7 8 | |
6740 "\\|" ; | | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6741 "\\(|\\)"))) ; 9 |
20323 | 6742 (goto-char (match-end 0)) |
6743 (setq spaces t) | |
6744 (cond ((match-beginning 1) ; Alphanum word + junk | |
6745 (forward-char -1)) | |
6746 ((or (match-beginning 3) ; $ab[12] | |
6747 (and (match-beginning 5) ; X* X+ X{2,3} | |
6748 (eq (preceding-char) ?\{))) | |
6749 (forward-char -1) | |
6750 (forward-sexp 1)) | |
6751 ((match-beginning 6) ; [] | |
6752 (setq tmp (point)) | |
6753 (if (looking-at "\\^?\\]") | |
6754 (goto-char (match-end 0))) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6755 ;; XXXX POSIX classes?! |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6756 (while (and (not pos) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6757 (re-search-forward "\\[:\\|\\]" e t)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6758 (if (eq (preceding-char) ?:) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6759 (or (re-search-forward ":\\]" e t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6760 (error "[:POSIX:]-group in []-group not terminated")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6761 (setq pos t))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6762 (or (eq (preceding-char) ?\]) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6763 (error "[]-group not terminated")) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6764 (if (eq (following-char) ?\{) |
20323 | 6765 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6766 (forward-sexp 1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6767 (and (eq (following-char) ??) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6768 (forward-char 1))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6769 (re-search-forward "\\=\\([*+?]\\??\\)" e t))) |
20323 | 6770 ((match-beginning 7) ; () |
6771 (goto-char (match-beginning 0)) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6772 (setq pos (current-column)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6773 (or (eq pos c1) |
20323 | 6774 (progn |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6775 (delete-horizontal-space) |
20323 | 6776 (insert "\n") |
6777 (indent-to-column c1))) | |
6778 (setq tmp (point)) | |
6779 (forward-sexp 1) | |
6780 ;; (or (forward-sexp 1) | |
6781 ;; (progn | |
6782 ;; (goto-char tmp) | |
6783 ;; (error "()-group not terminated"))) | |
6784 (set-marker m (1- (point))) | |
6785 (set-marker m1 (point)) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6786 (if (= level 1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6787 (if (progn ; indent rigidly if multiline |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
6788 ;; 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
|
6789 ;; 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
|
6790 ;; to insertion of "\n" and " " |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6791 (goto-char tmp) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6792 (search-forward "\n" m1 t)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6793 (indent-rigidly (point) m1 (- c1 pos))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6794 (setq level (1- level)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6795 (cond |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6796 ((not (match-beginning 8)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6797 (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
|
6798 ((eq (char-after (+ 2 tmp)) ?\{) ; Code |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6799 t) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6800 ((eq (char-after (+ 2 tmp)) ?\() ; Conditional |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6801 (goto-char (+ 2 tmp)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6802 (forward-sexp 1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6803 (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
|
6804 ((eq (char-after (+ 2 tmp)) ?<) ; Lookbehind |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6805 (goto-char (+ 3 tmp)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6806 (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
|
6807 (t |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6808 (cperl-beautify-regexp-piece tmp m t level)))) |
20323 | 6809 (goto-char m1) |
6810 (cond ((looking-at "[*+?]\\??") | |
6811 (goto-char (match-end 0))) | |
6812 ((eq (following-char) ?\{) | |
6813 (forward-sexp 1) | |
6814 (if (eq (following-char) ?\?) | |
6815 (forward-char)))) | |
6816 (skip-chars-forward " \t") | |
6817 (setq spaces nil) | |
6818 (if (looking-at "[#\n]") | |
6819 (progn | |
6820 (or (eolp) (indent-for-comment)) | |
6821 (beginning-of-line 2)) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6822 (delete-horizontal-space) |
20323 | 6823 (insert "\n")) |
6824 (end-of-line) | |
6825 (setq inline nil)) | |
6826 ((match-beginning 9) ; | | |
6827 (forward-char -1) | |
6828 (setq tmp (point)) | |
6829 (beginning-of-line) | |
6830 (if (re-search-forward "[^ \t]" tmp t) | |
6831 (progn | |
6832 (goto-char tmp) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6833 (delete-horizontal-space) |
20323 | 6834 (insert "\n")) |
6835 ;; first at line | |
6836 (delete-region (point) tmp)) | |
6837 (indent-to-column c) | |
6838 (forward-char 1) | |
6839 (skip-chars-forward " \t") | |
6840 (setq spaces nil) | |
6841 (if (looking-at "[#\n]") | |
6842 (beginning-of-line 2) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6843 (delete-horizontal-space) |
20323 | 6844 (insert "\n")) |
6845 (end-of-line) | |
6846 (setq inline nil))) | |
6847 (or (looking-at "[ \t\n]") | |
6848 (not spaces) | |
6849 (insert " ")) | |
6850 (skip-chars-forward " \t")) | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6851 (or (looking-at "[#\n]") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6852 (error "Unknown code `%s' in a regexp" |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6853 (buffer-substring (point) (1+ (point))))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6854 (and inline (end-of-line 2))) |
20323 | 6855 ;; Special-case the last line of group |
6856 (if (and (>= (point) (marker-position e)) | |
6857 (/= (current-indentation) c)) | |
6858 (progn | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6859 (beginning-of-line) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6860 (setq s (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6861 (skip-chars-forward " \t") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6862 (delete-region s (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6863 (indent-to-column c))))) |
20323 | 6864 |
6865 (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
|
6866 ;; Returns position of the start |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6867 ;; XXX this is called too often! Need to cache the result! |
20323 | 6868 (save-excursion |
6869 (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
|
6870 (error "I need to have a regexp marked!")) |
20323 | 6871 ;; Find the start |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6872 (if (looking-at "\\s|") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6873 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
|
6874 (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
|
6875 (forward-char 1) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6876 (re-search-backward "\\s|"))) ; Assume it is scanned already. |
20323 | 6877 ;;(forward-char 1) |
6878 (let ((b (point)) (e (make-marker)) have-x delim (c (current-column)) | |
6879 (sub-p (eq (preceding-char) ?s)) s) | |
6880 (forward-sexp 1) | |
6881 (set-marker e (1- (point))) | |
6882 (setq delim (preceding-char)) | |
6883 (if (and sub-p (eq delim (char-after (- (point) 2)))) | |
6884 (error "Possible s/blah// - do not know how to deal with")) | |
6885 (if sub-p (forward-sexp 1)) | |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
6886 (if (looking-at "\\sw*x") |
20323 | 6887 (setq have-x t) |
6888 (insert "x")) | |
6889 ;; Protect fragile " ", "#" | |
6890 (if have-x nil | |
6891 (goto-char (1+ b)) | |
6892 (while (re-search-forward "\\(\\=\\|[^\\\\]\\)\\(\\\\\\\\\\)*[ \t\n#]" e t) ; Need to include (?#) too? | |
6893 (forward-char -1) | |
6894 (insert "\\") | |
6895 (forward-char 1))) | |
6896 b))) | |
6897 | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6898 (defun cperl-beautify-regexp (&optional deep) |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
6899 "Do it. (Experimental, may change semantics, recheck the result.) |
20323 | 6900 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
|
6901 (interactive "P") |
49516
774eed0b5c78
(cperl-beautify-level, cperl-beautify-regexp): Fix use of
Juanma Barranquero <lekktu@gmail.com>
parents:
49304
diff
changeset
|
6902 (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
|
6903 (save-excursion |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6904 (goto-char (cperl-make-regexp-x)) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6905 (let ((b (point)) (e (make-marker))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6906 (forward-sexp 1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6907 (set-marker e (1- (point))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6908 (cperl-beautify-regexp-piece b e nil deep)))) |
20323 | 6909 |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6910 (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
|
6911 "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
|
6912 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
|
6913 (interactive) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6914 (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
|
6915 (while (not done) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6916 (or (eq (following-char) ?\() |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6917 (search-backward "(" (1+ limit) t) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6918 (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
|
6919 (setq done |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6920 (save-excursion |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6921 (skip-chars-backward "\\") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6922 (looking-at "\\(\\\\\\\\\\)*("))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6923 (or done (forward-char -1))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6924 |
20323 | 6925 (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
|
6926 "Find an enclosing group in regexp and contract it. |
20323 | 6927 \(Experimental, may change semantics, recheck the result.) |
6928 We suppose that the regexp is scanned already." | |
6929 (interactive) | |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6930 ;; (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
|
6931 (cperl-regext-to-level-start) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6932 (let ((b (point)) (e (make-marker)) s c) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6933 (forward-sexp 1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6934 (set-marker e (1- (point))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6935 (goto-char b) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6936 (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
|
6937 (cond |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6938 ((match-beginning 1) ; #-comment |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6939 (or c (setq c (current-indentation))) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6940 (beginning-of-line 2) ; Skip |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6941 (setq s (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6942 (skip-chars-forward " \t") |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6943 (delete-region s (point)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6944 (indent-to-column c)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6945 (t |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6946 (delete-char -1) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6947 (just-one-space)))))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6948 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6949 (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
|
6950 "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
|
6951 \(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
|
6952 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
|
6953 (interactive) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6954 (save-excursion |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6955 (condition-case nil |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6956 (cperl-regext-to-level-start) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6957 (error ; We are outside outermost group |
37569
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
6958 (goto-char (cperl-make-regexp-x)))) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
6959 (let ((b (point)) (e (make-marker)) s c) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
6960 (forward-sexp 1) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
6961 (set-marker e (1- (point))) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
6962 (goto-char (1+ b)) |
44748506225d
(cperl-font-lock-keywords)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36602
diff
changeset
|
6963 (while (re-search-forward "\\(\\\\\\\\\\)\\|(" e t) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49516
diff
changeset
|
6964 (cond |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6965 ((match-beginning 1) ; Skip |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6966 nil) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6967 (t ; Group |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6968 (cperl-contract-level))))))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6969 |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6970 (defun cperl-beautify-level (&optional deep) |
20323 | 6971 "Find an enclosing group in regexp and beautify it. |
6972 \(Experimental, may change semantics, recheck the result.) | |
6973 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
|
6974 (interactive "P") |
49516
774eed0b5c78
(cperl-beautify-level, cperl-beautify-regexp): Fix use of
Juanma Barranquero <lekktu@gmail.com>
parents:
49304
diff
changeset
|
6975 (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
|
6976 (save-excursion |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6977 (cperl-regext-to-level-start) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6978 (let ((b (point)) (e (make-marker))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6979 (forward-sexp 1) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6980 (set-marker e (1- (point))) |
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6981 (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
|
6982 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6983 (defun cperl-invert-if-unless () |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6984 "Change `if (A) {B}' into `B if A;' etc if possible." |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6985 (interactive) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6986 (or (looking-at "\\<") |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
6987 (forward-sexp -1)) |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
6988 (if (looking-at "\\<\\(if\\|unless\\|while\\|until\\|for\\|foreach\\)\\>") |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6989 (let ((pos1 (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6990 pos2 pos3 pos4 pos5 s1 s2 state p pos45 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6991 (s0 (buffer-substring (match-beginning 0) (match-end 0)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6992 (forward-sexp 2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6993 (setq pos3 (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6994 (forward-sexp -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6995 (setq pos2 (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6996 (if (eq (following-char) ?\( ) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6997 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6998 (goto-char pos3) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
6999 (forward-sexp 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7000 (setq pos5 (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7001 (forward-sexp -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7002 (setq pos4 (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7003 ;; XXXX In fact may be `A if (B); {C}' ... |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7004 (if (and (eq (following-char) ?\{ ) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7005 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7006 (cperl-backward-to-noncomment pos3) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7007 (eq (preceding-char) ?\) ))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7008 (if (condition-case nil |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7009 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7010 (goto-char pos5) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7011 (forward-sexp 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7012 (forward-sexp -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7013 (looking-at "\\<els\\(e\\|if\\)\\>")) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7014 (error nil)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7015 (error |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7016 "`%s' (EXPR) {BLOCK} with `else'/`elsif'" s0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7017 (goto-char (1- pos5)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7018 (cperl-backward-to-noncomment pos4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7019 (if (eq (preceding-char) ?\;) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7020 (forward-char -1)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7021 (setq pos45 (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7022 (goto-char pos4) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7023 (while (re-search-forward "\\<\\(for\\|foreach\\|if\\|unless\\|while\\|until\\)\\>\\|;" pos45 t) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7024 (setq p (match-beginning 0) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7025 s1 (buffer-substring p (match-end 0)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7026 state (parse-partial-sexp pos4 p)) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7027 (or (nth 3 state) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7028 (nth 4 state) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7029 (nth 5 state) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7030 (error "`%s' inside `%s' BLOCK" s1 s0)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7031 (goto-char (match-end 0))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7032 ;; Finally got it |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7033 (goto-char (1+ pos4)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7034 (skip-chars-forward " \t\n") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7035 (setq s2 (buffer-substring (point) pos45)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7036 (goto-char pos45) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7037 (or (looking-at ";?[ \t\n]*}") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7038 (progn |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7039 (skip-chars-forward "; \t\n") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7040 (setq s2 (concat s2 "\n" (buffer-substring (point) (1- pos5)))))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7041 (and (equal s2 "") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7042 (setq s2 "1")) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7043 (goto-char (1- pos3)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7044 (cperl-backward-to-noncomment pos2) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7045 (or (looking-at "[ \t\n]*)") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7046 (goto-char (1- pos3))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7047 (setq p (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7048 (goto-char (1+ pos2)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7049 (skip-chars-forward " \t\n") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7050 (setq s1 (buffer-substring (point) p)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7051 (delete-region pos4 pos5) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7052 (delete-region pos2 pos3) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7053 (goto-char pos1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7054 (insert s2 " ") |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7055 (just-one-space) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7056 (forward-word 1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7057 (setq pos1 (point)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7058 (insert " " s1 ";") |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7059 (delete-horizontal-space) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7060 (forward-char -1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7061 (delete-horizontal-space) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7062 (goto-char pos1) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7063 (just-one-space) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7064 (cperl-indent-line)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7065 (error "`%s' (EXPR) not with an {BLOCK}" s0))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7066 (error "`%s' not with an (EXPR)" s0))) |
46024
267399555cd1
Many trivial doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
44446
diff
changeset
|
7067 (error "Not at `if', `unless', `while', `until', `for' or `foreach'"))) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7068 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7069 ;;; By Anthony Foiani <afoiani@uswest.com> |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7070 ;;; Getting help on modules in C-h f ? |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7071 ;;; This is a modified version of `man'. |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7072 ;;; Need to teach it how to lookup functions |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7073 (defun cperl-perldoc (word) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7074 "Run `perldoc' on WORD." |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7075 (interactive |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7076 (list (let* ((default-entry (cperl-word-at-point)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7077 (input (read-string |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7078 (format "perldoc entry%s: " |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7079 (if (string= default-entry "") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7080 "" |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7081 (format " (default %s)" default-entry)))))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7082 (if (string= input "") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7083 (if (string= default-entry "") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7084 (error "No perldoc args given") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7085 default-entry) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7086 input)))) |
41309
8c4c4027c7bd
(cperl-perldoc): Require man before binding `manual-program'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39836
diff
changeset
|
7087 (require 'man) |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7088 (let* ((case-fold-search nil) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7089 (is-func (and |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7090 (string-match "^[a-z]+$" word) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7091 (string-match (concat "^" word "\\>") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7092 (documentation-property |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7093 'cperl-short-docs |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7094 'variable-documentation)))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7095 (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
|
7096 (cond |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7097 (cperl-xemacs-p |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7098 (let ((Manual-program "perldoc") |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7099 (Manual-switches (if is-func (list "-f")))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7100 (manual-entry word))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7101 (t |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7102 (Man-getpage-in-background word))))) |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7103 |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7104 (defun cperl-perldoc-at-point () |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7105 "Run a `perldoc' on the word around point." |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7106 (interactive) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7107 (cperl-perldoc (cperl-word-at-point))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7108 |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7109 (defcustom pod2man-program "pod2man" |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7110 "*File name for `pod2man'." |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7111 :type 'file |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7112 :group 'cperl) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7113 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7114 ;;; 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
|
7115 (defun cperl-pod-to-manpage () |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7116 "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
|
7117 (interactive) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7118 (require 'man) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7119 (let* ((pod2man-args (concat buffer-file-name " | nroff -man ")) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7120 (bufname (concat "Man " buffer-file-name)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7121 (buffer (generate-new-buffer bufname))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7122 (save-excursion |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7123 (set-buffer buffer) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7124 (let ((process-environment (copy-sequence process-environment))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7125 ;; Prevent any attempt to use display terminal fanciness. |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7126 (setenv "TERM" "dumb") |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7127 (set-process-sentinel |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7128 (start-process pod2man-program buffer "sh" "-c" |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7129 (format (cperl-pod2man-build-command) pod2man-args)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7130 'Man-bgproc-sentinel))))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7131 |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7132 ;;; Updated version by him too |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7133 (defun cperl-build-manpage () |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7134 "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
|
7135 (interactive) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7136 (require 'man) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7137 (cond |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7138 (cperl-xemacs-p |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7139 (let ((Manual-program "perldoc")) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7140 (manual-entry buffer-file-name))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7141 (t |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7142 (let* ((manual-program "perldoc")) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7143 (Man-getpage-in-background buffer-file-name))))) |
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7144 |
22409
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7145 (defun cperl-pod2man-build-command () |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7146 "Builds the entire background manpage and cleaning command." |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7147 (let ((command (concat pod2man-program " %s 2>/dev/null")) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7148 (flist Man-filter-list)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7149 (while (and flist (car flist)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7150 (let ((pcom (car (car flist))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7151 (pargs (cdr (car flist)))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7152 (setq command |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7153 (concat command " | " pcom " " |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7154 (mapconcat '(lambda (phrase) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7155 (if (not (stringp phrase)) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7156 (error "Malformed Man-filter-list")) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7157 phrase) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7158 pargs " "))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7159 (setq flist (cdr flist)))) |
382becc612e1
(pod2man-program): Var reinstalled.
Richard M. Stallman <rms@gnu.org>
parents:
22398
diff
changeset
|
7160 command)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7161 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7162 (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
|
7163 (defun cperl-lazy-unstall ()) ; Avoid a warning |
20323 | 7164 |
7165 (if (fboundp 'run-with-idle-timer) | |
7166 (progn | |
7167 (defvar cperl-help-shown nil | |
7168 "Non-nil means that the help was already shown now.") | |
7169 | |
7170 (defvar cperl-lazy-installed nil | |
7171 "Non-nil means that the lazy-help handlers are installed now.") | |
7172 | |
7173 (defun cperl-lazy-install () | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7174 "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
|
7175 Delay of auto-help controlled by `cperl-lazy-help-time'." |
20323 | 7176 (interactive) |
7177 (make-variable-buffer-local 'cperl-help-shown) | |
7178 (if (and (cperl-val 'cperl-lazy-help-time) | |
7179 (not cperl-lazy-installed)) | |
7180 (progn | |
7181 (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
|
7182 (run-with-idle-timer |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7183 (cperl-val 'cperl-lazy-help-time 1000000 5) |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7184 t |
20323 | 7185 'cperl-get-help-defer) |
7186 (setq cperl-lazy-installed t)))) | |
7187 | |
7188 (defun cperl-lazy-unstall () | |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7189 "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
|
7190 Delay of auto-help controlled by `cperl-lazy-help-time'." |
20323 | 7191 (interactive) |
7192 (remove-hook 'post-command-hook 'cperl-lazy-hook) | |
7193 (cancel-function-timers 'cperl-get-help-defer) | |
7194 (setq cperl-lazy-installed nil)) | |
7195 | |
7196 (defun cperl-lazy-hook () | |
7197 (setq cperl-help-shown nil)) | |
7198 | |
7199 (defun cperl-get-help-defer () | |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7200 (if (not (memq major-mode '(perl-mode cperl-mode))) nil |
20323 | 7201 (let ((cperl-message-on-help-error nil) (cperl-help-from-timer t)) |
7202 (cperl-get-help) | |
7203 (setq cperl-help-shown t)))) | |
7204 (cperl-lazy-install))) | |
7205 | |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7206 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7207 ;;; Plug for wrong font-lock: |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7208 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7209 (defun cperl-font-lock-unfontify-region-function (beg end) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7210 (let* ((modified (buffer-modified-p)) (buffer-undo-list t) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7211 (inhibit-read-only t) (inhibit-point-motion-hooks t) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7212 before-change-functions after-change-functions |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7213 deactivate-mark buffer-file-name buffer-file-truename) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7214 (remove-text-properties beg end '(face nil)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7215 (when (and (not modified) (buffer-modified-p)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7216 (set-buffer-modified-p nil)))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7217 |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7218 (defvar cperl-d-l nil) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7219 (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
|
7220 ;; Some vars for debugging only |
39836
c2db8c1499cb
Merged in changes from v4.32.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
7221 ;; (message "Syntaxifying...") |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7222 (let ((dbg (point)) (iend end) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7223 (istate (car cperl-syntax-state)) |
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7224 start) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7225 (and cperl-syntaxify-unwind |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7226 (setq end (cperl-unwind-to-safe t end))) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7227 (setq start (point)) |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7228 (or cperl-syntax-done-to |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7229 (setq cperl-syntax-done-to (point-min))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7230 (if (or (not (boundp 'font-lock-hot-pass)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7231 (eval 'font-lock-hot-pass) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7232 t) ; Not debugged otherwise |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7233 ;; Need to forget what is after `start' |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7234 (setq start (min cperl-syntax-done-to start)) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7235 ;; Fontification without a change |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7236 (setq start (max cperl-syntax-done-to start))) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7237 (and (> end start) |
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7238 (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
|
7239 (cperl-find-pods-heres start end t nil t)) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7240 (if (eq cperl-syntaxify-by-font-lock 'message) |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7241 (message "Syntaxified %s..%s from %s to %s(%s), state %s-->%s" |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7242 dbg iend |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7243 start end cperl-syntax-done-to |
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7244 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
|
7245 nil)) ; Do not iterate |
22293
0544aa57ff27
(cperl-style-alist): New variable, since `c-mode'
Richard M. Stallman <rms@gnu.org>
parents:
20961
diff
changeset
|
7246 |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7247 (defun cperl-fontify-update (end) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7248 (let ((pos (point)) prop posend) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7249 (while (< pos end) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7250 (setq prop (get-text-property pos 'cperl-postpone)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7251 (setq posend (next-single-property-change pos 'cperl-postpone nil end)) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7252 (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
|
7253 (setq pos posend))) |
49918
c5956f47d1f6
Merge changes from CPerl-4.35.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49850
diff
changeset
|
7254 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
|
7255 |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7256 (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
|
7257 (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
|
7258 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
|
7259 (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
|
7260 (< 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
|
7261 (progn |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7262 (save-excursion |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7263 (goto-char from) |
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7264 (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
|
7265 |
32384
a18be74d62e5
(cperl-invalid-face): double-quote underline
Sam Steingold <sds@gnu.org>
parents:
31821
diff
changeset
|
7266 (defvar cperl-version |
49919
249621b2dae5
Merge changes from CPerl-5.0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49918
diff
changeset
|
7267 (let ((v "Revision: 5.0")) |
23977
abc9bc6aef59
Can use linear algorithm for indentation if Emacs supports it.
Richard M. Stallman <rms@gnu.org>
parents:
23270
diff
changeset
|
7268 (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
|
7269 (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
|
7270 "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
|
7271 |
20323 | 7272 (provide 'cperl-mode) |
7273 | |
7274 ;;; cperl-mode.el ends here |