diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/cperl-mode.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ce4c371aeed..d14a3a8584b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-07-09 Sam Steingold <sds@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/cperl-mode.el (cperl-block-p): Treat the perl keyword | ||
| 4 | `constant' like `bless', `return' &c | ||
| 5 | |||
| 1 | 2014-07-09 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2014-07-09 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * rect.el (apply-on-rectangle): Check forward-line really moved to the | 8 | * rect.el (apply-on-rectangle): Check forward-line really moved to the |
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index c4f2b9ffe51..cd60475974c 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el | |||
| @@ -4828,9 +4828,9 @@ the sections using `cperl-pod-head-face', `cperl-pod-face', | |||
| 4828 | (and (memq (char-syntax (preceding-char)) '(?w ?_)) | 4828 | (and (memq (char-syntax (preceding-char)) '(?w ?_)) |
| 4829 | (progn | 4829 | (progn |
| 4830 | (backward-sexp) | 4830 | (backward-sexp) |
| 4831 | ;; sub {BLK}, print {BLK} $data, but NOT `bless', `return', `tr' | 4831 | ;; sub {BLK}, print {BLK} $data, but NOT `bless', `return', `tr', `constant' |
| 4832 | (or (and (looking-at "[a-zA-Z0-9_:]+[ \t\n\f]*[{#]") ; Method call syntax | 4832 | (or (and (looking-at "[a-zA-Z0-9_:]+[ \t\n\f]*[{#]") ; Method call syntax |
| 4833 | (not (looking-at "\\(bless\\|return\\|q[wqrx]?\\|tr\\|[smy]\\)\\>"))) | 4833 | (not (looking-at "\\(bless\\|return\\|q[wqrx]?\\|tr\\|[smy]\\|constant\\)\\>"))) |
| 4834 | ;; sub bless::foo {} | 4834 | ;; sub bless::foo {} |
| 4835 | (progn | 4835 | (progn |
| 4836 | (cperl-backward-to-noncomment (point-min)) | 4836 | (cperl-backward-to-noncomment (point-min)) |