(perl-mode-syntax-table): Change $ back to just "/" instead of "/ p".

(perl-font-lock-syntactic-keywords): Use ". p" for the `$'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2cefa07b1885ad85dc56b7ab207b62bc31fbeee1..b520e9f99b00df0cd097c0965a8d79097c419977 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-18  Stefan Monnier  <monnier@rum.cs.yale.edu>
+
+       * progmodes/perl-mode.el (perl-mode-syntax-table): Change $ back
+       to just "/" instead of "/ p".
+       (perl-font-lock-syntactic-keywords): Use ". p" for the `$'.
+
 2002-10-18  Juanma Barranquero  <lektu@terra.es>
 
        * textmodes/artist.el (artist-ff-is-bottommost-line): Fix misplaced

diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 2b12f86e29b3f1f0859473290d8b8e03ad5e3a45..626310a2261868ad2aaf1f2b12f72603010ece2c 100644 (file)
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -139,7 +139,9 @@ The expansion is entirely correct because it uses the C preprocessor."
   (let ((st (make-syntax-table (standard-syntax-table))))
     (modify-syntax-entry ?\n ">" st)
     (modify-syntax-entry ?# "<" st)
-    (modify-syntax-entry ?$ "/ p" st)
+    ;; `$' is also a prefix char so I was tempted to say "/ p",
+    ;; but the `p' thingy basically overrides the `/' :-(   --stef
+    (modify-syntax-entry ?$ "/" st)
     (modify-syntax-entry ?% ". p" st)
     (modify-syntax-entry ?@ ". p" st)
     (modify-syntax-entry ?& "." st)
@@ -250,7 +252,7 @@ The expansion is entirely correct because it uses the C preprocessor."
     ;; Catch ${ so that ${var} doesn't screw up indentation.
     ;; This also catches $' to handle 'foo$', although it should really
     ;; check that it occurs inside a '..' string.
-    ("\\(\\$\\)[{']" (1 "."))
+    ("\\(\\$\\)[{']" (1 ". p"))
     ;; Handle funny names like $DB'stop.
     ("\\$ ?{?^?[_a-zA-Z][_a-zA-Z0-9]*\\('\\)[_a-zA-Z]" (1 "_"))
     ;; format statements