Mercurial > emacs
changeset 80057:1db7c78912f4
*** empty log message ***
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Tue, 05 Feb 2008 14:24:26 +0000 |
| parents | 20a6490b2f90 |
| children | efee46831e2e |
| files | lisp/progmodes/cperl-mode.el |
| diffstat | 1 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/progmodes/cperl-mode.el Tue Feb 05 14:21:18 2008 +0000 +++ b/lisp/progmodes/cperl-mode.el Tue Feb 05 14:24:26 2008 +0000 @@ -1250,7 +1250,7 @@ ["Contract groups" cperl-contract-levels cperl-use-syntax-table-text-property] "----" - ["Find next interpolated" cperl-next-interpolated-REx + ["Find next interpolated" cperl-next-interpolated-REx (next-single-property-change (point-min) 'REx-interpolated)] ["Find next interpolated (no //o)" cperl-next-interpolated-REx-0 @@ -2845,7 +2845,7 @@ (skip-chars-backward " \t") (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*[ \t]*:"))) (get-text-property (point) 'first-format-line))) - + ;; 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. @@ -3079,7 +3079,7 @@ ((eq 'toplevel (elt i 0)) ;; [toplevel start char-after state immed-after-block] (+ (save-excursion ; To beg-of-defun, or end of last sexp (goto-char (elt i 1)) ; start = Good place to start parsing - (- (current-indentation) ; + (- (current-indentation) ; (if (elt i 4) cperl-indent-level 0))) ; immed-after-block (if (eq (elt i 2) ?{) cperl-continued-brace-offset 0) ; char-after ;; Look at previous line that's at column 0 @@ -3899,7 +3899,7 @@ ;;; XXX What to do: foo <<bar ??? ;;; XXX Need to support print {a} <<B ??? (forward-sexp -1) - (save-match-data + (save-match-data ; $foo << b; $f .= <<B; ; ($f+1) << b; a($f) . <<B; ; foo 1, <<B; $x{a} <<b; @@ -3931,7 +3931,7 @@ qtag (regexp-quote tag)) (cond (cperl-pod-here-fontify ;; Highlight the starting delimiter - (cperl-postpone-fontification + (cperl-postpone-fontification b1 e1 'face my-cperl-delimiters-face) (cperl-put-do-not-fontify b1 e1 t))) (forward-line) @@ -4291,7 +4291,7 @@ ;;;m^a[\^b]c^ + m.a[^b]\.c.; (save-excursion (goto-char (1+ b)) - ;; First + ;; First (cperl-look-at-leading-count is-x-REx e) (setq hairy-RE (concat @@ -4452,7 +4452,7 @@ ;; This is not pretty: the 5.8.7 logic: ;; \0numx -> octal (up to total 3 dig) ;; \DIGIT -> backref unless \0 - ;; \DIGITs -> backref if legal + ;; \DIGITs -> backref if valid ;; otherwise up to 3 -> octal ;; Do not try to distinguish, we guess ((or (and (memq qtag (append "01234567" nil)) @@ -4460,7 +4460,7 @@ "\\=[01234567]?[01234567]?" (1- e) 'to-end)) (and (memq qtag (append "89" nil)) - (re-search-forward + (re-search-forward "\\=[0123456789]*" (1- e) 'to-end)) (and (eq qtag ?x) (re-search-forward @@ -4498,7 +4498,7 @@ ;; in m]]: m][\\\]\]] produces [\\]] ;;; POSIX? [:word:] [:^word:] only inside [] ;;; "\\=\\(\\\\.\\|[^][\\\\]\\|\\[:\\^?\sw+:]\\|\\[[^:]\\)*]") - (while + (while (and argument (re-search-forward (if (eq (char-after b) ?\] ) @@ -5815,7 +5815,7 @@ "," cperl-maybe-white-and-comment-rex "\\([$@%*]\\([a-zA-Z0-9_:]+\\|[^a-zA-Z0-9_]\\)\\)") - ;; Bug in font-lock: limit is used not only to limit + ;; Bug in font-lock: limit is used not only to limit ;; searches, but to set the "extend window for ;; facification" property. Thus we need to minimize. ,(if cperl-font-lock-multiline @@ -6784,7 +6784,7 @@ by CPerl." (interactive "P") (or arg - (setq arg (if (eq cperl-syntaxify-by-font-lock + (setq arg (if (eq cperl-syntaxify-by-font-lock (if backtrace 'backtrace 'message)) 0 1))) (setq arg (if (> arg 0) (if backtrace 'backtrace 'message) t)) (setq cperl-syntaxify-by-font-lock arg) @@ -8245,7 +8245,7 @@ (defun cperl-invert-if-unless-modifiers () "Change `B if A;' into `if (A) {B}' etc if possible. \(Unfinished.)" - (interactive) ; + (interactive) ; (let (A B pre-B post-B pre-if post-if pre-A post-A if-string (w-rex "\\<\\(if\\|unless\\|while\\|until\\|for\\|foreach\\)\\>")) (and (= (char-syntax (preceding-char)) ?w)