(perl-nochange, perl-calculate-indent):

Don't confuse module-prefixed identifiers for labels.
Reported by Juan-Leon Lahoz Garcia <juanleon1@gmail.com>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac78d4d7f9ac2ad1e6262b4d38a6d297e0b8e5c5..7ad139850ba7e938fcee92caa4d6d1a3258d0ec3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index c24e8046b667dfb6f97e72340ad27b5b7c0f7938..eb630c2ed542f8a4a83514333a5d29a32f144580 100644 (file)
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -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 @@ existing comment, moves to end-of-line, or if at end-of-line already,
 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)
 \f
@@ -769,7 +769,7 @@ Optional argument PARSE-START should be the position of `beginning-of-defun'."
                           (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 @@ With argument, repeat that many times; negative args move backward."
 
 (provide 'perl-mode)
 
-;;; arch-tag: 8c7ff68d-15f3-46a2-ade2-b7c41f176826
+;; arch-tag: 8c7ff68d-15f3-46a2-ade2-b7c41f176826
 ;;; perl-mode.el ends here