From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 16 Aug 2007 14:20:37 +0000 (+0000)
Subject: (perl-font-lock-syntactic-keywords): Correctly match / regexp matchers
X-Git-Tag: emacs-pretest-22.1.90~984
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ed0e2ad11b2b80f7a8505b72285c7ff041a5b37b;p=emacs.git

(perl-font-lock-syntactic-keywords): Correctly match / regexp matchers
as first char on a line when fontifying only that line.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16edb115181..33b2c21eeed 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2007-08-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* progmodes/perl-mode.el (perl-font-lock-syntactic-keywords):
+	Correctly match / regexp matchers as first char on a line when
+	fontifying only that line.
+
 	* emacs-lisp/cl-macs.el (cl-transform-lambda): Preserve the match-data.
 
 2007-08-16  Glenn Morris  <rgm@gnu.org>
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index cfef0eedfe4..f2feff595bb 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -267,8 +267,16 @@ The expansion is entirely correct because it uses the C preprocessor."
     ("^[ \t]*format.*=[ \t]*\\(\n\\)" (1 '(7)))
     ;; Funny things in sub arg specifications like `sub myfunc ($$)'
     ("\\<sub\\s-+\\S-+\\s-*(\\([^)]+\\))" 1 '(1))
-    ;; regexp and funny quotes
-    ("[?:.,;=!~({[][ \t\n]*\\(/\\)" (1 '(7)))
+    ;; Regexp and funny quotes.
+    ("\\(?:[?:.,;=!~({[]\\|\\(^\\)\\)[ \t\n]*\\(/\\)"
+     (2 (if (and (match-end 1)
+                 (save-excursion
+                   (goto-char (match-end 1))
+                   (skip-chars-backward " \t\n")
+                   (not (memq (char-before)
+                              '(?? ?: ?. ?, ?\; ?= ?! ?~ ?\( ?\[)))))
+            nil ;; A division sign instead of a regexp-match.
+          '(7))))
     ("\\(^\\|[?:.,;=!~({[ \t]\\)\\([msy]\\|q[qxrw]?\\|tr\\)\\>\\s-*\\([^])}> \n\t]\\)"
      ;; Nasty cases:
      ;; /foo/m  $a->m  $#m $m @m %m