Mercurial > emacs
changeset 59328:7f974399bee1
(perl-nochange, perl-calculate-indent):
Don't confuse module-prefixed identifiers for labels.
Reported by Juan-Leon Lahoz Garcia <juanleon1@gmail.com>.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 03 Jan 2005 20:46:22 +0000 |
| parents | 6535aefcfd51 |
| children | 75e5456e5a43 |
| files | lisp/ChangeLog lisp/progmodes/perl-mode.el |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Jan 03 16:56:28 2005 +0000 +++ b/lisp/ChangeLog Mon Jan 03 20:46:22 2005 +0000 @@ -1,3 +1,9 @@ +2005-01-03 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/perl-mode.el (perl-nochange, perl-calculate-indent): + Don't confuse module-prefixed identifiers for labels. + Reported by Juan-Leon Lahoz Garcia <juanleon1@gmail.com>. + 2005-01-02 Richard M. Stallman <rms@gnu.org> * files.el (basic-save-buffer-1): Fix previous change.
--- a/lisp/progmodes/perl-mode.el Mon Jan 03 16:56:28 2005 +0000 +++ b/lisp/progmodes/perl-mode.el Mon Jan 03 20:46:22 2005 +0000 @@ -1,6 +1,6 @@ ;;; perl-mode.el --- Perl code editing commands for GNU Emacs -;; Copyright (C) 1990, 1994, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1994, 2003, 2005 Free Software Foundation, Inc. ;; Author: William F. Mann ;; Maintainer: FSF @@ -408,7 +408,7 @@ create a new comment." :type 'boolean) -(defcustom perl-nochange ";?#\\|\f\\|\\s(\\|\\(\\w\\|\\s_\\)+:" +(defcustom perl-nochange ";?#\\|\f\\|\\s(\\|\\(\\w\\|\\s_\\)+:[^:]" "*Lines starting with this regular expression are not auto-indented." :type 'regexp) @@ -769,7 +769,7 @@ (skip-chars-forward " \t\f\n") (cond ((looking-at ";?#") (forward-line 1) t) - ((looking-at "\\(\\w\\|\\s_\\)+:") + ((looking-at "\\(\\w\\|\\s_\\)+:[^:]") (save-excursion (end-of-line) (setq colon-line-end (point))) @@ -929,5 +929,5 @@ (provide 'perl-mode) -;;; arch-tag: 8c7ff68d-15f3-46a2-ade2-b7c41f176826 +;; arch-tag: 8c7ff68d-15f3-46a2-ade2-b7c41f176826 ;;; perl-mode.el ends here