* CPerl mode cleaned up
@ 2003-02-11 23:11 Daniel Pfeiffer
2003-02-12 5:06 ` Ilya Zakharevich
2003-02-12 20:34 ` Richard Stallman
0 siblings, 2 replies; 6+ messages in thread
From: Daniel Pfeiffer @ 2003-02-11 23:11 UTC (permalink / raw)
Cc: Ilya Zakharevich
[-- Attachment #1: Type: text/plain, Size: 867 bytes --]
Hi,
the version of CPerl mode seems utter chaos. Both Emacs and Ilya's web-site
have 4.32, but they are very different. While Emacs' newest copyright is
much older, CVS with its many little fixes, shows that the opposite is true.
Therefore I have updated both the copyright and version number to 4.33. I
have changed no functionality (as the mode is rather intimidating). But I
have continued the cleanup from CVS started in many places.
Note that there are two diffs, as most changes concern indentation (which
was often wrong and misleading). So the first shows only "real"
non-whitespace changes.
coralament / best Grötens / liebe Grüße / best regards / elkorajn salutojn
Daniel Pfeiffer
-- GPL 3: take the wind out of Palladium's sails! --
------
-- My other stuff here too, sawfish, make.pl...: --
------
-- http://dapfy.bei.t-online.de/ --
[-- Attachment #2: ChangeLog --]
[-- Type: application/octet-stream, Size: 796 bytes --]
2003-02-11 Daniel Pfeiffer <occitan@esperanto.org>
* cperl-mode.el: normalized comment starters, normalized
indentation (except where constructed regexps were purposely
indented differently), rearranged let-clauses so they indent
right, drew up dangling parens and doc string ends, removed
obsolete function`s around lambda`s, consistently upcased "POD" in
strings
(cperl-tips): hint that ftp version isn't necessarily newer
(cperl-mode): unless instead of (or .. (progn))
(cperl-find-pods-heres): write complex condition only once
(cperl-backward-to-noncomment): simplified if
(cperl-indent-region): eliminate nested save-excursion
(cperl-short-docs): use same pseudo-value as other cperl micro
docs, remove eliminated comparators
(cperl-version): incremented, to end confusion
[-- Attachment #3: cperl-bu.diff --]
[-- Type: application/octet-stream, Size: 31714 bytes --]
This one is only for understanding the real changes. Apply the other patch
which includes corrected indentation.
--- CVS/cperl-mode.el 2003-02-04 14:24:34.000000000 +0100
+++ pfeiffer/cperl-mode.el 2003-02-11 23:00:28.000000000 +0100
@@ -1,3 +1,2 @@
;;; cperl-mode.el --- Perl code editing commands for Emacs
-;; Copyright (C) 1985, 86, 87, 91, 92, 93, 94, 95, 96, 1997
*;; Copyright (C) 1985, 86, 87, 91, 92, 93, 94, 95, 96, 1997, 2000, 2003
;; Free Software Foundation, Inc.
;; Author: Ilya Zakharevich and Bob Olson
@@ -28,5 +28,3 @@
;;; Commentary:
-;;; You can either fine-tune the bells and whistles of this mode or
-;;; bulk enable them by putting
*;; You can either fine-tune the bells and whistles of this mode or
*;; bulk enable them by putting
;; (setq cperl-hairy t)
-;;; in your .emacs file. (Emacs rulers do not consider it politically
-;;; correct to make whistles enabled by default.)
*;; in your .emacs file. (Emacs rulers do not consider it politically
*;; correct to make whistles enabled by default.)
-;;; DO NOT FORGET to read micro-docs (available from `Perl' menu) <<<<<<
-;;; or as help on variables `cperl-tips', `cperl-problems', <<<<<<
-;;; `cperl-praise', `cperl-speed'. <<<<<<
-
-;;; The mode information (on C-h m) provides some customization help.
-;;; If you use font-lock feature of this mode, it is advisable to use
-;;; either lazy-lock-mode or fast-lock-mode. I prefer lazy-lock.
-
-;;; Faces used now: three faces for first-class and second-class keywords
-;;; and control flow words, one for each: comments, string, labels,
-;;; functions definitions and packages, arrays, hashes, and variable
-;;; definitions. If you do not see all these faces, your font-lock does
-;;; not define them, so you need to define them manually.
-
-;;; into your .emacs file.
-
-;;;; This mode supports font-lock, imenu and mode-compile. In the
-;;;; hairy version font-lock is on, but you should activate imenu
-;;;; yourself (note that mode-compile is not standard yet). Well, you
-;;;; can use imenu from keyboard anyway (M-x imenu), but it is better
-;;;; to bind it like that:
*;; DO NOT FORGET to read micro-docs (available from `Perl' menu) <<<<<<
*;; or as help on variables `cperl-tips', `cperl-problems', <<<<<<
*;; `cperl-praise', `cperl-speed'. <<<<<<
*
*;; The mode information (on C-h m) provides some customization help.
*;; If you use font-lock feature of this mode, it is advisable to use
*;; either lazy-lock-mode or fast-lock-mode. I prefer lazy-lock.
*
*;; Faces used now: three faces for first-class and second-class keywords
*;; and control flow words, one for each: comments, string, labels,
*;; functions definitions and packages, arrays, hashes, and variable
*;; definitions. If you do not see all these faces, your font-lock does
*;; not define them, so you need to define them manually.
*
*;; This mode supports font-lock, imenu and mode-compile. In the
*;; hairy version font-lock is on, but you should activate imenu
*;; yourself (note that mode-compile is not standard yet). Well, you
*;; can use imenu from keyboard anyway (M-x imenu), but it is better
*;; to bind it like that:
;; (define-key global-map [M-S-down-mouse-3] 'imenu)
*;;; Font lock bugs:
*
*;; The following kinds of Perl code erroneously start strings:
*;; \$` \$' \$"
*;; $opt::s $opt_s $opt{s} (s => ...) /\s+.../
*;; likewise with m, tr, y, q, qX instead of s
*
;;; Code:
;; Some macros are needed for `defcustom'
@@ -170,5 +175,3 @@
instead of:
if () {
- }
-"
* }"
:type 'boolean
:group 'cperl-autoinsert-details)
@@ -354,4 +358,3 @@
:group 'cperl-affected-by-hairy)
(defcustom cperl-pod-face 'font-lock-comment-face
- "*Face for pod highlighting."
* "*Face for POD highlighting."
:type 'face
:group 'cperl-faces)
(defcustom cperl-pod-head-face 'font-lock-variable-name-face
- "*Face for pod highlighting.
* "*Face for POD highlighting.
Font for POD headers."
:type 'face
:group 'cperl-faces)
@@ -376,4 +380,3 @@
:group 'cperl-faces)
(defcustom cperl-pod-here-fontify '(featurep 'font-lock)
- "*Not-nil after evaluation means to highlight pod and here-docs sections."
* "*Not-nil after evaluation means to highlight POD and here-docs sections."
:type 'boolean
:group 'cperl-faces)
@@ -395,4 +399,3 @@
:group 'cperl)
(defcustom cperl-pod-here-scan t
- "*Not-nil means look for pod and here-docs sections during startup.
* "*Not-nil means look for POD and here-docs sections during startup.
You can always make lookup from menu or using \\[cperl-find-pods-heres]."
:type 'boolean
:group 'cperl-speed)
@@ -593,4 +597,3 @@
;;; Short extra-docs.
(defvar cperl-tips 'please-ignore-this-line
- "Get newest version of this package from
* "Get maybe newer version of this package from
ftp://ftp.math.ohio-state.edu/pub/users/ilya/emacs
and/or
ftp://ftp.math.ohio-state.edu/pub/users/ilya/perl
@@ -681,4 +685,3 @@
This may be confusing, since the regexp s#//#/#\; may be highlighted
as a comment, but it will be recognized as a regexp by the indentation
-code. Or the opposite case, when a pod section is highlighted, but
*code. Or the opposite case, when a POD section is highlighted, but
may break the indentation of the following code (though indentation
should work if the balance of delimiters is not broken by POD).
@@ -699,4 +703,3 @@
If these bugs cannot be fixed on your machine (say, you have an inferior
environment and cannot recompile), you may still disable all the fancy stuff
-via `cperl-use-syntax-table-text-property'." )
*via `cperl-use-syntax-table-text-property'.")
(defvar cperl-praise 'please-ignore-this-line
"Advantages of CPerl mode.
@@ -783,5 +787,3 @@
line-breaks/spacing between elements of the construct.
10) Uses a linear-time algorith for indentation of regions (on Emaxen with
-capable syntax engines).
-")
*capable syntax engines).")
(defvar cperl-speed 'please-ignore-this-line
"This is an incomplete compendium of what is available in other parts
@@ -828,5 +831,3 @@
wrongly matched parentheses, wrong indentation, etc.
One can unset `cperl-syntaxify-unwind'. This might speed up editing
- of, say, long POD sections.
-")
* of, say, long POD sections.")
(defvar cperl-tips-faces 'please-ignore-this-line
"CPerl mode uses following faces for highlighting:
@@ -955,3 +957,3 @@
;;; (setq interpreter-mode-alist (append interpreter-mode-alist
;;; '(("miniperl" . perl-mode))))))
(eval-when-compile
* (mapc (lambda (p)
(condition-case nil
- (require 'imenu)
- (error nil))
- (condition-case nil
- (require 'easymenu)
- (error nil))
- (condition-case nil
- (require 'etags)
- (error nil))
- (condition-case nil
- (require 'timer)
- (error nil))
- (condition-case nil
- (require 'man)
- (error nil))
- (condition-case nil
- (require 'info)
- (error nil))
* (require p)
* (error nil)))
* '(imenu easymenu etags timer man info))
(if (fboundp 'ps-extend-face-list)
(defmacro cperl-ps-extend-face-list (arg)
`(ps-extend-face-list ,arg))
@@ -1224,5 +1213,3 @@
(modify-syntax-entry ?| "." cperl-mode-syntax-table)
(setq cperl-string-syntax-table (copy-syntax-table cperl-mode-syntax-table))
(modify-syntax-entry ?$ "." cperl-string-syntax-table)
- (modify-syntax-entry ?# "." cperl-string-syntax-table) ; (?# comment )
-)
* (modify-syntax-entry ?# "." cperl-string-syntax-table)) ; (?# comment )
\f
@@ -1337,4 +1325,3 @@
span the needed amount of lines.
Variables `cperl-pod-here-scan', `cperl-pod-here-fontify',
-`cperl-pod-face', `cperl-pod-head-face' control processing of pod and
*`cperl-pod-face', `cperl-pod-head-face' control processing of POD and
here-docs sections. With capable Emaxen results of scan are used
for indentation too, otherwise they are used for highlighting only.
@@ -1504,4 +1492,3 @@
(set 'font-lock-unfontify-region-function
'font-lock-default-unfontify-region))
(make-local-variable 'font-lock-unfontify-region-function)
- (set 'font-lock-unfontify-region-function
* (setq font-lock-unfontify-region-function
'cperl-font-lock-unfontify-region-function)
(make-local-variable 'cperl-syntax-done-to)
;; Another bug: unless font-lock-syntactic-keywords, font-lock
@@ -1531,9 +1519,3 @@
(run-hooks 'cperl-mode-hook)
;; After hooks since fontification will break this
(if cperl-pod-here-scan
- (or ;;(and (boundp 'font-lock-mode)
- ;; (eval 'font-lock-mode) ; Avoid warning
- ;; (boundp 'font-lock-hot-pass) ; Newer font-lock
- cperl-syntaxify-by-font-lock ;;)
- (progn (or cperl-faces-init (cperl-init-faces-weak))
- (cperl-find-pods-heres)))))
* (unless cperl-syntaxify-by-font-lock
* (or cperl-faces-init (cperl-init-faces-weak))
* (cperl-find-pods-heres))))
\f
;; Fix for perldb - make default reasonable
(defun cperl-db ()
@@ -1675,4 +1660,3 @@
(setq last-command-char ?\{)
(cperl-electric-lbrace arg insertpos))
(forward-char 1))
- ;: Check whether we close something "usual" with `}'
* ;; Check whether we close something "usual" with `}'
(if (and (eq last-command-char ?\})
(not
(condition-case nil
@@ -1725,5 +1710,3 @@
(defun cperl-electric-lbrace (arg &optional end)
"Insert character, correct line's indentation, correct quoting by space."
(interactive "P")
- (let (pos after
- (cperl-brace-recursing t)
* (let ((cperl-brace-recursing t)
(cperl-auto-newline cperl-auto-newline)
(other-end (or end
(if (and cperl-electric-parens-mark
@@ -1735,4 +1719,3 @@
(save-excursion
(goto-char (mark))
(point-marker))
- nil))))
* nil)))
* pos after)
(and (cperl-val 'cperl-electric-lbrace-space)
(eq (preceding-char) ?$)
(save-excursion
@@ -1879,5 +1864,3 @@
(insert "\n}")
(and do (insert " while ();")))
(t
- (insert (if do " {\n} while ();" " () {\n}")))
- )
* (insert (if do " {\n} while ();" " () {\n}"))))
(or (looking-at "[ \t]\\|$") (insert " "))
(cperl-indent-line)
(if dollar (progn (search-backward "$")
@@ -2000,5 +1984,3 @@
(cperl-indent-line)
(insert "\n\n}"))
(t
- (insert " {\n\n}"))
- )
* (insert " {\n\n}")))
(or (looking-at "[ \t]\\|$") (insert " "))
(cperl-indent-line)
(forward-line -1)
@@ -2129,4 +2112,3 @@
(defun cperl-electric-terminator (arg)
"Insert character and correct line's indentation."
(interactive "P")
- (let (insertpos (end (point))
* (let ((end (point))
(auto (and cperl-auto-newline
(or (not (eq last-command-char ?:))
- cperl-auto-newline-after-colon))))
* cperl-auto-newline-after-colon)))
* insertpos)
(if (and ;;(not arg)
(eolp)
(not (save-excursion
@@ -2251,6 +2235,3 @@
(defun cperl-indent-line (&optional parse-data)
"Indent current line as Perl code.
Return the amount the indentation changed by."
- (let (indent i beg shift-amt
- (case-fold-search nil)
- (pos (- (point-max) (point))))
* (let ((case-fold-search nil)
* (pos (- (point-max) (point)))
* indent i beg shift-amt)
(setq indent (cperl-calculate-indent parse-data)
i indent)
(beginning-of-line)
@@ -2368,4 +2352,3 @@
(not (get-text-property (point) 'indentable)))
;; before start of POD - whitespace found since do not have 'pod!
(and (looking-at "[ \t]*\n=")
- (error "Spaces before pod section!"))
* (error "Spaces before POD section!"))
(and (not cperl-indent-left-aligned-comments)
(looking-at "^#")))
nil
@@ -2386,4 +2370,3 @@
)
(t
(save-excursion
- ;; Not in pod
* ;; Not in POD
(cperl-backward-to-noncomment nil)
(setq p (max (point-min) (1- (point)))
prop (get-text-property p 'syntax-type)
@@ -2529,4 +2513,3 @@
;; (Had \, too)
(while ;;(or (eq (preceding-char) ?\,)
(and (eq (preceding-char) ?:)
- (or;;(eq (char-after (- (point) 2)) ?\') ; ????
* (or ;;(eq (char-after (- (point) 2)) ?\') ; ????
(memq (char-syntax (char-after (- (point) 2)))
'(?w ?_))))
;;)
@@ -2882,5 +2866,3 @@
(goto-char (1- cpoint)))))
(setq stop-in t) ; Finish
(forward-char -1))
- (setq stop-in t)) ; Finish
- )
* (setq stop-in t))) ; Finish
(nth 4 state))))
(defsubst cperl-1- (p)
@@ -3095,4 +3078,3 @@
cperl-syntax-state nil
cperl-syntax-done-to min))
(or max (setq max (point-max)))
- (let* (face head-face here-face b e bb tag qtag b1 e1 argument i c tail tb
* (let* ((cperl-pod-here-fontify (eval cperl-pod-here-fontify)) go tmpend
* face head-face here-face b e bb tag qtag b1 e1 argument i c tail tb
is-REx is-x-REx REx-comment-start REx-comment-end was-comment i2
- (cperl-pod-here-fontify (eval cperl-pod-here-fontify)) go tmpend
(case-fold-search nil) (inhibit-read-only t) (buffer-undo-list t)
(modified (buffer-modified-p))
(after-change-functions nil)
@@ -3176,5 +3159,3 @@
"__\\(END\\|DATA\\)__"
;; 1+6+2+1+1+2+1+1+1=16 extra () before this:
"\\|"
- "\\\\\\(['`\"]\\)"
- )
* "\\\\\\(['`\"]\\)")
""))))
(unwind-protect
(progn
@@ -3279,4 +3261,3 @@
(cperl-commentify bb e nil)
(goto-char e)
(or (eq e (point-max))
- (forward-char -1)))) ; Prepare for immediate pod start.
* (forward-char -1)))) ; Prepare for immediate POD start.
;; Here document
;; We do only one here-per-line
;; ;; One extra () before this:
@@ -3448,5 +3430,3 @@
(and (eq (char-syntax (preceding-char)) ?w)
(progn
(forward-sexp -1)
-;; After these keywords `/' starts a RE. One should add all the
-;; functions/builtins which expect an argument, but ...
* ;; After these keywords `/' starts a RE. One should add all the
* ;; functions/builtins which expect an argument, but ...
(if (eq (preceding-char) ?-)
;; -d ?foo? is a RE
(looking-at "[a-zA-Z]\\>")
@@ -3596,5 +3578,4 @@
(while
(and (< (point) e)
(re-search-forward
- (if is-x-REx
(if (eq (char-after b) ?\#)
* (if is-x-REx
"\\((\\?\\\\#\\)\\|\\(\\\\#\\)"
- "\\((\\?#\\)\\|\\(#\\)")
- (if (eq (char-after b) ?\#)
- "\\((\\?\\\\#\\)"
* "\\((\\?\\\\#\\)")
* (if is-x-REx
* "\\((\\?#\\)\\|\\(#\\)"
"\\((\\?#\\)"))
(1- e) 'to-end))
(goto-char (match-beginning 0))
@@ -3744,7 +3726,3 @@
(if (memq (setq pr (get-text-property (point) 'syntax-type))
'(pod here-doc here-doc-delim))
(cperl-unwind-to-safe nil)
- (if (or (looking-at "^[ \t]*\\(#\\|$\\)")
- (progn (cperl-to-comment-or-eol) (bolp)))
- nil ; Only comment, skip
- ;; Else
* (or (looking-at "^[ \t]*\\(#\\|$\\)")
* (progn (cperl-to-comment-or-eol) (bolp))
* (progn
(skip-chars-backward " \t")
(if (< p (point)) (goto-char p))
- (setq stop t))))))
* (setq stop t)))))))
(defun cperl-after-block-p (lim)
;; We suppose that the preceding char is }.
@@ -3780,5 +3761,3 @@
TEST is the expression to evaluate at the found position. If absent,
CHARS is a string that contains good characters to have before us (however,
`}' is treated \"smartly\" if it is not in the list)."
- (let (stop p
- (lim (or lim (point-min))))
* (let ((lim (or lim (point-min)))
* stop p)
(save-excursion
(while (and (not stop) (> (point) lim))
(skip-chars-backward " \t\n\f" lim)
@@ -3874,5 +3855,3 @@
(interactive)
(or end
(setq end (point-max)))
- (let (p pp ml have-brace ret
- (ee (save-excursion (end-of-line) (point)))
* (let ((ee (save-excursion (end-of-line) (point)))
(cperl-indent-region-fix-constructs
- (or cperl-indent-region-fix-constructs 1)))
* (or cperl-indent-region-fix-constructs 1))
* p pp ml have-brace ret)
(save-excursion
(beginning-of-line)
(setq ret (point))
@@ -4067,5 +4048,3 @@
(cperl-update-syntaxification end end)
(save-excursion
(let (cperl-update-start cperl-update-end (h-a-c after-change-functions))
- (let (st comm old-comm-indent new-comm-indent p pp i empty
- (indent-info (if cperl-emacs-can-parse
* (let ((indent-info (if cperl-emacs-can-parse
(list nil nil nil) ; Cannot use '(), since will modify
nil))
* (pm 0) (imenu-scanning-message "Indenting... (%3d%%)")
after-change-functions ; Speed it up!
- (pm 0) (imenu-scanning-message "Indenting... (%3d%%)"))
* st comm old-comm-indent new-comm-indent p pp i empty)
(if h-a-c (add-hook 'after-change-functions 'cperl-delay-update-hook))
(goto-char start)
(setq old-comm-indent (and (cperl-to-comment-or-eol)
@@ -4127,6 +4108,3 @@
(imenu-progress-message pm 100)
(message nil)))
;; Now run the update hooks
- (if after-change-functions
- (save-excursion
- (if cperl-update-end
* (and after-change-functions
* cperl-update-end
(progn
(goto-char cperl-update-end)
(insert " ")
(delete-char -1)
(goto-char cperl-update-start)
(insert " ")
- (delete-char -1))))))))
* (delete-char -1))))))
;; Stolen from lisp-mode with a lot of improvements
@@ -4146,5 +4126,3 @@
block of it that point is in, preserving the comment's initial
indentation and initial hashes. Behaves usually outside of comment."
(interactive "P")
- (let (
- ;; Non-nil if the current line contains a comment.
* (let (;; Non-nil if the current line contains a comment.
has-comment
;; If has-comment, the appropriate fill-prefix for the comment.
@@ -4255,4 +4234,3 @@
(t
(or name
(setq name "+++BACK+++"))
- (mapcar (function (lambda (elt)
* (mapcar (lambda (elt)
(if (and (listp elt) (listp (cdr elt)))
(progn
;; In the other order it goes up
;; one level only ;-(
(setcdr elt (cons (cons name lst)
(cdr elt)))
- (cperl-imenu-addback (cdr elt) t name)
- ))))
* (cperl-imenu-addback (cdr elt) t name))))
(if isback (cdr lst) lst))
lst)))
@@ -4301,5 +4279,3 @@
(null (get-text-property (match-beginning 1) 'in-pod)))
(save-excursion
(goto-char (match-beginning 2))
- (setq fchar (following-char))
- )
* (setq fchar (following-char)))
;; (if (looking-at "([^()]*)[ \t\n\f]*")
;; (goto-char (match-end 0))) ; Messes what follows
(setq char (following-char) ; ?\; for "sub foo () ;"
@@ -4345,4 +4322,3 @@
(push index index-alist))
(if meth (push index index-meth-alist))
(push index index-unsorted-alist)))
- ((match-beginning 5) ; Pod section
* ((match-beginning 5) ; POD section
;; (beginning-of-line)
(setq index (imenu-example--name-and-position)
name (buffer-substring (match-beginning 6) (match-end 6)))
@@ -4448,8 +4425,6 @@
;; Need to init anyway:
(or cperl-faces-init (cperl-init-faces))
(add-hook 'font-lock-mode-hook
- (function
(lambda ()
(if (memq major-mode '(perl-mode cperl-mode))
(progn
- (or cperl-faces-init (cperl-init-faces)))))))
* (or cperl-faces-init (cperl-init-faces))))))
(if (fboundp 'eval-after-load)
(eval-after-load
"ps-print"
@@ -4739,5 +4715,3 @@
nil
[nil nil t t t]
nil
- [nil nil t t t]
- )
* [nil nil t t t])
(list 'font-lock-constant-face
["CadetBlue" "Aquamarine" "Gray50" "LightGray"]
nil
[nil nil t t t]
nil
- [nil nil t t t]
- )
* [nil nil t t t])
(list 'cperl-nonoverridable-face
["chartreuse3" ("orchid1" "orange")
nil "Gray80"]
[nil nil "gray90"]
[nil nil nil t t]
[nil nil t t]
- [nil nil t t t]
- )
* [nil nil t t t])
(list 'cperl-array-face
["blue" "yellow" nil "Gray80"]
["lightyellow2" ("navy" "os2blue" "darkgreen")
@@ -4773,10 +4746,3 @@
;; Do it the dull way, without choose-color
(defvar cperl-guessed-background nil
"Display characteristics as guessed by cperl.")
-;; (or (fboundp 'x-color-defined-p)
-;; (defalias 'x-color-defined-p
-;; (cond ((fboundp 'color-defined-p) 'color-defined-p)
-;; ;; XEmacs >= 19.12
-;; ((fboundp 'valid-color-name-p) 'valid-color-name-p)
-;; ;; XEmacs 19.11
-;; (t 'x-valid-color-name-p))))
* ;; (or (fboundp 'x-color-defined-p)
* ;; (defalias 'x-color-defined-p
* ;; (cond ((fboundp 'color-defined-p) 'color-defined-p)
* ;; ;; XEmacs >= 19.12
* ;; ((fboundp 'valid-color-name-p) 'valid-color-name-p)
* ;; ;; XEmacs 19.11
* ;; (t 'x-valid-color-name-p))))
(cperl-force-face font-lock-constant-face
"Face for constant and label names")
(cperl-force-face font-lock-variable-name-face
@@ -4846,6 +4819,3 @@
(if (boundp 'font-lock-background-mode)
font-lock-background-mode
'light))
- (face-list (and (fboundp 'face-list) (face-list)))
- ;; cperl-is-face
- )
* (face-list (and (fboundp 'face-list) (face-list))))
;;;; (fset 'cperl-is-face
;;;; (cond ((fboundp 'find-face)
;;;; (symbol-function 'find-face))
@@ -4862,6 +4833,3 @@
'gray
background)
"Background as guessed by CPerl mode")
- (if (and
- (not (cperl-is-face 'font-lock-constant-face))
- (cperl-is-face 'font-lock-reference-face))
* (and (not (cperl-is-face 'font-lock-constant-face))
* (cperl-is-face 'font-lock-reference-face)
(copy-face 'font-lock-reference-face 'font-lock-constant-face))
(if (cperl-is-face 'font-lock-type-face) nil
(copy-face 'default 'font-lock-type-face)
@@ -5093,4 +5063,3 @@
Chosing \"Current\" style will not change style, so this may be used for
side-effect of memorizing only."
(interactive
- (let ((list (mapcar (function (lambda (elt) (list (car elt))))
* (let ((list (mapcar (lambda (elt) (list (car elt)))
cperl-style-alist)))
(list (completing-read "Enter style: " list nil 'insist))))
(or cperl-old-style
(setq cperl-old-style
- (mapcar (function
- (lambda (name)
- (cons name (eval name))))
* (mapcar (lambda (name)
* (cons name (eval name)))
cperl-styles-entries)))
(let ((style (cdr (assoc style cperl-style-alist))) setting str sym)
(while style
@@ -5235,5 +5204,3 @@
;; Non-functioning under OS/2:
(if (eq char-height 1) (setq char-height 18))
;; Title, menubar, + 2 for slack
- (- (/ (x-display-pixel-height) char-height) 4)
- ))
* (- (/ (x-display-pixel-height) char-height) 4)))
(if (> height max-height) (setq height max-height))
;;(message "was %s doing %s" iniheight height)
(if not-loner
@@ -5343,4 +5311,3 @@
(setq e (point))
(skip-chars-backward " \t")
(delete-region (point) e)
- (indent-to-column col); (make-string (- col (current-column)) ?\ ))
* (indent-to-column col) ; (make-string (- col (current-column)) ?\ ))
(beginning-of-line 2)
(and (< (point) end)
(re-search-forward search end t)
@@ -5491,4 +5459,3 @@
(defvar cperl-unreadable-ok nil)
(defun cperl-find-tags (ifile xs topdir)
- (let (ind (b (get-buffer cperl-tmp-buffer)) lst elt pos ret rel
* (let ((b (get-buffer cperl-tmp-buffer)) ind lst elt pos ret rel
(cperl-pod-here-fontify nil) f file)
(save-excursion
(if b (set-buffer b)
@@ -5518,7 +5486,6 @@
(setq lst (cdr (assoc "+Unsorted List+..." ind))))
(setq lst
(mapcar
- (function
(lambda (elt)
(cond ((string-match "^[_a-zA-Z]" (car elt))
(goto-char (cdr elt))
@@ -5533,4 +5500,3 @@
(point))
(progn
(beginning-of-line)
- (point))))))))
* (point)))))))
lst))
(erase-buffer)
(while lst
@@ -5626,4 +5593,3 @@
(setq cperl-unreadable-ok t
tm nil) ; Return empty list
(error "Aborting: unreadable directory %s" file)))))))
- (mapcar (function (lambda (file)
* (mapcar (lambda (file)
(cond
((string-match cperl-noscan-files-regexp file)
nil)
@@ -5634,6 +5601,3 @@
(if (string-match cperl-scan-files-regexp file)
(cperl-write-tags file erase recurse nil t noxs topdir)))
((not recurse) nil)
- (t (cperl-write-tags file erase recurse t t noxs topdir)))))
- files))
- )
* (t (cperl-write-tags file erase recurse t t noxs topdir))))
* files)))
(t
(setq xs (string-match "\\.xs$" file))
(if (not (and xs noxs))
@@ -5733,5 +5699,3 @@
(require 'etags)
(require 'imenu)
(if (or update (null (nth 2 cperl-hierarchy)))
- (let (pack name cons1 to l1 l2 l3 l4 b
- (remover (function (lambda (elt) ; (name (file1...) (file2..))
* (let ((remover (lambda (elt) ; (name (file1...) (file2..))
(or (nthcdr 2 elt)
;; Only in one file
- (setcdr elt (cdr (nth 1 elt))))))))
* (setcdr elt (cdr (nth 1 elt))))))
* pack name cons1 to l1 l2 l3 l4 b)
;; (setq cperl-hierarchy '(() () ())) ; Would write into '() later!
(setq cperl-hierarchy (list l1 l2 l3))
(if cperl-xemacs-p ; Not checked
@@ -5751,8 +5717,6 @@
(or tags-table-list
(call-interactively 'visit-tags-table))
(mapcar
- (function
(lambda (tagsfile)
(message "Updating list of classes... %s" tagsfile)
(set-buffer (get-file-buffer tagsfile))
- (cperl-tags-hier-fill)))
* (cperl-tags-hier-fill))
tags-table-list)
(message "Updating list of classes... postprocessing..."))
(mapcar remover (car cperl-hierarchy))
@@ -5797,7 +5762,6 @@
l1 head tail cons1 cons2 ord writeto packs recurse
root-packages root-functions ms many_ms same_name ps
(move-deeper
- (function
(lambda (elt)
(cond ((and (string-match regexp (car elt))
(or (eq ord 1) (match-end 2)))
@@ -5816,4 +5780,3 @@
((eq ord 2)
(setq root-functions (cons elt root-functions)))
(t
- (setq root-packages (cons elt root-packages))))))))
* (setq root-packages (cons elt root-packages)))))))
(setcdr to l1) ; Init to dynamic space
(setq writeto to)
(setq ord 1)
@@ -5824,5 +5788,3 @@
(setq ord 2)
(mapcar move-deeper methods)
(if recurse
- (mapcar (function (lambda (elt)
- (cperl-tags-treeify elt (1+ level))))
* (mapcar (lambda (elt)
* (cperl-tags-treeify elt (1+ level)))
(cdr to)))
;;Now clean up leaders with one child only
- (mapcar (function (lambda (elt)
* (mapcar (lambda (elt)
(if (not (and (listp (cdr elt))
(eq (length elt) 2))) nil
(setcar elt (car (nth 1 elt)))
- (setcdr elt (cdr (nth 1 elt))))))
* (setcdr elt (cdr (nth 1 elt)))))
(cdr to))
;; Sort the roots of subtrees
(if (default-value 'imenu-sort-function)
(setcdr to
(sort (cdr to) (default-value 'imenu-sort-function))))
;; Now add back functions removed from display
- (mapcar (function (lambda (elt)
- (setcdr to (cons elt (cdr to)))))
* (mapcar (lambda (elt)
* (setcdr to (cons elt (cdr to))))
(if (default-value 'imenu-sort-function)
(nreverse
(sort root-functions (default-value 'imenu-sort-function)))
root-functions))
;; Now add back packages removed from display
- (mapcar (function (lambda (elt)
* (mapcar (lambda (elt)
(setcdr to (cons (cons (concat "package " (car elt))
(cdr elt))
- (cdr to)))))
* (cdr to))))
(if (default-value 'imenu-sort-function)
(nreverse
(sort root-packages (default-value 'imenu-sort-function)))
- root-packages))
- ))
* root-packages))))
;;;(x-popup-menu t
;;; '(keymap "Name1"
@@ -5886,7 +5849,6 @@
(let (list)
(cons 'keymap
(mapcar
- (function
(lambda (elt)
(cond ((listp (cdr elt))
(setq list (cperl-list-fold
@@ -5895,4 +5857,3 @@
(cons (car elt)
(cperl-menu-to-keymap list))))
(t
- (list (cdr elt) (car elt) t))))) ; t is needed in 19.34
* (list (cdr elt) (car elt) t)))) ; t is needed in 19.34
(cperl-list-fold menu "Root" imenu-max-items)))))
\f
(defvar cperl-bad-style-regexp
(mapconcat 'identity
'("[^-\n\t <>=+!.&|(*/'`\"#^][-=+<>!|&^]" ; char sign
- "[-<>=+^&|]+[^- \t\n=+<>~]" ; sign+ char
- )
* "[-<>=+^&|]+[^- \t\n=+<>~]") ; sign+ char
"\\|")
"Finds places such that insertion of a whitespace may help a lot.")
@@ -5946,4 +5907,3 @@
(setq last-nonmenu-event 13) ; To disable popup
(beginning-of-buffer)
(map-y-or-n-p "Insert space here? "
- (function (lambda (arg) (insert " ")))
* (lambda (arg) (insert " "))
'cperl-next-bad-style
'("location" "locations" "insert a space into")
'((?\C-r (lambda (arg)
@@ -6004,4 +5965,3 @@
"[$@][^ \n\t]" ; Special variable
"-[a-zA-Z]" ; File test
"\\\\[a-zA-Z0]" ; Special chars
- "^=[a-z][a-zA-Z0-9_]*" ; Pod sections
* "^=[a-z][a-zA-Z0-9_]*" ; POD sections
"[-!&*+,-./<=>?\\\\^|~]+" ; Operator
"[a-zA-Z_0-9:]+" ; symbol or number
"x="
- "#!"
- )
* "#!")
;;"\\)\\|\\("
- "\\|"
- )
* "\\|")
;;"\\)"
;;)
"Matches places in the buffer we can find help for.")
@@ -6139,4 +6098,3 @@
(if cperl-message-on-help-error
(message "No definition for %s" val)))))))
-(defvar cperl-short-docs "Ignore my value"
*(defvar cperl-short-docs 'please-ignore-this-line
;; Perl4 version was written by Johan Vromans (jvromans@squirrel.nl)
"# based on '@(#)@ perl-descr.el 1.9 - describe-perl-symbol' [Perl 5]
! ... Logical negation.
@@ -6512,12 +6471,6 @@
CORE:: Prefix to access builtin function if imported sub obscures it.
SUPER:: Prefix to lookup for a method in @ISA classes.
DESTROY Shorthand for `sub DESTROY {...}'.
-... EQ ... Obsolete synonym of `eq'.
-... GE ... Obsolete synonym of `ge'.
-... GT ... Obsolete synonym of `gt'.
-... LE ... Obsolete synonym of `le'.
-... LT ... Obsolete synonym of `lt'.
-... NE ... Obsolete synonym of `ne'.
abs [ EXPR ] absolute value
... and ... Low-precedence synonym for &&.
bless REFERENCE [, PACKAGE] Makes reference into an object of a package.
@@ -6633,5 +6586,3 @@
"\\|" ; Grouping
"\\((\\(\\?\\)?\\)" ; 7 8
"\\|" ; |
- "\\(|\\)" ; 9
- )))
* "\\(|\\)"))) ; 9
(goto-char (match-end 0))
(setq spaces t)
(cond ((match-beginning 1) ; Alphanum word + junk
@@ -6756,5 +6708,3 @@
(setq s (point))
(skip-chars-forward " \t")
(delete-region s (point))
- (indent-to-column c)))
- ))
* (indent-to-column c)))))
(defun cperl-make-regexp-x ()
;; Returns position of the start
@@ -7091,5 +7042,3 @@
(defun cperl-fontify-syntaxically (end)
;; Some vars for debugging only
;; (message "Syntaxifying...")
- (let (start (dbg (point)) (iend end)
- (istate (car cperl-syntax-state)))
* (let ((dbg (point)) (iend end)
* (istate (car cperl-syntax-state))
* start)
(and cperl-syntaxify-unwind
(setq end (cperl-unwind-to-safe t end)))
(setq start (point))
@@ -7135,4 +7087,3 @@
(cperl-fontify-syntaxically to)))))
(defvar cperl-version
- (let ((v "Revision: 4.32"))
* (let ((v "Revision: 4.33"))
(string-match ":\\s *\\([0-9.]+\\)" v)
(substring v (match-beginning 1) (match-end 1)))
"Version of IZ-supported CPerl package this file is based on.")
[-- Attachment #4: cperl-u.diff --]
[-- Type: application/octet-stream, Size: 118622 bytes --]
--- CVS/cperl-mode.el 2003-02-04 14:24:34.000000000 +0100
+++ pfeiffer/cperl-mode.el 2003-02-11 23:00:28.000000000 +0100
@@ -1,6 +1,6 @@
;;; cperl-mode.el --- Perl code editing commands for Emacs
-;; Copyright (C) 1985, 86, 87, 91, 92, 93, 94, 95, 96, 1997
+;; Copyright (C) 1985, 86, 87, 91, 92, 93, 94, 95, 96, 1997, 2000, 2003
;; Free Software Foundation, Inc.
;; Author: Ilya Zakharevich and Bob Olson
@@ -28,38 +28,43 @@
;;; Commentary:
-;;; You can either fine-tune the bells and whistles of this mode or
-;;; bulk enable them by putting
+;; You can either fine-tune the bells and whistles of this mode or
+;; bulk enable them by putting
;; (setq cperl-hairy t)
-;;; in your .emacs file. (Emacs rulers do not consider it politically
-;;; correct to make whistles enabled by default.)
+;; in your .emacs file. (Emacs rulers do not consider it politically
+;; correct to make whistles enabled by default.)
-;;; DO NOT FORGET to read micro-docs (available from `Perl' menu) <<<<<<
-;;; or as help on variables `cperl-tips', `cperl-problems', <<<<<<
-;;; `cperl-praise', `cperl-speed'. <<<<<<
-
-;;; The mode information (on C-h m) provides some customization help.
-;;; If you use font-lock feature of this mode, it is advisable to use
-;;; either lazy-lock-mode or fast-lock-mode. I prefer lazy-lock.
-
-;;; Faces used now: three faces for first-class and second-class keywords
-;;; and control flow words, one for each: comments, string, labels,
-;;; functions definitions and packages, arrays, hashes, and variable
-;;; definitions. If you do not see all these faces, your font-lock does
-;;; not define them, so you need to define them manually.
-
-;;; into your .emacs file.
-
-;;;; This mode supports font-lock, imenu and mode-compile. In the
-;;;; hairy version font-lock is on, but you should activate imenu
-;;;; yourself (note that mode-compile is not standard yet). Well, you
-;;;; can use imenu from keyboard anyway (M-x imenu), but it is better
-;;;; to bind it like that:
+;; DO NOT FORGET to read micro-docs (available from `Perl' menu) <<<<<<
+;; or as help on variables `cperl-tips', `cperl-problems', <<<<<<
+;; `cperl-praise', `cperl-speed'. <<<<<<
+
+;; The mode information (on C-h m) provides some customization help.
+;; If you use font-lock feature of this mode, it is advisable to use
+;; either lazy-lock-mode or fast-lock-mode. I prefer lazy-lock.
+
+;; Faces used now: three faces for first-class and second-class keywords
+;; and control flow words, one for each: comments, string, labels,
+;; functions definitions and packages, arrays, hashes, and variable
+;; definitions. If you do not see all these faces, your font-lock does
+;; not define them, so you need to define them manually.
+
+;; This mode supports font-lock, imenu and mode-compile. In the
+;; hairy version font-lock is on, but you should activate imenu
+;; yourself (note that mode-compile is not standard yet). Well, you
+;; can use imenu from keyboard anyway (M-x imenu), but it is better
+;; to bind it like that:
;; (define-key global-map [M-S-down-mouse-3] 'imenu)
+;;; Font lock bugs:
+
+;; The following kinds of Perl code erroneously start strings:
+;; \$` \$' \$"
+;; $opt::s $opt_s $opt{s} (s => ...) /\s+.../
+;; likewise with m, tr, y, q, qX instead of s
+
;;; Code:
;; Some macros are needed for `defcustom'
@@ -170,8 +175,7 @@
instead of:
if () {
- }
-"
+ }"
:type 'boolean
:group 'cperl-autoinsert-details)
@@ -354,12 +358,12 @@
:group 'cperl-affected-by-hairy)
(defcustom cperl-pod-face 'font-lock-comment-face
- "*Face for pod highlighting."
+ "*Face for POD highlighting."
:type 'face
:group 'cperl-faces)
(defcustom cperl-pod-head-face 'font-lock-variable-name-face
- "*Face for pod highlighting.
+ "*Face for POD highlighting.
Font for POD headers."
:type 'face
:group 'cperl-faces)
@@ -376,7 +380,7 @@
:group 'cperl-faces)
(defcustom cperl-pod-here-fontify '(featurep 'font-lock)
- "*Not-nil after evaluation means to highlight pod and here-docs sections."
+ "*Not-nil after evaluation means to highlight POD and here-docs sections."
:type 'boolean
:group 'cperl-faces)
@@ -395,7 +399,7 @@
:group 'cperl)
(defcustom cperl-pod-here-scan t
- "*Not-nil means look for pod and here-docs sections during startup.
+ "*Not-nil means look for POD and here-docs sections during startup.
You can always make lookup from menu or using \\[cperl-find-pods-heres]."
:type 'boolean
:group 'cperl-speed)
@@ -593,7 +597,7 @@
;;; Short extra-docs.
(defvar cperl-tips 'please-ignore-this-line
- "Get newest version of this package from
+ "Get maybe newer version of this package from
ftp://ftp.math.ohio-state.edu/pub/users/ilya/emacs
and/or
ftp://ftp.math.ohio-state.edu/pub/users/ilya/perl
@@ -681,7 +685,7 @@
This may be confusing, since the regexp s#//#/#\; may be highlighted
as a comment, but it will be recognized as a regexp by the indentation
-code. Or the opposite case, when a pod section is highlighted, but
+code. Or the opposite case, when a POD section is highlighted, but
may break the indentation of the following code (though indentation
should work if the balance of delimiters is not broken by POD).
@@ -699,7 +703,7 @@
If these bugs cannot be fixed on your machine (say, you have an inferior
environment and cannot recompile), you may still disable all the fancy stuff
-via `cperl-use-syntax-table-text-property'." )
+via `cperl-use-syntax-table-text-property'.")
(defvar cperl-praise 'please-ignore-this-line
"Advantages of CPerl mode.
@@ -783,8 +787,7 @@
line-breaks/spacing between elements of the construct.
10) Uses a linear-time algorith for indentation of regions (on Emaxen with
-capable syntax engines).
-")
+capable syntax engines).")
(defvar cperl-speed 'please-ignore-this-line
"This is an incomplete compendium of what is available in other parts
@@ -828,8 +831,7 @@
wrongly matched parentheses, wrong indentation, etc.
One can unset `cperl-syntaxify-unwind'. This might speed up editing
- of, say, long POD sections.
-")
+ of, say, long POD sections.")
(defvar cperl-tips-faces 'please-ignore-this-line
"CPerl mode uses following faces for highlighting:
@@ -901,7 +903,7 @@
(defsubst cperl-enable-font-lock ()
(or cperl-xemacs-p window-system))
-(defun cperl-putback-char (c) ; Emacs 19
+(defun cperl-putback-char (c) ; Emacs 19
(set 'unread-command-events (list c))) ; Avoid undefined warning
(if (boundp 'unread-command-events)
@@ -926,7 +928,7 @@
;; If POST, do not do it with postponed fontification
(if (and post cperl-syntaxify-by-font-lock)
nil
- (put-text-property (max (point-min) (1- from))
+ (put-text-property (max (point-min) (1- from))
to cperl-do-not-fontify t)))
(defcustom cperl-mode-hook nil
@@ -955,24 +957,11 @@
;;; (setq interpreter-mode-alist (append interpreter-mode-alist
;;; '(("miniperl" . perl-mode))))))
(eval-when-compile
- (condition-case nil
- (require 'imenu)
- (error nil))
- (condition-case nil
- (require 'easymenu)
- (error nil))
- (condition-case nil
- (require 'etags)
- (error nil))
- (condition-case nil
- (require 'timer)
- (error nil))
- (condition-case nil
- (require 'man)
- (error nil))
- (condition-case nil
- (require 'info)
- (error nil))
+ (mapc (lambda (p)
+ (condition-case nil
+ (require p)
+ (error nil)))
+ '(imenu easymenu etags timer man info))
(if (fboundp 'ps-extend-face-list)
(defmacro cperl-ps-extend-face-list (arg)
`(ps-extend-face-list ,arg))
@@ -1071,51 +1060,51 @@
(progn
(require 'easymenu)
(easy-menu-define cperl-menu cperl-mode-map "Menu for CPerl mode"
- '("Perl"
- ["Beginning of function" beginning-of-defun t]
- ["End of function" end-of-defun t]
- ["Mark function" mark-defun t]
- ["Indent expression" cperl-indent-exp t]
- ["Fill paragraph/comment" cperl-fill-paragraph t]
- "----"
- ["Line up a construction" cperl-lineup (cperl-use-region-p)]
- ["Invert if/unless/while etc" cperl-invert-if-unless t]
- ("Regexp"
- ["Beautify" cperl-beautify-regexp
- cperl-use-syntax-table-text-property]
- ["Beautify one level deep" (cperl-beautify-regexp 1)
- cperl-use-syntax-table-text-property]
- ["Beautify a group" cperl-beautify-level
- cperl-use-syntax-table-text-property]
- ["Beautify a group one level deep" (cperl-beautify-level 1)
- cperl-use-syntax-table-text-property]
- ["Contract a group" cperl-contract-level
- cperl-use-syntax-table-text-property]
- ["Contract groups" cperl-contract-levels
- cperl-use-syntax-table-text-property])
- ["Refresh \"hard\" constructions" cperl-find-pods-heres t]
- "----"
- ["Indent region" cperl-indent-region (cperl-use-region-p)]
- ["Comment region" cperl-comment-region (cperl-use-region-p)]
- ["Uncomment region" cperl-uncomment-region (cperl-use-region-p)]
- "----"
- ["Run" mode-compile (fboundp 'mode-compile)]
- ["Kill" mode-compile-kill (and (fboundp 'mode-compile-kill)
- (get-buffer "*compilation*"))]
- ["Next error" next-error (get-buffer "*compilation*")]
- ["Check syntax" cperl-check-syntax (fboundp 'mode-compile)]
- "----"
- ["Debugger" cperl-db t]
- "----"
- ("Tools"
- ["Imenu" imenu (fboundp 'imenu)]
- ["Insert spaces if needed" cperl-find-bad-style t]
- ["Class Hierarchy from TAGS" cperl-tags-hier-init t]
- ;;["Update classes" (cperl-tags-hier-init t) tags-table-list]
- ["CPerl pretty print (exprmntl)" cperl-ps-print
- (fboundp 'ps-extend-face-list)]
- ["Imenu on info" cperl-imenu-on-info (featurep 'imenu)]
- ("Tags"
+ '("Perl"
+ ["Beginning of function" beginning-of-defun t]
+ ["End of function" end-of-defun t]
+ ["Mark function" mark-defun t]
+ ["Indent expression" cperl-indent-exp t]
+ ["Fill paragraph/comment" cperl-fill-paragraph t]
+ "----"
+ ["Line up a construction" cperl-lineup (cperl-use-region-p)]
+ ["Invert if/unless/while etc" cperl-invert-if-unless t]
+ ("Regexp"
+ ["Beautify" cperl-beautify-regexp
+ cperl-use-syntax-table-text-property]
+ ["Beautify one level deep" (cperl-beautify-regexp 1)
+ cperl-use-syntax-table-text-property]
+ ["Beautify a group" cperl-beautify-level
+ cperl-use-syntax-table-text-property]
+ ["Beautify a group one level deep" (cperl-beautify-level 1)
+ cperl-use-syntax-table-text-property]
+ ["Contract a group" cperl-contract-level
+ cperl-use-syntax-table-text-property]
+ ["Contract groups" cperl-contract-levels
+ cperl-use-syntax-table-text-property])
+ ["Refresh \"hard\" constructions" cperl-find-pods-heres t]
+ "----"
+ ["Indent region" cperl-indent-region (cperl-use-region-p)]
+ ["Comment region" cperl-comment-region (cperl-use-region-p)]
+ ["Uncomment region" cperl-uncomment-region (cperl-use-region-p)]
+ "----"
+ ["Run" mode-compile (fboundp 'mode-compile)]
+ ["Kill" mode-compile-kill (and (fboundp 'mode-compile-kill)
+ (get-buffer "*compilation*"))]
+ ["Next error" next-error (get-buffer "*compilation*")]
+ ["Check syntax" cperl-check-syntax (fboundp 'mode-compile)]
+ "----"
+ ["Debugger" cperl-db t]
+ "----"
+ ("Tools"
+ ["Imenu" imenu (fboundp 'imenu)]
+ ["Insert spaces if needed" cperl-find-bad-style t]
+ ["Class Hierarchy from TAGS" cperl-tags-hier-init t]
+ ;;["Update classes" (cperl-tags-hier-init t) tags-table-list]
+ ["CPerl pretty print (exprmntl)" cperl-ps-print
+ (fboundp 'ps-extend-face-list)]
+ ["Imenu on info" cperl-imenu-on-info (featurep 'imenu)]
+ ("Tags"
;;; ["Create tags for current file" cperl-etags t]
;;; ["Add tags for current file" (cperl-etags t) t]
;;; ["Create tags for Perl files in directory" (cperl-etags nil t) t]
@@ -1125,57 +1114,57 @@
;;; ["Add tags for Perl files in (sub)directories"
;;; (cperl-etags t 'recursive) t])
;;;; cperl-write-tags (&optional file erase recurse dir inbuffer)
- ["Create tags for current file" (cperl-write-tags nil t) t]
- ["Add tags for current file" (cperl-write-tags) t]
- ["Create tags for Perl files in directory"
- (cperl-write-tags nil t nil t) t]
- ["Add tags for Perl files in directory"
- (cperl-write-tags nil nil nil t) t]
- ["Create tags for Perl files in (sub)directories"
- (cperl-write-tags nil t t t) t]
- ["Add tags for Perl files in (sub)directories"
- (cperl-write-tags nil nil t t) t]))
- ("Perl docs"
- ["Define word at point" imenu-go-find-at-position
- (fboundp 'imenu-go-find-at-position)]
- ["Help on function" cperl-info-on-command t]
- ["Help on function at point" cperl-info-on-current-command t]
- ["Help on symbol at point" cperl-get-help t]
- ["Perldoc" cperl-perldoc t]
- ["Perldoc on word at point" cperl-perldoc-at-point t]
- ["View manpage of POD in this file" cperl-pod-to-manpage t]
- ["Auto-help on" cperl-lazy-install
- (and (fboundp 'run-with-idle-timer)
- (not cperl-lazy-installed))]
- ["Auto-help off" (eval '(cperl-lazy-unstall))
- (and (fboundp 'run-with-idle-timer)
- cperl-lazy-installed)])
- ("Toggle..."
- ["Auto newline" cperl-toggle-auto-newline t]
- ["Electric parens" cperl-toggle-electric t]
- ["Electric keywords" cperl-toggle-abbrev t]
- ["Fix whitespace on indent" cperl-toggle-construct-fix t]
- ["Auto fill" auto-fill-mode t])
- ("Indent styles..."
- ["CPerl" (cperl-set-style "CPerl") t]
- ["PerlStyle" (cperl-set-style "PerlStyle") t]
- ["GNU" (cperl-set-style "GNU") t]
- ["C++" (cperl-set-style "C++") t]
- ["FSF" (cperl-set-style "FSF") t]
- ["BSD" (cperl-set-style "BSD") t]
- ["Whitesmith" (cperl-set-style "Whitesmith") t]
- ["Current" (cperl-set-style "Current") t]
- ["Memorized" (cperl-set-style-back) cperl-old-style])
- ("Micro-docs"
- ["Tips" (describe-variable 'cperl-tips) t]
- ["Problems" (describe-variable 'cperl-problems) t]
- ["Speed" (describe-variable 'cperl-speed) t]
- ["Praise" (describe-variable 'cperl-praise) t]
- ["Faces" (describe-variable 'cperl-tips-faces) t]
- ["CPerl mode" (describe-function 'cperl-mode) t]
- ["CPerl version"
- (message "The version of master-file for this CPerl is %s-emacs"
- cperl-version) t]))))
+ ["Create tags for current file" (cperl-write-tags nil t) t]
+ ["Add tags for current file" (cperl-write-tags) t]
+ ["Create tags for Perl files in directory"
+ (cperl-write-tags nil t nil t) t]
+ ["Add tags for Perl files in directory"
+ (cperl-write-tags nil nil nil t) t]
+ ["Create tags for Perl files in (sub)directories"
+ (cperl-write-tags nil t t t) t]
+ ["Add tags for Perl files in (sub)directories"
+ (cperl-write-tags nil nil t t) t]))
+ ("Perl docs"
+ ["Define word at point" imenu-go-find-at-position
+ (fboundp 'imenu-go-find-at-position)]
+ ["Help on function" cperl-info-on-command t]
+ ["Help on function at point" cperl-info-on-current-command t]
+ ["Help on symbol at point" cperl-get-help t]
+ ["Perldoc" cperl-perldoc t]
+ ["Perldoc on word at point" cperl-perldoc-at-point t]
+ ["View manpage of POD in this file" cperl-pod-to-manpage t]
+ ["Auto-help on" cperl-lazy-install
+ (and (fboundp 'run-with-idle-timer)
+ (not cperl-lazy-installed))]
+ ["Auto-help off" (eval '(cperl-lazy-unstall))
+ (and (fboundp 'run-with-idle-timer)
+ cperl-lazy-installed)])
+ ("Toggle..."
+ ["Auto newline" cperl-toggle-auto-newline t]
+ ["Electric parens" cperl-toggle-electric t]
+ ["Electric keywords" cperl-toggle-abbrev t]
+ ["Fix whitespace on indent" cperl-toggle-construct-fix t]
+ ["Auto fill" auto-fill-mode t])
+ ("Indent styles..."
+ ["CPerl" (cperl-set-style "CPerl") t]
+ ["PerlStyle" (cperl-set-style "PerlStyle") t]
+ ["GNU" (cperl-set-style "GNU") t]
+ ["C++" (cperl-set-style "C++") t]
+ ["FSF" (cperl-set-style "FSF") t]
+ ["BSD" (cperl-set-style "BSD") t]
+ ["Whitesmith" (cperl-set-style "Whitesmith") t]
+ ["Current" (cperl-set-style "Current") t]
+ ["Memorized" (cperl-set-style-back) cperl-old-style])
+ ("Micro-docs"
+ ["Tips" (describe-variable 'cperl-tips) t]
+ ["Problems" (describe-variable 'cperl-problems) t]
+ ["Speed" (describe-variable 'cperl-speed) t]
+ ["Praise" (describe-variable 'cperl-praise) t]
+ ["Faces" (describe-variable 'cperl-tips-faces) t]
+ ["CPerl mode" (describe-function 'cperl-mode) t]
+ ["CPerl version"
+ (message "The version of master-file for this CPerl is %s-emacs"
+ cperl-version) t]))))
(error nil))
(autoload 'c-macro-expand "cmacexp"
@@ -1186,9 +1175,9 @@
(defvar cperl-imenu--function-name-regexp-perl
(concat
"^\\("
- "[ \t]*\\(sub\\|package\\)[ \t\n]+\\([a-zA-Z_0-9:']+\\)[ \t]*\\(([^()]*)[ \t]*\\)?"
- "\\|"
- "=head\\([12]\\)[ \t]+\\([^\n]+\\)$"
+ "[ \t]*\\(sub\\|package\\)[ \t\n]+\\([a-zA-Z_0-9:']+\\)[ \t]*\\(([^()]*)[ \t]*\\)?"
+ "\\|"
+ "=head\\([12]\\)[ \t]+\\([^\n]+\\)$"
"\\)"))
(defvar cperl-outline-regexp
@@ -1224,8 +1213,7 @@
(modify-syntax-entry ?| "." cperl-mode-syntax-table)
(setq cperl-string-syntax-table (copy-syntax-table cperl-mode-syntax-table))
(modify-syntax-entry ?$ "." cperl-string-syntax-table)
- (modify-syntax-entry ?# "." cperl-string-syntax-table) ; (?# comment )
-)
+ (modify-syntax-entry ?# "." cperl-string-syntax-table)) ; (?# comment )
\f
@@ -1337,7 +1325,7 @@
span the needed amount of lines.
Variables `cperl-pod-here-scan', `cperl-pod-here-fontify',
-`cperl-pod-face', `cperl-pod-head-face' control processing of pod and
+`cperl-pod-face', `cperl-pod-head-face' control processing of POD and
here-docs sections. With capable Emaxen results of scan are used
for indentation too, otherwise they are used for highlighting only.
@@ -1502,9 +1490,9 @@
;; Fix broken font-lock:
(or (boundp 'font-lock-unfontify-region-function)
(set 'font-lock-unfontify-region-function
- 'font-lock-default-unfontify-region))
+ 'font-lock-default-unfontify-region))
(make-local-variable 'font-lock-unfontify-region-function)
- (set 'font-lock-unfontify-region-function
+ (setq font-lock-unfontify-region-function
'cperl-font-lock-unfontify-region-function)
(make-local-variable 'cperl-syntax-done-to)
;; Another bug: unless font-lock-syntactic-keywords, font-lock
@@ -1531,12 +1519,9 @@
(run-hooks 'cperl-mode-hook)
;; After hooks since fontification will break this
(if cperl-pod-here-scan
- (or ;;(and (boundp 'font-lock-mode)
- ;; (eval 'font-lock-mode) ; Avoid warning
- ;; (boundp 'font-lock-hot-pass) ; Newer font-lock
- cperl-syntaxify-by-font-lock ;;)
- (progn (or cperl-faces-init (cperl-init-faces-weak))
- (cperl-find-pods-heres)))))
+ (unless cperl-syntaxify-by-font-lock
+ (or cperl-faces-init (cperl-init-faces-weak))
+ (cperl-find-pods-heres))))
\f
;; Fix for perldb - make default reasonable
(defun cperl-db ()
@@ -1546,10 +1531,10 @@
(if (consp gud-perldb-history)
(car gud-perldb-history)
(concat "perl " ;;(file-name-nondirectory
- ;; I have problems
- ;; in OS/2
- ;; otherwise
- (buffer-file-name)))
+ ;; I have problems
+ ;; in OS/2
+ ;; otherwise
+ (buffer-file-name)))
nil nil
'(gud-perldb-history . 1))))
\f
@@ -1675,7 +1660,7 @@
(setq last-command-char ?\{)
(cperl-electric-lbrace arg insertpos))
(forward-char 1))
- ;: Check whether we close something "usual" with `}'
+ ;; Check whether we close something "usual" with `}'
(if (and (eq last-command-char ?\})
(not
(condition-case nil
@@ -1725,17 +1710,17 @@
(defun cperl-electric-lbrace (arg &optional end)
"Insert character, correct line's indentation, correct quoting by space."
(interactive "P")
- (let (pos after
- (cperl-brace-recursing t)
- (cperl-auto-newline cperl-auto-newline)
- (other-end (or end
- (if (and cperl-electric-parens-mark
- (cperl-mark-active)
- (> (mark) (point)))
- (save-excursion
- (goto-char (mark))
- (point-marker))
- nil))))
+ (let ((cperl-brace-recursing t)
+ (cperl-auto-newline cperl-auto-newline)
+ (other-end (or end
+ (if (and cperl-electric-parens-mark
+ (cperl-mark-active)
+ (> (mark) (point)))
+ (save-excursion
+ (goto-char (mark))
+ (point-marker))
+ nil)))
+ pos after)
(and (cperl-val 'cperl-electric-lbrace-space)
(eq (preceding-char) ?$)
(save-excursion
@@ -1768,9 +1753,9 @@
(other-end (if (and cperl-electric-parens-mark
(cperl-mark-active)
(> (mark) (point)))
- (save-excursion
- (goto-char (mark))
- (point-marker))
+ (save-excursion
+ (goto-char (mark))
+ (point-marker))
nil)))
(if (and (cperl-val 'cperl-electric-parens)
(memq last-command-char
@@ -1822,9 +1807,9 @@
(insert (make-string
(prefix-numeric-value arg)
(cdr (assoc last-command-char '((?\} . ?\{)
- (?\] . ?\[)
- (?\) . ?\()
- (?\> . ?\<))))))
+ (?\] . ?\[)
+ (?\) . ?\()
+ (?\> . ?\<))))))
(goto-char (1+ p)))
(self-insert-command (prefix-numeric-value arg)))))
@@ -1879,8 +1864,7 @@
(insert "\n}")
(and do (insert " while ();")))
(t
- (insert (if do " {\n} while ();" " () {\n}")))
- )
+ (insert (if do " {\n} while ();" " () {\n}"))))
(or (looking-at "[ \t]\\|$") (insert " "))
(cperl-indent-line)
(if dollar (progn (search-backward "$")
@@ -1943,7 +1927,7 @@
(save-excursion
(forward-char -1)
(re-search-backward "\\(\\`\n?\\|\n\n\\)=head1\\>"
- nil t)))) ; Only one
+ nil t)))) ; Only one
(progn
(forward-word 1)
(setq name (file-name-sans-extension
@@ -2000,8 +1984,7 @@
(cperl-indent-line)
(insert "\n\n}"))
(t
- (insert " {\n\n}"))
- )
+ (insert " {\n\n}")))
(or (looking-at "[ \t]\\|$") (insert " "))
(cperl-indent-line)
(forward-line -1)
@@ -2021,7 +2004,7 @@
(if (and ; Check if we need to split:
; i.e., on a boundary and inside "{...}"
(save-excursion (cperl-to-comment-or-eol)
- (>= (point) pos)) ; Not in a comment
+ (>= (point) pos)) ; Not in a comment
(or (save-excursion
(skip-chars-backward " \t" beg)
(forward-char -1)
@@ -2058,7 +2041,7 @@
(cperl-indent-line)
(beginning-of-line)
(or (looking-at "[ \t]*}[,; \t]*$") ; If there is a statement
- ; after, move it to separate line
+ ; after, move it to separate line
(progn
(end-of-line)
(search-backward "}" beg)
@@ -2077,7 +2060,7 @@
(save-excursion
(skip-chars-backward " \t")
(eq (preceding-char) ?\)))) ; Probably if () {} group
- ; with an extra newline.
+ ; with an extra newline.
(forward-line 2)
(cperl-indent-line))
((save-excursion ; In POD header
@@ -2129,10 +2112,11 @@
(defun cperl-electric-terminator (arg)
"Insert character and correct line's indentation."
(interactive "P")
- (let (insertpos (end (point))
- (auto (and cperl-auto-newline
- (or (not (eq last-command-char ?:))
- cperl-auto-newline-after-colon))))
+ (let ((end (point))
+ (auto (and cperl-auto-newline
+ (or (not (eq last-command-char ?:))
+ cperl-auto-newline-after-colon)))
+ insertpos)
(if (and ;;(not arg)
(eolp)
(not (save-excursion
@@ -2251,9 +2235,9 @@
(defun cperl-indent-line (&optional parse-data)
"Indent current line as Perl code.
Return the amount the indentation changed by."
- (let (indent i beg shift-amt
- (case-fold-search nil)
- (pos (- (point-max) (point))))
+ (let ((case-fold-search nil)
+ (pos (- (point-max) (point)))
+ indent i beg shift-amt)
(setq indent (cperl-calculate-indent parse-data)
i indent)
(beginning-of-line)
@@ -2331,7 +2315,7 @@
(or state (setq state (parse-partial-sexp start start-point -1 nil start-state)))
(list start state depth prestart))))
-(defun cperl-block-p () ; Do not C-M-q ! One string contains ";" !
+(defun cperl-block-p () ; Do not C-M-q ! One string contains ";" !
;; Positions is before ?\{. Checks whether it starts a block.
;; No save-excursion!
(cperl-backward-to-noncomment (point-min))
@@ -2368,134 +2352,134 @@
(not (get-text-property (point) 'indentable)))
;; before start of POD - whitespace found since do not have 'pod!
(and (looking-at "[ \t]*\n=")
- (error "Spaces before pod section!"))
+ (error "Spaces before POD section!"))
(and (not cperl-indent-left-aligned-comments)
(looking-at "^#")))
nil
- (beginning-of-line)
- (let ((indent-point (point))
- (char-after (save-excursion
- (skip-chars-forward " \t")
- (following-char)))
- (in-pod (get-text-property (point) 'in-pod))
- (pre-indent-point (point))
- p prop look-prop is-block delim)
- (cond
- (in-pod
- ;; In the verbatim part, probably code example. What to do???
- )
- (t
- (save-excursion
- ;; Not in pod
- (cperl-backward-to-noncomment nil)
- (setq p (max (point-min) (1- (point)))
- prop (get-text-property p 'syntax-type)
- look-prop (or (nth 1 (assoc prop cperl-look-for-prop))
- 'syntax-type))
- (if (memq prop '(pod here-doc format here-doc-delim))
+ (beginning-of-line)
+ (let ((indent-point (point))
+ (char-after (save-excursion
+ (skip-chars-forward " \t")
+ (following-char)))
+ (in-pod (get-text-property (point) 'in-pod))
+ (pre-indent-point (point))
+ p prop look-prop is-block delim)
+ (cond
+ (in-pod
+ ;; In the verbatim part, probably code example. What to do???
+ )
+ (t
+ (save-excursion
+ ;; Not in POD
+ (cperl-backward-to-noncomment nil)
+ (setq p (max (point-min) (1- (point)))
+ prop (get-text-property p 'syntax-type)
+ look-prop (or (nth 1 (assoc prop cperl-look-for-prop))
+ 'syntax-type))
+ (if (memq prop '(pod here-doc format here-doc-delim))
+ (progn
+ (goto-char (or (previous-single-property-change p look-prop)
+ (point-min)))
+ (beginning-of-line)
+ (setq pre-indent-point (point)))))))
+ (goto-char pre-indent-point)
+ (let* ((case-fold-search nil)
+ (s-s (cperl-get-state (car parse-data) (nth 1 parse-data)))
+ (start (or (nth 2 parse-data)
+ (nth 0 s-s)))
+ (state (nth 1 s-s))
+ (containing-sexp (car (cdr state)))
+ old-indent)
+ (if (and
+ ;;containing-sexp ;; We are buggy at toplevel :-(
+ parse-data)
(progn
- (goto-char (or (previous-single-property-change p look-prop)
- (point-min)))
- (beginning-of-line)
- (setq pre-indent-point (point)))))))
- (goto-char pre-indent-point)
- (let* ((case-fold-search nil)
- (s-s (cperl-get-state (car parse-data) (nth 1 parse-data)))
- (start (or (nth 2 parse-data)
- (nth 0 s-s)))
- (state (nth 1 s-s))
- (containing-sexp (car (cdr state)))
- old-indent)
- (if (and
- ;;containing-sexp ;; We are buggy at toplevel :-(
- parse-data)
- (progn
- (setcar parse-data pre-indent-point)
- (setcar (cdr parse-data) state)
- (or (nth 2 parse-data)
- (setcar (cddr parse-data) start))
- ;; Before this point: end of statement
- (setq old-indent (nth 3 parse-data))))
- (cond ((get-text-property (point) 'indentable)
- ;; indent to just after the surrounding open,
- ;; skip blanks if we do not close the expression.
- (goto-char (1+ (previous-single-property-change (point) 'indentable)))
- (or (memq char-after (append ")]}" nil))
- (looking-at "[ \t]*\\(#\\|$\\)")
- (skip-chars-forward " \t"))
- (current-column))
- ((or (nth 3 state) (nth 4 state))
- ;; return nil or t if should not change this line
- (nth 4 state))
- ;; XXXX Do we need to special-case this?
- ((null containing-sexp)
- ;; Line is at top level. May be data or function definition,
- ;; or may be function argument declaration.
- ;; Indent like the previous top level line
- ;; unless that ends in a closeparen without semicolon,
- ;; in which case this line is the first argument decl.
- (skip-chars-forward " \t")
- (+ (save-excursion
- (goto-char start)
- (- (current-indentation)
- (if (nth 2 s-s) cperl-indent-level 0)))
- (if (= char-after ?{) cperl-continued-brace-offset 0)
- (progn
- (cperl-backward-to-noncomment (or old-indent (point-min)))
- ;; Look at previous line that's at column 0
- ;; to determine whether we are in top-level decls
- ;; or function's arg decls. Set basic-indent accordingly.
- ;; Now add a little if this is a continuation line.
- (if (or (bobp)
- (eq (point) old-indent) ; old-indent was at comment
- (eq (preceding-char) ?\;)
- ;; Had ?\) too
- (and (eq (preceding-char) ?\})
- (cperl-after-block-and-statement-beg
- (point-min))) ; Was start - too close
- (memq char-after (append ")]}" nil))
- (and (eq (preceding-char) ?\:) ; label
- (progn
- (forward-sexp -1)
- (skip-chars-backward " \t")
- (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*[ \t]*:"))))
- (progn
- (if (and parse-data
- (not (eq char-after ?\C-j)))
- (setcdr (cddr parse-data)
- (list pre-indent-point)))
- 0)
- cperl-continued-statement-offset))))
- ((not
- (or (setq is-block
- (and (setq delim (= (char-after containing-sexp) ?{))
- (save-excursion ; Is it a hash?
- (goto-char containing-sexp)
- (cperl-block-p))))
- cperl-indent-parens-as-block))
- ;; group is an expression, not a block:
- ;; indent to just after the surrounding open parens,
- ;; skip blanks if we do not close the expression.
- (goto-char (1+ containing-sexp))
- (or (memq char-after (append ")]}" nil))
- (looking-at "[ \t]*\\(#\\|$\\)")
- (skip-chars-forward " \t"))
- (current-column))
- ((progn
- ;; Containing-expr starts with \{. Check whether it is a hash.
- (goto-char containing-sexp)
- (not (cperl-block-p)))
- (goto-char (1+ containing-sexp))
- (or (memq char-after
- (append (if delim "}" ")]}") nil))
- (looking-at "[ \t]*\\(#\\|$\\)")
- (skip-chars-forward " \t"))
- (+ (current-column)
- (if (and delim
- (eq char-after ?\}))
- ;; Correct indentation of trailing ?\}
- (+ cperl-indent-level cperl-close-paren-offset)
- 0)))
+ (setcar parse-data pre-indent-point)
+ (setcar (cdr parse-data) state)
+ (or (nth 2 parse-data)
+ (setcar (cddr parse-data) start))
+ ;; Before this point: end of statement
+ (setq old-indent (nth 3 parse-data))))
+ (cond ((get-text-property (point) 'indentable)
+ ;; indent to just after the surrounding open,
+ ;; skip blanks if we do not close the expression.
+ (goto-char (1+ (previous-single-property-change (point) 'indentable)))
+ (or (memq char-after (append ")]}" nil))
+ (looking-at "[ \t]*\\(#\\|$\\)")
+ (skip-chars-forward " \t"))
+ (current-column))
+ ((or (nth 3 state) (nth 4 state))
+ ;; return nil or t if should not change this line
+ (nth 4 state))
+ ;; XXXX Do we need to special-case this?
+ ((null containing-sexp)
+ ;; Line is at top level. May be data or function definition,
+ ;; or may be function argument declaration.
+ ;; Indent like the previous top level line
+ ;; unless that ends in a closeparen without semicolon,
+ ;; in which case this line is the first argument decl.
+ (skip-chars-forward " \t")
+ (+ (save-excursion
+ (goto-char start)
+ (- (current-indentation)
+ (if (nth 2 s-s) cperl-indent-level 0)))
+ (if (= char-after ?{) cperl-continued-brace-offset 0)
+ (progn
+ (cperl-backward-to-noncomment (or old-indent (point-min)))
+ ;; Look at previous line that's at column 0
+ ;; to determine whether we are in top-level decls
+ ;; or function's arg decls. Set basic-indent accordingly.
+ ;; Now add a little if this is a continuation line.
+ (if (or (bobp)
+ (eq (point) old-indent) ; old-indent was at comment
+ (eq (preceding-char) ?\;)
+ ;; Had ?\) too
+ (and (eq (preceding-char) ?\})
+ (cperl-after-block-and-statement-beg
+ (point-min))) ; Was start - too close
+ (memq char-after (append ")]}" nil))
+ (and (eq (preceding-char) ?\:) ; label
+ (progn
+ (forward-sexp -1)
+ (skip-chars-backward " \t")
+ (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*[ \t]*:"))))
+ (progn
+ (if (and parse-data
+ (not (eq char-after ?\C-j)))
+ (setcdr (cddr parse-data)
+ (list pre-indent-point)))
+ 0)
+ cperl-continued-statement-offset))))
+ ((not
+ (or (setq is-block
+ (and (setq delim (= (char-after containing-sexp) ?{))
+ (save-excursion ; Is it a hash?
+ (goto-char containing-sexp)
+ (cperl-block-p))))
+ cperl-indent-parens-as-block))
+ ;; group is an expression, not a block:
+ ;; indent to just after the surrounding open parens,
+ ;; skip blanks if we do not close the expression.
+ (goto-char (1+ containing-sexp))
+ (or (memq char-after (append ")]}" nil))
+ (looking-at "[ \t]*\\(#\\|$\\)")
+ (skip-chars-forward " \t"))
+ (current-column))
+ ((progn
+ ;; Containing-expr starts with \{. Check whether it is a hash.
+ (goto-char containing-sexp)
+ (not (cperl-block-p)))
+ (goto-char (1+ containing-sexp))
+ (or (memq char-after
+ (append (if delim "}" ")]}") nil))
+ (looking-at "[ \t]*\\(#\\|$\\)")
+ (skip-chars-forward " \t"))
+ (+ (current-column)
+ (if (and delim
+ (eq char-after ?\}))
+ ;; Correct indentation of trailing ?\}
+ (+ cperl-indent-level cperl-close-paren-offset)
+ 0)))
;;; ((and (/= (char-after containing-sexp) ?{)
;;; (not cperl-indent-parens-as-block))
;;; ;; line is expression, not statement:
@@ -2519,151 +2503,151 @@
;;; (if (eq char-after ?\}) (+ cperl-indent-level
;;; cperl-close-paren-offset)
;;; 0)))
- (t
- ;; Statement level. Is it a continuation or a new statement?
- ;; Find previous non-comment character.
- (goto-char pre-indent-point)
- (cperl-backward-to-noncomment containing-sexp)
- ;; Back up over label lines, since they don't
- ;; affect whether our line is a continuation.
- ;; (Had \, too)
- (while ;;(or (eq (preceding-char) ?\,)
- (and (eq (preceding-char) ?:)
- (or;;(eq (char-after (- (point) 2)) ?\') ; ????
- (memq (char-syntax (char-after (- (point) 2)))
- '(?w ?_))))
- ;;)
- (if (eq (preceding-char) ?\,)
- ;; Will go to beginning of line, essentially.
- ;; Will ignore embedded sexpr XXXX.
- (cperl-backward-to-start-of-continued-exp containing-sexp))
- (beginning-of-line)
- (cperl-backward-to-noncomment containing-sexp))
- ;; Now we get the answer.
- (if (not (or (eq (1- (point)) containing-sexp)
- (memq (preceding-char)
- (append (if is-block " ;{" " ,;{") '(nil)))
- (and (eq (preceding-char) ?\})
- (cperl-after-block-and-statement-beg
- containing-sexp))))
- ;; This line is continuation of preceding line's statement;
- ;; indent `cperl-continued-statement-offset' more than the
- ;; previous line of the statement.
- ;;
- ;; There might be a label on this line, just
- ;; consider it bad style and ignore it.
- (progn
- (cperl-backward-to-start-of-continued-exp containing-sexp)
- (+ (if (memq char-after (append "}])" nil))
- 0 ; Closing parenth
- cperl-continued-statement-offset)
- (if (or is-block
- (not delim)
- (not (eq char-after ?\})))
- 0
- ;; Now it is a hash reference
- (+ cperl-indent-level cperl-close-paren-offset))
- (if (looking-at "\\w+[ \t]*:")
- (if (> (current-indentation) cperl-min-label-indent)
- (- (current-indentation) cperl-label-offset)
- ;; Do not move `parse-data', this should
- ;; be quick anyway (this comment comes
- ;; from different location):
- (cperl-calculate-indent))
- (current-column))
- (if (eq char-after ?\{)
- cperl-continued-brace-offset 0)))
- ;; This line starts a new statement.
- ;; Position following last unclosed open.
- (goto-char containing-sexp)
- ;; Is line first statement after an open-brace?
- (or
- ;; If no, find that first statement and indent like
- ;; it. If the first statement begins with label, do
- ;; not believe when the indentation of the label is too
- ;; small.
- (save-excursion
- (forward-char 1)
- (setq old-indent (current-indentation))
- (let ((colon-line-end 0))
- (while (progn (skip-chars-forward " \t\n")
- (looking-at "#\\|[a-zA-Z0-9_$]*:[^:]"))
- ;; Skip over comments and labels following openbrace.
- (cond ((= (following-char) ?\#)
- (forward-line 1))
- ;; label:
- (t
- (save-excursion (end-of-line)
- (setq colon-line-end (point)))
- (search-forward ":"))))
- ;; The first following code counts
- ;; if it is before the line we want to indent.
- (and (< (point) indent-point)
- (if (> colon-line-end (point)) ; After label
- (if (> (current-indentation)
- cperl-min-label-indent)
- (- (current-indentation) cperl-label-offset)
- ;; Do not believe: `max' is involved
- (+ old-indent cperl-indent-level))
- (current-column)))))
- ;; If no previous statement,
- ;; indent it relative to line brace is on.
- ;; For open brace in column zero, don't let statement
- ;; start there too. If cperl-indent-level is zero,
- ;; use cperl-brace-offset + cperl-continued-statement-offset instead.
- ;; For open-braces not the first thing in a line,
- ;; add in cperl-brace-imaginary-offset.
-
- ;; If first thing on a line: ?????
- (+ (if (and (bolp) (zerop cperl-indent-level))
- (+ cperl-brace-offset cperl-continued-statement-offset)
- cperl-indent-level)
- (if (or is-block
- (not delim)
- (not (eq char-after ?\})))
- 0
- ;; Now it is a hash reference
- (+ cperl-indent-level cperl-close-paren-offset))
- ;; Move back over whitespace before the openbrace.
- ;; If openbrace is not first nonwhite thing on the line,
- ;; add the cperl-brace-imaginary-offset.
- (progn (skip-chars-backward " \t")
- (if (bolp) 0 cperl-brace-imaginary-offset))
- ;; If the openbrace is preceded by a parenthesized exp,
- ;; move to the beginning of that;
- ;; possibly a different line
+ (t
+ ;; Statement level. Is it a continuation or a new statement?
+ ;; Find previous non-comment character.
+ (goto-char pre-indent-point)
+ (cperl-backward-to-noncomment containing-sexp)
+ ;; Back up over label lines, since they don't
+ ;; affect whether our line is a continuation.
+ ;; (Had \, too)
+ (while ;;(or (eq (preceding-char) ?\,)
+ (and (eq (preceding-char) ?:)
+ (or ;;(eq (char-after (- (point) 2)) ?\') ; ????
+ (memq (char-syntax (char-after (- (point) 2)))
+ '(?w ?_))))
+ ;;)
+ (if (eq (preceding-char) ?\,)
+ ;; Will go to beginning of line, essentially.
+ ;; Will ignore embedded sexpr XXXX.
+ (cperl-backward-to-start-of-continued-exp containing-sexp))
+ (beginning-of-line)
+ (cperl-backward-to-noncomment containing-sexp))
+ ;; Now we get the answer.
+ (if (not (or (eq (1- (point)) containing-sexp)
+ (memq (preceding-char)
+ (append (if is-block " ;{" " ,;{") '(nil)))
+ (and (eq (preceding-char) ?\})
+ (cperl-after-block-and-statement-beg
+ containing-sexp))))
+ ;; This line is continuation of preceding line's statement;
+ ;; indent `cperl-continued-statement-offset' more than the
+ ;; previous line of the statement.
+ ;;
+ ;; There might be a label on this line, just
+ ;; consider it bad style and ignore it.
(progn
- (if (eq (preceding-char) ?\))
- (forward-sexp -1))
- ;; In the case it starts a subroutine, indent with
- ;; respect to `sub', not with respect to the
- ;; first thing on the line, say in the case of
- ;; anonymous sub in a hash.
- ;;
- (skip-chars-backward " \t")
- (if (and (eq (preceding-char) ?b)
- (progn
- (forward-sexp -1)
- (looking-at "sub\\>"))
- (setq old-indent
- (nth 1
- (parse-partial-sexp
- (save-excursion (beginning-of-line) (point))
- (point)))))
- (progn (goto-char (1+ old-indent))
- (skip-chars-forward " \t")
- (current-column))
- ;; Get initial indentation of the line we are on.
- ;; If line starts with label, calculate label indentation
- (if (save-excursion
- (beginning-of-line)
- (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*:[^:]"))
- (if (> (current-indentation) cperl-min-label-indent)
- (- (current-indentation) cperl-label-offset)
- ;; Do not move `parse-data', this should
- ;; be quick anyway:
- (cperl-calculate-indent))
- (current-indentation))))))))))))))
+ (cperl-backward-to-start-of-continued-exp containing-sexp)
+ (+ (if (memq char-after (append "}])" nil))
+ 0 ; Closing parenth
+ cperl-continued-statement-offset)
+ (if (or is-block
+ (not delim)
+ (not (eq char-after ?\})))
+ 0
+ ;; Now it is a hash reference
+ (+ cperl-indent-level cperl-close-paren-offset))
+ (if (looking-at "\\w+[ \t]*:")
+ (if (> (current-indentation) cperl-min-label-indent)
+ (- (current-indentation) cperl-label-offset)
+ ;; Do not move `parse-data', this should
+ ;; be quick anyway (this comment comes
+ ;; from different location):
+ (cperl-calculate-indent))
+ (current-column))
+ (if (eq char-after ?\{)
+ cperl-continued-brace-offset 0)))
+ ;; This line starts a new statement.
+ ;; Position following last unclosed open.
+ (goto-char containing-sexp)
+ ;; Is line first statement after an open-brace?
+ (or
+ ;; If no, find that first statement and indent like
+ ;; it. If the first statement begins with label, do
+ ;; not believe when the indentation of the label is too
+ ;; small.
+ (save-excursion
+ (forward-char 1)
+ (setq old-indent (current-indentation))
+ (let ((colon-line-end 0))
+ (while (progn (skip-chars-forward " \t\n")
+ (looking-at "#\\|[a-zA-Z0-9_$]*:[^:]"))
+ ;; Skip over comments and labels following openbrace.
+ (cond ((= (following-char) ?\#)
+ (forward-line 1))
+ ;; label:
+ (t
+ (save-excursion (end-of-line)
+ (setq colon-line-end (point)))
+ (search-forward ":"))))
+ ;; The first following code counts
+ ;; if it is before the line we want to indent.
+ (and (< (point) indent-point)
+ (if (> colon-line-end (point)) ; After label
+ (if (> (current-indentation)
+ cperl-min-label-indent)
+ (- (current-indentation) cperl-label-offset)
+ ;; Do not believe: `max' is involved
+ (+ old-indent cperl-indent-level))
+ (current-column)))))
+ ;; If no previous statement,
+ ;; indent it relative to line brace is on.
+ ;; For open brace in column zero, don't let statement
+ ;; start there too. If cperl-indent-level is zero,
+ ;; use cperl-brace-offset + cperl-continued-statement-offset instead.
+ ;; For open-braces not the first thing in a line,
+ ;; add in cperl-brace-imaginary-offset.
+
+ ;; If first thing on a line: ?????
+ (+ (if (and (bolp) (zerop cperl-indent-level))
+ (+ cperl-brace-offset cperl-continued-statement-offset)
+ cperl-indent-level)
+ (if (or is-block
+ (not delim)
+ (not (eq char-after ?\})))
+ 0
+ ;; Now it is a hash reference
+ (+ cperl-indent-level cperl-close-paren-offset))
+ ;; Move back over whitespace before the openbrace.
+ ;; If openbrace is not first nonwhite thing on the line,
+ ;; add the cperl-brace-imaginary-offset.
+ (progn (skip-chars-backward " \t")
+ (if (bolp) 0 cperl-brace-imaginary-offset))
+ ;; If the openbrace is preceded by a parenthesized exp,
+ ;; move to the beginning of that;
+ ;; possibly a different line
+ (progn
+ (if (eq (preceding-char) ?\))
+ (forward-sexp -1))
+ ;; In the case it starts a subroutine, indent with
+ ;; respect to `sub', not with respect to the
+ ;; first thing on the line, say in the case of
+ ;; anonymous sub in a hash.
+ ;;
+ (skip-chars-backward " \t")
+ (if (and (eq (preceding-char) ?b)
+ (progn
+ (forward-sexp -1)
+ (looking-at "sub\\>"))
+ (setq old-indent
+ (nth 1
+ (parse-partial-sexp
+ (save-excursion (beginning-of-line) (point))
+ (point)))))
+ (progn (goto-char (1+ old-indent))
+ (skip-chars-forward " \t")
+ (current-column))
+ ;; Get initial indentation of the line we are on.
+ ;; If line starts with label, calculate label indentation
+ (if (save-excursion
+ (beginning-of-line)
+ (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*:[^:]"))
+ (if (> (current-indentation) cperl-min-label-indent)
+ (- (current-indentation) cperl-label-offset)
+ ;; Do not move `parse-data', this should
+ ;; be quick anyway:
+ (cperl-calculate-indent))
+ (current-indentation))))))))))))))
(defvar cperl-indent-alist
'((string nil)
@@ -2725,9 +2709,9 @@
(point)))
(cons (list 'expression containing-sexp) res))))
((progn
- ;; Containing-expr starts with \{. Check whether it is a hash.
- (goto-char containing-sexp)
- (not (cperl-block-p)))
+ ;; Containing-expr starts with \{. Check whether it is a hash.
+ (goto-char containing-sexp)
+ (not (cperl-block-p)))
(setq res (cons (list 'expression-blanks
(progn
(goto-char (1+ containing-sexp))
@@ -2748,7 +2732,7 @@
(save-excursion (cperl-after-label)))
(if (eq (preceding-char) ?\,)
;; Will go to beginning of line, essentially
- ;; Will ignore embedded sexpr XXXX.
+ ;; Will ignore embedded sexpr XXXX.
(cperl-backward-to-start-of-continued-exp containing-sexp))
(beginning-of-line)
(cperl-backward-to-noncomment containing-sexp))
@@ -2848,43 +2832,42 @@
"Go to position before comment on the current line, or to end of line.
Returns true if comment is found."
(let (state stop-in cpoint (lim (progn (end-of-line) (point))))
- (beginning-of-line)
- (if (or
- (eq (get-text-property (point) 'syntax-type) 'pod)
- (re-search-forward "\\=[ \t]*\\(#\\|$\\)" lim t))
- (if (eq (preceding-char) ?\#) (progn (backward-char 1) t))
- ;; Else
- (while (not stop-in)
- (setq state (parse-partial-sexp (point) lim nil nil nil t))
+ (beginning-of-line)
+ (if (or
+ (eq (get-text-property (point) 'syntax-type) 'pod)
+ (re-search-forward "\\=[ \t]*\\(#\\|$\\)" lim t))
+ (if (eq (preceding-char) ?\#) (progn (backward-char 1) t))
+ ;; Else
+ (while (not stop-in)
+ (setq state (parse-partial-sexp (point) lim nil nil nil t))
; stop at comment
- ;; If fails (beginning-of-line inside sexp), then contains not-comment
- (if (nth 4 state) ; After `#';
+ ;; If fails (beginning-of-line inside sexp), then contains not-comment
+ (if (nth 4 state) ; After `#';
; (nth 2 state) can be
; beginning of m,s,qq and so
; on
- (if (nth 2 state)
- (progn
- (setq cpoint (point))
- (goto-char (nth 2 state))
- (cond
- ((looking-at "\\(s\\|tr\\)\\>")
- (or (re-search-forward
- "\\=\\w+[ \t]*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*"
- lim 'move)
- (setq stop-in t)))
- ((looking-at "\\(m\\|q\\([qxwr]\\)?\\)\\>")
- (or (re-search-forward
- "\\=\\w+[ \t]*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*#"
- lim 'move)
- (setq stop-in t)))
- (t ; It was fair comment
- (setq stop-in t) ; Finish
- (goto-char (1- cpoint)))))
- (setq stop-in t) ; Finish
- (forward-char -1))
- (setq stop-in t)) ; Finish
- )
- (nth 4 state))))
+ (if (nth 2 state)
+ (progn
+ (setq cpoint (point))
+ (goto-char (nth 2 state))
+ (cond
+ ((looking-at "\\(s\\|tr\\)\\>")
+ (or (re-search-forward
+ "\\=\\w+[ \t]*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*"
+ lim 'move)
+ (setq stop-in t)))
+ ((looking-at "\\(m\\|q\\([qxwr]\\)?\\)\\>")
+ (or (re-search-forward
+ "\\=\\w+[ \t]*#\\([^\n\\\\#]\\|\\\\[\\\\#]\\)*#"
+ lim 'move)
+ (setq stop-in t)))
+ (t ; It was fair comment
+ (setq stop-in t) ; Finish
+ (goto-char (1- cpoint)))))
+ (setq stop-in t) ; Finish
+ (forward-char -1))
+ (setq stop-in t))) ; Finish
+ (nth 4 state))))
(defsubst cperl-1- (p)
(max (point-min) (1- p)))
@@ -3008,7 +2991,7 @@
(setq set-st nil)
(setq ender (cperl-forward-re lim end nil t st-l err-l
argument starter ender)
- ender (nth 2 ender)))))
+ ender (nth 2 ender)))))
(error (goto-char lim)
(setq set-st nil)
(if reset-st
@@ -3035,7 +3018,7 @@
;; Do after syntactic fontification?
(if cperl-syntaxify-by-font-lock
(or now (put-text-property b e 'cperl-postpone (cons type val)))
- (put-text-property b e type val)))
+ (put-text-property b e type val)))
;;; Here is how the global structures (those which cannot be
;;; recognized locally) are marked:
@@ -3095,100 +3078,99 @@
cperl-syntax-state nil
cperl-syntax-done-to min))
(or max (setq max (point-max)))
- (let* (face head-face here-face b e bb tag qtag b1 e1 argument i c tail tb
- is-REx is-x-REx REx-comment-start REx-comment-end was-comment i2
- (cperl-pod-here-fontify (eval cperl-pod-here-fontify)) go tmpend
- (case-fold-search nil) (inhibit-read-only t) (buffer-undo-list t)
- (modified (buffer-modified-p))
- (after-change-functions nil)
- (use-syntax-state (and cperl-syntax-state
- (>= min (car cperl-syntax-state))))
- (state-point (if use-syntax-state
- (car cperl-syntax-state)
- (point-min)))
- (state (if use-syntax-state
- (cdr cperl-syntax-state)))
- ;; (st-l '(nil)) (err-l '(nil)) ; Would overwrite - propagates from a function call to a function call!
- (st-l (list nil)) (err-l (list nil))
- ;; Somehow font-lock may be not loaded yet...
- (font-lock-string-face (if (boundp 'font-lock-string-face)
- font-lock-string-face
- 'font-lock-string-face))
- (font-lock-constant-face (if (boundp 'font-lock-constant-face)
- font-lock-constant-face
- 'font-lock-constant-face))
- (font-lock-function-name-face
- (if (boundp 'font-lock-function-name-face)
- font-lock-function-name-face
- 'font-lock-function-name-face))
- (font-lock-comment-face
- (if (boundp 'font-lock-comment-face)
- font-lock-comment-face
- 'font-lock-comment-face))
- (cperl-nonoverridable-face
- (if (boundp 'cperl-nonoverridable-face)
- cperl-nonoverridable-face
- 'cperl-nonoverridable-face))
- (stop-point (if ignore-max
- (point-max)
- max))
- (search
+ (let* ((cperl-pod-here-fontify (eval cperl-pod-here-fontify)) go tmpend
+ face head-face here-face b e bb tag qtag b1 e1 argument i c tail tb
+ is-REx is-x-REx REx-comment-start REx-comment-end was-comment i2
+ (case-fold-search nil) (inhibit-read-only t) (buffer-undo-list t)
+ (modified (buffer-modified-p))
+ (after-change-functions nil)
+ (use-syntax-state (and cperl-syntax-state
+ (>= min (car cperl-syntax-state))))
+ (state-point (if use-syntax-state
+ (car cperl-syntax-state)
+ (point-min)))
+ (state (if use-syntax-state
+ (cdr cperl-syntax-state)))
+ ;; (st-l '(nil)) (err-l '(nil)) ; Would overwrite - propagates from a function call to a function call!
+ (st-l (list nil)) (err-l (list nil))
+ ;; Somehow font-lock may be not loaded yet...
+ (font-lock-string-face (if (boundp 'font-lock-string-face)
+ font-lock-string-face
+ 'font-lock-string-face))
+ (font-lock-constant-face (if (boundp 'font-lock-constant-face)
+ font-lock-constant-face
+ 'font-lock-constant-face))
+ (font-lock-function-name-face
+ (if (boundp 'font-lock-function-name-face)
+ font-lock-function-name-face
+ 'font-lock-function-name-face))
+ (font-lock-comment-face
+ (if (boundp 'font-lock-comment-face)
+ font-lock-comment-face
+ 'font-lock-comment-face))
+ (cperl-nonoverridable-face
+ (if (boundp 'cperl-nonoverridable-face)
+ cperl-nonoverridable-face
+ 'cperl-nonoverridable-face))
+ (stop-point (if ignore-max
+ (point-max)
+ max))
+ (search
+ (concat
+ "\\(\\`\n?\\|^\n\\)="
+ "\\|"
+ ;; One extra () before this:
+ "<<"
+ "\\(" ; 1 + 1
+ ;; First variant "BLAH" or just ``.
+ "[ \t]*" ; Yes, whitespace is allowed!
+ "\\([\"'`]\\)" ; 2 + 1 = 3
+ "\\([^\"'`\n]*\\)" ; 3 + 1
+ "\\3"
+ "\\|"
+ ;; Second variant: Identifier or \ID or empty
+ "\\\\?\\(\\([a-zA-Z_][a-zA-Z_0-9]*\\)?\\)" ; 4 + 1, 5 + 1
+ ;; Do not have <<= or << 30 or <<30 or << $blah.
+ ;; "\\([^= \t0-9$@%&]\\|[ \t]+[^ \t\n0-9$@%&]\\)" ; 6 + 1
+ "\\(\\)" ; To preserve count of pars :-( 6 + 1
+ "\\)"
+ "\\|"
+ ;; 1+6 extra () before this:
+ "^[ \t]*\\(format\\)[ \t]*\\([a-zA-Z0-9_]+\\)?[ \t]*=[ \t]*$"
+ (if cperl-use-syntax-table-text-property
(concat
- "\\(\\`\n?\\|^\n\\)="
"\\|"
- ;; One extra () before this:
- "<<"
- "\\(" ; 1 + 1
- ;; First variant "BLAH" or just ``.
- "[ \t]*" ; Yes, whitespace is allowed!
- "\\([\"'`]\\)" ; 2 + 1 = 3
- "\\([^\"'`\n]*\\)" ; 3 + 1
- "\\3"
- "\\|"
- ;; Second variant: Identifier or \ID or empty
- "\\\\?\\(\\([a-zA-Z_][a-zA-Z_0-9]*\\)?\\)" ; 4 + 1, 5 + 1
- ;; Do not have <<= or << 30 or <<30 or << $blah.
- ;; "\\([^= \t0-9$@%&]\\|[ \t]+[^ \t\n0-9$@%&]\\)" ; 6 + 1
- "\\(\\)" ; To preserve count of pars :-( 6 + 1
- "\\)"
+ ;; 1+6+2=9 extra () before this:
+ "\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>"
+ "\\|"
+ ;; 1+6+2+1=10 extra () before this:
+ "\\([?/<]\\)" ; /blah/ or ?blah? or <file*glob>
+ "\\|"
+ ;; 1+6+2+1+1=11 extra () before this:
+ "\\<sub\\>[ \t]*\\([a-zA-Z_:'0-9]+[ \t]*\\)?\\(([^()]*)\\)"
"\\|"
- ;; 1+6 extra () before this:
- "^[ \t]*\\(format\\)[ \t]*\\([a-zA-Z0-9_]+\\)?[ \t]*=[ \t]*$"
- (if cperl-use-syntax-table-text-property
- (concat
- "\\|"
- ;; 1+6+2=9 extra () before this:
- "\\<\\(q[wxqr]?\\|[msy]\\|tr\\)\\>"
- "\\|"
- ;; 1+6+2+1=10 extra () before this:
- "\\([?/<]\\)" ; /blah/ or ?blah? or <file*glob>
- "\\|"
- ;; 1+6+2+1+1=11 extra () before this:
- "\\<sub\\>[ \t]*\\([a-zA-Z_:'0-9]+[ \t]*\\)?\\(([^()]*)\\)"
- "\\|"
- ;; 1+6+2+1+1+2=13 extra () before this:
- "\\$\\(['{]\\)"
- "\\|"
- ;; 1+6+2+1+1+2+1=14 extra () before this:
- "\\(\\<sub[ \t\n\f]+\\|[&*$@%]\\)[a-zA-Z0-9_]*'"
- ;; 1+6+2+1+1+2+1+1=15 extra () before this:
- "\\|"
- "__\\(END\\|DATA\\)__"
- ;; 1+6+2+1+1+2+1+1+1=16 extra () before this:
- "\\|"
- "\\\\\\(['`\"]\\)"
- )
- ""))))
+ ;; 1+6+2+1+1+2=13 extra () before this:
+ "\\$\\(['{]\\)"
+ "\\|"
+ ;; 1+6+2+1+1+2+1=14 extra () before this:
+ "\\(\\<sub[ \t\n\f]+\\|[&*$@%]\\)[a-zA-Z0-9_]*'"
+ ;; 1+6+2+1+1+2+1+1=15 extra () before this:
+ "\\|"
+ "__\\(END\\|DATA\\)__"
+ ;; 1+6+2+1+1+2+1+1+1=16 extra () before this:
+ "\\|"
+ "\\\\\\(['`\"]\\)")
+ ""))))
(unwind-protect
(progn
(save-excursion
(or non-inter
(message "Scanning for \"hard\" Perl constructions..."))
(and cperl-pod-here-fontify
- ;; We had evals here, do not know why...
- (setq face cperl-pod-face
- head-face cperl-pod-head-face
- here-face cperl-here-face))
+ ;; We had evals here, do not know why...
+ (setq face cperl-pod-face
+ head-face cperl-pod-head-face
+ here-face cperl-here-face))
(remove-text-properties min max
'(syntax-type t in-pod t syntax-table t
cperl-postpone t
@@ -3279,7 +3261,7 @@
(cperl-commentify bb e nil)
(goto-char e)
(or (eq e (point-max))
- (forward-char -1)))) ; Prepare for immediate pod start.
+ (forward-char -1)))) ; Prepare for immediate POD start.
;; Here document
;; We do only one here-per-line
;; ;; One extra () before this:
@@ -3333,11 +3315,11 @@
(progn
;; Highlight the ending delimiter
(cperl-postpone-fontification (match-beginning 0) (match-end 0)
- 'face font-lock-constant-face)
+ 'face font-lock-constant-face)
(cperl-put-do-not-fontify b (match-end 0) t)
;; Highlight the HERE-DOC
(cperl-postpone-fontification b (match-beginning 0)
- 'face here-face)))
+ 'face here-face)))
(setq e1 (cperl-1+ (match-end 0)))
(put-text-property b (match-beginning 0)
'syntax-type 'here-doc)
@@ -3379,18 +3361,18 @@
(end-of-line)
;; Highlight the format line
(cperl-postpone-fontification b1 (point)
- 'face font-lock-string-face)
+ 'face font-lock-string-face)
(cperl-commentify b1 (point) nil)
(cperl-put-do-not-fontify b1 (point) t))))
;; We do not search to max, since we may be called from
;; some hook of fontification, and max is random
(re-search-forward "^[.;]$" stop-point 'toend))
(beginning-of-line)
- (if (looking-at "^\\.$") ; ";" is not supported yet
+ (if (looking-at "^\\.$") ; ";" is not supported yet
(progn
;; Highlight the ending delimiter
(cperl-postpone-fontification (point) (+ (point) 2)
- 'face font-lock-string-face)
+ 'face font-lock-string-face)
(cperl-commentify (point) (+ (point) 2) nil)
(cperl-put-do-not-fontify (point) (+ (point) 2) t))
(message "End of format `%s' not found." name)
@@ -3418,7 +3400,7 @@
(memq bb '(?\$ ?\@ ?\% ?\* ?\#)) ; $#y
(and (eq bb ?-) (eq c ?s)) ; -s file test
(and (eq bb ?\&)
- (not (eq (char-after ; &&m/blah/
+ (not (eq (char-after ; &&m/blah/
(- (match-beginning b1) 2))
?\&))))
;; <file> or <$file>
@@ -3448,8 +3430,8 @@
(and (eq (char-syntax (preceding-char)) ?w)
(progn
(forward-sexp -1)
-;; After these keywords `/' starts a RE. One should add all the
-;; functions/builtins which expect an argument, but ...
+ ;; After these keywords `/' starts a RE. One should add all the
+ ;; functions/builtins which expect an argument, but ...
(if (eq (preceding-char) ?-)
;; -d ?foo? is a RE
(looking-at "[a-zA-Z]\\>")
@@ -3596,13 +3578,13 @@
(while
(and (< (point) e)
(re-search-forward
- (if is-x-REx
- (if (eq (char-after b) ?\#)
+ (if (eq (char-after b) ?\#)
+ (if is-x-REx
"\\((\\?\\\\#\\)\\|\\(\\\\#\\)"
- "\\((\\?#\\)\\|\\(#\\)")
- (if (eq (char-after b) ?\#)
- "\\((\\?\\\\#\\)"
- "\\((\\?#\\)"))
+ "\\((\\?\\\\#\\)")
+ (if is-x-REx
+ "\\((\\?#\\)\\|\\(#\\)"
+ "\\((\\?#\\)"))
(1- e) 'to-end))
(goto-char (match-beginning 0))
(setq REx-comment-start (point)
@@ -3744,13 +3726,12 @@
(if (memq (setq pr (get-text-property (point) 'syntax-type))
'(pod here-doc here-doc-delim))
(cperl-unwind-to-safe nil)
- (if (or (looking-at "^[ \t]*\\(#\\|$\\)")
- (progn (cperl-to-comment-or-eol) (bolp)))
- nil ; Only comment, skip
- ;; Else
- (skip-chars-backward " \t")
- (if (< p (point)) (goto-char p))
- (setq stop t))))))
+ (or (looking-at "^[ \t]*\\(#\\|$\\)")
+ (progn (cperl-to-comment-or-eol) (bolp))
+ (progn
+ (skip-chars-backward " \t")
+ (if (< p (point)) (goto-char p))
+ (setq stop t)))))))
(defun cperl-after-block-p (lim)
;; We suppose that the preceding char is }.
@@ -3780,8 +3761,8 @@
TEST is the expression to evaluate at the found position. If absent,
CHARS is a string that contains good characters to have before us (however,
`}' is treated \"smartly\" if it is not in the list)."
- (let (stop p
- (lim (or lim (point-min))))
+ (let ((lim (or lim (point-min)))
+ stop p)
(save-excursion
(while (and (not stop) (> (point) lim))
(skip-chars-backward " \t\n\f" lim)
@@ -3874,10 +3855,10 @@
(interactive)
(or end
(setq end (point-max)))
- (let (p pp ml have-brace ret
- (ee (save-excursion (end-of-line) (point)))
- (cperl-indent-region-fix-constructs
- (or cperl-indent-region-fix-constructs 1)))
+ (let ((ee (save-excursion (end-of-line) (point)))
+ (cperl-indent-region-fix-constructs
+ (or cperl-indent-region-fix-constructs 1))
+ p pp ml have-brace ret)
(save-excursion
(beginning-of-line)
(setq ret (point))
@@ -3887,165 +3868,165 @@
(or (looking-at "[ \t]*\\(els\\(e\\|if\\)\\|continue\\|if\\|while\\|for\\(each\\)?\\|until\\)")
(setq have-brace (save-excursion (search-forward "}" ee t)))))
nil ; Do not need to do anything
- ;; Looking at:
- ;; }
- ;; else
- (if (and cperl-merge-trailing-else
- (looking-at
- "[ \t]*}[ \t]*\n[ \t\n]*\\(els\\(e\\|if\\)\\|continue\\)\\>"))
- (progn
- (search-forward "}")
- (setq p (point))
- (skip-chars-forward " \t\n")
- (delete-region p (point))
- (insert (make-string cperl-indent-region-fix-constructs ?\ ))
- (beginning-of-line)))
- ;; Looking at:
- ;; } else
- (if (looking-at "[ \t]*}\\(\t*\\|[ \t][ \t]+\\)\\<\\(els\\(e\\|if\\)\\|continue\\)\\>")
- (progn
- (search-forward "}")
- (delete-horizontal-space)
- (insert (make-string cperl-indent-region-fix-constructs ?\ ))
- (beginning-of-line)))
- ;; Looking at:
- ;; else {
- (if (looking-at
- "[ \t]*}?[ \t]*\\<\\(\\els\\(e\\|if\\)\\|continue\\|unless\\|if\\|while\\|for\\(each\\)?\\|until\\)\\>\\(\t*\\|[ \t][ \t]+\\)[^ \t\n#]")
- (progn
- (forward-word 1)
- (delete-horizontal-space)
- (insert (make-string cperl-indent-region-fix-constructs ?\ ))
- (beginning-of-line)))
- ;; Looking at:
- ;; foreach my $var
- (if (looking-at
- "[ \t]*\\<for\\(each\\)?[ \t]+\\(my\\|local\\|our\\)\\(\t*\\|[ \t][ \t]+\\)[^ \t\n]")
- (progn
- (forward-word 2)
- (delete-horizontal-space)
- (insert (make-string cperl-indent-region-fix-constructs ?\ ))
- (beginning-of-line)))
- ;; Looking at:
- ;; foreach my $var (
- (if (looking-at
+ ;; Looking at:
+ ;; }
+ ;; else
+ (if (and cperl-merge-trailing-else
+ (looking-at
+ "[ \t]*}[ \t]*\n[ \t\n]*\\(els\\(e\\|if\\)\\|continue\\)\\>"))
+ (progn
+ (search-forward "}")
+ (setq p (point))
+ (skip-chars-forward " \t\n")
+ (delete-region p (point))
+ (insert (make-string cperl-indent-region-fix-constructs ?\ ))
+ (beginning-of-line)))
+ ;; Looking at:
+ ;; } else
+ (if (looking-at "[ \t]*}\\(\t*\\|[ \t][ \t]+\\)\\<\\(els\\(e\\|if\\)\\|continue\\)\\>")
+ (progn
+ (search-forward "}")
+ (delete-horizontal-space)
+ (insert (make-string cperl-indent-region-fix-constructs ?\ ))
+ (beginning-of-line)))
+ ;; Looking at:
+ ;; else {
+ (if (looking-at
+ "[ \t]*}?[ \t]*\\<\\(\\els\\(e\\|if\\)\\|continue\\|unless\\|if\\|while\\|for\\(each\\)?\\|until\\)\\>\\(\t*\\|[ \t][ \t]+\\)[^ \t\n#]")
+ (progn
+ (forward-word 1)
+ (delete-horizontal-space)
+ (insert (make-string cperl-indent-region-fix-constructs ?\ ))
+ (beginning-of-line)))
+ ;; Looking at:
+ ;; foreach my $var
+ (if (looking-at
+ "[ \t]*\\<for\\(each\\)?[ \t]+\\(my\\|local\\|our\\)\\(\t*\\|[ \t][ \t]+\\)[^ \t\n]")
+ (progn
+ (forward-word 2)
+ (delete-horizontal-space)
+ (insert (make-string cperl-indent-region-fix-constructs ?\ ))
+ (beginning-of-line)))
+ ;; Looking at:
+ ;; foreach my $var (
+ (if (looking-at
"[ \t]*\\<for\\(each\\)?[ \t]+\\(my\\|local\\|our\\)[ \t]*\\$[_a-zA-Z0-9]+\\(\t*\\|[ \t][ \t]+\\)[^ \t\n#]")
- (progn
- (forward-word 3)
- (delete-horizontal-space)
- (insert
- (make-string cperl-indent-region-fix-constructs ?\ ))
- (beginning-of-line)))
- ;; Looking at:
- ;; } foreach my $var () {
- (if (looking-at
+ (progn
+ (forward-word 3)
+ (delete-horizontal-space)
+ (insert
+ (make-string cperl-indent-region-fix-constructs ?\ ))
+ (beginning-of-line)))
+ ;; Looking at:
+ ;; } foreach my $var () {
+ (if (looking-at
"[ \t]*\\(}[ \t]*\\)?\\<\\(\\els\\(e\\|if\\)\\|continue\\|if\\|unless\\|while\\|for\\(each\\)?\\(\\([ \t]+\\(my\\|local\\|our\\)\\)?[ \t]*\\$[_a-zA-Z0-9]+\\)?\\|until\\)\\>\\([ \t]*(\\|[ \t\n]*{\\)\\|[ \t]*{")
- (progn
- (setq ml (match-beginning 8))
- (re-search-forward "[({]")
- (forward-char -1)
- (setq p (point))
- (if (eq (following-char) ?\( )
- (progn
- (forward-sexp 1)
- (setq pp (point)))
- ;; after `else' or nothing
- (if ml ; after `else'
- (skip-chars-backward " \t\n")
- (beginning-of-line))
- (setq pp nil))
- ;; Now after the sexp before the brace
- ;; Multiline expr should be special
- (setq ml (and pp (save-excursion (goto-char p)
- (search-forward "\n" pp t))))
- (if (and (or (not pp) (< pp end))
- (looking-at "[ \t\n]*{"))
- (progn
- (cond
- ((bolp) ; Were before `{', no if/else/etc
- nil)
- ((looking-at "\\(\t*\\| [ \t]+\\){")
- (delete-horizontal-space)
- (if (if ml
- cperl-extra-newline-before-brace-multiline
- cperl-extra-newline-before-brace)
- (progn
- (delete-horizontal-space)
- (insert "\n")
- (setq ret (point))
- (if (cperl-indent-line parse-data)
- (progn
- (cperl-fix-line-spacing end parse-data)
- (setq ret (point)))))
+ (progn
+ (setq ml (match-beginning 8))
+ (re-search-forward "[({]")
+ (forward-char -1)
+ (setq p (point))
+ (if (eq (following-char) ?\( )
+ (progn
+ (forward-sexp 1)
+ (setq pp (point)))
+ ;; after `else' or nothing
+ (if ml ; after `else'
+ (skip-chars-backward " \t\n")
+ (beginning-of-line))
+ (setq pp nil))
+ ;; Now after the sexp before the brace
+ ;; Multiline expr should be special
+ (setq ml (and pp (save-excursion (goto-char p)
+ (search-forward "\n" pp t))))
+ (if (and (or (not pp) (< pp end))
+ (looking-at "[ \t\n]*{"))
+ (progn
+ (cond
+ ((bolp) ; Were before `{', no if/else/etc
+ nil)
+ ((looking-at "\\(\t*\\| [ \t]+\\){")
+ (delete-horizontal-space)
+ (if (if ml
+ cperl-extra-newline-before-brace-multiline
+ cperl-extra-newline-before-brace)
+ (progn
+ (delete-horizontal-space)
+ (insert "\n")
+ (setq ret (point))
+ (if (cperl-indent-line parse-data)
+ (progn
+ (cperl-fix-line-spacing end parse-data)
+ (setq ret (point)))))
+ (insert
+ (make-string cperl-indent-region-fix-constructs ?\ ))))
+ ((and (looking-at "[ \t]*\n")
+ (not (if ml
+ cperl-extra-newline-before-brace-multiline
+ cperl-extra-newline-before-brace)))
+ (setq pp (point))
+ (skip-chars-forward " \t\n")
+ (delete-region pp (point))
(insert
(make-string cperl-indent-region-fix-constructs ?\ ))))
- ((and (looking-at "[ \t]*\n")
- (not (if ml
- cperl-extra-newline-before-brace-multiline
- cperl-extra-newline-before-brace)))
- (setq pp (point))
- (skip-chars-forward " \t\n")
- (delete-region pp (point))
- (insert
- (make-string cperl-indent-region-fix-constructs ?\ ))))
- ;; Now we are before `{'
- (if (looking-at "[ \t\n]*{[ \t]*[^ \t\n#]")
- (progn
- (skip-chars-forward " \t\n")
- (setq pp (point))
- (forward-sexp 1)
- (setq p (point))
- (goto-char pp)
- (setq ml (search-forward "\n" p t))
- (if (or cperl-break-one-line-blocks-when-indent ml)
- ;; not good: multi-line BLOCK
- (progn
- (goto-char (1+ pp))
- (delete-horizontal-space)
- (insert "\n")
- (setq ret (point))
- (if (cperl-indent-line parse-data)
- (setq ret (cperl-fix-line-spacing end parse-data)))))))))))
- (beginning-of-line)
- (setq p (point) pp (save-excursion (end-of-line) (point))) ; May be different from ee.
- ;; Now check whether there is a hanging `}'
- ;; Looking at:
- ;; } blah
- (if (and
- cperl-fix-hanging-brace-when-indent
- have-brace
- (not (looking-at "[ \t]*}[ \t]*\\(\\<\\(els\\(if\\|e\\)\\|continue\\|while\\|until\\)\\>\\|$\\|#\\)"))
- (condition-case nil
- (progn
- (up-list 1)
- (if (and (<= (point) pp)
- (eq (preceding-char) ?\} )
- (cperl-after-block-and-statement-beg (point-min)))
- t
- (goto-char p)
- nil))
- (error nil)))
- (progn
- (forward-char -1)
- (skip-chars-backward " \t")
- (if (bolp)
- ;; `}' was the first thing on the line, insert NL *after* it.
- (progn
- (cperl-indent-line parse-data)
- (search-forward "}")
- (delete-horizontal-space)
- (insert "\n"))
- (delete-horizontal-space)
- (or (eq (preceding-char) ?\;)
- (bolp)
- (and (eq (preceding-char) ?\} )
- (cperl-after-block-p (point-min)))
- (insert ";"))
- (insert "\n")
- (setq ret (point)))
- (if (cperl-indent-line parse-data)
- (setq ret (cperl-fix-line-spacing end parse-data)))
- (beginning-of-line)))))
+ ;; Now we are before `{'
+ (if (looking-at "[ \t\n]*{[ \t]*[^ \t\n#]")
+ (progn
+ (skip-chars-forward " \t\n")
+ (setq pp (point))
+ (forward-sexp 1)
+ (setq p (point))
+ (goto-char pp)
+ (setq ml (search-forward "\n" p t))
+ (if (or cperl-break-one-line-blocks-when-indent ml)
+ ;; not good: multi-line BLOCK
+ (progn
+ (goto-char (1+ pp))
+ (delete-horizontal-space)
+ (insert "\n")
+ (setq ret (point))
+ (if (cperl-indent-line parse-data)
+ (setq ret (cperl-fix-line-spacing end parse-data)))))))))))
+ (beginning-of-line)
+ (setq p (point) pp (save-excursion (end-of-line) (point))) ; May be different from ee.
+ ;; Now check whether there is a hanging `}'
+ ;; Looking at:
+ ;; } blah
+ (if (and
+ cperl-fix-hanging-brace-when-indent
+ have-brace
+ (not (looking-at "[ \t]*}[ \t]*\\(\\<\\(els\\(if\\|e\\)\\|continue\\|while\\|until\\)\\>\\|$\\|#\\)"))
+ (condition-case nil
+ (progn
+ (up-list 1)
+ (if (and (<= (point) pp)
+ (eq (preceding-char) ?\} )
+ (cperl-after-block-and-statement-beg (point-min)))
+ t
+ (goto-char p)
+ nil))
+ (error nil)))
+ (progn
+ (forward-char -1)
+ (skip-chars-backward " \t")
+ (if (bolp)
+ ;; `}' was the first thing on the line, insert NL *after* it.
+ (progn
+ (cperl-indent-line parse-data)
+ (search-forward "}")
+ (delete-horizontal-space)
+ (insert "\n"))
+ (delete-horizontal-space)
+ (or (eq (preceding-char) ?\;)
+ (bolp)
+ (and (eq (preceding-char) ?\} )
+ (cperl-after-block-p (point-min)))
+ (insert ";"))
+ (insert "\n")
+ (setq ret (point)))
+ (if (cperl-indent-line parse-data)
+ (setq ret (cperl-fix-line-spacing end parse-data)))
+ (beginning-of-line)))))
ret))
(defvar cperl-update-start) ; Do not need to make them local
@@ -4067,76 +4048,75 @@
(cperl-update-syntaxification end end)
(save-excursion
(let (cperl-update-start cperl-update-end (h-a-c after-change-functions))
- (let (st comm old-comm-indent new-comm-indent p pp i empty
- (indent-info (if cperl-emacs-can-parse
- (list nil nil nil) ; Cannot use '(), since will modify
- nil))
- after-change-functions ; Speed it up!
- (pm 0) (imenu-scanning-message "Indenting... (%3d%%)"))
+ (let ((indent-info (if cperl-emacs-can-parse
+ (list nil nil nil) ; Cannot use '(), since will modify
+ nil))
+ (pm 0) (imenu-scanning-message "Indenting... (%3d%%)")
+ after-change-functions ; Speed it up!
+ st comm old-comm-indent new-comm-indent p pp i empty)
(if h-a-c (add-hook 'after-change-functions 'cperl-delay-update-hook))
- (goto-char start)
- (setq old-comm-indent (and (cperl-to-comment-or-eol)
- (current-column))
- new-comm-indent old-comm-indent)
- (goto-char start)
- (setq end (set-marker (make-marker) end)) ; indentation changes pos
- (or (bolp) (beginning-of-line 2))
- (or (fboundp 'imenu-progress-message)
- (message "Indenting... For feedback load `imenu'..."))
- (while (and (<= (point) end) (not (eobp))) ; bol to check start
- (and (fboundp 'imenu-progress-message)
- (imenu-progress-message
- pm (/ (* 100 (- (point) start)) (- end start -1))))
+ (goto-char start)
+ (setq old-comm-indent (and (cperl-to-comment-or-eol)
+ (current-column))
+ new-comm-indent old-comm-indent)
+ (goto-char start)
+ (setq end (set-marker (make-marker) end)) ; indentation changes pos
+ (or (bolp) (beginning-of-line 2))
+ (or (fboundp 'imenu-progress-message)
+ (message "Indenting... For feedback load `imenu'..."))
+ (while (and (<= (point) end) (not (eobp))) ; bol to check start
+ (and (fboundp 'imenu-progress-message)
+ (imenu-progress-message
+ pm (/ (* 100 (- (point) start)) (- end start -1))))
(setq st (point))
(if (or
(setq empty (looking-at "[ \t]*\n"))
(and (setq comm (looking-at "[ \t]*#"))
- (or (eq (current-indentation) (or old-comm-indent
- comment-column))
+ (or (eq (current-indentation) (or old-comm-indent
+ comment-column))
(setq old-comm-indent nil))))
- (if (and old-comm-indent
+ (if (and old-comm-indent
(not empty)
- (= (current-indentation) old-comm-indent)
+ (= (current-indentation) old-comm-indent)
(not (eq (get-text-property (point) 'syntax-type) 'pod))
(not (eq (get-text-property (point) 'syntax-table)
cperl-st-cfence)))
- (let ((comment-column new-comm-indent))
- (indent-for-comment)))
- (progn
+ (let ((comment-column new-comm-indent))
+ (indent-for-comment)))
+ (progn
(setq i (cperl-indent-line indent-info))
- (or comm
- (not i)
- (progn
- (if cperl-indent-region-fix-constructs
+ (or comm
+ (not i)
+ (progn
+ (if cperl-indent-region-fix-constructs
(goto-char (cperl-fix-line-spacing end indent-info)))
- (if (setq old-comm-indent
- (and (cperl-to-comment-or-eol)
- (not (memq (get-text-property (point)
- 'syntax-type)
- '(pod here-doc)))
+ (if (setq old-comm-indent
+ (and (cperl-to-comment-or-eol)
+ (not (memq (get-text-property (point)
+ 'syntax-type)
+ '(pod here-doc)))
(not (eq (get-text-property (point)
'syntax-table)
cperl-st-cfence))
- (current-column)))
- (progn (indent-for-comment)
- (skip-chars-backward " \t")
- (skip-chars-backward "#")
- (setq new-comm-indent (current-column))))))))
- (beginning-of-line 2))
+ (current-column)))
+ (progn (indent-for-comment)
+ (skip-chars-backward " \t")
+ (skip-chars-backward "#")
+ (setq new-comm-indent (current-column))))))))
+ (beginning-of-line 2))
(if (fboundp 'imenu-progress-message)
- (imenu-progress-message pm 100)
+ (imenu-progress-message pm 100)
(message nil)))
;; Now run the update hooks
- (if after-change-functions
- (save-excursion
- (if cperl-update-end
- (progn
- (goto-char cperl-update-end)
- (insert " ")
- (delete-char -1)
- (goto-char cperl-update-start)
- (insert " ")
- (delete-char -1))))))))
+ (and after-change-functions
+ cperl-update-end
+ (progn
+ (goto-char cperl-update-end)
+ (insert " ")
+ (delete-char -1)
+ (goto-char cperl-update-start)
+ (insert " ")
+ (delete-char -1))))))
;; Stolen from lisp-mode with a lot of improvements
@@ -4146,8 +4126,7 @@
block of it that point is in, preserving the comment's initial
indentation and initial hashes. Behaves usually outside of comment."
(interactive "P")
- (let (
- ;; Non-nil if the current line contains a comment.
+ (let (;; Non-nil if the current line contains a comment.
has-comment
;; If has-comment, the appropriate fill-prefix for the comment.
@@ -4183,7 +4162,7 @@
(delete-char len)
(insert (make-string dc ?-)))))
(if (not has-comment)
- (fill-paragraph justify) ; Do the usual thing outside of comment
+ (fill-paragraph justify) ; Do the usual thing outside of comment
;; Narrow to include only the comment, and then fill the region.
(save-restriction
(narrow-to-region
@@ -4217,7 +4196,7 @@
(progn
(goto-char start)
(if (> dc 0)
- (progn (delete-char dc) (insert spaces)))
+ (progn (delete-char dc) (insert spaces)))
(if (or (= (current-column) c) iteration) nil
(setq comment-column c)
(indent-for-comment)
@@ -4230,22 +4209,22 @@
(end-of-line)
(current-column))
fill-column)
- (let ((c (save-excursion (beginning-of-line)
- (cperl-to-comment-or-eol) (point)))
- (s (memq (following-char) '(?\ ?\t))) marker)
- (if (>= c (point)) nil
- (setq marker (point-marker))
- (cperl-fill-paragraph)
- (goto-char marker)
- ;; Is not enough, sometimes marker is a start of line
- (if (bolp) (progn (re-search-forward "#+[ \t]*")
- (goto-char (match-end 0))))
- ;; Following space could have gone:
- (if (or (not s) (memq (following-char) '(?\ ?\t))) nil
- (insert " ")
- (backward-char 1))
- ;; Previous space could have gone:
- (or (memq (preceding-char) '(?\ ?\t)) (insert " "))))))
+ (let ((c (save-excursion (beginning-of-line)
+ (cperl-to-comment-or-eol) (point)))
+ (s (memq (following-char) '(?\ ?\t))) marker)
+ (if (>= c (point)) nil
+ (setq marker (point-marker))
+ (cperl-fill-paragraph)
+ (goto-char marker)
+ ;; Is not enough, sometimes marker is a start of line
+ (if (bolp) (progn (re-search-forward "#+[ \t]*")
+ (goto-char (match-end 0))))
+ ;; Following space could have gone:
+ (if (or (not s) (memq (following-char) '(?\ ?\t))) nil
+ (insert " ")
+ (backward-char 1))
+ ;; Previous space could have gone:
+ (or (memq (preceding-char) '(?\ ?\t)) (insert " "))))))
(defun cperl-imenu-addback (lst &optional isback name)
;; We suppose that the lst is a DAG, unless the first element only
@@ -4255,15 +4234,14 @@
(t
(or name
(setq name "+++BACK+++"))
- (mapcar (function (lambda (elt)
- (if (and (listp elt) (listp (cdr elt)))
- (progn
- ;; In the other order it goes up
- ;; one level only ;-(
- (setcdr elt (cons (cons name lst)
- (cdr elt)))
- (cperl-imenu-addback (cdr elt) t name)
- ))))
+ (mapcar (lambda (elt)
+ (if (and (listp elt) (listp (cdr elt)))
+ (progn
+ ;; In the other order it goes up
+ ;; one level only ;-(
+ (setcdr elt (cons (cons name lst)
+ (cdr elt)))
+ (cperl-imenu-addback (cdr elt) t name))))
(if isback (cdr lst) lst))
lst)))
@@ -4291,7 +4269,7 @@
(match-beginning 2) ; package or sub
(eq (char-after (match-beginning 2)) ?p) ; package
(not (save-match-data
- (looking-at "[ \t\n]*;")))) ; Plain text word 'package'
+ (looking-at "[ \t\n]*;")))) ; Plain text word 'package'
nil)
((and
(match-beginning 2) ; package or sub
@@ -4301,8 +4279,7 @@
(null (get-text-property (match-beginning 1) 'in-pod)))
(save-excursion
(goto-char (match-beginning 2))
- (setq fchar (following-char))
- )
+ (setq fchar (following-char)))
;; (if (looking-at "([^()]*)[ \t\n\f]*")
;; (goto-char (match-end 0))) ; Messes what follows
(setq char (following-char) ; ?\; for "sub foo () ;"
@@ -4345,7 +4322,7 @@
(push index index-alist))
(if meth (push index index-meth-alist))
(push index index-unsorted-alist)))
- ((match-beginning 5) ; Pod section
+ ((match-beginning 5) ; POD section
;; (beginning-of-line)
(setq index (imenu-example--name-and-position)
name (buffer-substring (match-beginning 6) (match-end 6)))
@@ -4361,7 +4338,7 @@
(setq index-alist
(if (default-value 'imenu-sort-function)
(sort index-alist (default-value 'imenu-sort-function))
- (nreverse index-alist)))
+ (nreverse index-alist)))
(and index-pod-alist
(push (cons "+POD headers+..."
(nreverse index-pod-alist))
@@ -4437,9 +4414,9 @@
(if (fboundp 'eval-after-load)
(eval-after-load
- "mode-compile"
- '(setq perl-compilation-error-regexp-alist
- cperl-compilation-error-regexp-alist)))
+ "mode-compile"
+ '(setq perl-compilation-error-regexp-alist
+ cperl-compilation-error-regexp-alist)))
(defun cperl-windowed-init ()
@@ -4448,15 +4425,14 @@
;; Need to init anyway:
(or cperl-faces-init (cperl-init-faces))
(add-hook 'font-lock-mode-hook
- (function
- (lambda ()
- (if (memq major-mode '(perl-mode cperl-mode))
- (progn
- (or cperl-faces-init (cperl-init-faces)))))))
+ (lambda ()
+ (if (memq major-mode '(perl-mode cperl-mode))
+ (progn
+ (or cperl-faces-init (cperl-init-faces))))))
(if (fboundp 'eval-after-load)
(eval-after-load
- "ps-print"
- '(or cperl-faces-init (cperl-init-faces))))))
+ "ps-print"
+ '(or cperl-faces-init (cperl-init-faces))))))
(defvar cperl-font-lock-keywords-1 nil
"Additional expressions to highlight in Perl mode. Minimal set.")
@@ -4633,7 +4609,7 @@
'("[\[ \t{,(]\\(-?[a-zA-Z0-9_:]+\\)[ \t]*=>" 1
font-lock-string-face t)
'("^[ \t]*\\([a-zA-Z0-9_]+[ \t]*:\\)[ \t]*\\($\\|{\\|\\<\\(until\\|while\\|for\\(each\\)?\\|do\\)\\>\\)" 1
- font-lock-constant-face) ; labels
+ font-lock-constant-face) ; labels
'("\\<\\(continue\\|next\\|last\\|redo\\|goto\\)\\>[ \t]+\\([a-zA-Z0-9_:]+\\)" ; labels as targets
2 font-lock-constant-face)
;; Uncomment to get perl-mode-like vars
@@ -4661,7 +4637,7 @@
(setq
t-font-lock-keywords-1
(and (fboundp 'turn-on-font-lock) ; Check for newer font-lock
- (not cperl-xemacs-p) ; not yet as of XEmacs 19.12
+ (not cperl-xemacs-p) ; not yet as of XEmacs 19.12
'(
("\\(\\([@%]\\|\$#\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)" 1
(if (eq (char-after (match-beginning 2)) ?%)
@@ -4696,90 +4672,87 @@
t-font-lock-keywords)
cperl-font-lock-keywords cperl-font-lock-keywords-1
cperl-font-lock-keywords-2 (append
- cperl-font-lock-keywords-1
- t-font-lock-keywords-1)))
+ cperl-font-lock-keywords-1
+ t-font-lock-keywords-1)))
(if (fboundp 'ps-print-buffer) (cperl-ps-print-init))
(if (or (featurep 'choose-color) (featurep 'font-lock-extra))
(eval ; Avoid a warning
- '(font-lock-require-faces
- (list
- ;; Color-light Color-dark Gray-light Gray-dark Mono
- (list 'font-lock-comment-face
- ["Firebrick" "OrangeRed" "DimGray" "Gray80"]
- nil
- [nil nil t t t]
- [nil nil t t t]
- nil)
- (list 'font-lock-string-face
- ["RosyBrown" "LightSalmon" "Gray50" "LightGray"]
- nil
- nil
- [nil nil t t t]
- nil)
- (list 'font-lock-function-name-face
- (vector
- "Blue" "LightSkyBlue" "Gray50" "LightGray"
- (cdr (assq 'background-color ; if mono
- (frame-parameters))))
- (vector
- nil nil nil nil
- (cdr (assq 'foreground-color ; if mono
- (frame-parameters))))
- [nil nil t t t]
- nil
- nil)
- (list 'font-lock-variable-name-face
- ["DarkGoldenrod" "LightGoldenrod" "DimGray" "Gray90"]
- nil
- [nil nil t t t]
- [nil nil t t t]
- nil)
- (list 'font-lock-type-face
- ["DarkOliveGreen" "PaleGreen" "DimGray" "Gray80"]
- nil
- [nil nil t t t]
- nil
- [nil nil t t t]
- )
- (list 'font-lock-constant-face
- ["CadetBlue" "Aquamarine" "Gray50" "LightGray"]
- nil
- [nil nil t t t]
- nil
- [nil nil t t t]
- )
- (list 'cperl-nonoverridable-face
- ["chartreuse3" ("orchid1" "orange")
- nil "Gray80"]
- [nil nil "gray90"]
- [nil nil nil t t]
- [nil nil t t]
- [nil nil t t t]
- )
- (list 'cperl-array-face
- ["blue" "yellow" nil "Gray80"]
- ["lightyellow2" ("navy" "os2blue" "darkgreen")
- "gray90"]
- t
- nil
- nil)
- (list 'cperl-hash-face
- ["red" "red" nil "Gray80"]
- ["lightyellow2" ("navy" "os2blue" "darkgreen")
- "gray90"]
- t
- t
- nil))))
+ '(font-lock-require-faces
+ (list
+ ;; Color-light Color-dark Gray-light Gray-dark Mono
+ (list 'font-lock-comment-face
+ ["Firebrick" "OrangeRed" "DimGray" "Gray80"]
+ nil
+ [nil nil t t t]
+ [nil nil t t t]
+ nil)
+ (list 'font-lock-string-face
+ ["RosyBrown" "LightSalmon" "Gray50" "LightGray"]
+ nil
+ nil
+ [nil nil t t t]
+ nil)
+ (list 'font-lock-function-name-face
+ (vector
+ "Blue" "LightSkyBlue" "Gray50" "LightGray"
+ (cdr (assq 'background-color ; if mono
+ (frame-parameters))))
+ (vector
+ nil nil nil nil
+ (cdr (assq 'foreground-color ; if mono
+ (frame-parameters))))
+ [nil nil t t t]
+ nil
+ nil)
+ (list 'font-lock-variable-name-face
+ ["DarkGoldenrod" "LightGoldenrod" "DimGray" "Gray90"]
+ nil
+ [nil nil t t t]
+ [nil nil t t t]
+ nil)
+ (list 'font-lock-type-face
+ ["DarkOliveGreen" "PaleGreen" "DimGray" "Gray80"]
+ nil
+ [nil nil t t t]
+ nil
+ [nil nil t t t])
+ (list 'font-lock-constant-face
+ ["CadetBlue" "Aquamarine" "Gray50" "LightGray"]
+ nil
+ [nil nil t t t]
+ nil
+ [nil nil t t t])
+ (list 'cperl-nonoverridable-face
+ ["chartreuse3" ("orchid1" "orange")
+ nil "Gray80"]
+ [nil nil "gray90"]
+ [nil nil nil t t]
+ [nil nil t t]
+ [nil nil t t t])
+ (list 'cperl-array-face
+ ["blue" "yellow" nil "Gray80"]
+ ["lightyellow2" ("navy" "os2blue" "darkgreen")
+ "gray90"]
+ t
+ nil
+ nil)
+ (list 'cperl-hash-face
+ ["red" "red" nil "Gray80"]
+ ["lightyellow2" ("navy" "os2blue" "darkgreen")
+ "gray90"]
+ t
+ t
+ nil))))
;; Do it the dull way, without choose-color
(defvar cperl-guessed-background nil
"Display characteristics as guessed by cperl.")
-;; (or (fboundp 'x-color-defined-p)
-;; (defalias 'x-color-defined-p
-;; (cond ((fboundp 'color-defined-p) 'color-defined-p)
-;; ;; XEmacs >= 19.12
-;; ((fboundp 'valid-color-name-p) 'valid-color-name-p)
-;; ;; XEmacs 19.11
-;; (t 'x-valid-color-name-p))))
+ ;; (or (fboundp 'x-color-defined-p)
+ ;; (defalias 'x-color-defined-p
+ ;; (cond ((fboundp 'color-defined-p) 'color-defined-p)
+ ;; ;; XEmacs >= 19.12
+ ;; ((fboundp 'valid-color-name-p) 'valid-color-name-p)
+ ;; ;; XEmacs 19.11
+ ;; (t 'x-valid-color-name-p))))
(cperl-force-face font-lock-constant-face
"Face for constant and label names")
(cperl-force-face font-lock-variable-name-face
@@ -4846,9 +4819,7 @@
(if (boundp 'font-lock-background-mode)
font-lock-background-mode
'light))
- (face-list (and (fboundp 'face-list) (face-list)))
- ;; cperl-is-face
- )
+ (face-list (and (fboundp 'face-list) (face-list))))
;;;; (fset 'cperl-is-face
;;;; (cond ((fboundp 'find-face)
;;;; (symbol-function 'find-face))
@@ -4862,10 +4833,9 @@
'gray
background)
"Background as guessed by CPerl mode")
- (if (and
- (not (cperl-is-face 'font-lock-constant-face))
- (cperl-is-face 'font-lock-reference-face))
- (copy-face 'font-lock-reference-face 'font-lock-constant-face))
+ (and (not (cperl-is-face 'font-lock-constant-face))
+ (cperl-is-face 'font-lock-reference-face)
+ (copy-face 'font-lock-reference-face 'font-lock-constant-face))
(if (cperl-is-face 'font-lock-type-face) nil
(copy-face 'default 'font-lock-type-face)
(cond
@@ -5023,7 +4993,7 @@
cperl-continued-statement-offset))
(defconst cperl-style-alist
- '(("CPerl" ; =GNU without extra-newline-before-brace
+ '(("CPerl" ; =GNU without extra-newline-before-brace
(cperl-indent-level . 2)
(cperl-brace-offset . 0)
(cperl-continued-brace-offset . 0)
@@ -5031,7 +5001,7 @@
(cperl-extra-newline-before-brace . nil)
(cperl-merge-trailing-else . t)
(cperl-continued-statement-offset . 2))
- ("PerlStyle" ; CPerl with 4 as indent
+ ("PerlStyle" ; CPerl with 4 as indent
(cperl-indent-level . 4)
(cperl-brace-offset . 0)
(cperl-continued-brace-offset . 0)
@@ -5093,14 +5063,13 @@
Chosing \"Current\" style will not change style, so this may be used for
side-effect of memorizing only."
(interactive
- (let ((list (mapcar (function (lambda (elt) (list (car elt))))
+ (let ((list (mapcar (lambda (elt) (list (car elt)))
cperl-style-alist)))
(list (completing-read "Enter style: " list nil 'insist))))
(or cperl-old-style
(setq cperl-old-style
- (mapcar (function
- (lambda (name)
- (cons name (eval name))))
+ (mapcar (lambda (name)
+ (cons name (eval name)))
cperl-styles-entries)))
(let ((style (cdr (assoc style cperl-style-alist))) setting str sym)
(while style
@@ -5172,11 +5141,11 @@
(interactive
(let* ((default (cperl-word-at-point))
(read (read-string
- (format "Find doc for Perl function (default %s): "
- default))))
+ (format "Find doc for Perl function (default %s): "
+ default))))
(list (if (equal read "")
- default
- read))))
+ default
+ read))))
(let ((buffer (current-buffer))
(cmd-desc (concat "^" (regexp-quote command) "[^a-zA-Z_0-9]")) ; "tr///"
@@ -5235,8 +5204,7 @@
;; Non-functioning under OS/2:
(if (eq char-height 1) (setq char-height 18))
;; Title, menubar, + 2 for slack
- (- (/ (x-display-pixel-height) char-height) 4)
- ))
+ (- (/ (x-display-pixel-height) char-height) 4)))
(if (> height max-height) (setq height max-height))
;;(message "was %s doing %s" iniheight height)
(if not-loner
@@ -5343,7 +5311,7 @@
(setq e (point))
(skip-chars-backward " \t")
(delete-region (point) e)
- (indent-to-column col); (make-string (- col (current-column)) ?\ ))
+ (indent-to-column col) ; (make-string (- col (current-column)) ?\ ))
(beginning-of-line 2)
(and (< (point) end)
(re-search-forward search end t)
@@ -5458,7 +5426,7 @@
(or noninteractive
(imenu-progress-message prev-pos))
(cond
- ((match-beginning 2) ; SECTION
+ ((match-beginning 2) ; SECTION
(setq package (buffer-substring (match-beginning 2) (match-end 2)))
(goto-char (match-beginning 0))
(skip-chars-forward " \t")
@@ -5491,11 +5459,11 @@
(defvar cperl-unreadable-ok nil)
(defun cperl-find-tags (ifile xs topdir)
- (let (ind (b (get-buffer cperl-tmp-buffer)) lst elt pos ret rel
- (cperl-pod-here-fontify nil) f file)
+ (let ((b (get-buffer cperl-tmp-buffer)) ind lst elt pos ret rel
+ (cperl-pod-here-fontify nil) f file)
(save-excursion
(if b (set-buffer b)
- (cperl-setup-tmp-buf))
+ (cperl-setup-tmp-buf))
(erase-buffer)
(condition-case err
(setq file (car (insert-file-contents ifile)))
@@ -5506,72 +5474,71 @@
(error "Aborting: unreadable file %s" ifile)))))
(if (not file)
(message "Unreadable file %s" ifile)
- (message "Scanning file %s ..." file)
- (if (and cperl-use-syntax-table-text-property-for-tags
- (not xs))
- (condition-case err ; after __END__ may have garbage
- (cperl-find-pods-heres nil nil noninteractive)
- (error (message "While scanning for syntax: %s" err))))
- (if xs
- (setq lst (cperl-xsub-scan))
- (setq ind (cperl-imenu--create-perl-index))
- (setq lst (cdr (assoc "+Unsorted List+..." ind))))
- (setq lst
- (mapcar
- (function
- (lambda (elt)
- (cond ((string-match "^[_a-zA-Z]" (car elt))
- (goto-char (cdr elt))
- (beginning-of-line) ; pos should be of the start of the line
- (list (car elt)
- (point)
- (1+ (count-lines 1 (point))) ; 1+ since at beg-o-l
- (buffer-substring (progn
- (goto-char (cdr elt))
- ;; After name now...
- (or (eolp) (forward-char 1))
- (point))
- (progn
- (beginning-of-line)
- (point))))))))
- lst))
- (erase-buffer)
- (while lst
- (setq elt (car lst) lst (cdr lst))
- (if elt
- (progn
- (insert (elt elt 3)
- 127
- (if (string-match "^package " (car elt))
- (substring (car elt) 8)
- (car elt) )
- 1
- (number-to-string (elt elt 2)) ; Line
- ","
- (number-to-string (1- (elt elt 1))) ; Char pos 0-based
- "\n")
- (if (and (string-match "^[_a-zA-Z]+::" (car elt))
- (string-match "^sub[ \t]+\\([_a-zA-Z]+\\)[^:_a-zA-Z]"
- (elt elt 3)))
- ;; Need to insert the name without package as well
- (setq lst (cons (cons (substring (elt elt 3)
- (match-beginning 1)
- (match-end 1))
- (cdr elt))
- lst))))))
- (setq pos (point))
- (goto-char 1)
- (setq rel file)
- ;; On case-preserving filesystems (EMX on OS/2) case might be encoded in properties
- (set-text-properties 0 (length rel) nil rel)
- (and (equal topdir (substring rel 0 (length topdir)))
- (setq rel (substring file (length topdir))))
- (insert "\f\n" rel "," (number-to-string (1- pos)) "\n")
- (setq ret (buffer-substring 1 (point-max)))
- (erase-buffer)
- (or noninteractive
- (message "Scanning file %s finished" file))
- ret))))
+ (message "Scanning file %s ..." file)
+ (if (and cperl-use-syntax-table-text-property-for-tags
+ (not xs))
+ (condition-case err ; after __END__ may have garbage
+ (cperl-find-pods-heres nil nil noninteractive)
+ (error (message "While scanning for syntax: %s" err))))
+ (if xs
+ (setq lst (cperl-xsub-scan))
+ (setq ind (cperl-imenu--create-perl-index))
+ (setq lst (cdr (assoc "+Unsorted List+..." ind))))
+ (setq lst
+ (mapcar
+ (lambda (elt)
+ (cond ((string-match "^[_a-zA-Z]" (car elt))
+ (goto-char (cdr elt))
+ (beginning-of-line) ; pos should be of the start of the line
+ (list (car elt)
+ (point)
+ (1+ (count-lines 1 (point))) ; 1+ since at beg-o-l
+ (buffer-substring (progn
+ (goto-char (cdr elt))
+ ;; After name now...
+ (or (eolp) (forward-char 1))
+ (point))
+ (progn
+ (beginning-of-line)
+ (point)))))))
+ lst))
+ (erase-buffer)
+ (while lst
+ (setq elt (car lst) lst (cdr lst))
+ (if elt
+ (progn
+ (insert (elt elt 3)
+ 127
+ (if (string-match "^package " (car elt))
+ (substring (car elt) 8)
+ (car elt) )
+ 1
+ (number-to-string (elt elt 2)) ; Line
+ ","
+ (number-to-string (1- (elt elt 1))) ; Char pos 0-based
+ "\n")
+ (if (and (string-match "^[_a-zA-Z]+::" (car elt))
+ (string-match "^sub[ \t]+\\([_a-zA-Z]+\\)[^:_a-zA-Z]"
+ (elt elt 3)))
+ ;; Need to insert the name without package as well
+ (setq lst (cons (cons (substring (elt elt 3)
+ (match-beginning 1)
+ (match-end 1))
+ (cdr elt))
+ lst))))))
+ (setq pos (point))
+ (goto-char 1)
+ (setq rel file)
+ ;; On case-preserving filesystems (EMX on OS/2) case might be encoded in properties
+ (set-text-properties 0 (length rel) nil rel)
+ (and (equal topdir (substring rel 0 (length topdir)))
+ (setq rel (substring file (length topdir))))
+ (insert "\f\n" rel "," (number-to-string (1- pos)) "\n")
+ (setq ret (buffer-substring 1 (point-max)))
+ (erase-buffer)
+ (or noninteractive
+ (message "Scanning file %s finished" file))
+ ret))))
(defun cperl-add-tags-recurse-noxs ()
"Add to TAGS data for Perl and XSUB files in the current directory and kids.
@@ -5606,7 +5573,7 @@
((file-exists-p tags-file-name)
(if cperl-xemacs-p
(visit-tags-table-buffer)
- (visit-tags-table-buffer tags-file-name)))
+ (visit-tags-table-buffer tags-file-name)))
(t (set-buffer (find-file-noselect tags-file-name))))
(cond
(dir
@@ -5624,46 +5591,45 @@
(if (y-or-n-p
(format "Directory %s unreadable. Continue? " file))
(setq cperl-unreadable-ok t
- tm nil) ; Return empty list
+ tm nil) ; Return empty list
(error "Aborting: unreadable directory %s" file)))))))
- (mapcar (function (lambda (file)
- (cond
- ((string-match cperl-noscan-files-regexp file)
- nil)
- ((not (file-directory-p file))
- (if (string-match cperl-scan-files-regexp file)
- (cperl-write-tags file erase recurse nil t noxs topdir)))
- ((not recurse) nil)
- (t (cperl-write-tags file erase recurse t t noxs topdir)))))
- files))
- )
+ (mapcar (lambda (file)
+ (cond
+ ((string-match cperl-noscan-files-regexp file)
+ nil)
+ ((not (file-directory-p file))
+ (if (string-match cperl-scan-files-regexp file)
+ (cperl-write-tags file erase recurse nil t noxs topdir)))
+ ((not recurse) nil)
+ (t (cperl-write-tags file erase recurse t t noxs topdir))))
+ files)))
(t
(setq xs (string-match "\\.xs$" file))
(if (not (and xs noxs))
(progn
(cond ((eq erase 'ignore) (goto-char (point-max)))
- (erase (erase-buffer))
- (t
- (goto-char 1)
- (setq rel file)
- ;; On case-preserving filesystems (EMX on OS/2) case might be encoded in properties
- (set-text-properties 0 (length rel) nil rel)
- (and (equal topdir (substring rel 0 (length topdir)))
- (setq rel (substring file (length topdir))))
- (if (search-forward (concat "\f\n" rel ",") nil t)
- (progn
- (search-backward "\f\n")
- (delete-region (point)
- (save-excursion
- (forward-char 1)
- (if (search-forward "\f\n"
- nil 'toend)
- (- (point) 2)
- (point-max)))))
- (goto-char (point-max)))))
+ (erase (erase-buffer))
+ (t
+ (goto-char 1)
+ (setq rel file)
+ ;; On case-preserving filesystems (EMX on OS/2) case might be encoded in properties
+ (set-text-properties 0 (length rel) nil rel)
+ (and (equal topdir (substring rel 0 (length topdir)))
+ (setq rel (substring file (length topdir))))
+ (if (search-forward (concat "\f\n" rel ",") nil t)
+ (progn
+ (search-backward "\f\n")
+ (delete-region (point)
+ (save-excursion
+ (forward-char 1)
+ (if (search-forward "\f\n"
+ nil 'toend)
+ (- (point) 2)
+ (point-max)))))
+ (goto-char (point-max)))))
(insert (cperl-find-tags file xs topdir))))))
- (if inbuffer nil ; Delegate to the caller
- (save-buffer 0) ; No backup
+ (if inbuffer nil ; Delegate to the caller
+ (save-buffer 0) ; No backup
(if (fboundp 'initialize-new-tags-table) ; Do we need something special in XEmacs?
(initialize-new-tags-table))))))
@@ -5733,30 +5699,29 @@
(require 'etags)
(require 'imenu)
(if (or update (null (nth 2 cperl-hierarchy)))
- (let (pack name cons1 to l1 l2 l3 l4 b
- (remover (function (lambda (elt) ; (name (file1...) (file2..))
- (or (nthcdr 2 elt)
- ;; Only in one file
- (setcdr elt (cdr (nth 1 elt))))))))
+ (let ((remover (lambda (elt) ; (name (file1...) (file2..))
+ (or (nthcdr 2 elt)
+ ;; Only in one file
+ (setcdr elt (cdr (nth 1 elt))))))
+ pack name cons1 to l1 l2 l3 l4 b)
;; (setq cperl-hierarchy '(() () ())) ; Would write into '() later!
(setq cperl-hierarchy (list l1 l2 l3))
(if cperl-xemacs-p ; Not checked
(progn
(or tags-file-name
;; Does this work in XEmacs?
- (call-interactively 'visit-tags-table))
- (message "Updating list of classes...")
+ (call-interactively 'visit-tags-table))
+ (message "Updating list of classes...")
(set-buffer (get-file-buffer tags-file-name))
(cperl-tags-hier-fill))
(or tags-table-list
(call-interactively 'visit-tags-table))
- (mapcar
- (function
- (lambda (tagsfile)
- (message "Updating list of classes... %s" tagsfile)
- (set-buffer (get-file-buffer tagsfile))
- (cperl-tags-hier-fill)))
- tags-table-list)
+ (mapcar
+ (lambda (tagsfile)
+ (message "Updating list of classes... %s" tagsfile)
+ (set-buffer (get-file-buffer tagsfile))
+ (cperl-tags-hier-fill))
+ tags-table-list)
(message "Updating list of classes... postprocessing..."))
(mapcar remover (car cperl-hierarchy))
(mapcar remover (nth 1 cperl-hierarchy))
@@ -5797,26 +5762,25 @@
l1 head tail cons1 cons2 ord writeto packs recurse
root-packages root-functions ms many_ms same_name ps
(move-deeper
- (function
- (lambda (elt)
- (cond ((and (string-match regexp (car elt))
- (or (eq ord 1) (match-end 2)))
- (setq head (substring (car elt) 0 (match-end 1))
- tail (if (match-end 2) (substring (car elt)
- (match-end 2)))
- recurse t)
- (if (setq cons1 (assoc head writeto)) nil
- ;; Need to init new head
- (setcdr writeto (cons (list head (list "Packages: ")
- (list "Methods: "))
- (cdr writeto)))
- (setq cons1 (nth 1 writeto)))
- (setq cons2 (nth ord cons1)) ; Either packs or meths
- (setcdr cons2 (cons elt (cdr cons2))))
- ((eq ord 2)
- (setq root-functions (cons elt root-functions)))
- (t
- (setq root-packages (cons elt root-packages))))))))
+ (lambda (elt)
+ (cond ((and (string-match regexp (car elt))
+ (or (eq ord 1) (match-end 2)))
+ (setq head (substring (car elt) 0 (match-end 1))
+ tail (if (match-end 2) (substring (car elt)
+ (match-end 2)))
+ recurse t)
+ (if (setq cons1 (assoc head writeto)) nil
+ ;; Need to init new head
+ (setcdr writeto (cons (list head (list "Packages: ")
+ (list "Methods: "))
+ (cdr writeto)))
+ (setq cons1 (nth 1 writeto)))
+ (setq cons2 (nth ord cons1)) ; Either packs or meths
+ (setcdr cons2 (cons elt (cdr cons2))))
+ ((eq ord 2)
+ (setq root-functions (cons elt root-functions)))
+ (t
+ (setq root-packages (cons elt root-packages)))))))
(setcdr to l1) ; Init to dynamic space
(setq writeto to)
(setq ord 1)
@@ -5824,37 +5788,36 @@
(setq ord 2)
(mapcar move-deeper methods)
(if recurse
- (mapcar (function (lambda (elt)
- (cperl-tags-treeify elt (1+ level))))
+ (mapcar (lambda (elt)
+ (cperl-tags-treeify elt (1+ level)))
(cdr to)))
;;Now clean up leaders with one child only
- (mapcar (function (lambda (elt)
- (if (not (and (listp (cdr elt))
- (eq (length elt) 2))) nil
- (setcar elt (car (nth 1 elt)))
- (setcdr elt (cdr (nth 1 elt))))))
+ (mapcar (lambda (elt)
+ (if (not (and (listp (cdr elt))
+ (eq (length elt) 2))) nil
+ (setcar elt (car (nth 1 elt)))
+ (setcdr elt (cdr (nth 1 elt)))))
(cdr to))
;; Sort the roots of subtrees
(if (default-value 'imenu-sort-function)
(setcdr to
(sort (cdr to) (default-value 'imenu-sort-function))))
;; Now add back functions removed from display
- (mapcar (function (lambda (elt)
- (setcdr to (cons elt (cdr to)))))
+ (mapcar (lambda (elt)
+ (setcdr to (cons elt (cdr to))))
(if (default-value 'imenu-sort-function)
(nreverse
(sort root-functions (default-value 'imenu-sort-function)))
root-functions))
;; Now add back packages removed from display
- (mapcar (function (lambda (elt)
- (setcdr to (cons (cons (concat "package " (car elt))
- (cdr elt))
- (cdr to)))))
+ (mapcar (lambda (elt)
+ (setcdr to (cons (cons (concat "package " (car elt))
+ (cdr elt))
+ (cdr to))))
(if (default-value 'imenu-sort-function)
(nreverse
(sort root-packages (default-value 'imenu-sort-function)))
- root-packages))
- ))
+ root-packages))))
;;;(x-popup-menu t
;;; '(keymap "Name1"
@@ -5886,52 +5849,50 @@
(let (list)
(cons 'keymap
(mapcar
- (function
- (lambda (elt)
- (cond ((listp (cdr elt))
- (setq list (cperl-list-fold
- (cdr elt) (car elt) imenu-max-items))
- (cons nil
- (cons (car elt)
- (cperl-menu-to-keymap list))))
- (t
- (list (cdr elt) (car elt) t))))) ; t is needed in 19.34
+ (lambda (elt)
+ (cond ((listp (cdr elt))
+ (setq list (cperl-list-fold
+ (cdr elt) (car elt) imenu-max-items))
+ (cons nil
+ (cons (car elt)
+ (cperl-menu-to-keymap list))))
+ (t
+ (list (cdr elt) (car elt) t)))) ; t is needed in 19.34
(cperl-list-fold menu "Root" imenu-max-items)))))
\f
(defvar cperl-bad-style-regexp
(mapconcat 'identity
- '("[^-\n\t <>=+!.&|(*/'`\"#^][-=+<>!|&^]" ; char sign
- "[-<>=+^&|]+[^- \t\n=+<>~]" ; sign+ char
- )
- "\\|")
+ '("[^-\n\t <>=+!.&|(*/'`\"#^][-=+<>!|&^]" ; char sign
+ "[-<>=+^&|]+[^- \t\n=+<>~]") ; sign+ char
+ "\\|")
"Finds places such that insertion of a whitespace may help a lot.")
(defvar cperl-not-bad-style-regexp
(mapconcat 'identity
- '("[^-\t <>=+]\\(--\\|\\+\\+\\)" ; var-- var++
- "[a-zA-Z0-9_][|&][a-zA-Z0-9_$]" ; abc|def abc&def are often used.
- "&[(a-zA-Z0-9_$]" ; &subroutine &(var->field)
- "<\\$?\\sw+\\(\\.\\sw+\\)?>" ; <IN> <stdin.h>
- "-[a-zA-Z][ \t]+[_$\"'`a-zA-Z]" ; -f file, -t STDIN
- "-[0-9]" ; -5
- "\\+\\+" ; ++var
- "--" ; --var
- ".->" ; a->b
- "->" ; a SPACE ->b
- "\\[-" ; a[-1]
- "\\\\[&$@*\\\\]" ; \&func
- "^=" ; =head
- "\\$." ; $|
- "<<[a-zA-Z_'\"`]" ; <<FOO, <<'FOO'
- "||"
- "&&"
- "[CBIXSLFZ]<\\(\\sw\\|\\s \\|\\s_\\|[\n]\\)*>" ; C<code like text>
- "-[a-zA-Z_0-9]+[ \t]*=>" ; -option => value
- ;; Unaddressed trouble spots: = -abc, f(56, -abc) --- specialcased below
- ;;"[*/+-|&<.]+="
- )
- "\\|")
+ '("[^-\t <>=+]\\(--\\|\\+\\+\\)" ; var-- var++
+ "[a-zA-Z0-9_][|&][a-zA-Z0-9_$]" ; abc|def abc&def are often used.
+ "&[(a-zA-Z0-9_$]" ; &subroutine &(var->field)
+ "<\\$?\\sw+\\(\\.\\sw+\\)?>" ; <IN> <stdin.h>
+ "-[a-zA-Z][ \t]+[_$\"'`a-zA-Z]" ; -f file, -t STDIN
+ "-[0-9]" ; -5
+ "\\+\\+" ; ++var
+ "--" ; --var
+ ".->" ; a->b
+ "->" ; a SPACE ->b
+ "\\[-" ; a[-1]
+ "\\\\[&$@*\\\\]" ; \&func
+ "^=" ; =head
+ "\\$." ; $|
+ "<<[a-zA-Z_'\"`]" ; <<FOO, <<'FOO'
+ "||"
+ "&&"
+ "[CBIXSLFZ]<\\(\\sw\\|\\s \\|\\s_\\|[\n]\\)*>" ; C<code like text>
+ "-[a-zA-Z_0-9]+[ \t]*=>" ; -option => value
+ ;; Unaddressed trouble spots: = -abc, f(56, -abc) --- specialcased below
+ ;;"[*/+-|&<.]+="
+ )
+ "\\|")
"If matches at the start of match found by `my-bad-c-style-regexp',
insertion of a whitespace will not help.")
@@ -5946,7 +5907,7 @@
(setq last-nonmenu-event 13) ; To disable popup
(beginning-of-buffer)
(map-y-or-n-p "Insert space here? "
- (function (lambda (arg) (insert " ")))
+ (lambda (arg) (insert " "))
'cperl-next-bad-style
'("location" "locations" "insert a space into")
'((?\C-r (lambda (arg)
@@ -5999,22 +5960,20 @@
;;(concat "\\("
(mapconcat
'identity
- '("[$@%*&][0-9a-zA-Z_:]+\\([ \t]*[[{]\\)?" ; Usual variable
+ '("[$@%*&][0-9a-zA-Z_:]+\\([ \t]*[[{]\\)?" ; Usual variable
"[$@]\\^[a-zA-Z]" ; Special variable
"[$@][^ \n\t]" ; Special variable
"-[a-zA-Z]" ; File test
"\\\\[a-zA-Z0]" ; Special chars
- "^=[a-z][a-zA-Z0-9_]*" ; Pod sections
+ "^=[a-z][a-zA-Z0-9_]*" ; POD sections
"[-!&*+,-./<=>?\\\\^|~]+" ; Operator
"[a-zA-Z_0-9:]+" ; symbol or number
"x="
- "#!"
- )
+ "#!")
;;"\\)\\|\\("
- "\\|"
- )
- ;;"\\)"
- ;;)
+ "\\|")
+ ;;"\\)"
+ ;;)
"Matches places in the buffer we can find help for.")
(defvar cperl-message-on-help-error t)
@@ -6102,22 +6061,22 @@
(let ((enable-recursive-minibuffers t)
args-file regexp)
(cond
- ((string-match "^[&*][a-zA-Z_]" val)
- (setq val (concat (substring val 0 1) "NAME")))
- ((string-match "^[$@]\\([a-zA-Z_:0-9]+\\)[ \t]*\\[" val)
- (setq val (concat "@" (substring val 1 (match-end 1)))))
- ((string-match "^[$@]\\([a-zA-Z_:0-9]+\\)[ \t]*{" val)
- (setq val (concat "%" (substring val 1 (match-end 1)))))
- ((and (string= val "x") (string-match "^x=" val))
- (setq val "x="))
- ((string-match "^\\$[\C-a-\C-z]" val)
- (setq val (concat "$^" (char-to-string (+ ?A -1 (aref val 1))))))
- ((string-match "^CORE::" val)
- (setq val "CORE::"))
- ((string-match "^SUPER::" val)
- (setq val "SUPER::"))
- ((and (string= "<" val) (string-match "^<\\$?[a-zA-Z0-9_:]+>" val))
- (setq val "<NAME>")))
+ ((string-match "^[&*][a-zA-Z_]" val)
+ (setq val (concat (substring val 0 1) "NAME")))
+ ((string-match "^[$@]\\([a-zA-Z_:0-9]+\\)[ \t]*\\[" val)
+ (setq val (concat "@" (substring val 1 (match-end 1)))))
+ ((string-match "^[$@]\\([a-zA-Z_:0-9]+\\)[ \t]*{" val)
+ (setq val (concat "%" (substring val 1 (match-end 1)))))
+ ((and (string= val "x") (string-match "^x=" val))
+ (setq val "x="))
+ ((string-match "^\\$[\C-a-\C-z]" val)
+ (setq val (concat "$^" (char-to-string (+ ?A -1 (aref val 1))))))
+ ((string-match "^CORE::" val)
+ (setq val "CORE::"))
+ ((string-match "^SUPER::" val)
+ (setq val "SUPER::"))
+ ((and (string= "<" val) (string-match "^<\\$?[a-zA-Z0-9_:]+>" val))
+ (setq val "<NAME>")))
(setq regexp (concat "^"
"\\([^a-zA-Z0-9_:]+[ \t]+\\)?"
(regexp-quote val)
@@ -6139,7 +6098,7 @@
(if cperl-message-on-help-error
(message "No definition for %s" val)))))))
-(defvar cperl-short-docs "Ignore my value"
+(defvar cperl-short-docs 'please-ignore-this-line
;; Perl4 version was written by Johan Vromans (jvromans@squirrel.nl)
"# based on '@(#)@ perl-descr.el 1.9 - describe-perl-symbol' [Perl 5]
! ... Logical negation.
@@ -6512,12 +6471,6 @@
CORE:: Prefix to access builtin function if imported sub obscures it.
SUPER:: Prefix to lookup for a method in @ISA classes.
DESTROY Shorthand for `sub DESTROY {...}'.
-... EQ ... Obsolete synonym of `eq'.
-... GE ... Obsolete synonym of `ge'.
-... GT ... Obsolete synonym of `gt'.
-... LE ... Obsolete synonym of `le'.
-... LT ... Obsolete synonym of `lt'.
-... NE ... Obsolete synonym of `ne'.
abs [ EXPR ] absolute value
... and ... Low-precedence synonym for &&.
bless REFERENCE [, PACKAGE] Makes reference into an object of a package.
@@ -6525,7 +6478,7 @@
chr Converts a number to char with the same ordinal.
else Part of if/unless {BLOCK} elsif {BLOCK} else {BLOCK}.
elsif Part of if/unless {BLOCK} elsif {BLOCK} else {BLOCK}.
-exists $HASH{KEY} True if the key exists.
+exists $HASH{KEY} True if the key exists.
format [NAME] = Start of output format. Ended by a single dot (.) on a line.
formline PICTURE, LIST Backdoor into \"format\" processing.
glob EXPR Synonym of <EXPR>.
@@ -6603,7 +6556,7 @@
(goto-char e)
(beginning-of-line)
(if (re-search-forward "[^ \t]" e t)
- (progn ; Something before the ending delimiter
+ (progn ; Something before the ending delimiter
(goto-char e)
(delete-horizontal-space)
(insert "\n")
@@ -6633,8 +6586,7 @@
"\\|" ; Grouping
"\\((\\(\\?\\)?\\)" ; 7 8
"\\|" ; |
- "\\(|\\)" ; 9
- )))
+ "\\(|\\)"))) ; 9
(goto-char (match-end 0))
(setq spaces t)
(cond ((match-beginning 1) ; Alphanum word + junk
@@ -6744,20 +6696,19 @@
(not spaces)
(insert " "))
(skip-chars-forward " \t"))
- (or (looking-at "[#\n]")
- (error "Unknown code `%s' in a regexp"
- (buffer-substring (point) (1+ (point)))))
- (and inline (end-of-line 2)))
+ (or (looking-at "[#\n]")
+ (error "Unknown code `%s' in a regexp"
+ (buffer-substring (point) (1+ (point)))))
+ (and inline (end-of-line 2)))
;; Special-case the last line of group
(if (and (>= (point) (marker-position e))
(/= (current-indentation) c))
(progn
- (beginning-of-line)
- (setq s (point))
- (skip-chars-forward " \t")
- (delete-region s (point))
- (indent-to-column c)))
- ))
+ (beginning-of-line)
+ (setq s (point))
+ (skip-chars-forward " \t")
+ (delete-region s (point))
+ (indent-to-column c)))))
(defun cperl-make-regexp-x ()
;; Returns position of the start
@@ -6770,7 +6721,7 @@
nil ; good already
(if (looking-at "\\([smy]\\|qr\\)\\s|")
(forward-char 1)
- (re-search-backward "\\s|"))) ; Assume it is scanned already.
+ (re-search-backward "\\s|"))) ; Assume it is scanned already.
;;(forward-char 1)
(let ((b (point)) (e (make-marker)) have-x delim (c (current-column))
(sub-p (eq (preceding-char) ?s)) s)
@@ -6825,23 +6776,23 @@
We suppose that the regexp is scanned already."
(interactive)
;; (save-excursion ; Can't, breaks `cperl-contract-levels'
- (cperl-regext-to-level-start)
- (let ((b (point)) (e (make-marker)) s c)
- (forward-sexp 1)
- (set-marker e (1- (point)))
- (goto-char b)
- (while (re-search-forward "\\(#\\)\\|\n" e 'to-end)
- (cond
- ((match-beginning 1) ; #-comment
- (or c (setq c (current-indentation)))
- (beginning-of-line 2) ; Skip
- (setq s (point))
- (skip-chars-forward " \t")
- (delete-region s (point))
- (indent-to-column c))
- (t
- (delete-char -1)
- (just-one-space))))))
+ (cperl-regext-to-level-start)
+ (let ((b (point)) (e (make-marker)) s c)
+ (forward-sexp 1)
+ (set-marker e (1- (point)))
+ (goto-char b)
+ (while (re-search-forward "\\(#\\)\\|\n" e 'to-end)
+ (cond
+ ((match-beginning 1) ; #-comment
+ (or c (setq c (current-indentation)))
+ (beginning-of-line 2) ; Skip
+ (setq s (point))
+ (skip-chars-forward " \t")
+ (delete-region s (point))
+ (indent-to-column c))
+ (t
+ (delete-char -1)
+ (just-one-space))))))
(defun cperl-contract-levels ()
"Find an enclosing group in regexp and contract all the kids.
@@ -6881,7 +6832,7 @@
"Change `if (A) {B}' into `B if A;' etc if possible."
(interactive)
(or (looking-at "\\<")
- (forward-sexp -1))
+ (forward-sexp -1))
(if (looking-at "\\<\\(if\\|unless\\|while\\|until\\|for\\|foreach\\)\\>")
(let ((pos1 (point))
pos2 pos3 pos4 pos5 s1 s2 state p pos45
@@ -7091,8 +7042,9 @@
(defun cperl-fontify-syntaxically (end)
;; Some vars for debugging only
;; (message "Syntaxifying...")
- (let (start (dbg (point)) (iend end)
- (istate (car cperl-syntax-state)))
+ (let ((dbg (point)) (iend end)
+ (istate (car cperl-syntax-state))
+ start)
(and cperl-syntaxify-unwind
(setq end (cperl-unwind-to-safe t end)))
(setq start (point))
@@ -7113,7 +7065,7 @@
dbg iend
start end cperl-syntax-done-to
istate (car cperl-syntax-state))) ; For debugging
- nil)) ; Do not iterate
+ nil)) ; Do not iterate
(defun cperl-fontify-update (end)
(let ((pos (point)) prop posend)
@@ -7122,7 +7074,7 @@
(setq posend (next-single-property-change pos 'cperl-postpone nil end))
(and prop (put-text-property pos posend (car prop) (cdr prop)))
(setq pos posend)))
- nil) ; Do not iterate
+ nil) ; Do not iterate
(defun cperl-update-syntaxification (from to)
(if (and cperl-use-syntax-table-text-property
@@ -7135,7 +7087,7 @@
(cperl-fontify-syntaxically to)))))
(defvar cperl-version
- (let ((v "Revision: 4.32"))
+ (let ((v "Revision: 4.33"))
(string-match ":\\s *\\([0-9.]+\\)" v)
(substring v (match-beginning 1) (match-end 1)))
"Version of IZ-supported CPerl package this file is based on.")
[-- Attachment #5: Type: text/plain, Size: 148 bytes --]
_______________________________________________
Bug-gnu-emacs mailing list
Bug-gnu-emacs@gnu.org
http://mail.gnu.org/mailman/listinfo/bug-gnu-emacs
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: CPerl mode cleaned up
2003-02-11 23:11 CPerl mode cleaned up Daniel Pfeiffer
@ 2003-02-12 5:06 ` Ilya Zakharevich
2003-02-12 20:34 ` Richard Stallman
1 sibling, 0 replies; 6+ messages in thread
From: Ilya Zakharevich @ 2003-02-12 5:06 UTC (permalink / raw)
Cc: bug-gnu-emacs
On Wed, Feb 12, 2003 at 12:11:31AM +0100, Daniel Pfeiffer wrote:
> Therefore I have updated both the copyright and version number to 4.33.
Thanks, Daniel,
but please read the docstring for the version number! If you change
the meaning of the number, please change the name of the variable too.
Yours,
Ilya
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: CPerl mode cleaned up
2003-02-11 23:11 CPerl mode cleaned up Daniel Pfeiffer
2003-02-12 5:06 ` Ilya Zakharevich
@ 2003-02-12 20:34 ` Richard Stallman
2003-02-12 21:36 ` Daniel Pfeiffer
1 sibling, 1 reply; 6+ messages in thread
From: Richard Stallman @ 2003-02-12 20:34 UTC (permalink / raw)
Cc: cpan
the version of CPerl mode seems utter chaos. Both Emacs and Ilya's web-site
have 4.32, but they are very different. While Emacs' newest copyright is
much older, CVS with its many little fixes, shows that the opposite is true.
Having version numbers in Lisp packages causes persistent problems
which persistently waste time.
In the past my solution was to delete the version numbers from Lisp
packages. They are redundant anyway, because each Emacs version comes
with on particular version of every Lisp file.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: CPerl mode cleaned up
2003-02-12 20:34 ` Richard Stallman
@ 2003-02-12 21:36 ` Daniel Pfeiffer
2003-02-13 22:17 ` Ilya Zakharevich
2003-02-17 7:20 ` Richard Stallman
0 siblings, 2 replies; 6+ messages in thread
From: Daniel Pfeiffer @ 2003-02-12 21:36 UTC (permalink / raw)
Cc: bug-gnu-emacs
Ilya Zakharevich <ilya@Math.Berkeley.EDU> skribis:
> On Wed, Feb 12, 2003 at 12:11:31AM +0100, Daniel Pfeiffer wrote:
> > Therefore I have updated both the copyright and version number to 4.33.
> but please read the docstring for the version number! If you change
> the meaning of the number, please change the name of the variable too.
Actually I changed it according to the name, but the doc string is
inconsistent with the name.
Richard Stallman <rms@gnu.org> skribis:
> the version of CPerl mode seems utter chaos. Both Emacs and Ilya's web-site
> have 4.32, but they are very different. While Emacs' newest copyright is
> much older, CVS with its many little fixes, shows that the opposite is true.
> Having version numbers in Lisp packages causes persistent problems
> which persistently waste time.
> In the past my solution was to delete the version numbers from Lisp
> packages. They are redundant anyway, because each Emacs version comes
> with on particular version of every Lisp file.
That is my feeling too. Given the recent discussion on gnu.emacs.help,
people don't read the doc of a variable called something-version. They just
assume that to be the version.
Ilya, you should say whether you plan to further develop cperl (from the
history of your ftp-site, I doubt it). And if you do, it would be a good
idea to develop the Emacs CVS version. Then the version number can be
eliminated without confusion.
Also, I found your email as written in the module to be defunct. It should
be updated in the module to the one above.
Richard, will you do those two little changes? No need to resend that huge
diff, is there? The variable also gets shown from an easymenu entry which
should be eliminated.
coralament / best Grötens / liebe Grüße / best regards / elkorajn salutojn
Daniel Pfeiffer
-- GPL 3: take the wind out of Palladium's sails! --
------
-- My other stuff here too, sawfish, make.pl...: --
------
-- http://dapfy.bei.t-online.de/ --
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: CPerl mode cleaned up
2003-02-12 21:36 ` Daniel Pfeiffer
@ 2003-02-13 22:17 ` Ilya Zakharevich
2003-02-17 7:20 ` Richard Stallman
1 sibling, 0 replies; 6+ messages in thread
From: Ilya Zakharevich @ 2003-02-13 22:17 UTC (permalink / raw)
Cc: bug-gnu-emacs
On Wed, Feb 12, 2003 at 10:36:06PM +0100, Daniel Pfeiffer wrote:
> Ilya, you should say whether you plan to further develop cperl
I develop CPerl constantly. Given no serious problems present,
currently this is only TODO file maintainace.
> (from the
> history of your ftp-site, I doubt it). And if you do, it would be a good
> idea to develop the Emacs CVS version.
If you make the CVS version match mine (modulo the default values of
variables), I would gladly do this. 1/2 ;-)
> Then the version number can be eliminated without confusion.
Elimination of the version number can never *decrease* confusion.
Hope this helps,
Ilya
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: CPerl mode cleaned up
2003-02-12 21:36 ` Daniel Pfeiffer
2003-02-13 22:17 ` Ilya Zakharevich
@ 2003-02-17 7:20 ` Richard Stallman
1 sibling, 0 replies; 6+ messages in thread
From: Richard Stallman @ 2003-02-17 7:20 UTC (permalink / raw)
Cc: emacs-devel
Richard, will you do those two little changes? No need to resend that huge
diff, is there?
I am too overloaded to deal with it myself--I hope someone else will.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2003-02-17 7:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-02-11 23:11 CPerl mode cleaned up Daniel Pfeiffer
2003-02-12 5:06 ` Ilya Zakharevich
2003-02-12 20:34 ` Richard Stallman
2003-02-12 21:36 ` Daniel Pfeiffer
2003-02-13 22:17 ` Ilya Zakharevich
2003-02-17 7:20 ` Richard Stallman
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.